Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FE] feat#46 선택한 퀴즈셋 서버로 전송 #209

Merged
merged 14 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
645 changes: 645 additions & 0 deletions FE/package-lock.json

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion FE/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,17 @@
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.14",
"globals": "^15.11.0",
"msw": "^2.6.5",
"postcss": "^8.4.47",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.14",
"typescript": "~5.6.2",
"typescript-eslint": "^8.11.0",
"vite": "^5.4.10"
},
"msw": {
"workerDirectory": [
"public"
]
}
}
}
295 changes: 295 additions & 0 deletions FE/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,295 @@
/* eslint-disable */
/* tslint:disable */

/**
* Mock Service Worker.
* @see https://github.com/mswjs/msw
* - Please do NOT modify this file.
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = '2.6.5'
const INTEGRITY_CHECKSUM = 'ca7800994cc8bfb5eb961e037c877074'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()

self.addEventListener('install', function () {
self.skipWaiting()
})

self.addEventListener('activate', function (event) {
event.waitUntil(self.clients.claim())
})

self.addEventListener('message', async function (event) {
const clientId = event.source.id

if (!clientId || !self.clients) {
return
}

const client = await self.clients.get(clientId)

if (!client) {
return
}

const allClients = await self.clients.matchAll({
type: 'window',
})

switch (event.data) {
case 'KEEPALIVE_REQUEST': {
sendToClient(client, {
type: 'KEEPALIVE_RESPONSE',
})
break
}

case 'INTEGRITY_CHECK_REQUEST': {
sendToClient(client, {
type: 'INTEGRITY_CHECK_RESPONSE',
payload: {
packageVersion: PACKAGE_VERSION,
checksum: INTEGRITY_CHECKSUM,
},
})
break
}

case 'MOCK_ACTIVATE': {
activeClientIds.add(clientId)

sendToClient(client, {
type: 'MOCKING_ENABLED',
payload: {
client: {
id: client.id,
frameType: client.frameType,
},
},
})
break
}

case 'MOCK_DEACTIVATE': {
activeClientIds.delete(clientId)
break
}

case 'CLIENT_CLOSED': {
activeClientIds.delete(clientId)

const remainingClients = allClients.filter((client) => {
return client.id !== clientId
})

// Unregister itself when there are no more clients
if (remainingClients.length === 0) {
self.registration.unregister()
}

break
}
}
})

self.addEventListener('fetch', function (event) {
const { request } = event

// Bypass navigation requests.
if (request.mode === 'navigate') {
return
}

// Opening the DevTools triggers the "only-if-cached" request
// that cannot be handled by the worker. Bypass such requests.
if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
return
}

// Bypass all requests when there are no active clients.
// Prevents the self-unregistered worked from handling requests
// after it's been deleted (still remains active until the next reload).
Comment on lines +111 to +113
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

킹피티?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ㅋㅋㅋㅋㅋㅋ 그 파일이 msw 패키지 설치하고 초기 실행하면 생기는 파일입니다

if (activeClientIds.size === 0) {
return
}

// Generate unique request ID.
const requestId = crypto.randomUUID()
event.respondWith(handleRequest(event, requestId))
})

async function handleRequest(event, requestId) {
const client = await resolveMainClient(event)
const response = await getResponse(event, client, requestId)

// Send back the response clone for the "response:*" life-cycle events.
// Ensure MSW is active and ready to handle the message, otherwise
// this message will pend indefinitely.
if (client && activeClientIds.has(client.id)) {
;(async function () {
const responseClone = response.clone()

sendToClient(
client,
{
type: 'RESPONSE',
payload: {
requestId,
isMockedResponse: IS_MOCKED_RESPONSE in response,
type: responseClone.type,
status: responseClone.status,
statusText: responseClone.statusText,
body: responseClone.body,
headers: Object.fromEntries(responseClone.headers.entries()),
},
},
[responseClone.body],
)
})()
}

return response
}

// Resolve the main client for the given event.
// Client that issues a request doesn't necessarily equal the client
// that registered the worker. It's with the latter the worker should
// communicate with during the response resolving phase.
async function resolveMainClient(event) {
const client = await self.clients.get(event.clientId)

if (activeClientIds.has(event.clientId)) {
return client
}

if (client?.frameType === 'top-level') {
return client
}

const allClients = await self.clients.matchAll({
type: 'window',
})

return allClients
.filter((client) => {
// Get only those clients that are currently visible.
return client.visibilityState === 'visible'
})
.find((client) => {
// Find the client ID that's recorded in the
// set of clients that have registered the worker.
return activeClientIds.has(client.id)
})
}

async function getResponse(event, client, requestId) {
const { request } = event

// Clone the request because it might've been already used
// (i.e. its body has been read and sent to the client).
const requestClone = request.clone()

function passthrough() {
// Cast the request headers to a new Headers instance
// so the headers can be manipulated with.
const headers = new Headers(requestClone.headers)

// Remove the "accept" header value that marked this request as passthrough.
// This prevents request alteration and also keeps it compliant with the
// user-defined CORS policies.
headers.delete('accept', 'msw/passthrough')

return fetch(requestClone, { headers })
}

// Bypass mocking when the client is not active.
if (!client) {
return passthrough()
}

// Bypass initial page load requests (i.e. static assets).
// The absence of the immediate/parent client in the map of the active clients
// means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
// and is not ready to handle requests.
if (!activeClientIds.has(client.id)) {
return passthrough()
}

// Notify the client that a request has been intercepted.
const requestBuffer = await request.arrayBuffer()
const clientMessage = await sendToClient(
client,
{
type: 'REQUEST',
payload: {
id: requestId,
url: request.url,
mode: request.mode,
method: request.method,
headers: Object.fromEntries(request.headers.entries()),
cache: request.cache,
credentials: request.credentials,
destination: request.destination,
integrity: request.integrity,
redirect: request.redirect,
referrer: request.referrer,
referrerPolicy: request.referrerPolicy,
body: requestBuffer,
keepalive: request.keepalive,
},
},
[requestBuffer],
Comment on lines +222 to +243
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

목장인..

)

switch (clientMessage.type) {
case 'MOCK_RESPONSE': {
return respondWithMock(clientMessage.data)
}

case 'PASSTHROUGH': {
return passthrough()
}
}

return passthrough()
}

function sendToClient(client, message, transferrables = []) {
return new Promise((resolve, reject) => {
const channel = new MessageChannel()

channel.port1.onmessage = (event) => {
if (event.data && event.data.error) {
return reject(event.data.error)
}

resolve(event.data)
}

client.postMessage(
message,
[channel.port2].concat(transferrables.filter(Boolean)),
)
})
}

async function respondWithMock(response) {
// Setting response status code to 0 is a no-op.
// However, when responding with a "Response.error()", the produced Response
// instance will have status code set to 0. Since it's not possible to create
// a Response instance with status code 0, handle that use-case separately.
if (response.status === 0) {
return Response.error()
}

const mockedResponse = new Response(response.body, response)

Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
value: true,
enumerable: true,
})

return mockedResponse
}
2 changes: 1 addition & 1 deletion FE/src/api/mocks/SocketMock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export class SocketMock {
const players = this.players.map((p) => {
const [y, x] = p.playerPosition;
const option =
Math.round(x) + Math.floor(y * Math.ceil((this.quiz?.choiceList.length || 0) / 2)) * 2;
Math.round(x) + Math.floor(y * Math.ceil((this.quiz?.choiceList.length || 0) / 2)) * 2 + 1;
return {
playerId: p.playerId,
isAnswer: option === answer,
Expand Down
2 changes: 1 addition & 1 deletion FE/src/api/mocks/socketMocks/SocketMockStartGame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default class SocketMockStartGame extends SocketMock {

// 퀴즈 종료
await this.delay(8);
this.calculateScore(0);
this.calculateScore(1);
this.log('퀴즈 가 종료 되었습니다.');
}
}
4 changes: 2 additions & 2 deletions FE/src/api/socketEventTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ type UpdateRoomOptionResponse = {

// 게임방 퀴즈셋 수정 타입
type UpdateRoomQuizsetRequest = {
quizsetId: number;
quizSetId: number;
quizCount: number;
};

type UpdateRoomQuizsetResponse = {
quizsetId: number;
quizSetId: number;
quizCount: number;
};

Expand Down
14 changes: 8 additions & 6 deletions FE/src/components/QuizHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import AnswerModal from './AnswerModal';
import QuizState from '@/constants/quizState';
import Lottie from 'lottie-react';
import quizLoading from '../assets/lottie/quiz_loading.json';
import useServerDate from '@/hooks/useServerDate';

export const QuizHeader = () => {
const currentQuiz = useQuizeStore((state) => state.currentQuiz);
Expand All @@ -12,12 +13,13 @@ export const QuizHeader = () => {
const [isAnswerVisible, setIsAnswerVisible] = useState(false);
const [limitTime, setLimitTime] = useState(0);
const answer = useQuizeStore((state) => state.currentAnswer);
const serverNow = useServerDate();
useEffect(() => {
if (currentQuiz) {
setSeconds((currentQuiz.endTime - Date.now()) / 1000);
setSeconds((currentQuiz.endTime - serverNow()) / 1000);
setLimitTime((currentQuiz.endTime - currentQuiz.startTime) / 1000);
}
}, [currentQuiz]);
}, [currentQuiz, serverNow]);

useEffect(() => {
setIsAnswerVisible(quizState === QuizState.END);
Expand All @@ -26,9 +28,9 @@ export const QuizHeader = () => {
useEffect(() => {
requestAnimationFrame(() => {
if (seconds <= 0 || !currentQuiz) return;
setSeconds((currentQuiz.endTime - Date.now()) / 1000);
setSeconds((currentQuiz.endTime - serverNow()) / 1000);
});
}, [currentQuiz, seconds]);
}, [currentQuiz, seconds, serverNow]);

if (!currentQuiz)
return (
Expand All @@ -38,10 +40,10 @@ export const QuizHeader = () => {
</div>
);

if (currentQuiz.startTime > Date.now())
if (currentQuiz.startTime > serverNow())
return (
<div className="border border-default component-popup flex justify-center items-center h-[280px] w-[1000px] text-orange-300 font-bold text-7xl">
{Math.ceil((currentQuiz.startTime - Date.now()) / 1000)}
{Math.ceil((currentQuiz.startTime - serverNow()) / 1000)}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p2: 1000은 매직넘버로 보입니다 ! 상수화해서 사용하면 좋을것같아요

</div>
);
return (
Expand Down
Loading