@littlepartytime/dev-kit 1.3.0 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__tests__/sandbox-guard.test.d.ts +2 -0
- package/dist/__tests__/sandbox-guard.test.d.ts.map +1 -0
- package/dist/__tests__/sandbox-guard.test.js +214 -0
- package/dist/__tests__/sandbox-guard.test.js.map +1 -0
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +56 -4
- package/dist/commands/dev.js.map +1 -1
- package/dist/server/sandbox-guard.d.ts +3 -0
- package/dist/server/sandbox-guard.d.ts.map +1 -0
- package/dist/server/sandbox-guard.js +109 -0
- package/dist/server/sandbox-guard.js.map +1 -0
- package/dist/server/socket-server.d.ts.map +1 -1
- package/dist/server/socket-server.js +4 -3
- package/dist/server/socket-server.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sandbox-guard.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/sandbox-guard.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const vitest_1 = require("vitest");
|
|
4
|
+
const sandbox_guard_1 = require("../server/sandbox-guard");
|
|
5
|
+
function createTestEngine(overrides = {}) {
|
|
6
|
+
return {
|
|
7
|
+
init: (players) => ({
|
|
8
|
+
phase: 'playing',
|
|
9
|
+
players: players.map((p) => ({ id: p.id })),
|
|
10
|
+
data: {},
|
|
11
|
+
}),
|
|
12
|
+
handleAction: (state, _playerId, _action) => state,
|
|
13
|
+
isGameOver: (state) => state.phase === 'ended',
|
|
14
|
+
getResult: (state) => ({
|
|
15
|
+
rankings: state.players.map((p, i) => ({
|
|
16
|
+
playerId: p.id,
|
|
17
|
+
rank: i + 1,
|
|
18
|
+
score: 0,
|
|
19
|
+
isWinner: i === 0,
|
|
20
|
+
})),
|
|
21
|
+
}),
|
|
22
|
+
getPlayerView: (state, _playerId) => state,
|
|
23
|
+
...overrides,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
(0, vitest_1.describe)('createSandboxedEngine', () => {
|
|
27
|
+
(0, vitest_1.describe)('timer guard', () => {
|
|
28
|
+
(0, vitest_1.it)('should warn when engine calls setTimeout', () => {
|
|
29
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
30
|
+
const engine = createTestEngine({
|
|
31
|
+
init: (players) => {
|
|
32
|
+
globalThis.setTimeout(() => { }, 100);
|
|
33
|
+
return { phase: 'playing', players: [], data: {} };
|
|
34
|
+
},
|
|
35
|
+
});
|
|
36
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
37
|
+
sandboxed.init([]);
|
|
38
|
+
(0, vitest_1.expect)(warnSpy).toHaveBeenCalledWith(vitest_1.expect.stringContaining('setTimeout() called in engine code'));
|
|
39
|
+
warnSpy.mockRestore();
|
|
40
|
+
});
|
|
41
|
+
(0, vitest_1.it)('should warn when engine calls setInterval', () => {
|
|
42
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
43
|
+
const engine = createTestEngine({
|
|
44
|
+
handleAction: (state) => {
|
|
45
|
+
globalThis.setInterval(() => { }, 1000);
|
|
46
|
+
return state;
|
|
47
|
+
},
|
|
48
|
+
});
|
|
49
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
50
|
+
sandboxed.handleAction({ phase: 'playing', players: [], data: {} }, 'p1', { type: 'X' });
|
|
51
|
+
(0, vitest_1.expect)(warnSpy).toHaveBeenCalledWith(vitest_1.expect.stringContaining('setInterval() called in engine code'));
|
|
52
|
+
warnSpy.mockRestore();
|
|
53
|
+
});
|
|
54
|
+
(0, vitest_1.it)('should restore real setTimeout after engine call', () => {
|
|
55
|
+
const realSetTimeout = globalThis.setTimeout;
|
|
56
|
+
const engine = createTestEngine({
|
|
57
|
+
init: () => {
|
|
58
|
+
globalThis.setTimeout(() => { }, 0);
|
|
59
|
+
return { phase: 'playing', players: [], data: {} };
|
|
60
|
+
},
|
|
61
|
+
});
|
|
62
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
63
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
64
|
+
sandboxed.init([]);
|
|
65
|
+
warnSpy.mockRestore();
|
|
66
|
+
(0, vitest_1.expect)(globalThis.setTimeout).toBe(realSetTimeout);
|
|
67
|
+
});
|
|
68
|
+
(0, vitest_1.it)('should restore globals even if engine throws', () => {
|
|
69
|
+
const realSetTimeout = globalThis.setTimeout;
|
|
70
|
+
const engine = createTestEngine({
|
|
71
|
+
init: () => { throw new Error('boom'); },
|
|
72
|
+
});
|
|
73
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
74
|
+
(0, vitest_1.expect)(() => sandboxed.init([])).toThrow('boom');
|
|
75
|
+
(0, vitest_1.expect)(globalThis.setTimeout).toBe(realSetTimeout);
|
|
76
|
+
});
|
|
77
|
+
(0, vitest_1.it)('should return no-op value (0) from mocked setTimeout', () => {
|
|
78
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
79
|
+
let timerReturn;
|
|
80
|
+
const engine = createTestEngine({
|
|
81
|
+
init: () => {
|
|
82
|
+
timerReturn = globalThis.setTimeout(() => { }, 100);
|
|
83
|
+
return { phase: 'playing', players: [], data: {} };
|
|
84
|
+
},
|
|
85
|
+
});
|
|
86
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
87
|
+
sandboxed.init([]);
|
|
88
|
+
warnSpy.mockRestore();
|
|
89
|
+
(0, vitest_1.expect)(timerReturn).toBe(0);
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
(0, vitest_1.describe)('serialization check', () => {
|
|
93
|
+
(0, vitest_1.it)('should warn when state contains a Map', () => {
|
|
94
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
95
|
+
const engine = createTestEngine({
|
|
96
|
+
init: () => ({
|
|
97
|
+
phase: 'playing',
|
|
98
|
+
players: [],
|
|
99
|
+
data: { lookup: new Map([['a', 1]]) },
|
|
100
|
+
}),
|
|
101
|
+
});
|
|
102
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
103
|
+
sandboxed.init([]);
|
|
104
|
+
(0, vitest_1.expect)(warnSpy).toHaveBeenCalledWith(vitest_1.expect.stringContaining('Map at state'));
|
|
105
|
+
warnSpy.mockRestore();
|
|
106
|
+
});
|
|
107
|
+
(0, vitest_1.it)('should warn when state contains a Set', () => {
|
|
108
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
109
|
+
const engine = createTestEngine({
|
|
110
|
+
handleAction: () => ({
|
|
111
|
+
phase: 'playing',
|
|
112
|
+
players: [],
|
|
113
|
+
data: { ids: new Set([1, 2, 3]) },
|
|
114
|
+
}),
|
|
115
|
+
});
|
|
116
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
117
|
+
sandboxed.handleAction({ phase: 'playing', players: [], data: {} }, 'p1', { type: 'X' });
|
|
118
|
+
(0, vitest_1.expect)(warnSpy).toHaveBeenCalledWith(vitest_1.expect.stringContaining('Set at state'));
|
|
119
|
+
warnSpy.mockRestore();
|
|
120
|
+
});
|
|
121
|
+
(0, vitest_1.it)('should warn when state contains a Date', () => {
|
|
122
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
123
|
+
const engine = createTestEngine({
|
|
124
|
+
init: () => ({
|
|
125
|
+
phase: 'playing',
|
|
126
|
+
players: [],
|
|
127
|
+
data: { createdAt: new Date() },
|
|
128
|
+
}),
|
|
129
|
+
});
|
|
130
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
131
|
+
sandboxed.init([]);
|
|
132
|
+
(0, vitest_1.expect)(warnSpy).toHaveBeenCalledWith(vitest_1.expect.stringContaining('Date at state'));
|
|
133
|
+
warnSpy.mockRestore();
|
|
134
|
+
});
|
|
135
|
+
(0, vitest_1.it)('should warn when state contains undefined values', () => {
|
|
136
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
137
|
+
const engine = createTestEngine({
|
|
138
|
+
init: () => ({
|
|
139
|
+
phase: 'playing',
|
|
140
|
+
players: [],
|
|
141
|
+
data: { missing: undefined },
|
|
142
|
+
}),
|
|
143
|
+
});
|
|
144
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
145
|
+
sandboxed.init([]);
|
|
146
|
+
(0, vitest_1.expect)(warnSpy).toHaveBeenCalledWith(vitest_1.expect.stringContaining('undefined at state'));
|
|
147
|
+
warnSpy.mockRestore();
|
|
148
|
+
});
|
|
149
|
+
(0, vitest_1.it)('should warn when state contains a function', () => {
|
|
150
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
151
|
+
const engine = createTestEngine({
|
|
152
|
+
init: () => ({
|
|
153
|
+
phase: 'playing',
|
|
154
|
+
players: [],
|
|
155
|
+
data: { compute: () => 42 },
|
|
156
|
+
}),
|
|
157
|
+
});
|
|
158
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
159
|
+
sandboxed.init([]);
|
|
160
|
+
(0, vitest_1.expect)(warnSpy).toHaveBeenCalledWith(vitest_1.expect.stringContaining('Function at state'));
|
|
161
|
+
warnSpy.mockRestore();
|
|
162
|
+
});
|
|
163
|
+
(0, vitest_1.it)('should not warn for clean serializable state', () => {
|
|
164
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
165
|
+
const engine = createTestEngine({
|
|
166
|
+
init: () => ({
|
|
167
|
+
phase: 'playing',
|
|
168
|
+
players: [{ id: 'p1' }],
|
|
169
|
+
data: { scores: [0, 0], turn: 0, active: true, name: 'test' },
|
|
170
|
+
}),
|
|
171
|
+
});
|
|
172
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
173
|
+
sandboxed.init([]);
|
|
174
|
+
(0, vitest_1.expect)(warnSpy).not.toHaveBeenCalled();
|
|
175
|
+
warnSpy.mockRestore();
|
|
176
|
+
});
|
|
177
|
+
(0, vitest_1.it)('should detect nested non-serializable types', () => {
|
|
178
|
+
const warnSpy = vitest_1.vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
179
|
+
const engine = createTestEngine({
|
|
180
|
+
init: () => ({
|
|
181
|
+
phase: 'playing',
|
|
182
|
+
players: [],
|
|
183
|
+
data: { nested: { deep: { items: new Set([1]) } } },
|
|
184
|
+
}),
|
|
185
|
+
});
|
|
186
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
187
|
+
sandboxed.init([]);
|
|
188
|
+
(0, vitest_1.expect)(warnSpy).toHaveBeenCalledWith(vitest_1.expect.stringContaining('.nested.deep.items'));
|
|
189
|
+
warnSpy.mockRestore();
|
|
190
|
+
});
|
|
191
|
+
});
|
|
192
|
+
(0, vitest_1.describe)('engine passthrough', () => {
|
|
193
|
+
(0, vitest_1.it)('should correctly pass through init result', () => {
|
|
194
|
+
const engine = createTestEngine();
|
|
195
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
196
|
+
const state = sandboxed.init([{ id: 'p1', nickname: 'A', avatarUrl: null, isHost: true }]);
|
|
197
|
+
(0, vitest_1.expect)(state.phase).toBe('playing');
|
|
198
|
+
(0, vitest_1.expect)(state.players).toHaveLength(1);
|
|
199
|
+
});
|
|
200
|
+
(0, vitest_1.it)('should correctly pass through isGameOver', () => {
|
|
201
|
+
const engine = createTestEngine();
|
|
202
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
203
|
+
(0, vitest_1.expect)(sandboxed.isGameOver({ phase: 'playing', players: [], data: {} })).toBe(false);
|
|
204
|
+
(0, vitest_1.expect)(sandboxed.isGameOver({ phase: 'ended', players: [], data: {} })).toBe(true);
|
|
205
|
+
});
|
|
206
|
+
(0, vitest_1.it)('should correctly pass through getResult', () => {
|
|
207
|
+
const engine = createTestEngine();
|
|
208
|
+
const sandboxed = (0, sandbox_guard_1.createSandboxedEngine)(engine);
|
|
209
|
+
const result = sandboxed.getResult({ phase: 'ended', players: [{ id: 'p1' }], data: {} });
|
|
210
|
+
(0, vitest_1.expect)(result.rankings).toHaveLength(1);
|
|
211
|
+
});
|
|
212
|
+
});
|
|
213
|
+
});
|
|
214
|
+
//# sourceMappingURL=sandbox-guard.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sandbox-guard.test.js","sourceRoot":"","sources":["../../src/__tests__/sandbox-guard.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAgDA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,UAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAmFvG"}
|
package/dist/commands/dev.js
CHANGED
|
@@ -9,6 +9,48 @@ const path_1 = __importDefault(require("path"));
|
|
|
9
9
|
const vite_1 = require("vite");
|
|
10
10
|
const socket_server_1 = require("../server/socket-server");
|
|
11
11
|
const chokidar_1 = __importDefault(require("chokidar"));
|
|
12
|
+
function createEngineRebuilder(projectDir, silent) {
|
|
13
|
+
let building = false;
|
|
14
|
+
let pendingBuild = false;
|
|
15
|
+
let debounceTimer = null;
|
|
16
|
+
async function runBuild() {
|
|
17
|
+
if (building) {
|
|
18
|
+
pendingBuild = true;
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
building = true;
|
|
22
|
+
if (!silent) {
|
|
23
|
+
console.log('[Dev] Source changed, rebuilding engine...');
|
|
24
|
+
}
|
|
25
|
+
try {
|
|
26
|
+
await (0, vite_1.build)({
|
|
27
|
+
configFile: path_1.default.join(projectDir, 'vite.config.ts'),
|
|
28
|
+
logLevel: 'warn',
|
|
29
|
+
});
|
|
30
|
+
if (!silent) {
|
|
31
|
+
console.log('[Dev] Engine rebuild complete.');
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
catch (err) {
|
|
35
|
+
console.error('[Dev] Engine rebuild failed:', err.message);
|
|
36
|
+
}
|
|
37
|
+
finally {
|
|
38
|
+
building = false;
|
|
39
|
+
if (pendingBuild) {
|
|
40
|
+
pendingBuild = false;
|
|
41
|
+
runBuild();
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return (filePath) => {
|
|
46
|
+
if (debounceTimer)
|
|
47
|
+
clearTimeout(debounceTimer);
|
|
48
|
+
debounceTimer = setTimeout(() => {
|
|
49
|
+
debounceTimer = null;
|
|
50
|
+
runBuild();
|
|
51
|
+
}, 300);
|
|
52
|
+
};
|
|
53
|
+
}
|
|
12
54
|
async function devCommand(projectDir, options = {}) {
|
|
13
55
|
const port = options.port || 4000;
|
|
14
56
|
const socketPort = options.socketPort || 4001;
|
|
@@ -23,15 +65,24 @@ async function devCommand(projectDir, options = {}) {
|
|
|
23
65
|
port: socketPort,
|
|
24
66
|
projectDir,
|
|
25
67
|
});
|
|
26
|
-
// Watch for engine changes
|
|
68
|
+
// Watch for engine build output changes (triggers reload)
|
|
27
69
|
const enginePath = path_1.default.join(projectDir, 'dist', 'engine.cjs');
|
|
28
|
-
const
|
|
29
|
-
|
|
70
|
+
const distWatcher = chokidar_1.default.watch(enginePath, { ignoreInitial: true });
|
|
71
|
+
distWatcher.on('change', () => {
|
|
30
72
|
if (!options.silent) {
|
|
31
73
|
console.log('[Dev] Engine changed, reloading...');
|
|
32
74
|
}
|
|
33
75
|
reloadEngine();
|
|
34
76
|
});
|
|
77
|
+
// Watch source files and auto-rebuild engine
|
|
78
|
+
const srcDir = path_1.default.join(projectDir, 'src');
|
|
79
|
+
const srcWatcher = chokidar_1.default.watch(srcDir, {
|
|
80
|
+
ignoreInitial: true,
|
|
81
|
+
ignored: /node_modules/,
|
|
82
|
+
});
|
|
83
|
+
const triggerRebuild = createEngineRebuilder(projectDir, !!options.silent);
|
|
84
|
+
srcWatcher.on('change', triggerRebuild);
|
|
85
|
+
srcWatcher.on('add', triggerRebuild);
|
|
35
86
|
// Start Vite dev server
|
|
36
87
|
const webappDir = path_1.default.join(__dirname, '..', 'webapp');
|
|
37
88
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
@@ -65,7 +116,8 @@ async function devCommand(projectDir, options = {}) {
|
|
|
65
116
|
port,
|
|
66
117
|
socketPort,
|
|
67
118
|
async stop() {
|
|
68
|
-
await
|
|
119
|
+
await distWatcher.close();
|
|
120
|
+
await srcWatcher.close();
|
|
69
121
|
await vite.close();
|
|
70
122
|
io.disconnectSockets(true);
|
|
71
123
|
io.close();
|
package/dist/commands/dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sandbox-guard.d.ts","sourceRoot":"","sources":["../../src/server/sandbox-guard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAyFlD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAsBpE"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createSandboxedEngine = createSandboxedEngine;
|
|
4
|
+
function createNoopTimer(name) {
|
|
5
|
+
let warned = false;
|
|
6
|
+
return (..._args) => {
|
|
7
|
+
if (!warned) {
|
|
8
|
+
console.warn(`[Sandbox] WARNING: ${name}() called in engine code. ` +
|
|
9
|
+
`This is a no-op in the platform sandbox. ` +
|
|
10
|
+
`Use client-side timers + platform.send() instead.`);
|
|
11
|
+
warned = true;
|
|
12
|
+
}
|
|
13
|
+
return 0;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
function withTimerGuard(fn) {
|
|
17
|
+
const origSetTimeout = globalThis.setTimeout;
|
|
18
|
+
const origSetInterval = globalThis.setInterval;
|
|
19
|
+
const origClearTimeout = globalThis.clearTimeout;
|
|
20
|
+
const origClearInterval = globalThis.clearInterval;
|
|
21
|
+
globalThis.setTimeout = createNoopTimer('setTimeout');
|
|
22
|
+
globalThis.setInterval = createNoopTimer('setInterval');
|
|
23
|
+
globalThis.clearTimeout = () => { };
|
|
24
|
+
globalThis.clearInterval = () => { };
|
|
25
|
+
try {
|
|
26
|
+
return fn();
|
|
27
|
+
}
|
|
28
|
+
finally {
|
|
29
|
+
globalThis.setTimeout = origSetTimeout;
|
|
30
|
+
globalThis.setInterval = origSetInterval;
|
|
31
|
+
globalThis.clearTimeout = origClearTimeout;
|
|
32
|
+
globalThis.clearInterval = origClearInterval;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
function checkStateSerializable(state, context) {
|
|
36
|
+
if (state == null)
|
|
37
|
+
return;
|
|
38
|
+
const warnings = [];
|
|
39
|
+
walkObject(state, '', warnings);
|
|
40
|
+
for (const w of warnings) {
|
|
41
|
+
console.warn(`[Sandbox] WARNING: ${context} — ${w}`);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
function walkObject(obj, path, warnings) {
|
|
45
|
+
if (obj == null)
|
|
46
|
+
return;
|
|
47
|
+
if (typeof obj === 'function') {
|
|
48
|
+
warnings.push(`Function at state${path} will be removed after JSON serialization.`);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
if (obj instanceof Map) {
|
|
52
|
+
warnings.push(`Map at state${path} will become {} after JSON serialization. Use a plain object instead.`);
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
if (obj instanceof Set) {
|
|
56
|
+
warnings.push(`Set at state${path} will become {} after JSON serialization. Use an array instead.`);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
if (obj instanceof Date) {
|
|
60
|
+
warnings.push(`Date at state${path} will become a string after JSON serialization. Use an ISO string instead.`);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
if (obj instanceof RegExp) {
|
|
64
|
+
warnings.push(`RegExp at state${path} will become {} after JSON serialization.`);
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
if (typeof obj !== 'object')
|
|
68
|
+
return;
|
|
69
|
+
if (Array.isArray(obj)) {
|
|
70
|
+
for (let i = 0; i < obj.length; i++) {
|
|
71
|
+
walkObject(obj[i], `${path}[${i}]`, warnings);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
for (const key of Object.keys(obj)) {
|
|
76
|
+
const val = obj[key];
|
|
77
|
+
if (val === undefined) {
|
|
78
|
+
warnings.push(`undefined at state${path}.${key} will be removed after JSON serialization.`);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
walkObject(val, `${path}.${key}`, warnings);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
function createSandboxedEngine(engine) {
|
|
87
|
+
return {
|
|
88
|
+
init(players, options) {
|
|
89
|
+
const state = withTimerGuard(() => engine.init(players, options));
|
|
90
|
+
checkStateSerializable(state, 'init()');
|
|
91
|
+
return state;
|
|
92
|
+
},
|
|
93
|
+
handleAction(state, playerId, action) {
|
|
94
|
+
const newState = withTimerGuard(() => engine.handleAction(state, playerId, action));
|
|
95
|
+
checkStateSerializable(newState, 'handleAction()');
|
|
96
|
+
return newState;
|
|
97
|
+
},
|
|
98
|
+
isGameOver(state) {
|
|
99
|
+
return withTimerGuard(() => engine.isGameOver(state));
|
|
100
|
+
},
|
|
101
|
+
getResult(state) {
|
|
102
|
+
return withTimerGuard(() => engine.getResult(state));
|
|
103
|
+
},
|
|
104
|
+
getPlayerView(state, playerId) {
|
|
105
|
+
return withTimerGuard(() => engine.getPlayerView(state, playerId));
|
|
106
|
+
},
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=sandbox-guard.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sandbox-guard.js","sourceRoot":"","sources":["../../src/server/sandbox-guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-server.d.ts","sourceRoot":"","sources":["../../src/server/socket-server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"socket-server.d.ts","sourceRoot":"","sources":["../../src/server/socket-server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAC;AAExC,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,KAAK,IAAI,CAAC;IAClD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG;IAChE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,QAAQ,CAAC,QAAQ,CAAC;IACjC,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B,CAkKA"}
|
|
@@ -41,6 +41,7 @@ exports.createSocketServer = createSocketServer;
|
|
|
41
41
|
const socket_io_1 = require("socket.io");
|
|
42
42
|
const http_1 = __importDefault(require("http"));
|
|
43
43
|
const engine_loader_1 = require("./engine-loader");
|
|
44
|
+
const sandbox_guard_1 = require("./sandbox-guard");
|
|
44
45
|
const GameRoom = __importStar(require("./game-room"));
|
|
45
46
|
function createSocketServer(options) {
|
|
46
47
|
const { port, projectDir, onStateChange, onLog } = options;
|
|
@@ -48,8 +49,8 @@ function createSocketServer(options) {
|
|
|
48
49
|
onLog?.(msg);
|
|
49
50
|
console.log(`[Socket] ${msg}`);
|
|
50
51
|
};
|
|
51
|
-
// Load engine
|
|
52
|
-
let engine = (0, engine_loader_1.loadEngine)(projectDir);
|
|
52
|
+
// Load engine with sandbox guard
|
|
53
|
+
let engine = (0, sandbox_guard_1.createSandboxedEngine)((0, engine_loader_1.loadEngine)(projectDir));
|
|
53
54
|
log(`Engine loaded from ${projectDir}`);
|
|
54
55
|
// Create room
|
|
55
56
|
const room = GameRoom.createRoom('dev-game');
|
|
@@ -181,7 +182,7 @@ function createSocketServer(options) {
|
|
|
181
182
|
getRoom: () => room,
|
|
182
183
|
reloadEngine: () => {
|
|
183
184
|
(0, engine_loader_1.clearEngineCache)();
|
|
184
|
-
engine = (0, engine_loader_1.loadEngine)(projectDir);
|
|
185
|
+
engine = (0, sandbox_guard_1.createSandboxedEngine)((0, engine_loader_1.loadEngine)(projectDir));
|
|
185
186
|
log(`Engine reloaded`);
|
|
186
187
|
},
|
|
187
188
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-server.js","sourceRoot":"","sources":["../../src/server/socket-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"socket-server.js","sourceRoot":"","sources":["../../src/server/socket-server.ts"],"names":[],"mappings":"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"}
|