Skip to content
Closed
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
12 changes: 11 additions & 1 deletion client/src/features/workSpace/hooks/usePagesManage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,21 @@ export const usePagesManage = (workspace: WorkSpace | null, clientId: number | n
return;
}
if (!socketStore.socket) return;

const startTime = performance.now();
// ํŽ˜์ด์ง€ ๋ฐ์ดํ„ฐ ์ˆ˜์‹  ํ•ธ๋“ค๋Ÿฌ
const handlePageData = (data: { pageId: string; serializedPage: any }) => {
if (data.pageId === pageId) {
// ํŽ˜์ด์ง€ ๋ฐ์ดํ„ฐ ์—…๋ฐ์ดํŠธ
const endTime = performance.now();
const totalTime = endTime - startTime;

console.log({
event: "fetchPageData",
pageId,
totalTime: `${totalTime}ms`,
dataSize: JSON.stringify(data.serializedPage).length,
timestamp: new Date().toISOString(),
});
updatePageData(pageId, data.serializedPage.crdt);

// ๋กœ๋”ฉ ์ƒํƒœ ์—…๋ฐ์ดํŠธ
Expand Down
7,577 changes: 7,273 additions & 304 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
"test:watch": "jest --watch",
"test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "jest --config ./test/jest-e2e.json"
"test:e2e": "jest --config ./test/jest-e2e.json",
"test:load": "artillery run ./test/socket-test.yaml",
"test:load:report": "artillery run ./test/socket-test.yml --output report.json && artillery report report.json"
},
"dependencies": {
"@nestjs/common": "^10.0.0",
Expand All @@ -35,6 +37,7 @@
"@nestjs/websockets": "^10.4.7",
"@noctaCrdt": "workspace:*",
"@types/cookie-parser": "^1.4.7",
"artillery": "^2.0.21",
"bcrypt": "^5.1.1",
"cookie-parser": "^1.4.7",
"express": "^4.21.1",
Expand Down
7 changes: 7 additions & 0 deletions server/src/metric/metric.interceptor.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { MetricInterceptor } from './metric.interceptor';

describe('MetricInterceptor', () => {
it('should be defined', () => {
expect(new MetricInterceptor()).toBeDefined();
});
});
24 changes: 24 additions & 0 deletions server/src/metric/metric.interceptor.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from "@nestjs/common";
import { Observable } from "rxjs";
import { tap } from "rxjs/operators";

@Injectable()
export class MetricInterceptor implements NestInterceptor {
intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
const start = Date.now();
const client = context.switchToWs().getClient();
const event = context.getArgs()[0].event;

return next.handle().pipe(
tap(() => {
const latency = Date.now() - start;
// ์„œ๋ฒ„ ์ธก ์ง€์—ฐ์‹œ๊ฐ„ ๋กœ๊น…
client.emit("operation:latency", {
event,
latency,
timestamp: Date.now(),
});
}),
);
}
}
10 changes: 9 additions & 1 deletion server/src/workspace/workspace.gateway.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ import {
RemoteCharUpdateOperation,
CursorPosition,
} from "@noctaCrdt/Interfaces";
import { Logger } from "@nestjs/common";
import { Logger, UseInterceptors } from "@nestjs/common";
import { nanoid } from "nanoid";
import { Page } from "@noctaCrdt/Page";
import { EditorCRDT } from "@noctaCrdt/Crdt";
import { AuthService } from "../auth/auth.service";
import { WorkspaceInviteData } from "./workspace.interface";
import { MetricInterceptor } from "../metric/metric.interceptor";

// ํด๋ผ์ด์–ธํŠธ ๋งต ํƒ€์ž… ์ •์˜
interface ClientInfo {
clientId: number; // ์„œ๋ฒ„๊ฐ€ ๋ถ€์—ฌํ•œ ์•„์ด๋””๋กœ, 0,1,2,3, ๊ฐ™์€ ์ˆซ์ž์ž„.
Expand All @@ -55,6 +57,7 @@ type Operation =
| RemoteCharUpdateOperation
| CursorPosition;

@UseInterceptors(MetricInterceptor)
@WebSocketGateway({
cors: {
origin:
Expand Down Expand Up @@ -453,6 +456,7 @@ export class WorkspaceGateway implements OnGatewayInit, OnGatewayConnection, OnG
page: newPage.serialize(),
} as RemotePageCreateOperation;
client.emit("create/page", operation);
console.log("ํŽ˜์ด์ง€์ •๋ณด:", operation);

this.emitOperation(client.id, workspaceId, "create/page", operation, batch);
} catch (error) {
Expand Down Expand Up @@ -773,6 +777,7 @@ export class WorkspaceGateway implements OnGatewayInit, OnGatewayConnection, OnG
@MessageBody() data: RemoteCharInsertOperation,
@ConnectedSocket() client: Socket,
batch: boolean = false,
startTime: string,
): Promise<void> {
const clientInfo = this.clientMap.get(client.id);
try {
Expand Down Expand Up @@ -803,6 +808,9 @@ export class WorkspaceGateway implements OnGatewayInit, OnGatewayConnection, OnG
backgroundColor: data.node.backgroundColor ? data.node.backgroundColor : "transparent",
} as RemoteCharInsertOperation;
this.emitOperation(client.id, data.pageId, "insert/char", operation, batch);
const endTime = performance.now();
const totalTime = endTime - startTime;
console.log("insert/char test time : ", totalTime);
} catch (error) {
this.logger.error(
`Char Insert ์—ฐ์‚ฐ ์ฒ˜๋ฆฌ ์ค‘ ์˜ค๋ฅ˜ ๋ฐœ์ƒ - Client ID: ${clientInfo?.clientId}`,
Expand Down
114 changes: 114 additions & 0 deletions server/test/processors.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
// processors.js
module.exports = {
handlePageCreation,
generateCharData,
handleCharInsertion,
};
function handlePageCreation(userContext, events, done) {
let doneCalled = false;
let timeoutId;

const socket = userContext.sockets[""];

// ๋จผ์ € ๋ชจ๋“  ๊ฐ€๋Šฅํ•œ ์‘๋‹ต ์ด๋ฒคํŠธ์— ๋Œ€ํ•œ ๋ฆฌ์Šค๋„ˆ๋ฅผ ์„ค์ •
socket.on("create/page", (response) => {
console.log("Received create/page response:", response);
if (response && response.page && response.page.id) {
handleSuccess(response.page.id);
}
});

socket.on("workspace", (response) => {
console.log("Received workspace response:", response);
if (response && response.id) {
handleSuccess(response.id);
}
});

// ์„ฑ๊ณต ์ฒ˜๋ฆฌ๋ฅผ ์œ„ํ•œ ํ—ฌํผ ํ•จ์ˆ˜
function handleSuccess(pageId) {
if (!doneCalled) {
userContext.vars.pageId = pageId;
console.log("Successfully captured page ID:", pageId);
doneCalled = true;
clearTimeout(timeoutId);
done();
}
}

// ์ด๋ฒคํŠธ ๋ฆฌ์Šค๋„ˆ ์„ค์ • ํ›„ emit ์‹คํ–‰
console.log("Emitting create/page event...");
socket.emit("create/page", {
type: "pageCreate",
workspaceId: "guest",
clientId: 3,
});

// ํƒ€์ž„์•„์›ƒ ์„ค์ • (์‹œ๊ฐ„์„ ์ข€ ๋” ๊ธธ๊ฒŒ ์„ค์ •)
timeoutId = setTimeout(() => {
if (!doneCalled) {
console.error("[ERROR] Page creation timed out - No response received after 10 seconds");
doneCalled = true;
done(new Error("Operation timed out"));
}
}, 5000); // 10์ดˆ๋กœ ์—ฐ์žฅ
}

const pageNodeTrackers = new Map();

function generateCharData(userContext, events, done) {
const pageId = userContext.vars.pageId;

// ํŽ˜์ด์ง€๋ณ„ ๋…ธ๋“œ ์ถ”์ ๊ธฐ ์ดˆ๊ธฐํ™”
if (!pageNodeTrackers.has(pageId)) {
pageNodeTrackers.set(pageId, {
lastNode: null,
firstNode: null,
});
}
const nodeTracker = pageNodeTrackers.get(pageId);

const clock = Date.now() % 100000;

// ์ƒˆ๋กœ์šด ๋ฌธ์ž ๋…ธ๋“œ ์ƒ์„ฑ
const charNode = {
id: {
clock: clock,
client: 3,
},
value: String.fromCharCode(65 + Math.floor(Math.random() * 26)),
next: null, // ๋‹ค์Œ์— ์—ฐ๊ฒฐ๋  ๋…ธ๋“œ
prev: nodeTracker.lastNode ? nodeTracker.lastNode.id : null, // ์ด์ „ ๋…ธ๋“œ์˜ ID
style: [],
color: "black",
backgroundColor: "transparent",
};

// ์ฒซ ๋ฒˆ์งธ ๋…ธ๋“œ์ธ ๊ฒฝ์šฐ ์ €์žฅ
if (!nodeTracker.firstNode) {
nodeTracker.firstNode = charNode;
}

// ์ด์ „ ๋…ธ๋“œ๊ฐ€ ์žˆ๋Š” ๊ฒฝ์šฐ, ํ•ด๋‹น ๋…ธ๋“œ์˜ next๋ฅผ ํ˜„์žฌ ๋…ธ๋“œ๋กœ ์„ค์ •
if (nodeTracker.lastNode) {
nodeTracker.lastNode.next = charNode.id;
}

// ํ˜„์žฌ ๋…ธ๋“œ๋ฅผ ๋งˆ์ง€๋ง‰ ๋…ธ๋“œ๋กœ ์ €์žฅ
nodeTracker.lastNode = charNode;

userContext.vars.charNode = charNode;
return done();
}

// ๋ฌธ์ž ์ž…๋ ฅ ์ฒ˜๋ฆฌ๋ฅผ ์œ„ํ•œ ์ƒˆ๋กœ์šด ํ•จ์ˆ˜
function handleCharInsertion(userContext, events, done) {
const socket = userContext.sockets[""];

// ๋ฌธ์ž ์ž…๋ ฅ ์ด๋ฒคํŠธ ๋ฆฌ์Šค๋„ˆ ์„ค์ •
socket.on("insert/char", (response) => {
console.log("Character inserted:", response);
});

done();
}
Loading
Loading