@zhin.js/adapter-sandbox 1.1.24 → 1.1.25
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/CHANGELOG.md +29 -0
- package/lib/endpoint.js +45 -7
- package/lib/protocol.d.ts +6 -0
- package/lib/protocol.js +15 -0
- package/package.json +17 -17
- package/pages/index/HtmlMessage.js +1 -1
- package/pages/index/HtmlMessage.tsx +1 -1
- package/pages/index/SandboxChat.js +131 -31
- package/pages/index/SandboxChat.tsx +334 -75
- package/pages/index/index.js +1 -1
- package/pages/index/index.tsx +1 -1
- package/pages/index/messages.js +2 -0
- package/pages/index/messages.ts +2 -0
- package/pages/index/styles.js +482 -181
- package/pages/index/styles.ts +482 -181
- package/src/endpoint.ts +42 -7
- package/src/protocol.ts +26 -0
package/src/endpoint.ts
CHANGED
|
@@ -363,6 +363,8 @@ export class SandboxWsEndpoint extends SandboxClient<SandboxConnection> implemen
|
|
|
363
363
|
}
|
|
364
364
|
const parsed = frame.message;
|
|
365
365
|
void this.#emitPlatformEvent('message', raw);
|
|
366
|
+
const senderId = parsed.senderId || owner;
|
|
367
|
+
const senderName = parsed.senderName || senderId;
|
|
366
368
|
const sceneId = parsed.id || owner;
|
|
367
369
|
const conversation = { ...sandboxInboundConversation(String(this.#options.id), {
|
|
368
370
|
type: parsed.type,
|
|
@@ -371,7 +373,7 @@ export class SandboxWsEndpoint extends SandboxClient<SandboxConnection> implemen
|
|
|
371
373
|
this.#logger.debug(formatCompact({
|
|
372
374
|
op: 'sandbox_recv',
|
|
373
375
|
target,
|
|
374
|
-
sender:
|
|
376
|
+
sender: senderId,
|
|
375
377
|
channelType: parsed.type,
|
|
376
378
|
channelId: sceneId,
|
|
377
379
|
text: parsed.text.slice(0, 80),
|
|
@@ -380,9 +382,22 @@ export class SandboxWsEndpoint extends SandboxClient<SandboxConnection> implemen
|
|
|
380
382
|
subscription.conversation = scene;
|
|
381
383
|
const messageId = parsed.messageId ?? randomUUID();
|
|
382
384
|
this.#broadcast(this.#subscribers(scene, true), JSON.stringify({
|
|
383
|
-
...scene, conversation: scene, direction: 'inbound', senderId
|
|
385
|
+
...scene, conversation: scene, direction: 'inbound', senderId,
|
|
386
|
+
...(parsed.senderName ? { senderName: parsed.senderName } : {}),
|
|
387
|
+
...(parsed.senderRole ? { senderRole: parsed.senderRole } : {}),
|
|
384
388
|
messageId, endpoint: this.#options.defaults.id, content: parsed.content, timestamp: parsed.timestamp,
|
|
385
389
|
}));
|
|
390
|
+
const sender = {
|
|
391
|
+
id: senderId,
|
|
392
|
+
name: senderName,
|
|
393
|
+
...(parsed.senderRole
|
|
394
|
+
? {
|
|
395
|
+
role: parsed.senderRole,
|
|
396
|
+
roles: parsed.senderRole === 'master' ? ['master', 'admin'] : parsed.senderRole === 'admin' ? ['admin'] : ['member'],
|
|
397
|
+
permissions: parsed.senderRole === 'master' ? ['master', 'admin'] : parsed.senderRole === 'admin' ? ['admin'] : [],
|
|
398
|
+
}
|
|
399
|
+
: {}),
|
|
400
|
+
};
|
|
386
401
|
void this[endpointSpec].events.message({
|
|
387
402
|
event: raw,
|
|
388
403
|
...(typeof parsed.timestamp === 'number' ? { platformSentAt: parsed.timestamp } : {}),
|
|
@@ -390,7 +405,7 @@ export class SandboxWsEndpoint extends SandboxClient<SandboxConnection> implemen
|
|
|
390
405
|
message: { conversation, id: messageId },
|
|
391
406
|
content: parsed.text,
|
|
392
407
|
segments: parsed.content,
|
|
393
|
-
sender
|
|
408
|
+
sender,
|
|
394
409
|
endpointId: target,
|
|
395
410
|
metadata: Object.freeze({
|
|
396
411
|
type: parsed.type,
|
|
@@ -398,6 +413,7 @@ export class SandboxWsEndpoint extends SandboxClient<SandboxConnection> implemen
|
|
|
398
413
|
channelId: parsed.id || owner,
|
|
399
414
|
elements: parsed.content,
|
|
400
415
|
timestamp: parsed.timestamp,
|
|
416
|
+
...(parsed.senderRole ? { senderRole: parsed.senderRole } : {}),
|
|
401
417
|
...(parsed.action ? { action: parsed.action } : {}),
|
|
402
418
|
...(parsed.agentRun ? { sandboxAgentRun: parsed.agentRun } : {}),
|
|
403
419
|
}),
|
|
@@ -489,22 +505,34 @@ export class SandboxWsEndpoint extends SandboxClient<SandboxConnection> implemen
|
|
|
489
505
|
}
|
|
490
506
|
}
|
|
491
507
|
|
|
508
|
+
const SHELL_ISOLATION_PROBE_TIMEOUT_MS = 500;
|
|
509
|
+
/** Hard ceiling for the ready gate even if the Docker CLI ignores SIGTERM or a child keeps stdio open. */
|
|
510
|
+
const SHELL_ISOLATION_PROBE_DEADLINE_MS = 750;
|
|
511
|
+
|
|
492
512
|
function probeShellIsolation(): Promise<ShellIsolationStatus> {
|
|
493
513
|
return new Promise<ShellIsolationStatus>((resolve) => {
|
|
494
|
-
|
|
514
|
+
let settled = false;
|
|
515
|
+
const settleRef: { clear?: () => void } = {};
|
|
516
|
+
const settle = (status: ShellIsolationStatus): void => {
|
|
517
|
+
if (settled) return;
|
|
518
|
+
settled = true;
|
|
519
|
+
settleRef.clear?.();
|
|
520
|
+
resolve(status);
|
|
521
|
+
};
|
|
522
|
+
const child = execFile('docker', ['info', '--format', '{{.ServerVersion}}'], {
|
|
495
523
|
encoding: 'utf8',
|
|
496
|
-
timeout:
|
|
524
|
+
timeout: SHELL_ISOLATION_PROBE_TIMEOUT_MS,
|
|
497
525
|
}, (error, stdout) => {
|
|
498
526
|
if (!error) {
|
|
499
527
|
const version = stdout.trim();
|
|
500
|
-
|
|
528
|
+
settle(Object.freeze({
|
|
501
529
|
available: true,
|
|
502
530
|
provider: 'docker',
|
|
503
531
|
message: version ? `Docker ${version}` : 'Docker ready',
|
|
504
532
|
}));
|
|
505
533
|
return;
|
|
506
534
|
}
|
|
507
|
-
|
|
535
|
+
settle(Object.freeze({
|
|
508
536
|
available: false,
|
|
509
537
|
provider: 'docker',
|
|
510
538
|
message: error.killed || error.code === 'ETIMEDOUT'
|
|
@@ -512,6 +540,13 @@ function probeShellIsolation(): Promise<ShellIsolationStatus> {
|
|
|
512
540
|
: 'Docker daemon is unavailable',
|
|
513
541
|
}));
|
|
514
542
|
});
|
|
543
|
+
// execFile only reports after the child's stdio closes; a hung CLI must not hold `ready` hostage.
|
|
544
|
+
const deadline = setTimeout(() => {
|
|
545
|
+
try { child?.kill('SIGKILL'); } catch { /* already gone */ }
|
|
546
|
+
settle(Object.freeze({ available: false, provider: 'docker', message: 'Docker readiness check timed out' }));
|
|
547
|
+
}, SHELL_ISOLATION_PROBE_DEADLINE_MS);
|
|
548
|
+
deadline.unref?.();
|
|
549
|
+
settleRef.clear = () => clearTimeout(deadline);
|
|
515
550
|
}).catch(() => Object.freeze({
|
|
516
551
|
available: false,
|
|
517
552
|
provider: 'docker' as const,
|
package/src/protocol.ts
CHANGED
|
@@ -130,6 +130,8 @@ export interface SandboxConversation {
|
|
|
130
130
|
readonly id: string;
|
|
131
131
|
}
|
|
132
132
|
|
|
133
|
+
export type SandboxSenderRole = 'master' | 'admin' | 'member';
|
|
134
|
+
|
|
133
135
|
export interface SandboxParsedMessage {
|
|
134
136
|
type: MessageType;
|
|
135
137
|
id: string;
|
|
@@ -139,8 +141,13 @@ export interface SandboxParsedMessage {
|
|
|
139
141
|
text: string;
|
|
140
142
|
action?: { id: string; payload: string };
|
|
141
143
|
agentRun?: SandboxAgentRunConfig;
|
|
144
|
+
senderId?: string;
|
|
145
|
+
senderName?: string;
|
|
146
|
+
senderRole?: SandboxSenderRole;
|
|
142
147
|
}
|
|
143
148
|
|
|
149
|
+
export type SandboxInboundEnvelope = SandboxParsedMessage;
|
|
150
|
+
|
|
144
151
|
interface SandboxWirePayload {
|
|
145
152
|
type?: MessageType;
|
|
146
153
|
id?: string;
|
|
@@ -149,6 +156,9 @@ interface SandboxWirePayload {
|
|
|
149
156
|
timestamp?: number;
|
|
150
157
|
messageId?: unknown;
|
|
151
158
|
agentRun?: unknown;
|
|
159
|
+
senderId?: unknown;
|
|
160
|
+
senderName?: unknown;
|
|
161
|
+
senderRole?: unknown;
|
|
152
162
|
}
|
|
153
163
|
|
|
154
164
|
function readSandboxWirePayload(raw: string): SandboxWirePayload & { op?: unknown; conversation?: unknown } {
|
|
@@ -187,6 +197,8 @@ export function parseSandboxWsPayload(raw: string): SandboxParsedMessage {
|
|
|
187
197
|
return normalizeSandboxWsPayload(readSandboxWirePayload(raw), raw);
|
|
188
198
|
}
|
|
189
199
|
|
|
200
|
+
export const parseSandboxInboundPayload = parseSandboxWsPayload;
|
|
201
|
+
|
|
190
202
|
function normalizeSandboxWsPayload(payload: SandboxWirePayload, raw: string): SandboxParsedMessage {
|
|
191
203
|
const type = payload.type ?? 'private';
|
|
192
204
|
const id = payload.id ?? 'sandbox-user';
|
|
@@ -225,6 +237,17 @@ function normalizeSandboxWsPayload(payload: SandboxWirePayload, raw: string): Sa
|
|
|
225
237
|
const agentRun = normalizeSandboxAgentRunConfig(payload.agentRun);
|
|
226
238
|
const rawMessageId = typeof payload.messageId === 'string' ? payload.messageId.trim() : '';
|
|
227
239
|
const messageId = /^[A-Za-z0-9._:-]{1,160}$/u.test(rawMessageId) ? rawMessageId : undefined;
|
|
240
|
+
const senderId = typeof payload.senderId === 'string' && payload.senderId.trim()
|
|
241
|
+
? payload.senderId.trim()
|
|
242
|
+
: undefined;
|
|
243
|
+
const senderName = typeof payload.senderName === 'string' && payload.senderName.trim()
|
|
244
|
+
? payload.senderName.trim()
|
|
245
|
+
: undefined;
|
|
246
|
+
const senderRole: SandboxSenderRole | undefined = payload.senderRole === 'master'
|
|
247
|
+
|| payload.senderRole === 'admin'
|
|
248
|
+
|| payload.senderRole === 'member'
|
|
249
|
+
? payload.senderRole
|
|
250
|
+
: undefined;
|
|
228
251
|
return {
|
|
229
252
|
type,
|
|
230
253
|
id,
|
|
@@ -234,6 +257,9 @@ function normalizeSandboxWsPayload(payload: SandboxWirePayload, raw: string): Sa
|
|
|
234
257
|
text,
|
|
235
258
|
action,
|
|
236
259
|
...(agentRun ? { agentRun } : {}),
|
|
260
|
+
...(senderId ? { senderId } : {}),
|
|
261
|
+
...(senderName ? { senderName } : {}),
|
|
262
|
+
...(senderRole ? { senderRole } : {}),
|
|
237
263
|
};
|
|
238
264
|
}
|
|
239
265
|
|