@marifold/core 0.69.0 → 0.70.5

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.
Files changed (94) hide show
  1. package/dist/agent/AgentRunner.d.ts +7 -1
  2. package/dist/agent/AgentRunner.d.ts.map +1 -1
  3. package/dist/agent/AgentRunner.js +50 -16
  4. package/dist/agent/AgentRunner.js.map +1 -1
  5. package/dist/agent/RunArtifacts.d.ts +6 -1
  6. package/dist/agent/RunArtifacts.d.ts.map +1 -1
  7. package/dist/agent/RunArtifacts.js +16 -3
  8. package/dist/agent/RunArtifacts.js.map +1 -1
  9. package/dist/agent/RunWorkspace.d.ts +3 -0
  10. package/dist/agent/RunWorkspace.d.ts.map +1 -1
  11. package/dist/agent/RunWorkspace.js +5 -0
  12. package/dist/agent/RunWorkspace.js.map +1 -1
  13. package/dist/agent/ScopedProcess.d.ts.map +1 -1
  14. package/dist/agent/ScopedProcess.js +1 -0
  15. package/dist/agent/ScopedProcess.js.map +1 -1
  16. package/dist/agent/ToolRegistry.d.ts +6 -1
  17. package/dist/agent/ToolRegistry.d.ts.map +1 -1
  18. package/dist/agent/ToolRegistry.js +4 -1
  19. package/dist/agent/ToolRegistry.js.map +1 -1
  20. package/dist/agent/tools/ReadFileTool.d.ts.map +1 -1
  21. package/dist/agent/tools/ReadFileTool.js +4 -0
  22. package/dist/agent/tools/ReadFileTool.js.map +1 -1
  23. package/dist/agent/tools/WriteFileTool.d.ts.map +1 -1
  24. package/dist/agent/tools/WriteFileTool.js +4 -0
  25. package/dist/agent/tools/WriteFileTool.js.map +1 -1
  26. package/dist/app/SkillAppInstanceRegistry.d.ts.map +1 -1
  27. package/dist/app/SkillAppInstanceRegistry.js +5 -0
  28. package/dist/app/SkillAppInstanceRegistry.js.map +1 -1
  29. package/dist/config/ChatGptCatalogVersion.d.ts +3 -0
  30. package/dist/config/ChatGptCatalogVersion.d.ts.map +1 -0
  31. package/dist/config/ChatGptCatalogVersion.js +55 -0
  32. package/dist/config/ChatGptCatalogVersion.js.map +1 -0
  33. package/dist/config/ProviderInspector.d.ts.map +1 -1
  34. package/dist/config/ProviderInspector.js +2 -5
  35. package/dist/config/ProviderInspector.js.map +1 -1
  36. package/dist/errors/MarifoldError.d.ts +1 -1
  37. package/dist/errors/MarifoldError.d.ts.map +1 -1
  38. package/dist/errors/MarifoldError.js.map +1 -1
  39. package/dist/images/AvatarThumbnail.d.ts +3 -0
  40. package/dist/images/AvatarThumbnail.d.ts.map +1 -0
  41. package/dist/images/AvatarThumbnail.js +16 -0
  42. package/dist/images/AvatarThumbnail.js.map +1 -0
  43. package/dist/index.d.ts +11 -0
  44. package/dist/index.d.ts.map +1 -1
  45. package/dist/index.js +19 -4
  46. package/dist/index.js.map +1 -1
  47. package/dist/profiles/ProfileManager.d.ts.map +1 -1
  48. package/dist/profiles/ProfileManager.js +2 -3
  49. package/dist/profiles/ProfileManager.js.map +1 -1
  50. package/dist/runs/RunRegistry.d.ts +27 -1
  51. package/dist/runs/RunRegistry.d.ts.map +1 -1
  52. package/dist/runs/RunRegistry.js +75 -16
  53. package/dist/runs/RunRegistry.js.map +1 -1
  54. package/dist/runtime/MarifoldRuntime.d.ts +9 -2
  55. package/dist/runtime/MarifoldRuntime.d.ts.map +1 -1
  56. package/dist/runtime/MarifoldRuntime.js +26 -5
  57. package/dist/runtime/MarifoldRuntime.js.map +1 -1
  58. package/dist/workspace/DeviceDelegateTool.d.ts +40 -0
  59. package/dist/workspace/DeviceDelegateTool.d.ts.map +1 -0
  60. package/dist/workspace/DeviceDelegateTool.js +79 -0
  61. package/dist/workspace/DeviceDelegateTool.js.map +1 -0
  62. package/dist/workspace/WorkspaceArtifactTransfer.d.ts +8 -0
  63. package/dist/workspace/WorkspaceArtifactTransfer.d.ts.map +1 -0
  64. package/dist/workspace/WorkspaceArtifactTransfer.js +45 -0
  65. package/dist/workspace/WorkspaceArtifactTransfer.js.map +1 -0
  66. package/dist/workspace/WorkspaceExecutor.d.ts +19 -0
  67. package/dist/workspace/WorkspaceExecutor.d.ts.map +1 -0
  68. package/dist/workspace/WorkspaceExecutor.js +212 -0
  69. package/dist/workspace/WorkspaceExecutor.js.map +1 -0
  70. package/dist/workspace/WorkspaceManager.d.ts +43 -0
  71. package/dist/workspace/WorkspaceManager.d.ts.map +1 -0
  72. package/dist/workspace/WorkspaceManager.js +378 -0
  73. package/dist/workspace/WorkspaceManager.js.map +1 -0
  74. package/dist/workspace/WorkspaceRuns.d.ts +18 -0
  75. package/dist/workspace/WorkspaceRuns.d.ts.map +1 -0
  76. package/dist/workspace/WorkspaceRuns.js +152 -0
  77. package/dist/workspace/WorkspaceRuns.js.map +1 -0
  78. package/dist/workspace/WorkspaceStore.d.ts +49 -0
  79. package/dist/workspace/WorkspaceStore.d.ts.map +1 -0
  80. package/dist/workspace/WorkspaceStore.js +419 -0
  81. package/dist/workspace/WorkspaceStore.js.map +1 -0
  82. package/dist/workspace/WorkspaceTerminal.d.ts +4 -0
  83. package/dist/workspace/WorkspaceTerminal.d.ts.map +1 -0
  84. package/dist/workspace/WorkspaceTerminal.js +80 -0
  85. package/dist/workspace/WorkspaceTerminal.js.map +1 -0
  86. package/dist/workspace/bridge/BridgePeer.d.ts +48 -0
  87. package/dist/workspace/bridge/BridgePeer.d.ts.map +1 -0
  88. package/dist/workspace/bridge/BridgePeer.js +307 -0
  89. package/dist/workspace/bridge/BridgePeer.js.map +1 -0
  90. package/dist/workspace/bridge/ChunkTransfers.d.ts +19 -0
  91. package/dist/workspace/bridge/ChunkTransfers.d.ts.map +1 -0
  92. package/dist/workspace/bridge/ChunkTransfers.js +125 -0
  93. package/dist/workspace/bridge/ChunkTransfers.js.map +1 -0
  94. package/package.json +6 -3
