@push.rocks/smartrust 2.2.0 → 2.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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.rustbridge.d.ts +16 -0
- package/dist_ts/classes.rustbridge.js +245 -24
- package/dist_ts/classes.rustbridgerequesterror.d.ts +4 -1
- package/dist_ts/classes.rustbridgerequesterror.js +4 -1
- package/dist_ts/classes.stdiotransport.d.ts +12 -0
- package/dist_ts/classes.stdiotransport.js +147 -2
- package/dist_ts/interfaces/config.d.ts +9 -0
- package/dist_ts/interfaces/ipc.d.ts +16 -0
- package/dist_ts/interfaces/transport.d.ts +4 -0
- package/dist_ts/plugins.d.ts +2 -1
- package/dist_ts/plugins.js +3 -2
- package/package.json +5 -5
- package/readme.md +86 -6
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.rustbridge.ts +281 -26
- package/ts/classes.rustbridgerequesterror.ts +6 -0
- package/ts/classes.stdiotransport.ts +145 -1
- package/ts/interfaces/config.ts +9 -0
- package/ts/interfaces/ipc.ts +18 -0
- package/ts/interfaces/transport.ts +6 -0
- package/ts/plugins.ts +2 -1
|
@@ -6,6 +6,9 @@ export interface IStdioTransportOptions {
|
|
|
6
6
|
cliArgs: string[];
|
|
7
7
|
env?: Record<string, string>;
|
|
8
8
|
inheritedFileDescriptors?: readonly number[];
|
|
9
|
+
sensitiveByteChannel?: {
|
|
10
|
+
maxPayloadSize: number;
|
|
11
|
+
};
|
|
9
12
|
maxPayloadSize: number;
|
|
10
13
|
/** Default for every cleanup path, including automatic stdin failure. */
|
|
11
14
|
terminationGracePeriodMs?: number;
|
|
@@ -23,12 +26,19 @@ export declare class StdioTransport extends plugins.events.EventEmitter implemen
|
|
|
23
26
|
private _connected;
|
|
24
27
|
constructor(options: IStdioTransportOptions);
|
|
25
28
|
get connected(): boolean;
|
|
29
|
+
get sensitiveFileDescriptor(): number | null;
|
|
26
30
|
/**
|
|
27
31
|
* Spawn the child process. Resolves when the process is running (not necessarily ready).
|
|
28
32
|
*/
|
|
29
33
|
connect(): Promise<void>;
|
|
30
34
|
/** Write data to stdin and resolve after the stream callback confirms it. */
|
|
31
35
|
write(data: string): Promise<void>;
|
|
36
|
+
/**
|
|
37
|
+
* Write the single sensitive frame owned by this child generation. The frame
|
|
38
|
+
* header and request id are non-secret; `data` is written without converting
|
|
39
|
+
* it to a string or copying its backing ArrayBuffer.
|
|
40
|
+
*/
|
|
41
|
+
writeSensitiveFrame(requestId: string, data: Uint8Array<ArrayBuffer>): Promise<void>;
|
|
32
42
|
/**
|
|
33
43
|
* Kill the child process without waiting for confirmation.
|
|
34
44
|
*/
|
|
@@ -43,6 +53,8 @@ export declare class StdioTransport extends plugins.events.EventEmitter implemen
|
|
|
43
53
|
private sendSignal;
|
|
44
54
|
private hasExited;
|
|
45
55
|
private destroyOwnedStdioEndpoint;
|
|
56
|
+
private writeSensitiveChunk;
|
|
57
|
+
private destroySensitiveEndpoint;
|
|
46
58
|
private toError;
|
|
47
59
|
private getErrorMessage;
|
|
48
60
|
}
|
|
@@ -2,6 +2,8 @@ import * as plugins from './plugins.js';
|
|
|
2
2
|
import { LineScanner } from './classes.linescanner.js';
|
|
3
3
|
const DEFAULT_DISCONNECT_GRACE_PERIOD_MS = 5000;
|
|
4
4
|
const MAX_TIMER_DELAY_MS = 2_147_483_647;
|
|
5
|
+
const SENSITIVE_FRAME_HEADER_SIZE = 16;
|
|
6
|
+
const SENSITIVE_FRAME_MAGIC = 'SMRS';
|
|
5
7
|
/**
|
|
6
8
|
* Transport that spawns a child process and communicates via stdin/stdout.
|
|
7
9
|
* Extracted from the original RustBridge process management logic.
|
|
@@ -18,12 +20,27 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
18
20
|
&& (!Number.isSafeInteger(options.terminationGracePeriodMs) || options.terminationGracePeriodMs < 0)) {
|
|
19
21
|
throw new RangeError('StdioTransport terminationGracePeriodMs must be a non-negative safe integer');
|
|
20
22
|
}
|
|
21
|
-
|
|
23
|
+
if (options.sensitiveByteChannel
|
|
24
|
+
&& (!Number.isSafeInteger(options.sensitiveByteChannel.maxPayloadSize)
|
|
25
|
+
|| options.sensitiveByteChannel.maxPayloadSize <= 0)) {
|
|
26
|
+
throw new RangeError('StdioTransport sensitiveByteChannel maxPayloadSize must be a positive safe integer');
|
|
27
|
+
}
|
|
28
|
+
this.options = {
|
|
29
|
+
...options,
|
|
30
|
+
sensitiveByteChannel: options.sensitiveByteChannel
|
|
31
|
+
? { ...options.sensitiveByteChannel }
|
|
32
|
+
: undefined,
|
|
33
|
+
};
|
|
22
34
|
this.lineScanner = new LineScanner(options.maxPayloadSize, options.logger);
|
|
23
35
|
}
|
|
24
36
|
get connected() {
|
|
25
37
|
return this._connected;
|
|
26
38
|
}
|
|
39
|
+
get sensitiveFileDescriptor() {
|
|
40
|
+
return this.options.sensitiveByteChannel
|
|
41
|
+
? 3 + (this.options.inheritedFileDescriptors?.length ?? 0)
|
|
42
|
+
: null;
|
|
43
|
+
}
|
|
27
44
|
/**
|
|
28
45
|
* Spawn the child process. Resolves when the process is running (not necessarily ready).
|
|
29
46
|
*/
|
|
@@ -41,6 +58,7 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
41
58
|
'pipe',
|
|
42
59
|
'pipe',
|
|
43
60
|
...(this.options.inheritedFileDescriptors ?? []),
|
|
61
|
+
...(this.options.sensitiveByteChannel ? ['pipe'] : []),
|
|
44
62
|
];
|
|
45
63
|
childProcess = plugins.childProcess.spawn(this.options.binaryPath, this.options.cliArgs, { stdio, env });
|
|
46
64
|
}
|
|
@@ -51,6 +69,12 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
51
69
|
const closePromise = new Promise((resolve) => {
|
|
52
70
|
resolveClose = resolve;
|
|
53
71
|
});
|
|
72
|
+
const sensitiveEndpoint = this.options.sensitiveByteChannel
|
|
73
|
+
? childProcess.stdio[this.sensitiveFileDescriptor]
|
|
74
|
+
: null;
|
|
75
|
+
const sensitiveWriter = sensitiveEndpoint instanceof plugins.stream.Writable
|
|
76
|
+
? sensitiveEndpoint
|
|
77
|
+
: null;
|
|
54
78
|
const generation = {
|
|
55
79
|
childProcess,
|
|
56
80
|
stderrRemainder: '',
|
|
@@ -65,6 +89,9 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
65
89
|
sigtermAttempted: false,
|
|
66
90
|
sigkillAttempted: false,
|
|
67
91
|
sigtermError: null,
|
|
92
|
+
sensitiveWriter,
|
|
93
|
+
sensitiveUsed: false,
|
|
94
|
+
sensitiveError: null,
|
|
68
95
|
};
|
|
69
96
|
this.generation = generation;
|
|
70
97
|
this.childProcess = childProcess;
|
|
@@ -98,6 +125,28 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
98
125
|
}
|
|
99
126
|
});
|
|
100
127
|
});
|
|
128
|
+
generation.sensitiveWriter?.on('error', (error) => {
|
|
129
|
+
if (generation.sensitiveError)
|
|
130
|
+
return;
|
|
131
|
+
generation.sensitiveError = error;
|
|
132
|
+
if (this.generation !== generation || generation.closed)
|
|
133
|
+
return;
|
|
134
|
+
this._connected = false;
|
|
135
|
+
queueMicrotask(() => {
|
|
136
|
+
if (this.generation !== generation || generation.closed)
|
|
137
|
+
return;
|
|
138
|
+
void this.disconnectAndWait().catch((disconnectError) => {
|
|
139
|
+
this.options.logger.log('error', 'Failed to clean up child after sensitive pipe error: '
|
|
140
|
+
+ this.getErrorMessage(disconnectError));
|
|
141
|
+
});
|
|
142
|
+
if (this.listenerCount('error') > 0)
|
|
143
|
+
this.emit('error', error);
|
|
144
|
+
else if (generation.disconnectPromise)
|
|
145
|
+
this.options.logger.log('error', 'Sensitive pipe error during disconnect: ' + error.message);
|
|
146
|
+
else
|
|
147
|
+
this.emit('error', error);
|
|
148
|
+
});
|
|
149
|
+
});
|
|
101
150
|
// Handle stderr with cross-chunk buffering.
|
|
102
151
|
childProcess.stderr?.on('data', (data) => {
|
|
103
152
|
if (this.generation !== generation || generation.closed) {
|
|
@@ -140,6 +189,7 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
140
189
|
this.destroyOwnedStdioEndpoint(generation, 'stdin');
|
|
141
190
|
this.destroyOwnedStdioEndpoint(generation, 'stdout');
|
|
142
191
|
this.destroyOwnedStdioEndpoint(generation, 'stderr');
|
|
192
|
+
this.destroySensitiveEndpoint(generation);
|
|
143
193
|
});
|
|
144
194
|
});
|
|
145
195
|
// ChildProcess 'close' is the termination confirmation: the process has exited
|
|
@@ -213,6 +263,47 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
213
263
|
});
|
|
214
264
|
});
|
|
215
265
|
}
|
|
266
|
+
/**
|
|
267
|
+
* Write the single sensitive frame owned by this child generation. The frame
|
|
268
|
+
* header and request id are non-secret; `data` is written without converting
|
|
269
|
+
* it to a string or copying its backing ArrayBuffer.
|
|
270
|
+
*/
|
|
271
|
+
async writeSensitiveFrame(requestId, data) {
|
|
272
|
+
if (!(data instanceof Uint8Array) || !(data.buffer instanceof ArrayBuffer)) {
|
|
273
|
+
throw new TypeError('sensitive bytes must use an ArrayBuffer-backed Uint8Array');
|
|
274
|
+
}
|
|
275
|
+
const generation = this.generation;
|
|
276
|
+
if (!generation || generation.closed || generation.childProcess !== this.childProcess
|
|
277
|
+
|| !this._connected || !generation.sensitiveWriter || generation.sensitiveWriter.destroyed) {
|
|
278
|
+
throw new Error('sensitive byte pipe not available');
|
|
279
|
+
}
|
|
280
|
+
if (generation.sensitiveUsed)
|
|
281
|
+
throw new Error('sensitive byte pipe was already used');
|
|
282
|
+
generation.sensitiveUsed = true;
|
|
283
|
+
const maxPayloadSize = this.options.sensitiveByteChannel?.maxPayloadSize;
|
|
284
|
+
if (maxPayloadSize === undefined || data.byteLength > maxPayloadSize) {
|
|
285
|
+
throw new Error('sensitive byte payload exceeds its configured limit');
|
|
286
|
+
}
|
|
287
|
+
if (!/^[A-Za-z0-9_-]{1,128}$/.test(requestId))
|
|
288
|
+
throw new Error('invalid sensitive request id');
|
|
289
|
+
const requestIdBytes = Buffer.from(requestId, 'ascii');
|
|
290
|
+
const header = Buffer.alloc(SENSITIVE_FRAME_HEADER_SIZE + requestIdBytes.byteLength);
|
|
291
|
+
header.write(SENSITIVE_FRAME_MAGIC, 0, 4, 'ascii');
|
|
292
|
+
header.writeUInt8(1, 4);
|
|
293
|
+
header.writeUInt8(0, 5);
|
|
294
|
+
header.writeUInt16BE(requestIdBytes.byteLength, 6);
|
|
295
|
+
header.writeBigUInt64BE(BigInt(data.byteLength), 8);
|
|
296
|
+
requestIdBytes.copy(header, SENSITIVE_FRAME_HEADER_SIZE);
|
|
297
|
+
const payload = Buffer.from(data.buffer, data.byteOffset, data.byteLength);
|
|
298
|
+
try {
|
|
299
|
+
await this.writeSensitiveChunk(generation, header, false);
|
|
300
|
+
await this.writeSensitiveChunk(generation, payload, true);
|
|
301
|
+
}
|
|
302
|
+
catch (error) {
|
|
303
|
+
this.destroySensitiveEndpoint(generation);
|
|
304
|
+
throw error;
|
|
305
|
+
}
|
|
306
|
+
}
|
|
216
307
|
/**
|
|
217
308
|
* Kill the child process without waiting for confirmation.
|
|
218
309
|
*/
|
|
@@ -254,6 +345,7 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
254
345
|
generation.disconnectPromise = disconnectPromise;
|
|
255
346
|
generation.rejectDisconnect = rejectDisconnect;
|
|
256
347
|
this._connected = false;
|
|
348
|
+
this.destroySensitiveEndpoint(generation);
|
|
257
349
|
void disconnectPromise.then(() => {
|
|
258
350
|
if (generation.disconnectPromise === disconnectPromise) {
|
|
259
351
|
generation.rejectDisconnect = null;
|
|
@@ -276,6 +368,7 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
276
368
|
this.destroyOwnedStdioEndpoint(generation, 'stdin');
|
|
277
369
|
this.destroyOwnedStdioEndpoint(generation, 'stdout');
|
|
278
370
|
this.destroyOwnedStdioEndpoint(generation, 'stderr');
|
|
371
|
+
this.destroySensitiveEndpoint(generation);
|
|
279
372
|
return disconnectPromise;
|
|
280
373
|
}
|
|
281
374
|
generation.sigtermAttempted = true;
|
|
@@ -369,6 +462,58 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
369
462
|
}
|
|
370
463
|
}
|
|
371
464
|
}
|
|
465
|
+
writeSensitiveChunk(generation, data, end) {
|
|
466
|
+
return new Promise((resolve, reject) => {
|
|
467
|
+
const writer = generation.sensitiveWriter;
|
|
468
|
+
if (!writer || writer.destroyed || generation.closed || this.generation !== generation) {
|
|
469
|
+
reject(new Error('sensitive byte pipe not available'));
|
|
470
|
+
return;
|
|
471
|
+
}
|
|
472
|
+
let settled = false;
|
|
473
|
+
const cleanup = () => {
|
|
474
|
+
writer.off('error', onError);
|
|
475
|
+
writer.off('close', onClose);
|
|
476
|
+
};
|
|
477
|
+
const settle = (error) => {
|
|
478
|
+
if (settled)
|
|
479
|
+
return;
|
|
480
|
+
settled = true;
|
|
481
|
+
cleanup();
|
|
482
|
+
if (error)
|
|
483
|
+
reject(error);
|
|
484
|
+
else
|
|
485
|
+
resolve();
|
|
486
|
+
};
|
|
487
|
+
const onError = (error) => settle(error);
|
|
488
|
+
const onClose = () => settle(new Error('sensitive byte pipe closed before write completion'));
|
|
489
|
+
writer.once('error', onError);
|
|
490
|
+
writer.once('close', onClose);
|
|
491
|
+
try {
|
|
492
|
+
if (end)
|
|
493
|
+
writer.end(data, () => settle());
|
|
494
|
+
else
|
|
495
|
+
writer.write(data, error => settle(error));
|
|
496
|
+
}
|
|
497
|
+
catch (error) {
|
|
498
|
+
settle(this.toError(error, 'Failed to write sensitive byte pipe'));
|
|
499
|
+
}
|
|
500
|
+
});
|
|
501
|
+
}
|
|
502
|
+
destroySensitiveEndpoint(generation) {
|
|
503
|
+
const endpoint = generation.sensitiveWriter;
|
|
504
|
+
if (!endpoint || endpoint.destroyed)
|
|
505
|
+
return;
|
|
506
|
+
try {
|
|
507
|
+
endpoint.destroy();
|
|
508
|
+
}
|
|
509
|
+
catch (error) {
|
|
510
|
+
const endpointError = this.toError(error, 'Failed to close sensitive byte pipe');
|
|
511
|
+
generation.rejectDisconnect?.(endpointError);
|
|
512
|
+
this.options.logger.log('error', endpointError.message);
|
|
513
|
+
if (this.listenerCount('error') > 0)
|
|
514
|
+
this.emit('error', endpointError);
|
|
515
|
+
}
|
|
516
|
+
}
|
|
372
517
|
toError(error, prefix) {
|
|
373
518
|
return new Error(prefix + ': ' + this.getErrorMessage(error));
|
|
374
519
|
}
|
|
@@ -376,4 +521,4 @@ export class StdioTransport extends plugins.events.EventEmitter {
|
|
|
376
521
|
return error instanceof Error ? error.message : String(error);
|
|
377
522
|
}
|
|
378
523
|
}
|
|
379
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.stdiotransport.js","sourceRoot":"","sources":["../ts/classes.stdiotransport.ts"],"names":[],"mappings":"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"}
|
|
524
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.stdiotransport.js","sourceRoot":"","sources":["../ts/classes.stdiotransport.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,15 @@ export interface IRustBridgeOptions extends IBinaryLocatorOptions {
|
|
|
57
57
|
* closes the caller's source descriptors.
|
|
58
58
|
*/
|
|
59
59
|
inheritedFileDescriptors?: readonly number[];
|
|
60
|
+
/**
|
|
61
|
+
* Opt in to one owned, one-shot binary pipe for a sensitive request in each
|
|
62
|
+
* spawned stdio generation. The pipe is appended after caller-owned inherited
|
|
63
|
+
* descriptors, so their child descriptor numbers remain unchanged.
|
|
64
|
+
*/
|
|
65
|
+
sensitiveByteChannel?: {
|
|
66
|
+
/** Maximum raw sensitive payload size accepted by the bridge. */
|
|
67
|
+
maxPayloadSize: number;
|
|
68
|
+
};
|
|
60
69
|
/** Timeout for individual requests in ms (default: 30000) */
|
|
61
70
|
requestTimeoutMs?: number;
|
|
62
71
|
/** Timeout for the ready event during spawn in ms (default: 10000) */
|
|
@@ -5,6 +5,18 @@ export interface IManagementRequest {
|
|
|
5
5
|
id: string;
|
|
6
6
|
method: string;
|
|
7
7
|
params: Record<string, any>;
|
|
8
|
+
/** Value-free metadata for an associated one-shot binary frame. */
|
|
9
|
+
sensitive?: IManagementSensitivePayload;
|
|
10
|
+
}
|
|
11
|
+
export interface IManagementSensitivePayload {
|
|
12
|
+
protocol: 'smartrust-sensitive-v1';
|
|
13
|
+
fileDescriptor: number;
|
|
14
|
+
byteLength: number;
|
|
15
|
+
}
|
|
16
|
+
export interface IManagementSensitiveAck {
|
|
17
|
+
protocol: 'smartrust-sensitive-v1';
|
|
18
|
+
consumed: true;
|
|
19
|
+
byteLength: number;
|
|
8
20
|
}
|
|
9
21
|
/**
|
|
10
22
|
* Management response received from the Rust binary via stdout.
|
|
@@ -15,6 +27,10 @@ export interface IManagementResponse {
|
|
|
15
27
|
result?: any;
|
|
16
28
|
error?: string;
|
|
17
29
|
errorCode?: string;
|
|
30
|
+
/** Optional structured details of a failure, for example per-field validation errors. */
|
|
31
|
+
errorData?: unknown;
|
|
32
|
+
/** Required after the receiver consumed the exact associated binary frame. */
|
|
33
|
+
sensitiveAck?: IManagementSensitiveAck;
|
|
18
34
|
}
|
|
19
35
|
/**
|
|
20
36
|
* Management event received from the Rust binary (unsolicited, no id field).
|
|
@@ -30,6 +30,10 @@ export interface IRustTransport extends plugins.events.EventEmitter {
|
|
|
30
30
|
connect(): Promise<void>;
|
|
31
31
|
/** Write a string to the transport. Handles backpressure. */
|
|
32
32
|
write(data: string): Promise<void>;
|
|
33
|
+
/** Child descriptor for the optional one-shot sensitive byte pipe. */
|
|
34
|
+
readonly sensitiveFileDescriptor?: number | null;
|
|
35
|
+
/** Write and close one correlated binary frame. Available only in stdio mode. */
|
|
36
|
+
writeSensitiveFrame?(requestId: string, data: Uint8Array<ArrayBuffer>): Promise<void>;
|
|
33
37
|
/** Disconnect the transport. For stdio: kills the process. For socket: closes the connection. */
|
|
34
38
|
disconnect(): void;
|
|
35
39
|
/** Disconnect and resolve only after the local transport has confirmed closure. */
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import * as childProcess from 'child_process';
|
|
|
4
4
|
import * as events from 'events';
|
|
5
5
|
import * as url from 'url';
|
|
6
6
|
import * as net from 'net';
|
|
7
|
-
|
|
7
|
+
import * as stream from 'stream';
|
|
8
|
+
export { path, fs, childProcess, events, url, net, stream };
|
|
8
9
|
import * as smartpath from '@push.rocks/smartpath';
|
|
9
10
|
export { smartpath };
|
package/dist_ts/plugins.js
CHANGED
|
@@ -5,8 +5,9 @@ import * as childProcess from 'child_process';
|
|
|
5
5
|
import * as events from 'events';
|
|
6
6
|
import * as url from 'url';
|
|
7
7
|
import * as net from 'net';
|
|
8
|
-
|
|
8
|
+
import * as stream from 'stream';
|
|
9
|
+
export { path, fs, childProcess, events, url, net, stream };
|
|
9
10
|
// @push.rocks scope
|
|
10
11
|
import * as smartpath from '@push.rocks/smartpath';
|
|
11
12
|
export { smartpath };
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZUFBZTtBQUNmLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxZQUFZLE1BQU0sZUFBZSxDQUFDO0FBQzlDLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQ2pDLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBRWpDLE9BQU8sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsQ0FBQztBQUU1RCxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUVuRCxPQUFPLEVBQUUsU0FBUyxFQUFFLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartrust",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A type-safe bridge between JavaScript engines and Rust binaries.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -9,10 +9,10 @@
|
|
|
9
9
|
"author": "Task Venture Capital GmbH",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"devDependencies": {
|
|
12
|
-
"@git.zone/tsbuild": "^
|
|
13
|
-
"@git.zone/tsrun": "^
|
|
14
|
-
"@git.zone/tstest": "^6.
|
|
15
|
-
"@types/node": "^26.
|
|
12
|
+
"@git.zone/tsbuild": "^5.0.0",
|
|
13
|
+
"@git.zone/tsrun": "^3.0.0",
|
|
14
|
+
"@git.zone/tstest": "^6.2.0",
|
|
15
|
+
"@types/node": "^26.6.1"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@push.rocks/smartpath": "^6.0.0"
|
package/readme.md
CHANGED
|
@@ -47,7 +47,7 @@ If you're integrating Rust into a Node.js project, you'll inevitably need:
|
|
|
47
47
|
|-----------|--------|-------------|
|
|
48
48
|
| **TS → Rust** (Request) | `{"id": "req_1", "method": "start", "params": {...}}` | Command with unique ID |
|
|
49
49
|
| **Rust → TS** (Response) | `{"id": "req_1", "success": true, "result": {...}}` | Final response correlated by ID |
|
|
50
|
-
| **Rust → TS** (Error) | `{"id": "req_1", "success": false, "error": "msg", "errorCode": "EAPP_INVALID"}` | Error correlated by ID; `errorCode`
|
|
50
|
+
| **Rust → TS** (Error) | `{"id": "req_1", "success": false, "error": "msg", "errorCode": "EAPP_INVALID", "errorData": {...}}` | Error correlated by ID; `errorCode` and `errorData` are optional |
|
|
51
51
|
| **Rust → TS** (Stream Chunk) | `{"id": "req_1", "stream": true, "data": {...}}` | Intermediate chunk (zero or more) |
|
|
52
52
|
| **Rust → TS** (Event) | `{"event": "ready", "data": {...}}` | Unsolicited event (no ID) |
|
|
53
53
|
|
|
@@ -134,6 +134,65 @@ non-empty descriptor list rejects because a socket daemon is not a child of the
|
|
|
134
134
|
bridge and cannot inherit them. Node.js does not support passing socket
|
|
135
135
|
descriptors this way on Windows.
|
|
136
136
|
|
|
137
|
+
### One-shot sensitive byte requests
|
|
138
|
+
|
|
139
|
+
Stdio mode can append one Smartrust-owned pipe after all caller-owned inherited
|
|
140
|
+
descriptors. It carries one raw byte payload without putting those bytes in the
|
|
141
|
+
JSON request, a string, an environment variable, or a backing file:
|
|
142
|
+
|
|
143
|
+
```typescript
|
|
144
|
+
const bridge = new RustBridge<TMyCommands>({
|
|
145
|
+
binaryName: 'my-rust-server',
|
|
146
|
+
sensitiveByteChannel: { maxPayloadSize: 2 * 1024 * 1024 },
|
|
147
|
+
});
|
|
148
|
+
|
|
149
|
+
await bridge.spawn();
|
|
150
|
+
const bytes = new Uint8Array([1, 2, 3]);
|
|
151
|
+
const result = await bridge.sendCommandWithSensitiveBytes('start', { port: 8080 }, bytes);
|
|
152
|
+
// Smartrust has cleared the exact `bytes` view before the promise settles.
|
|
153
|
+
```
|
|
154
|
+
|
|
155
|
+
Only one sensitive request may use a spawned generation. It runs exclusively
|
|
156
|
+
with respect to other commands, but ordinary JSON commands can continue after
|
|
157
|
+
its successful acknowledgement. A new `spawn()` creates a new pipe. Socket
|
|
158
|
+
mode rejects `sensitiveByteChannel` because the daemon is not a child process.
|
|
159
|
+
|
|
160
|
+
The JSON request adds only this value-free metadata:
|
|
161
|
+
|
|
162
|
+
```json
|
|
163
|
+
{"sensitive":{"protocol":"smartrust-sensitive-v1","fileDescriptor":3,"byteLength":3}}
|
|
164
|
+
```
|
|
165
|
+
|
|
166
|
+
The child descriptor is `3 + inheritedFileDescriptors.length`, so existing
|
|
167
|
+
inherited descriptor numbers never move. The binary frame is:
|
|
168
|
+
|
|
169
|
+
| Offset | Size | Value |
|
|
170
|
+
|---:|---:|---|
|
|
171
|
+
| 0 | 4 | ASCII `SMRS` |
|
|
172
|
+
| 4 | 1 | version `1` |
|
|
173
|
+
| 5 | 1 | flags `0` |
|
|
174
|
+
| 6 | 2 | big-endian request-id byte length |
|
|
175
|
+
| 8 | 8 | big-endian payload byte length |
|
|
176
|
+
| 16 | variable | ASCII request id, then raw payload bytes |
|
|
177
|
+
|
|
178
|
+
The receiver must consume and validate the complete frame before sending its
|
|
179
|
+
normal JSON response. That response must include an exact value-free ACK:
|
|
180
|
+
|
|
181
|
+
```json
|
|
182
|
+
{"sensitiveAck":{"protocol":"smartrust-sensitive-v1","consumed":true,"byteLength":3}}
|
|
183
|
+
```
|
|
184
|
+
|
|
185
|
+
Smartrust settles only after both the local pipe write callback and the matching
|
|
186
|
+
ACK, regardless of their event order. Abort, timeout, partial pipe failure,
|
|
187
|
+
malformed ACK, or a receiver error terminates the child and rejects every pending
|
|
188
|
+
request, so buffered bytes cannot become a later request.
|
|
189
|
+
|
|
190
|
+
Calling the method transfers exclusive use of the supplied mutable
|
|
191
|
+
`Uint8Array<ArrayBuffer>` view until settlement. Smartrust clears that exact
|
|
192
|
+
view after the write callback or failure. It cannot promise erasure of aliases,
|
|
193
|
+
JavaScript engine or Node.js internal copies, kernel pipe buffers, or memory the
|
|
194
|
+
receiver owns; each receiver must bound and clear its own buffers.
|
|
195
|
+
|
|
137
196
|
### Per-Command Deadlines and Cancellation
|
|
138
197
|
|
|
139
198
|
Non-streaming commands accept an optional `IRustBridgeRequestOptions` argument:
|
|
@@ -215,6 +274,24 @@ message. The bridge-owned `code` remains
|
|
|
215
274
|
failures from application-specific Rust failures. Legacy responses and
|
|
216
275
|
non-string `errorCode` values leave `responseErrorCode` undefined.
|
|
217
276
|
|
|
277
|
+
When a failure has structured details, for example one reason per invalid
|
|
278
|
+
input, Rust can send them as the optional response `errorData`, any JSON
|
|
279
|
+
value. `RustBridgeRequestError.responseErrorData` carries it as sent, typed
|
|
280
|
+
`unknown`, so the caller narrows it for its own error codes. A response
|
|
281
|
+
without `errorData` leaves `responseErrorData` undefined.
|
|
282
|
+
|
|
283
|
+
```typescript
|
|
284
|
+
// Rust: {"id":"req_7","success":false,"error":"Validation failed",
|
|
285
|
+
// "errorCode":"EVALIDATION","errorData":{"fields":[{"name":"port","messages":["must be 1-65535"]}]}}
|
|
286
|
+
try {
|
|
287
|
+
await bridge.sendCommand('configure', { port: 0 });
|
|
288
|
+
} catch (error) {
|
|
289
|
+
if (error instanceof RustBridgeRequestError && error.responseErrorCode === 'EVALIDATION') {
|
|
290
|
+
console.error(error.responseErrorData);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
```
|
|
294
|
+
|
|
218
295
|
### Confirmed Termination
|
|
219
296
|
|
|
220
297
|
Use `await bridge.terminate()` when later work must not overlap the current
|
|
@@ -368,8 +445,9 @@ try {
|
|
|
368
445
|
```
|
|
369
446
|
|
|
370
447
|
A final `success: false` response rejects both paths with the same
|
|
371
|
-
`RustBridgeRequestError`. When the response includes an `errorCode
|
|
372
|
-
|
|
448
|
+
`RustBridgeRequestError`. When the response includes an `errorCode` or
|
|
449
|
+
`errorData`, they are available as `responseErrorCode` and `responseErrorData`
|
|
450
|
+
on that error.
|
|
373
451
|
|
|
374
452
|
#### Stream Timeout
|
|
375
453
|
|
|
@@ -457,6 +535,7 @@ const bridge = new RustBridge<TMyCommands>({
|
|
|
457
535
|
// --- Bridge Options ---
|
|
458
536
|
cliArgs: ['--management'], // optional: args passed to binary (default: ['--management'])
|
|
459
537
|
inheritedFileDescriptors: [sourceFd], // optional: caller-owned source fds mapped to child fd 3+
|
|
538
|
+
sensitiveByteChannel: { maxPayloadSize: 2 * 1024 * 1024 }, // optional: one owned raw-byte pipe per spawn
|
|
460
539
|
requestTimeoutMs: 30000, // optional: default request timeout (default: 30000)
|
|
461
540
|
streamTimeoutMs: 30000, // optional: streaming inactivity timeout (default: requestTimeoutMs)
|
|
462
541
|
readyTimeoutMs: 10000, // optional: ready event timeout (default: 10000)
|
|
@@ -672,8 +751,9 @@ fn main() {
|
|
|
672
751
|
|---|---|---|
|
|
673
752
|
| `constructor` | `new RustBridge<T>(options: IRustBridgeOptions)` | Create a new bridge instance |
|
|
674
753
|
| `spawn()` | `Promise<boolean>` | **Stdio mode**: Spawn and wait for ready; rejects invalid explicit selection, returns `false` for ordinary discovery/startup failure |
|
|
675
|
-
| `connect(socketPath, options?)` | `Promise<boolean>` | **Socket mode**: Connect to a running daemon; returns `false` on connection/readiness failure and rejects
|
|
754
|
+
| `connect(socketPath, options?)` | `Promise<boolean>` | **Socket mode**: Connect to a running daemon; returns `false` on connection/readiness failure and rejects stdio-only descriptor/byte-channel options |
|
|
676
755
|
| `sendCommand(method, params, options?)` | `Promise<TCommands[K]['result']>` | Send a typed command with an optional per-call timeout or abort signal |
|
|
756
|
+
| `sendCommandWithSensitiveBytes(method, params, bytes, options?)` | `Promise<TCommands[K]['result']>` | Send one exclusive JSON command with its raw bytes on the generation-owned one-shot pipe |
|
|
677
757
|
| `sendCommandStreaming(method, params)` | `StreamingResponse<TChunk, TResult>` | Send a streaming command; returns immediately |
|
|
678
758
|
| `terminate(options?)` | `Promise<void>` | Confirm stdio child exit or local socket closure; `gracePeriodMs` controls SIGKILL escalation |
|
|
679
759
|
| `kill()` | `void` | Fire-and-forget compatibility wrapper around `terminate()` |
|
|
@@ -738,14 +818,14 @@ fn main() {
|
|
|
738
818
|
| `IRustBridgeLogger` | Logger interface: `{ log(level, message, data?) }` |
|
|
739
819
|
| `IRustTransport` | Transport interface (extends `EventEmitter`) |
|
|
740
820
|
| `IManagementRequest` | IPC request shape: `{ id, method, params }` |
|
|
741
|
-
| `IManagementResponse` | IPC response shape: `{ id, success, result?, error?, errorCode? }` |
|
|
821
|
+
| `IManagementResponse` | IPC response shape: `{ id, success, result?, error?, errorCode?, errorData? }` |
|
|
742
822
|
| `IManagementEvent` | IPC event shape: `{ event, data }` |
|
|
743
823
|
| `IManagementStreamChunk` | IPC stream chunk shape: `{ id, stream: true, data }` |
|
|
744
824
|
| `ICommandDefinition` | Single command definition: `{ params, result }` |
|
|
745
825
|
| `TCommandMap` | `Record<string, ICommandDefinition>` |
|
|
746
826
|
| `TStreamingCommandKeys<T>` | Extracts keys from a command map that have a `chunk` field |
|
|
747
827
|
| `TExtractChunk<T>` | Extracts the chunk type from a streaming command definition |
|
|
748
|
-
| `RustBridgeRequestError` | Request error class with stable `code`, optional `responseErrorCode`, `requestId`, and `method` fields |
|
|
828
|
+
| `RustBridgeRequestError` | Request error class with stable `code`, optional `responseErrorCode`, `responseErrorData`, `requestId`, and `method` fields |
|
|
749
829
|
| `TRustBridgeRequestErrorCode` | Union of stable request error code strings |
|
|
750
830
|
|
|
751
831
|
## License and Legal Information
|