@push.rocks/smartrust 1.4.0 → 1.4.1
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/.smartconfig.json +12 -7
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.rustbridge.d.ts +5 -2
- package/dist_ts/classes.rustbridge.js +158 -40
- package/dist_ts/classes.rustbridgerequesterror.d.ts +23 -0
- package/dist_ts/classes.rustbridgerequesterror.js +20 -0
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/interfaces/config.d.ts +9 -0
- package/package.json +11 -12
- package/readme.md +56 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.rustbridge.ts +204 -44
- package/ts/classes.rustbridgerequesterror.ts +37 -0
- package/ts/index.ts +5 -0
- package/ts/interfaces/config.ts +10 -0
package/.smartconfig.json
CHANGED
|
@@ -21,12 +21,17 @@
|
|
|
21
21
|
]
|
|
22
22
|
},
|
|
23
23
|
"release": {
|
|
24
|
-
"
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
"targets": {
|
|
25
|
+
"npm": {
|
|
26
|
+
"registries": [
|
|
27
|
+
"https://verdaccio.lossless.digital",
|
|
28
|
+
"https://registry.npmjs.org"
|
|
29
|
+
],
|
|
30
|
+
"accessLevel": "public"
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
"schemaVersion": 2
|
|
30
35
|
},
|
|
31
36
|
"@git.zone/tsdoc": {
|
|
32
37
|
"legal": "\n## License and Legal Information\n\nThis repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](./license) file.\n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH or third parties, and are not included within the scope of the MIT license granted herein.\n\nUse of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines or the guidelines of the respective third-party owners, and any usage must be approved in writing. Third-party trademarks used herein are the property of their respective owners and used only in a descriptive manner, e.g. for an implementation of an API or similar.\n\n### Company Information\n\nTask Venture Capital GmbH\nRegistered at District Court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
|
|
@@ -34,4 +39,4 @@
|
|
|
34
39
|
"@ship.zone/szci": {
|
|
35
40
|
"npmGlobalTools": []
|
|
36
41
|
}
|
|
37
|
-
}
|
|
42
|
+
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartrust',
|
|
6
|
-
version: '1.4.
|
|
6
|
+
version: '1.4.1',
|
|
7
7
|
description: 'A type-safe bridge between JavaScript engines and Rust binaries.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx1QkFBdUI7SUFDN0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGtFQUFrRTtDQUNoRixDQUFBIn0=
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { StreamingResponse } from './classes.streamingresponse.js';
|
|
3
|
-
import type { IRustBridgeOptions, ISocketConnectOptions, TCommandMap, TStreamingCommandKeys, TExtractChunk } from './interfaces/index.js';
|
|
3
|
+
import type { IRustBridgeOptions, IRustBridgeRequestOptions, ISocketConnectOptions, TCommandMap, TStreamingCommandKeys, TExtractChunk } from './interfaces/index.js';
|
|
4
4
|
/**
|
|
5
5
|
* Generic bridge between TypeScript and a Rust binary.
|
|
6
6
|
* Communicates via JSON-over-stdin/stdout IPC protocol (stdio mode)
|
|
@@ -38,7 +38,7 @@ export declare class RustBridge<TCommands extends TCommandMap = TCommandMap> ext
|
|
|
38
38
|
/**
|
|
39
39
|
* Send a typed command to the Rust process and wait for the response.
|
|
40
40
|
*/
|
|
41
|
-
sendCommand<K extends string & keyof TCommands>(method: K, params: TCommands[K]['params']): Promise<TCommands[K]['result']>;
|
|
41
|
+
sendCommand<K extends string & keyof TCommands>(method: K, params: TCommands[K]['params'], options?: IRustBridgeRequestOptions): Promise<TCommands[K]['result']>;
|
|
42
42
|
/**
|
|
43
43
|
* Send a streaming command to the Rust process.
|
|
44
44
|
* Returns a StreamingResponse that yields chunks via `for await...of`
|
|
@@ -56,5 +56,8 @@ export declare class RustBridge<TCommands extends TCommandMap = TCommandMap> ext
|
|
|
56
56
|
*/
|
|
57
57
|
get running(): boolean;
|
|
58
58
|
private handleLine;
|
|
59
|
+
private settlePendingRequest;
|
|
60
|
+
private rejectAllPendingRequests;
|
|
59
61
|
private cleanup;
|
|
62
|
+
private getErrorMessage;
|
|
60
63
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
3
|
+
import { RustBridgeRequestError } from './classes.rustbridgerequesterror.js';
|
|
3
4
|
import { StreamingResponse } from './classes.streamingresponse.js';
|
|
4
5
|
import { StdioTransport } from './classes.stdiotransport.js';
|
|
5
6
|
import { SocketTransport } from './classes.sockettransport.js';
|
|
@@ -87,12 +88,12 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
87
88
|
});
|
|
88
89
|
transport.on('close', (...args) => {
|
|
89
90
|
this.logger.log('info', `Transport closed`);
|
|
90
|
-
this.cleanup();
|
|
91
|
+
this.cleanup(`${this.options.binaryName} process exited`);
|
|
91
92
|
this.emit('exit', ...args);
|
|
92
93
|
});
|
|
93
94
|
transport.on('error', (err) => {
|
|
94
95
|
this.logger.log('error', `Transport error: ${err.message}`);
|
|
95
|
-
this.cleanup();
|
|
96
|
+
this.cleanup(`${this.options.binaryName} process exited`, err);
|
|
96
97
|
resolve(false);
|
|
97
98
|
});
|
|
98
99
|
transport.on('reconnected', () => {
|
|
@@ -128,10 +129,23 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
128
129
|
/**
|
|
129
130
|
* Send a typed command to the Rust process and wait for the response.
|
|
130
131
|
*/
|
|
131
|
-
async sendCommand(method, params) {
|
|
132
|
+
async sendCommand(method, params, options) {
|
|
133
|
+
const timeoutMs = options?.timeoutMs ?? this.options.requestTimeoutMs;
|
|
134
|
+
if (options?.timeoutMs !== undefined
|
|
135
|
+
&& (!Number.isSafeInteger(options.timeoutMs) || options.timeoutMs <= 0)) {
|
|
136
|
+
throw new RangeError('RustBridge request timeoutMs must be a positive safe integer');
|
|
137
|
+
}
|
|
138
|
+
if (options?.signal?.aborted) {
|
|
139
|
+
throw new RustBridgeRequestError(`Command '${method}' was aborted before it was sent`, {
|
|
140
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_ABORTED',
|
|
141
|
+
method,
|
|
142
|
+
cause: options.signal.reason,
|
|
143
|
+
});
|
|
144
|
+
}
|
|
132
145
|
if (!this.transport?.connected || !this.isRunning) {
|
|
133
146
|
throw new Error(`${this.options.binaryName} bridge is not running`);
|
|
134
147
|
}
|
|
148
|
+
const transport = this.transport;
|
|
135
149
|
const id = `req_${++this.requestCounter}`;
|
|
136
150
|
const request = { id, method, params };
|
|
137
151
|
const json = JSON.stringify(request);
|
|
@@ -141,16 +155,62 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
141
155
|
throw new Error(`Outbound message exceeds maxPayloadSize (${byteLength} > ${this.options.maxPayloadSize})`);
|
|
142
156
|
}
|
|
143
157
|
return new Promise((resolve, reject) => {
|
|
144
|
-
const
|
|
145
|
-
|
|
146
|
-
reject
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
158
|
+
const pending = {
|
|
159
|
+
resolve,
|
|
160
|
+
reject,
|
|
161
|
+
timer: null,
|
|
162
|
+
method,
|
|
163
|
+
abortSignal: options?.signal,
|
|
164
|
+
};
|
|
165
|
+
this.pendingRequests.set(id, pending);
|
|
166
|
+
if (options?.signal) {
|
|
167
|
+
pending.abortHandler = () => {
|
|
168
|
+
this.settlePendingRequest(id, {
|
|
169
|
+
outcome: 'reject',
|
|
170
|
+
error: new RustBridgeRequestError(`Command '${method}' was aborted`, {
|
|
171
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_ABORTED',
|
|
172
|
+
requestId: id,
|
|
173
|
+
method,
|
|
174
|
+
cause: options.signal?.reason,
|
|
175
|
+
}),
|
|
176
|
+
});
|
|
177
|
+
};
|
|
178
|
+
options.signal.addEventListener('abort', pending.abortHandler, { once: true });
|
|
179
|
+
}
|
|
180
|
+
pending.timer = setTimeout(() => {
|
|
181
|
+
this.settlePendingRequest(id, {
|
|
182
|
+
outcome: 'reject',
|
|
183
|
+
error: new RustBridgeRequestError(`Command '${method}' timed out after ${timeoutMs}ms`, {
|
|
184
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_TIMEOUT',
|
|
185
|
+
requestId: id,
|
|
186
|
+
method,
|
|
187
|
+
}),
|
|
188
|
+
});
|
|
189
|
+
}, timeoutMs);
|
|
190
|
+
try {
|
|
191
|
+
void transport.write(json + '\n').catch((err) => {
|
|
192
|
+
this.settlePendingRequest(id, {
|
|
193
|
+
outcome: 'reject',
|
|
194
|
+
error: new RustBridgeRequestError(`Failed to write to transport: ${this.getErrorMessage(err)}`, {
|
|
195
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_WRITE',
|
|
196
|
+
requestId: id,
|
|
197
|
+
method,
|
|
198
|
+
cause: err,
|
|
199
|
+
}),
|
|
200
|
+
});
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
catch (err) {
|
|
204
|
+
this.settlePendingRequest(id, {
|
|
205
|
+
outcome: 'reject',
|
|
206
|
+
error: new RustBridgeRequestError(`Failed to write to transport: ${this.getErrorMessage(err)}`, {
|
|
207
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_WRITE',
|
|
208
|
+
requestId: id,
|
|
209
|
+
method,
|
|
210
|
+
cause: err,
|
|
211
|
+
}),
|
|
212
|
+
});
|
|
213
|
+
}
|
|
154
214
|
});
|
|
155
215
|
}
|
|
156
216
|
/**
|
|
@@ -174,20 +234,32 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
174
234
|
}
|
|
175
235
|
const timeoutMs = this.options.streamTimeoutMs ?? this.options.requestTimeoutMs;
|
|
176
236
|
const timer = setTimeout(() => {
|
|
177
|
-
this.
|
|
178
|
-
|
|
237
|
+
this.settlePendingRequest(id, {
|
|
238
|
+
outcome: 'reject',
|
|
239
|
+
error: new Error(`Streaming command '${method}' timed out after ${timeoutMs}ms`),
|
|
240
|
+
});
|
|
179
241
|
}, timeoutMs);
|
|
180
242
|
this.pendingRequests.set(id, {
|
|
181
243
|
resolve: (result) => streaming.finish(result),
|
|
182
244
|
reject: (error) => streaming.fail(error),
|
|
183
245
|
timer,
|
|
246
|
+
method,
|
|
184
247
|
streaming,
|
|
185
248
|
});
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
249
|
+
try {
|
|
250
|
+
void this.transport.write(json + '\n').catch((err) => {
|
|
251
|
+
this.settlePendingRequest(id, {
|
|
252
|
+
outcome: 'reject',
|
|
253
|
+
error: new Error(`Failed to write to transport: ${this.getErrorMessage(err)}`),
|
|
254
|
+
});
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
catch (err) {
|
|
258
|
+
this.settlePendingRequest(id, {
|
|
259
|
+
outcome: 'reject',
|
|
260
|
+
error: new Error(`Failed to write to transport: ${this.getErrorMessage(err)}`),
|
|
261
|
+
});
|
|
262
|
+
}
|
|
191
263
|
return streaming;
|
|
192
264
|
}
|
|
193
265
|
/**
|
|
@@ -201,11 +273,7 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
201
273
|
this.transport = null;
|
|
202
274
|
this.isRunning = false;
|
|
203
275
|
// Reject pending requests
|
|
204
|
-
|
|
205
|
-
clearTimeout(pending.timer);
|
|
206
|
-
pending.reject(new Error(`${this.options.binaryName} process killed`));
|
|
207
|
-
}
|
|
208
|
-
this.pendingRequests.clear();
|
|
276
|
+
this.rejectAllPendingRequests(`${this.options.binaryName} process killed`);
|
|
209
277
|
transport.removeAllListeners();
|
|
210
278
|
transport.disconnect();
|
|
211
279
|
}
|
|
@@ -238,11 +306,15 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
238
306
|
const pending = this.pendingRequests.get(parsed.id);
|
|
239
307
|
if (pending?.streaming) {
|
|
240
308
|
// Reset inactivity timeout
|
|
241
|
-
|
|
309
|
+
if (pending.timer) {
|
|
310
|
+
clearTimeout(pending.timer);
|
|
311
|
+
}
|
|
242
312
|
const timeoutMs = this.options.streamTimeoutMs ?? this.options.requestTimeoutMs;
|
|
243
313
|
pending.timer = setTimeout(() => {
|
|
244
|
-
this.
|
|
245
|
-
|
|
314
|
+
this.settlePendingRequest(parsed.id, {
|
|
315
|
+
outcome: 'reject',
|
|
316
|
+
error: new Error(`Streaming command timed out after ${timeoutMs}ms of inactivity`),
|
|
317
|
+
});
|
|
246
318
|
}, timeoutMs);
|
|
247
319
|
pending.streaming.pushChunk(parsed.data);
|
|
248
320
|
}
|
|
@@ -253,26 +325,72 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
253
325
|
const response = parsed;
|
|
254
326
|
const pending = this.pendingRequests.get(response.id);
|
|
255
327
|
if (pending) {
|
|
256
|
-
clearTimeout(pending.timer);
|
|
257
|
-
this.pendingRequests.delete(response.id);
|
|
258
328
|
if (response.success) {
|
|
259
|
-
|
|
329
|
+
this.settlePendingRequest(response.id, {
|
|
330
|
+
outcome: 'resolve',
|
|
331
|
+
value: response.result,
|
|
332
|
+
});
|
|
260
333
|
}
|
|
261
334
|
else {
|
|
262
|
-
|
|
335
|
+
const message = response.error || 'Unknown error from Rust process';
|
|
336
|
+
this.settlePendingRequest(response.id, {
|
|
337
|
+
outcome: 'reject',
|
|
338
|
+
error: pending.streaming
|
|
339
|
+
? new Error(message)
|
|
340
|
+
: new RustBridgeRequestError(message, {
|
|
341
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_RUST_RESPONSE',
|
|
342
|
+
requestId: response.id,
|
|
343
|
+
method: pending.method,
|
|
344
|
+
}),
|
|
345
|
+
});
|
|
263
346
|
}
|
|
264
347
|
}
|
|
265
348
|
}
|
|
266
349
|
}
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
350
|
+
settlePendingRequest(id, settlement) {
|
|
351
|
+
const pending = this.pendingRequests.get(id);
|
|
352
|
+
if (!pending) {
|
|
353
|
+
return false;
|
|
354
|
+
}
|
|
355
|
+
this.pendingRequests.delete(id);
|
|
356
|
+
if (pending.timer) {
|
|
272
357
|
clearTimeout(pending.timer);
|
|
273
|
-
pending.
|
|
358
|
+
pending.timer = null;
|
|
274
359
|
}
|
|
275
|
-
|
|
360
|
+
if (pending.abortSignal && pending.abortHandler) {
|
|
361
|
+
pending.abortSignal.removeEventListener('abort', pending.abortHandler);
|
|
362
|
+
pending.abortHandler = undefined;
|
|
363
|
+
}
|
|
364
|
+
if (settlement.outcome === 'resolve') {
|
|
365
|
+
pending.resolve(settlement.value);
|
|
366
|
+
}
|
|
367
|
+
else {
|
|
368
|
+
pending.reject(settlement.error);
|
|
369
|
+
}
|
|
370
|
+
return true;
|
|
371
|
+
}
|
|
372
|
+
rejectAllPendingRequests(message, cause) {
|
|
373
|
+
for (const [id, pending] of [...this.pendingRequests]) {
|
|
374
|
+
this.settlePendingRequest(id, {
|
|
375
|
+
outcome: 'reject',
|
|
376
|
+
error: pending.streaming
|
|
377
|
+
? new Error(message)
|
|
378
|
+
: new RustBridgeRequestError(message, {
|
|
379
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_TRANSPORT',
|
|
380
|
+
requestId: id,
|
|
381
|
+
method: pending.method,
|
|
382
|
+
cause,
|
|
383
|
+
}),
|
|
384
|
+
});
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
cleanup(message, cause) {
|
|
388
|
+
this.isRunning = false;
|
|
389
|
+
this.transport = null;
|
|
390
|
+
this.rejectAllPendingRequests(message, cause);
|
|
391
|
+
}
|
|
392
|
+
getErrorMessage(error) {
|
|
393
|
+
return error instanceof Error ? error.message : String(error);
|
|
276
394
|
}
|
|
277
395
|
}
|
|
278
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.rustbridge.js","sourceRoot":"","sources":["../ts/classes.rustbridge.ts"],"names":[],"mappings":"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"}
|
|
396
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.rustbridge.js","sourceRoot":"","sources":["../ts/classes.rustbridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Stable error codes for failures while waiting for a Rust bridge request.
|
|
3
|
+
*/
|
|
4
|
+
export type TRustBridgeRequestErrorCode = 'ERR_RUST_BRIDGE_REQUEST_TIMEOUT' | 'ERR_RUST_BRIDGE_REQUEST_ABORTED' | 'ERR_RUST_BRIDGE_REQUEST_WRITE' | 'ERR_RUST_BRIDGE_REQUEST_TRANSPORT' | 'ERR_RUST_BRIDGE_REQUEST_RUST_RESPONSE';
|
|
5
|
+
export interface IRustBridgeRequestErrorOptions {
|
|
6
|
+
code: TRustBridgeRequestErrorCode;
|
|
7
|
+
requestId?: string;
|
|
8
|
+
method?: string;
|
|
9
|
+
cause?: unknown;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Error raised while preparing or waiting for a Rust bridge request.
|
|
13
|
+
*
|
|
14
|
+
* Existing error messages are preserved while `code` provides a stable way to
|
|
15
|
+
* distinguish timeout, cancellation, transport, write, and Rust response
|
|
16
|
+
* failures.
|
|
17
|
+
*/
|
|
18
|
+
export declare class RustBridgeRequestError extends Error {
|
|
19
|
+
readonly code: TRustBridgeRequestErrorCode;
|
|
20
|
+
readonly requestId?: string;
|
|
21
|
+
readonly method?: string;
|
|
22
|
+
constructor(message: string, options: IRustBridgeRequestErrorOptions);
|
|
23
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Error raised while preparing or waiting for a Rust bridge request.
|
|
3
|
+
*
|
|
4
|
+
* Existing error messages are preserved while `code` provides a stable way to
|
|
5
|
+
* distinguish timeout, cancellation, transport, write, and Rust response
|
|
6
|
+
* failures.
|
|
7
|
+
*/
|
|
8
|
+
export class RustBridgeRequestError extends Error {
|
|
9
|
+
code;
|
|
10
|
+
requestId;
|
|
11
|
+
method;
|
|
12
|
+
constructor(message, options) {
|
|
13
|
+
super(message, options.cause === undefined ? undefined : { cause: options.cause });
|
|
14
|
+
this.name = 'RustBridgeRequestError';
|
|
15
|
+
this.code = options.code;
|
|
16
|
+
this.requestId = options.requestId;
|
|
17
|
+
this.method = options.method;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5ydXN0YnJpZGdlcmVxdWVzdGVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2xhc3Nlcy5ydXN0YnJpZGdlcmVxdWVzdGVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWlCQTs7Ozs7O0dBTUc7QUFDSCxNQUFNLE9BQU8sc0JBQXVCLFNBQVEsS0FBSztJQUMvQixJQUFJLENBQThCO0lBQ2xDLFNBQVMsQ0FBVTtJQUNuQixNQUFNLENBQVU7SUFFaEMsWUFBWSxPQUFlLEVBQUUsT0FBdUM7UUFDbEUsS0FBSyxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsS0FBSyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQztRQUNuRixJQUFJLENBQUMsSUFBSSxHQUFHLHdCQUF3QixDQUFDO1FBQ3JDLElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztRQUN6QixJQUFJLENBQUMsU0FBUyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUM7UUFDbkMsSUFBSSxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDO0lBQy9CLENBQUM7Q0FDRiJ9
|
package/dist_ts/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { RustBridge } from './classes.rustbridge.js';
|
|
2
|
+
export { RustBridgeRequestError, type IRustBridgeRequestErrorOptions, type TRustBridgeRequestErrorCode, } from './classes.rustbridgerequesterror.js';
|
|
2
3
|
export { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
3
4
|
export { StreamingResponse } from './classes.streamingresponse.js';
|
|
4
5
|
export { StdioTransport } from './classes.stdiotransport.js';
|
package/dist_ts/index.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export { RustBridge } from './classes.rustbridge.js';
|
|
2
|
+
export { RustBridgeRequestError, } from './classes.rustbridgerequesterror.js';
|
|
2
3
|
export { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
3
4
|
export { StreamingResponse } from './classes.streamingresponse.js';
|
|
4
5
|
export { StdioTransport } from './classes.stdiotransport.js';
|
|
5
6
|
export { SocketTransport } from './classes.sockettransport.js';
|
|
6
7
|
export { LineScanner } from './classes.linescanner.js';
|
|
7
8
|
export * from './interfaces/index.js';
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckQsT0FBTyxFQUNMLHNCQUFzQixHQUd2QixNQUFNLHFDQUFxQyxDQUFDO0FBQzdDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDL0QsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZELGNBQWMsdUJBQXVCLENBQUMifQ==
|
|
@@ -4,6 +4,15 @@
|
|
|
4
4
|
export interface IRustBridgeLogger {
|
|
5
5
|
log(level: string, message: string, data?: Record<string, any>): void;
|
|
6
6
|
}
|
|
7
|
+
/**
|
|
8
|
+
* Options for one non-streaming Rust bridge request.
|
|
9
|
+
*/
|
|
10
|
+
export interface IRustBridgeRequestOptions {
|
|
11
|
+
/** Abort only the local wait for this request. */
|
|
12
|
+
signal?: AbortSignal;
|
|
13
|
+
/** Override the bridge request timeout for this call, in milliseconds. */
|
|
14
|
+
timeoutMs?: number;
|
|
15
|
+
}
|
|
7
16
|
/**
|
|
8
17
|
* Options for locating a Rust binary.
|
|
9
18
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartrust",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A type-safe bridge between JavaScript engines and Rust binaries.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -8,16 +8,11 @@
|
|
|
8
8
|
"type": "module",
|
|
9
9
|
"author": "Task Venture Capital GmbH",
|
|
10
10
|
"license": "MIT",
|
|
11
|
-
"scripts": {
|
|
12
|
-
"test": "(tstest test/ --verbose --logfile --timeout 60)",
|
|
13
|
-
"build": "(tsbuild tsfolders)",
|
|
14
|
-
"buildDocs": "(tsdoc)"
|
|
15
|
-
},
|
|
16
11
|
"devDependencies": {
|
|
17
|
-
"@git.zone/tsbuild": "^4.4.
|
|
18
|
-
"@git.zone/tsrun": "^2.0.
|
|
19
|
-
"@git.zone/tstest": "^3.6.
|
|
20
|
-
"@types/node": "^
|
|
12
|
+
"@git.zone/tsbuild": "^4.4.2",
|
|
13
|
+
"@git.zone/tsrun": "^2.0.5",
|
|
14
|
+
"@git.zone/tstest": "^3.6.7",
|
|
15
|
+
"@types/node": "^26.1.1"
|
|
21
16
|
},
|
|
22
17
|
"dependencies": {
|
|
23
18
|
"@push.rocks/smartpath": "^6.0.0"
|
|
@@ -51,5 +46,9 @@
|
|
|
51
46
|
"bugs": {
|
|
52
47
|
"url": "https://code.foss.global/push.rocks/smartrust/issues"
|
|
53
48
|
},
|
|
54
|
-
"
|
|
55
|
-
|
|
49
|
+
"scripts": {
|
|
50
|
+
"test": "(tstest test/ --verbose --logfile --timeout 60)",
|
|
51
|
+
"build": "(tsbuild tsfolders)",
|
|
52
|
+
"buildDocs": "(tsdoc)"
|
|
53
|
+
}
|
|
54
|
+
}
|
package/readme.md
CHANGED
|
@@ -103,6 +103,57 @@ bridge.on('management:configChanged', (data) => {
|
|
|
103
103
|
bridge.kill();
|
|
104
104
|
```
|
|
105
105
|
|
|
106
|
+
### Per-Command Deadlines and Cancellation
|
|
107
|
+
|
|
108
|
+
Non-streaming commands accept an optional `IRustBridgeRequestOptions` argument:
|
|
109
|
+
|
|
110
|
+
```typescript
|
|
111
|
+
import { RustBridgeRequestError } from '@push.rocks/smartrust';
|
|
112
|
+
|
|
113
|
+
const controller = new AbortController();
|
|
114
|
+
|
|
115
|
+
try {
|
|
116
|
+
const metrics = await bridge.sendCommand(
|
|
117
|
+
'getMetrics',
|
|
118
|
+
{},
|
|
119
|
+
{
|
|
120
|
+
timeoutMs: 2000,
|
|
121
|
+
signal: controller.signal,
|
|
122
|
+
},
|
|
123
|
+
);
|
|
124
|
+
} catch (error) {
|
|
125
|
+
if (error instanceof RustBridgeRequestError) {
|
|
126
|
+
console.error(error.code, error.message);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
```
|
|
130
|
+
|
|
131
|
+
`timeoutMs` must be a positive safe integer. When it is omitted, the bridge's
|
|
132
|
+
constructor-level `requestTimeoutMs` remains the default. An already-aborted
|
|
133
|
+
signal rejects before a request ID is allocated or anything is written.
|
|
134
|
+
|
|
135
|
+
Timeout and abort only abandon the local TypeScript wait. They do not kill or
|
|
136
|
+
disconnect the shared bridge, late responses are ignored, and later commands
|
|
137
|
+
can continue using the same bridge.
|
|
138
|
+
|
|
139
|
+
> The JSON-lines protocol has no cancellation message. After a command has
|
|
140
|
+
> been written, Rust may still execute it even if the local wait times out or
|
|
141
|
+
> is aborted. Do not blindly retry mutating commands; first establish whether
|
|
142
|
+
> the original command executed or design the command to be idempotent.
|
|
143
|
+
|
|
144
|
+
Timeout, cancellation, transport-write/exit, and Rust response failures use
|
|
145
|
+
`RustBridgeRequestError`.
|
|
146
|
+
Existing message text remains available, while `code` is stable for
|
|
147
|
+
programmatic handling:
|
|
148
|
+
|
|
149
|
+
| Code | Meaning |
|
|
150
|
+
|---|---|
|
|
151
|
+
| `ERR_RUST_BRIDGE_REQUEST_TIMEOUT` | The local request deadline elapsed |
|
|
152
|
+
| `ERR_RUST_BRIDGE_REQUEST_ABORTED` | The caller's signal aborted the local wait |
|
|
153
|
+
| `ERR_RUST_BRIDGE_REQUEST_WRITE` | The transport rejected the request write |
|
|
154
|
+
| `ERR_RUST_BRIDGE_REQUEST_TRANSPORT` | The transport exited, disconnected, or was killed |
|
|
155
|
+
| `ERR_RUST_BRIDGE_REQUEST_RUST_RESPONSE` | Rust returned `success: false` |
|
|
156
|
+
|
|
106
157
|
### Socket Mode — Connect to a Running Daemon 🔗
|
|
107
158
|
|
|
108
159
|
When the Rust binary runs as a system service (e.g., via `systemd`, `launchd`, or a Windows Service), use `connect()` to talk to it over a Unix socket or named pipe:
|
|
@@ -282,7 +333,7 @@ const bridge = new RustBridge<TMyCommands>({
|
|
|
282
333
|
|
|
283
334
|
// --- Bridge Options ---
|
|
284
335
|
cliArgs: ['--management'], // optional: args passed to binary (default: ['--management'])
|
|
285
|
-
requestTimeoutMs: 30000, // optional:
|
|
336
|
+
requestTimeoutMs: 30000, // optional: default request timeout (default: 30000)
|
|
286
337
|
streamTimeoutMs: 30000, // optional: streaming inactivity timeout (default: requestTimeoutMs)
|
|
287
338
|
readyTimeoutMs: 10000, // optional: ready event timeout (default: 10000)
|
|
288
339
|
maxPayloadSize: 50 * 1024 * 1024, // optional: max message size in bytes (default: 50MB)
|
|
@@ -486,7 +537,7 @@ fn main() {
|
|
|
486
537
|
| `constructor` | `new RustBridge<T>(options: IRustBridgeOptions)` | Create a new bridge instance |
|
|
487
538
|
| `spawn()` | `Promise<boolean>` | **Stdio mode**: Spawn the binary and wait for ready; returns `false` on failure |
|
|
488
539
|
| `connect(socketPath, options?)` | `Promise<boolean>` | **Socket mode**: Connect to a running daemon; returns `false` on failure |
|
|
489
|
-
| `sendCommand(method, params)` | `Promise<TCommands[K]['result']>` | Send a typed command
|
|
540
|
+
| `sendCommand(method, params, options?)` | `Promise<TCommands[K]['result']>` | Send a typed command with an optional per-call timeout or abort signal |
|
|
490
541
|
| `sendCommandStreaming(method, params)` | `StreamingResponse<TChunk, TResult>` | Send a streaming command; returns immediately |
|
|
491
542
|
| `kill()` | `void` | Stdio: SIGTERM the process, SIGKILL after 5s. Socket: close the connection (daemon stays alive) |
|
|
492
543
|
| `running` | `boolean` | Whether the bridge is currently connected and ready |
|
|
@@ -539,6 +590,7 @@ fn main() {
|
|
|
539
590
|
| Interface / Type | Description |
|
|
540
591
|
|---|---|
|
|
541
592
|
| `IRustBridgeOptions` | Full configuration for `RustBridge` |
|
|
593
|
+
| `IRustBridgeRequestOptions` | Per-command options: `{ signal?, timeoutMs? }` |
|
|
542
594
|
| `IBinaryLocatorOptions` | Configuration for `RustBinaryLocator` |
|
|
543
595
|
| `ISocketConnectOptions` | Socket connection options (reconnect settings) |
|
|
544
596
|
| `IRustBridgeLogger` | Logger interface: `{ log(level, message, data?) }` |
|
|
@@ -551,6 +603,8 @@ fn main() {
|
|
|
551
603
|
| `TCommandMap` | `Record<string, ICommandDefinition>` |
|
|
552
604
|
| `TStreamingCommandKeys<T>` | Extracts keys from a command map that have a `chunk` field |
|
|
553
605
|
| `TExtractChunk<T>` | Extracts the chunk type from a streaming command definition |
|
|
606
|
+
| `RustBridgeRequestError` | Request error class with stable `code`, `requestId`, and `method` fields |
|
|
607
|
+
| `TRustBridgeRequestErrorCode` | Union of stable request error code strings |
|
|
554
608
|
|
|
555
609
|
## License and Legal Information
|
|
556
610
|
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/classes.rustbridge.ts
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
3
|
+
import { RustBridgeRequestError } from './classes.rustbridgerequesterror.js';
|
|
3
4
|
import { StreamingResponse } from './classes.streamingresponse.js';
|
|
4
5
|
import { StdioTransport } from './classes.stdiotransport.js';
|
|
5
6
|
import { SocketTransport } from './classes.sockettransport.js';
|
|
6
7
|
import type {
|
|
7
8
|
IRustBridgeOptions,
|
|
9
|
+
IRustBridgeRequestOptions,
|
|
8
10
|
IRustBridgeLogger,
|
|
9
11
|
ISocketConnectOptions,
|
|
10
12
|
TCommandMap,
|
|
@@ -20,6 +22,20 @@ const defaultLogger: IRustBridgeLogger = {
|
|
|
20
22
|
log() {},
|
|
21
23
|
};
|
|
22
24
|
|
|
25
|
+
interface IPendingRequest {
|
|
26
|
+
resolve: (value: any) => void;
|
|
27
|
+
reject: (error: Error) => void;
|
|
28
|
+
timer: ReturnType<typeof setTimeout> | null;
|
|
29
|
+
method: string;
|
|
30
|
+
abortSignal?: AbortSignal;
|
|
31
|
+
abortHandler?: () => void;
|
|
32
|
+
streaming?: StreamingResponse<any, any>;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
type TPendingRequestSettlement =
|
|
36
|
+
| { outcome: 'resolve'; value: any }
|
|
37
|
+
| { outcome: 'reject'; error: Error };
|
|
38
|
+
|
|
23
39
|
/**
|
|
24
40
|
* Generic bridge between TypeScript and a Rust binary.
|
|
25
41
|
* Communicates via JSON-over-stdin/stdout IPC protocol (stdio mode)
|
|
@@ -32,12 +48,7 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
32
48
|
private options: Required<Pick<IRustBridgeOptions, 'cliArgs' | 'requestTimeoutMs' | 'readyTimeoutMs' | 'readyEventName' | 'maxPayloadSize'>> & IRustBridgeOptions;
|
|
33
49
|
private logger: IRustBridgeLogger;
|
|
34
50
|
private transport: IRustTransport | null = null;
|
|
35
|
-
private pendingRequests = new Map<string,
|
|
36
|
-
resolve: (value: any) => void;
|
|
37
|
-
reject: (error: Error) => void;
|
|
38
|
-
timer: ReturnType<typeof setTimeout>;
|
|
39
|
-
streaming?: StreamingResponse<any, any>;
|
|
40
|
-
}>();
|
|
51
|
+
private pendingRequests = new Map<string, IPendingRequest>();
|
|
41
52
|
private requestCounter = 0;
|
|
42
53
|
private isRunning = false;
|
|
43
54
|
private binaryPath: string | null = null;
|
|
@@ -116,13 +127,13 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
116
127
|
|
|
117
128
|
transport.on('close', (...args: any[]) => {
|
|
118
129
|
this.logger.log('info', `Transport closed`);
|
|
119
|
-
this.cleanup();
|
|
130
|
+
this.cleanup(`${this.options.binaryName} process exited`);
|
|
120
131
|
this.emit('exit', ...args);
|
|
121
132
|
});
|
|
122
133
|
|
|
123
134
|
transport.on('error', (err: Error) => {
|
|
124
135
|
this.logger.log('error', `Transport error: ${err.message}`);
|
|
125
|
-
this.cleanup();
|
|
136
|
+
this.cleanup(`${this.options.binaryName} process exited`, err);
|
|
126
137
|
resolve(false);
|
|
127
138
|
});
|
|
128
139
|
|
|
@@ -164,11 +175,32 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
164
175
|
public async sendCommand<K extends string & keyof TCommands>(
|
|
165
176
|
method: K,
|
|
166
177
|
params: TCommands[K]['params'],
|
|
178
|
+
options?: IRustBridgeRequestOptions,
|
|
167
179
|
): Promise<TCommands[K]['result']> {
|
|
180
|
+
const timeoutMs = options?.timeoutMs ?? this.options.requestTimeoutMs;
|
|
181
|
+
if (
|
|
182
|
+
options?.timeoutMs !== undefined
|
|
183
|
+
&& (!Number.isSafeInteger(options.timeoutMs) || options.timeoutMs <= 0)
|
|
184
|
+
) {
|
|
185
|
+
throw new RangeError('RustBridge request timeoutMs must be a positive safe integer');
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
if (options?.signal?.aborted) {
|
|
189
|
+
throw new RustBridgeRequestError(
|
|
190
|
+
`Command '${method}' was aborted before it was sent`,
|
|
191
|
+
{
|
|
192
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_ABORTED',
|
|
193
|
+
method,
|
|
194
|
+
cause: options.signal.reason,
|
|
195
|
+
},
|
|
196
|
+
);
|
|
197
|
+
}
|
|
198
|
+
|
|
168
199
|
if (!this.transport?.connected || !this.isRunning) {
|
|
169
200
|
throw new Error(`${this.options.binaryName} bridge is not running`);
|
|
170
201
|
}
|
|
171
202
|
|
|
203
|
+
const transport = this.transport;
|
|
172
204
|
const id = `req_${++this.requestCounter}`;
|
|
173
205
|
const request: IManagementRequest = { id, method, params };
|
|
174
206
|
const json = JSON.stringify(request);
|
|
@@ -182,18 +214,76 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
182
214
|
}
|
|
183
215
|
|
|
184
216
|
return new Promise<TCommands[K]['result']>((resolve, reject) => {
|
|
185
|
-
const
|
|
186
|
-
|
|
187
|
-
reject
|
|
188
|
-
|
|
217
|
+
const pending: IPendingRequest = {
|
|
218
|
+
resolve,
|
|
219
|
+
reject,
|
|
220
|
+
timer: null,
|
|
221
|
+
method,
|
|
222
|
+
abortSignal: options?.signal,
|
|
223
|
+
};
|
|
224
|
+
this.pendingRequests.set(id, pending);
|
|
225
|
+
|
|
226
|
+
if (options?.signal) {
|
|
227
|
+
pending.abortHandler = () => {
|
|
228
|
+
this.settlePendingRequest(id, {
|
|
229
|
+
outcome: 'reject',
|
|
230
|
+
error: new RustBridgeRequestError(
|
|
231
|
+
`Command '${method}' was aborted`,
|
|
232
|
+
{
|
|
233
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_ABORTED',
|
|
234
|
+
requestId: id,
|
|
235
|
+
method,
|
|
236
|
+
cause: options.signal?.reason,
|
|
237
|
+
},
|
|
238
|
+
),
|
|
239
|
+
});
|
|
240
|
+
};
|
|
241
|
+
options.signal.addEventListener('abort', pending.abortHandler, { once: true });
|
|
242
|
+
}
|
|
189
243
|
|
|
190
|
-
|
|
244
|
+
pending.timer = setTimeout(() => {
|
|
245
|
+
this.settlePendingRequest(id, {
|
|
246
|
+
outcome: 'reject',
|
|
247
|
+
error: new RustBridgeRequestError(
|
|
248
|
+
`Command '${method}' timed out after ${timeoutMs}ms`,
|
|
249
|
+
{
|
|
250
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_TIMEOUT',
|
|
251
|
+
requestId: id,
|
|
252
|
+
method,
|
|
253
|
+
},
|
|
254
|
+
),
|
|
255
|
+
});
|
|
256
|
+
}, timeoutMs);
|
|
191
257
|
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
258
|
+
try {
|
|
259
|
+
void transport.write(json + '\n').catch((err: unknown) => {
|
|
260
|
+
this.settlePendingRequest(id, {
|
|
261
|
+
outcome: 'reject',
|
|
262
|
+
error: new RustBridgeRequestError(
|
|
263
|
+
`Failed to write to transport: ${this.getErrorMessage(err)}`,
|
|
264
|
+
{
|
|
265
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_WRITE',
|
|
266
|
+
requestId: id,
|
|
267
|
+
method,
|
|
268
|
+
cause: err,
|
|
269
|
+
},
|
|
270
|
+
),
|
|
271
|
+
});
|
|
272
|
+
});
|
|
273
|
+
} catch (err: unknown) {
|
|
274
|
+
this.settlePendingRequest(id, {
|
|
275
|
+
outcome: 'reject',
|
|
276
|
+
error: new RustBridgeRequestError(
|
|
277
|
+
`Failed to write to transport: ${this.getErrorMessage(err)}`,
|
|
278
|
+
{
|
|
279
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_WRITE',
|
|
280
|
+
requestId: id,
|
|
281
|
+
method,
|
|
282
|
+
cause: err,
|
|
283
|
+
},
|
|
284
|
+
),
|
|
285
|
+
});
|
|
286
|
+
}
|
|
197
287
|
});
|
|
198
288
|
}
|
|
199
289
|
|
|
@@ -227,22 +317,33 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
227
317
|
|
|
228
318
|
const timeoutMs = this.options.streamTimeoutMs ?? this.options.requestTimeoutMs;
|
|
229
319
|
const timer = setTimeout(() => {
|
|
230
|
-
this.
|
|
231
|
-
|
|
320
|
+
this.settlePendingRequest(id, {
|
|
321
|
+
outcome: 'reject',
|
|
322
|
+
error: new Error(`Streaming command '${method}' timed out after ${timeoutMs}ms`),
|
|
323
|
+
});
|
|
232
324
|
}, timeoutMs);
|
|
233
325
|
|
|
234
326
|
this.pendingRequests.set(id, {
|
|
235
327
|
resolve: (result: any) => streaming.finish(result),
|
|
236
328
|
reject: (error: Error) => streaming.fail(error),
|
|
237
329
|
timer,
|
|
330
|
+
method,
|
|
238
331
|
streaming,
|
|
239
332
|
});
|
|
240
333
|
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
334
|
+
try {
|
|
335
|
+
void this.transport!.write(json + '\n').catch((err: unknown) => {
|
|
336
|
+
this.settlePendingRequest(id, {
|
|
337
|
+
outcome: 'reject',
|
|
338
|
+
error: new Error(`Failed to write to transport: ${this.getErrorMessage(err)}`),
|
|
339
|
+
});
|
|
340
|
+
});
|
|
341
|
+
} catch (err: unknown) {
|
|
342
|
+
this.settlePendingRequest(id, {
|
|
343
|
+
outcome: 'reject',
|
|
344
|
+
error: new Error(`Failed to write to transport: ${this.getErrorMessage(err)}`),
|
|
345
|
+
});
|
|
346
|
+
}
|
|
246
347
|
|
|
247
348
|
return streaming;
|
|
248
349
|
}
|
|
@@ -259,11 +360,7 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
259
360
|
this.isRunning = false;
|
|
260
361
|
|
|
261
362
|
// Reject pending requests
|
|
262
|
-
|
|
263
|
-
clearTimeout(pending.timer);
|
|
264
|
-
pending.reject(new Error(`${this.options.binaryName} process killed`));
|
|
265
|
-
}
|
|
266
|
-
this.pendingRequests.clear();
|
|
363
|
+
this.rejectAllPendingRequests(`${this.options.binaryName} process killed`);
|
|
267
364
|
|
|
268
365
|
transport.removeAllListeners();
|
|
269
366
|
transport.disconnect();
|
|
@@ -300,11 +397,15 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
300
397
|
const pending = this.pendingRequests.get(parsed.id);
|
|
301
398
|
if (pending?.streaming) {
|
|
302
399
|
// Reset inactivity timeout
|
|
303
|
-
|
|
400
|
+
if (pending.timer) {
|
|
401
|
+
clearTimeout(pending.timer);
|
|
402
|
+
}
|
|
304
403
|
const timeoutMs = this.options.streamTimeoutMs ?? this.options.requestTimeoutMs;
|
|
305
404
|
pending.timer = setTimeout(() => {
|
|
306
|
-
this.
|
|
307
|
-
|
|
405
|
+
this.settlePendingRequest(parsed.id, {
|
|
406
|
+
outcome: 'reject',
|
|
407
|
+
error: new Error(`Streaming command timed out after ${timeoutMs}ms of inactivity`),
|
|
408
|
+
});
|
|
308
409
|
}, timeoutMs);
|
|
309
410
|
pending.streaming.pushChunk(parsed.data);
|
|
310
411
|
}
|
|
@@ -316,26 +417,85 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
316
417
|
const response = parsed as IManagementResponse;
|
|
317
418
|
const pending = this.pendingRequests.get(response.id);
|
|
318
419
|
if (pending) {
|
|
319
|
-
clearTimeout(pending.timer);
|
|
320
|
-
this.pendingRequests.delete(response.id);
|
|
321
420
|
if (response.success) {
|
|
322
|
-
|
|
421
|
+
this.settlePendingRequest(response.id, {
|
|
422
|
+
outcome: 'resolve',
|
|
423
|
+
value: response.result,
|
|
424
|
+
});
|
|
323
425
|
} else {
|
|
324
|
-
|
|
426
|
+
const message = response.error || 'Unknown error from Rust process';
|
|
427
|
+
this.settlePendingRequest(response.id, {
|
|
428
|
+
outcome: 'reject',
|
|
429
|
+
error: pending.streaming
|
|
430
|
+
? new Error(message)
|
|
431
|
+
: new RustBridgeRequestError(
|
|
432
|
+
message,
|
|
433
|
+
{
|
|
434
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_RUST_RESPONSE',
|
|
435
|
+
requestId: response.id,
|
|
436
|
+
method: pending.method,
|
|
437
|
+
},
|
|
438
|
+
),
|
|
439
|
+
});
|
|
325
440
|
}
|
|
326
441
|
}
|
|
327
442
|
}
|
|
328
443
|
}
|
|
329
444
|
|
|
330
|
-
private
|
|
331
|
-
|
|
332
|
-
|
|
445
|
+
private settlePendingRequest(
|
|
446
|
+
id: string,
|
|
447
|
+
settlement: TPendingRequestSettlement,
|
|
448
|
+
): boolean {
|
|
449
|
+
const pending = this.pendingRequests.get(id);
|
|
450
|
+
if (!pending) {
|
|
451
|
+
return false;
|
|
452
|
+
}
|
|
333
453
|
|
|
334
|
-
|
|
335
|
-
|
|
454
|
+
this.pendingRequests.delete(id);
|
|
455
|
+
if (pending.timer) {
|
|
336
456
|
clearTimeout(pending.timer);
|
|
337
|
-
pending.
|
|
457
|
+
pending.timer = null;
|
|
458
|
+
}
|
|
459
|
+
if (pending.abortSignal && pending.abortHandler) {
|
|
460
|
+
pending.abortSignal.removeEventListener('abort', pending.abortHandler);
|
|
461
|
+
pending.abortHandler = undefined;
|
|
462
|
+
}
|
|
463
|
+
|
|
464
|
+
if (settlement.outcome === 'resolve') {
|
|
465
|
+
pending.resolve(settlement.value);
|
|
466
|
+
} else {
|
|
467
|
+
pending.reject(settlement.error);
|
|
338
468
|
}
|
|
339
|
-
|
|
469
|
+
return true;
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
private rejectAllPendingRequests(message: string, cause?: unknown): void {
|
|
473
|
+
for (const [id, pending] of [...this.pendingRequests]) {
|
|
474
|
+
this.settlePendingRequest(id, {
|
|
475
|
+
outcome: 'reject',
|
|
476
|
+
error: pending.streaming
|
|
477
|
+
? new Error(message)
|
|
478
|
+
: new RustBridgeRequestError(
|
|
479
|
+
message,
|
|
480
|
+
{
|
|
481
|
+
code: 'ERR_RUST_BRIDGE_REQUEST_TRANSPORT',
|
|
482
|
+
requestId: id,
|
|
483
|
+
method: pending.method,
|
|
484
|
+
cause,
|
|
485
|
+
},
|
|
486
|
+
),
|
|
487
|
+
});
|
|
488
|
+
}
|
|
489
|
+
}
|
|
490
|
+
|
|
491
|
+
private cleanup(message: string, cause?: unknown): void {
|
|
492
|
+
this.isRunning = false;
|
|
493
|
+
this.transport = null;
|
|
494
|
+
|
|
495
|
+
this.rejectAllPendingRequests(message, cause);
|
|
496
|
+
}
|
|
497
|
+
|
|
498
|
+
private getErrorMessage(error: unknown): string {
|
|
499
|
+
return error instanceof Error ? error.message : String(error);
|
|
340
500
|
}
|
|
341
501
|
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Stable error codes for failures while waiting for a Rust bridge request.
|
|
3
|
+
*/
|
|
4
|
+
export type TRustBridgeRequestErrorCode =
|
|
5
|
+
| 'ERR_RUST_BRIDGE_REQUEST_TIMEOUT'
|
|
6
|
+
| 'ERR_RUST_BRIDGE_REQUEST_ABORTED'
|
|
7
|
+
| 'ERR_RUST_BRIDGE_REQUEST_WRITE'
|
|
8
|
+
| 'ERR_RUST_BRIDGE_REQUEST_TRANSPORT'
|
|
9
|
+
| 'ERR_RUST_BRIDGE_REQUEST_RUST_RESPONSE';
|
|
10
|
+
|
|
11
|
+
export interface IRustBridgeRequestErrorOptions {
|
|
12
|
+
code: TRustBridgeRequestErrorCode;
|
|
13
|
+
requestId?: string;
|
|
14
|
+
method?: string;
|
|
15
|
+
cause?: unknown;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Error raised while preparing or waiting for a Rust bridge request.
|
|
20
|
+
*
|
|
21
|
+
* Existing error messages are preserved while `code` provides a stable way to
|
|
22
|
+
* distinguish timeout, cancellation, transport, write, and Rust response
|
|
23
|
+
* failures.
|
|
24
|
+
*/
|
|
25
|
+
export class RustBridgeRequestError extends Error {
|
|
26
|
+
public readonly code: TRustBridgeRequestErrorCode;
|
|
27
|
+
public readonly requestId?: string;
|
|
28
|
+
public readonly method?: string;
|
|
29
|
+
|
|
30
|
+
constructor(message: string, options: IRustBridgeRequestErrorOptions) {
|
|
31
|
+
super(message, options.cause === undefined ? undefined : { cause: options.cause });
|
|
32
|
+
this.name = 'RustBridgeRequestError';
|
|
33
|
+
this.code = options.code;
|
|
34
|
+
this.requestId = options.requestId;
|
|
35
|
+
this.method = options.method;
|
|
36
|
+
}
|
|
37
|
+
}
|
package/ts/index.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
export { RustBridge } from './classes.rustbridge.js';
|
|
2
|
+
export {
|
|
3
|
+
RustBridgeRequestError,
|
|
4
|
+
type IRustBridgeRequestErrorOptions,
|
|
5
|
+
type TRustBridgeRequestErrorCode,
|
|
6
|
+
} from './classes.rustbridgerequesterror.js';
|
|
2
7
|
export { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
3
8
|
export { StreamingResponse } from './classes.streamingresponse.js';
|
|
4
9
|
export { StdioTransport } from './classes.stdiotransport.js';
|
package/ts/interfaces/config.ts
CHANGED
|
@@ -5,6 +5,16 @@ export interface IRustBridgeLogger {
|
|
|
5
5
|
log(level: string, message: string, data?: Record<string, any>): void;
|
|
6
6
|
}
|
|
7
7
|
|
|
8
|
+
/**
|
|
9
|
+
* Options for one non-streaming Rust bridge request.
|
|
10
|
+
*/
|
|
11
|
+
export interface IRustBridgeRequestOptions {
|
|
12
|
+
/** Abort only the local wait for this request. */
|
|
13
|
+
signal?: AbortSignal;
|
|
14
|
+
/** Override the bridge request timeout for this call, in milliseconds. */
|
|
15
|
+
timeoutMs?: number;
|
|
16
|
+
}
|
|
17
|
+
|
|
8
18
|
/**
|
|
9
19
|
* Options for locating a Rust binary.
|
|
10
20
|
*/
|