@@ -0,0 +1,307 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.BridgePeer = void 0;
7
+ const ws_1 = __importDefault(require("ws"));
8
+ const ChunkTransfers_1 = require("./ChunkTransfers");
9
+ const workspace_protocol_1 = require("@marifold/workspace-protocol");
10
+ class BridgePeer {
11
+ options;
12
+ socket;
13
+ stopped = false;
14
+ connected = false;
15
+ retry;
16
+ ping;
17
+ retryMs = 1000;
18
+ pending = new Map();
19
+ controls = new Map();
20
+ seen = new Map();
21
+ transfers = new ChunkTransfers_1.ChunkTransfers();
22
+ transferWindow = 1;
23
+ inflight = new Map();
24
+ lastPong = Date.now();
25
+ hostDeviceId;
26
+ constructor(options) {
27
+ this.options = options;
28
+ this.hostDeviceId = options.hostDeviceId;
29
+ }
30
+ get online() {
31
+ return this.connected;
32
+ }
33
+ get hostId() {
34
+ if (!this.hostDeviceId)
35
+ throw new Error('Bridge is not connected.');
36
+ return this.hostDeviceId;
37
+ }
38
+ start() {
39
+ this.stopped = false;
40
+ this.connect();
41
+ }
42
+ close() {
43
+ this.stopped = true;
44
+ clearTimeout(this.retry);
45
+ clearInterval(this.ping);
46
+ this.socket?.close();
47
+ this.connected = false;
48
+ for (const p of this.pending.values()) {
49
+ clearTimeout(p.timer);
50
+ p.reject(new Error('Workspace connection closed.'));
51
+ }
52
+ this.pending.clear();
53
+ this.transfers.reset();
54
+ for (const control of this.controls.values())
55
+ control.reject();
56
+ this.controls.clear();
57
+ }
58
+ async ready(timeoutMs = 10000) {
59
+ const end = Date.now() + timeoutMs;
60
+ while (!this.connected && !this.stopped && Date.now() < end)
61
+ await new Promise((r) => setTimeout(r, 25));
62
+ if (!this.connected)
63
+ throw new Error('Workspace bridge is unavailable.');
64
+ }
65
+ request(operation, input, recipient = this.hostId, identity = this.options.host, id = (0, workspace_protocol_1.randomId)(), timeoutMs = 120000) {
66
+ if (this.pending.has(id))
67
+ return Promise.reject(new Error('Request is already awaiting a response.'));
68
+ if (!this.connected)
69
+ return Promise.reject(new Error('Workspace is offline.'));
70
+ if (this.pending.size >= 32)
71
+ return Promise.reject(new Error('Too many pending workspace operations.'));
72
+ if (Buffer.byteLength(JSON.stringify(input ?? null)) > 29 * 1024 * 1024)
73
+ return Promise.reject(new Error('Workspace request exceeds the transfer limit.'));
74
+ return new Promise((resolve, reject) => {
75
+ const request = { type: 'request', id, operation, input };
76
+ const timer = setTimeout(() => {
77
+ this.pending.delete(id);
78
+ reject(new Error('Workspace request timed out. Its outcome may be unknown; it was not repeated under a new ID.'));
79
+ }, timeoutMs);
80
+ this.pending.set(id, { request, recipient, identity, resolve, reject, timer });
81
+ void this.transmit(recipient, identity, request).catch(() => {
82
+ /* reconnect resends with the same operation id */
83
+ });
84
+ });
85
+ }
86
+ revoke(deviceId) {
87
+ if (!this.connected)
88
+ return Promise.reject(new Error('Bridge unavailable; revocation will be sent after reconnect.'));
89
+ const id = (0, workspace_protocol_1.randomId)();
90
+ return new Promise((resolve, reject) => {
91
+ const timer = setTimeout(() => {
92
+ this.controls.delete(id);
93
+ reject(new Error('Bridge revocation was not acknowledged.'));
94
+ }, 5000);
95
+ this.controls.set(id, {
96
+ resolve: () => {
97
+ clearTimeout(timer);
98
+ this.controls.delete(id);
99
+ resolve();
100
+ },
101
+ reject: () => {
102
+ clearTimeout(timer);
103
+ reject(new Error('Bridge disconnected.'));
104
+ },
105
+ });
106
+ this.socket.send(JSON.stringify({ type: 'revoke', deviceId, id }));
107
+ });
108
+ }
109
+ connect() {
110
+ if (this.stopped)
111
+ return;
112
+ const url = new URL('/v1/connect', this.options.bridgeUrl);
113
+ url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
114
+ const socket = new ws_1.default(url, { maxPayload: 512 * 1024, perMessageDeflate: false });
115
+ this.socket = socket;
116
+ socket.on('message', (bytes) => {
117
+ try {
118
+ void this.receive(JSON.parse(bytes.toString())).catch(() => {
119
+ /* invalid peer frames never reach dispatch */
120
+ });
121
+ }
122
+ catch {
123
+ socket.close(1008, 'Invalid frame');
124
+ }
125
+ });
126
+ socket.on('error', () => undefined);
127
+ socket.on('close', () => {
128
+ if (this.socket !== socket)
129
+ return;
130
+ this.connected = false;
131
+ this.transfers.reset();
132
+ this.options.onStatus?.(false);
133
+ clearInterval(this.ping);
134
+ if (!this.stopped) {
135
+ this.retry = setTimeout(() => this.connect(), this.retryMs + Math.random() * 500);
136
+ this.retryMs = Math.min(this.retryMs * 2, 15000);
137
+ }
138
+ });
139
+ }
140
+ async receive(value) {
141
+ const frame = (0, workspace_protocol_1.record)(value);
142
+ if (frame.type === 'challenge') {
143
+ this.socket?.send(JSON.stringify({
144
+ type: 'auth',
145
+ workspaceId: this.options.workspaceId,
146
+ deviceId: this.options.deviceId,
147
+ certificate: this.options.certificate,
148
+ identity: (0, workspace_protocol_1.publicIdentity)(this.options.identity),
149
+ signature: (0, workspace_protocol_1.signText)(this.options.identity, String(frame.nonce)),
150
+ }));
151
+ return;
152
+ }
153
+ if (frame.type === 'ready') {
154
+ this.transferWindow = frame.deliveryReplay === 'on-reconnect' ? 4 : 1;
155
+ this.hostDeviceId = String(frame.hostDeviceId);
156
+ if (this.options.hostDeviceId && this.hostDeviceId !== this.options.hostDeviceId) {
157
+ this.close();
158
+ throw new Error('Host identity changed.');
159
+ }
160
+ this.lastPong = Date.now();
161
+ this.connected = true;
162
+ this.retryMs = 1000;
163
+ this.options.onStatus?.(true);
164
+ this.ping = setInterval(() => {
165
+ if (Date.now() - this.lastPong > 45000) {
166
+ this.socket?.terminate();
167
+ return;
168
+ }
169
+ if (this.socket?.readyState === ws_1.default.OPEN)
170
+ this.socket.send('{"type":"ping"}');
171
+ }, 15000);
172
+ for (const p of this.pending.values())
173
+ void this.transmit(p.recipient, p.identity, p.request).catch(() => undefined);
174
+ return;
175
+ }
176
+ if (frame.type === 'revoked') {
177
+ this.controls.get(String(frame.id))?.resolve();
178
+ return;
179
+ }
180
+ if (frame.type === 'pong') {
181
+ this.lastPong = Date.now();
182
+ return;
183
+ }
184
+ if (frame.type !== 'delivery')
185
+ return;
186
+ // Acknowledging transport receipt does not assert successful execution. The
187
+ // sender retains stable request IDs until it receives an application reply.
188
+ this.socket?.send(JSON.stringify({ type: 'ack', deliveryId: frame.deliveryId }));
189
+ const packet = (0, workspace_protocol_1.record)(frame.packet);
190
+ const message = packet.message;
191
+ const sender = message.header.sender;
192
+ const certificate = packet.certificate;
193
+ let identity;
194
+ if (sender === this.hostDeviceId)
195
+ identity = this.options.host;
196
+ else if (certificate) {
197
+ if (!(0, workspace_protocol_1.validMembership)(certificate, this.options.host) ||
198
+ certificate.membership.workspaceId !== this.options.workspaceId ||
199
+ certificate.membership.deviceId !== sender ||
200
+ this.options.accept?.(certificate) === false)
201
+ throw new Error('Invalid or revoked sender.');
202
+ identity = certificate.membership.identity;
203
+ }
204
+ else {
205
+ if (this.options.deviceId !== this.hostDeviceId || !sender.startsWith('pending_'))
206
+ throw new Error('Unpaired sender.');
207
+ identity = packet.identity;
208
+ }
209
+ const decoded = (0, workspace_protocol_1.record)(await (0, workspace_protocol_1.decryptMessage)(this.options.identity, identity, message, {
210
+ workspaceId: this.options.workspaceId,
211
+ recipient: this.options.deviceId,
212
+ }));
213
+ if (!certificate &&
214
+ sender !== this.hostDeviceId &&
215
+ (decoded.type !== 'request' || decoded.operation !== 'join' || JSON.stringify(decoded).length > 4096))
216
+ throw new Error('Invalid pairing message.');
217
+ for (const [id, expiry] of this.seen)
218
+ if (expiry < Date.now())
219
+ this.seen.delete(id);
220
+ if (this.seen.has(message.header.id))
221
+ return;
222
+ this.seen.set(message.header.id, message.header.expiresAt);
223
+ if (decoded.type === 'chunk_ack') {
224
+ this.transfers.acknowledge(sender, decoded);
225
+ return;
226
+ }
227
+ if (decoded.type === 'chunk') {
228
+ const { ack, text } = this.transfers.receive(sender, decoded);
229
+ await this.send(sender, identity, { ...ack, window: this.transferWindow });
230
+ if (text !== undefined)
231
+ await this.dispatch((0, workspace_protocol_1.record)(JSON.parse(text)), sender, identity, certificate);
232
+ return;
233
+ }
234
+ await this.dispatch(decoded, sender, identity, certificate);
235
+ }
236
+ async dispatch(data, sender, identity, certificate) {
237
+ if (data.type === 'response') {
238
+ const pending = this.pending.get(String(data.id));
239
+ if (!pending || pending.recipient !== sender)
240
+ return;
241
+ this.pending.delete(String(data.id));
242
+ clearTimeout(pending.timer);
243
+ if (data.ok === true)
244
+ pending.resolve(data.value);
245
+ else
246
+ pending.reject(new Error(typeof data.error === 'string' ? data.error : 'Workspace operation failed.'));
247
+ return;
248
+ }
249
+ if (data.type !== 'request' || typeof data.id !== 'string' || typeof data.operation !== 'string')
250
+ return;
251
+ if (!certificate && sender !== this.hostDeviceId && data.operation !== 'join')
252
+ throw new Error('Pairing required.');
253
+ const request = data;
254
+ const key = `${sender}:${request.id}`;
255
+ const hash = (0, workspace_protocol_1.digest)(JSON.stringify(request));
256
+ let entry = this.inflight.get(key);
257
+ if (entry && entry.hash !== hash)
258
+ throw new Error('Request ID was reused with different input.');
259
+ if (!entry) {
260
+ if (this.inflight.size >= 64)
261
+ throw new Error('Too many in-flight requests.');
262
+ const job = this.options.onRequest(request, { id: sender, identity, certificate });
263
+ entry = { hash, job };
264
+ this.inflight.set(key, entry);
265
+ void job.finally(() => this.inflight.delete(key)).catch(() => undefined);
266
+ }
267
+ let response;
268
+ try {
269
+ response = { type: 'response', id: request.id, ok: true, value: await entry.job };
270
+ }
271
+ catch (error) {
272
+ response = {
273
+ type: 'response',
274
+ id: request.id,
275
+ ok: false,
276
+ error: error instanceof Error ? error.message : 'Workspace operation failed.',
277
+ };
278
+ }
279
+ await this.transmit(sender, identity, response);
280
+ }
281
+ async transmit(recipient, identity, value) {
282
+ const text = JSON.stringify(value);
283
+ if (Buffer.byteLength(text) < 64000) {
284
+ await this.send(recipient, identity, value);
285
+ return;
286
+ }
287
+ await this.transfers.transmit(recipient, text, chunk => this.send(recipient, identity, chunk), this.transferWindow);
288
+ }
289
+ async send(recipient, identity, value) {
290
+ if (!this.connected || this.socket?.readyState !== ws_1.default.OPEN)
291
+ throw new Error('Workspace disconnected.');
292
+ const socket = this.socket;
293
+ const message = await (0, workspace_protocol_1.encryptMessage)(this.options.identity, identity, {
294
+ version: 1,
295
+ workspaceId: this.options.workspaceId,
296
+ sender: this.options.deviceId,
297
+ recipient,
298
+ id: (0, workspace_protocol_1.randomId)(),
299
+ expiresAt: Date.now() + workspace_protocol_1.MESSAGE_TTL_MS,
300
+ }, value);
301
+ if (this.socket !== socket || socket.readyState !== ws_1.default.OPEN)
302
+ throw new Error('Workspace disconnected.');
303
+ socket.send(JSON.stringify({ type: 'send', message }));
304
+ }
305
+ }
306
+ exports.BridgePeer = BridgePeer;
307
+ //# sourceMappingURL=BridgePeer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"BridgePeer.js","sourceRoot":"","sources":["../../../src/workspace/bridge/BridgePeer.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,19 @@
1
+ type Send = (value: unknown) => Promise<void>;
2
+ /** Bounded bulk traffic shares the connection without holding up ordinary messages. */
3
+ export declare class ChunkTransfers {
4
+ private assemblies;
5
+ private acknowledgments;
6
+ private slots;
7
+ private active;
8
+ private generation;
9
+ reset(): void;
10
+ acknowledge(sender: string, frame: Record<string, unknown>): void;
11
+ receive(sender: string, frame: Record<string, unknown>): {
12
+ ack: Record<string, unknown>;
13
+ text?: string;
14
+ };
15
+ transmit(recipient: string, text: string, send: Send, relayWindow?: number): Promise<void>;
16
+ private sendChunk;
17
+ }
18
+ export {};
19
+ //# sourceMappingURL=ChunkTransfers.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ChunkTransfers.d.ts","sourceRoot":"","sources":["../../../src/workspace/bridge/ChunkTransfers.ts"],"names":[],"mappings":"AAkBA,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9C,uFAAuF;AACvF,qBAAa,cAAc;IACzB,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,eAAe,CAAqC;IAC5D,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,UAAU,CAAK;IAEvB,KAAK,IAAI,IAAI,CAKZ;IAED,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAGhE;IAED,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAiCvG;IAEK,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB/F;YAEa,SAAS;CAgCxB"}
@@ -0,0 +1,125 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ChunkTransfers = void 0;
4
+ const workspace_protocol_1 = require("@marifold/workspace-protocol");
5
+ const CHUNK_SIZE = 96000;
6
+ const WINDOW = 4;
7
+ const PEER_WINDOW = 8;
8
+ const TRANSFER_LIMIT = 40 * 1024 * 1024;
9
+ /** Bounded bulk traffic shares the connection without holding up ordinary messages. */
10
+ class ChunkTransfers {
11
+ assemblies = new Map();
12
+ acknowledgments = new Map();
13
+ slots = [];
14
+ active = 0;
15
+ generation = 0;
16
+ reset() {
17
+ this.generation++;
18
+ this.assemblies.clear();
19
+ for (const ack of this.acknowledgments.values())
20
+ ack.reject();
21
+ this.acknowledgments.clear();
22
+ }
23
+ acknowledge(sender, frame) {
24
+ const ack = this.acknowledgments.get(`${frame.transfer}:${frame.index}`);
25
+ if (ack?.recipient === sender)
26
+ ack.accept(frame.window === WINDOW ? WINDOW : 1);
27
+ }
28
+ receive(sender, frame) {
29
+ const transfer = (0, workspace_protocol_1.identifier)(frame.transfer);
30
+ const index = frame.index;
31
+ if (typeof index !== 'number' || !Number.isSafeInteger(index) || index < 0 || index >= 1024 ||
32
+ typeof frame.data !== 'string' || frame.data.length === 0 || frame.data.length > 128000 ||
33
+ typeof frame.last !== 'boolean')
34
+ throw new Error('Invalid transfer chunk.');
35
+ const key = `${sender}:${transfer}`;
36
+ for (const [id, item] of this.assemblies)
37
+ if (item.expires < Date.now())
38
+ this.assemblies.delete(id);
39
+ let item = this.assemblies.get(key);
40
+ if (!item) {
41
+ if (this.assemblies.size >= 16 || index !== 0)
42
+ throw new Error('Invalid transfer.');
43
+ item = { parts: [], next: 0, bytes: 0, expires: Date.now() + 60000 };
44
+ this.assemblies.set(key, item);
45
+ }
46
+ // Chunk zero negotiates the window before the sender pipelines further chunks.
47
+ if (index >= item.next + WINDOW || item.parts[index] !== undefined ||
48
+ (item.last !== undefined && index > item.last) ||
49
+ (frame.last && (item.last !== undefined || item.parts.length > index + 1)))
50
+ throw new Error('Out-of-order transfer.');
51
+ item.parts[index] = frame.data;
52
+ item.bytes += frame.data.length;
53
+ item.expires = Date.now() + 60000;
54
+ if (frame.last)
55
+ item.last = index;
56
+ if (item.bytes > TRANSFER_LIMIT ||
57
+ [...this.assemblies.values()].reduce((total, entry) => total + entry.bytes, 0) > 64 * 1024 * 1024) {
58
+ this.assemblies.delete(key);
59
+ throw new Error('Transfer limit exceeded.');
60
+ }
61
+ while (item.parts[item.next] !== undefined)
62
+ item.next++;
63
+ const ack = { type: 'chunk_ack', transfer, index, window: WINDOW };
64
+ if (item.last === undefined || item.next !== item.last + 1)
65
+ return { ack };
66
+ this.assemblies.delete(key);
67
+ return { ack, text: Buffer.from(item.parts.join(''), 'base64').toString('utf8') };
68
+ }
69
+ async transmit(recipient, text, send, relayWindow = WINDOW) {
70
+ const encoded = Buffer.from(text).toString('base64');
71
+ if (encoded.length > TRANSFER_LIMIT)
72
+ throw new Error('Transfer exceeds limit.');
73
+ const transfer = (0, workspace_protocol_1.randomId)();
74
+ const generation = this.generation;
75
+ const chunkSize = relayWindow === WINDOW ? CHUNK_SIZE : 48000;
76
+ const chunk = (index) => this.sendChunk(recipient, {
77
+ type: 'chunk', transfer, index,
78
+ data: encoded.slice(index * chunkSize, (index + 1) * chunkSize),
79
+ last: (index + 1) * chunkSize >= encoded.length,
80
+ }, send, generation);
81
+ // Old receivers omit window and continue to receive one chunk at a time.
82
+ const window = Math.min(await chunk(0), relayWindow);
83
+ const count = Math.ceil(encoded.length / chunkSize);
84
+ for (let index = 1; index < count; index += window) {
85
+ await Promise.all(Array.from({ length: Math.min(window, count - index) }, (_, offset) => chunk(index + offset)));
86
+ }
87
+ }
88
+ async sendChunk(recipient, frame, send, generation) {
89
+ if (this.active >= PEER_WINDOW)
90
+ await new Promise(resolve => this.slots.push(resolve));
91
+ else
92
+ this.active++;
93
+ try {
94
+ if (generation !== this.generation)
95
+ throw new Error('Transfer disconnected.');
96
+ return await new Promise((resolve, reject) => {
97
+ const key = `${frame.transfer}:${frame.index}`;
98
+ const finish = (error, window = 1) => {
99
+ clearTimeout(timer);
100
+ this.acknowledgments.delete(key);
101
+ if (error)
102
+ reject(error);
103
+ else
104
+ resolve(window);
105
+ };
106
+ const timer = setTimeout(() => finish(new Error('Transfer acknowledgment timed out.')), 15000);
107
+ this.acknowledgments.set(key, {
108
+ recipient,
109
+ accept: window => finish(undefined, window),
110
+ reject: () => finish(new Error('Transfer disconnected.')),
111
+ });
112
+ void send(frame).catch(error => finish(error));
113
+ });
114
+ }
115
+ finally {
116
+ const resume = this.slots.shift();
117
+ if (resume)
118
+ resume();
119
+ else
120
+ this.active--;
121
+ }
122
+ }
123
+ }
124
+ exports.ChunkTransfers = ChunkTransfers;
125
+ //# sourceMappingURL=ChunkTransfers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ChunkTransfers.js","sourceRoot":"","sources":["../../../src/workspace/bridge/ChunkTransfers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@marifold/core",
3
- "version": "0.69.0",
3
+ "version": "0.70.5",
4
4
  "description": "Core runtime for Marifold",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -16,13 +16,16 @@
16
16
  "smol-toml": "^1.7.0",
17
17
  "typescript-compiler": "npm:typescript@^6.0.2",
18
18
  "undici": "^7.28.0",
19
- "yaml": "^2.9.0"
19
+ "yaml": "^2.9.0",
20
+ "ws": "^8.18.3",
21
+ "@marifold/workspace-protocol": "0.69.2"
20
22
  },
21
23
  "devDependencies": {
22
24
  "@types/better-sqlite3": "^7.6.13",
23
25
  "@types/node": "^24.13.3",
24
26
  "typescript": "^7.0.2",
25
- "vitest": "^4.1.10"
27
+ "vitest": "^4.1.10",
28
+ "@types/ws": "^8.18.1"
26
29
  },
27
30
  "engines": {
28
31
  "node": ">=24.0.0 <25"