@push.rocks/smartrust 1.9.1 → 2.1.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.rustbinarylocator.d.ts +3 -1
- package/dist_ts/classes.rustbinarylocator.js +52 -13
- package/dist_ts/classes.rustbinarylocatorerror.d.ts +6 -0
- package/dist_ts/classes.rustbinarylocatorerror.js +11 -0
- package/dist_ts/classes.rustbridge.d.ts +1 -0
- package/dist_ts/classes.rustbridge.js +20 -2
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/interfaces/config.d.ts +6 -1
- package/dist_ts/interfaces/transport.d.ts +10 -0
- package/package.json +4 -4
- package/readme.md +31 -4
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.rustbinarylocator.ts +48 -13
- package/ts/classes.rustbinarylocatorerror.ts +13 -0
- package/ts/classes.rustbridge.ts +19 -1
- package/ts/index.ts +1 -0
- package/ts/interfaces/config.ts +6 -1
- package/ts/interfaces/transport.ts +11 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartrust',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '2.1.0',
|
|
7
7
|
description: 'A type-safe bridge between JavaScript engines and Rust binaries.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx1QkFBdUI7SUFDN0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGtFQUFrRTtDQUNoRixDQUFBIn0=
|
|
@@ -14,7 +14,8 @@ export declare class RustBinaryLocator {
|
|
|
14
14
|
constructor(options: IBinaryLocatorOptions, logger?: IRustBridgeLogger);
|
|
15
15
|
/**
|
|
16
16
|
* Find the binary path.
|
|
17
|
-
* Returns null if no binary
|
|
17
|
+
* Returns null if discovery finds no binary. An unusable explicit path
|
|
18
|
+
* rejects with RustBinaryLocatorError without trying discovery or chmod.
|
|
18
19
|
*/
|
|
19
20
|
findBinary(): Promise<string | null>;
|
|
20
21
|
/**
|
|
@@ -24,6 +25,7 @@ export declare class RustBinaryLocator {
|
|
|
24
25
|
private searchBinary;
|
|
25
26
|
private findPlatformPackageBinary;
|
|
26
27
|
private isExecutable;
|
|
28
|
+
private validateExplicitPath;
|
|
27
29
|
private getPlatformSuffix;
|
|
28
30
|
private findInPath;
|
|
29
31
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { RustBinaryLocatorError } from './classes.rustbinarylocatorerror.js';
|
|
2
3
|
const defaultLogger = {
|
|
3
4
|
log() { },
|
|
4
5
|
};
|
|
@@ -15,16 +16,31 @@ export class RustBinaryLocator {
|
|
|
15
16
|
logger;
|
|
16
17
|
cachedPath = null;
|
|
17
18
|
constructor(options, logger) {
|
|
18
|
-
|
|
19
|
+
// Anchor relative paths without collapsing symlink/.. traversal into another executable.
|
|
20
|
+
const cwd = process.cwd();
|
|
21
|
+
const relativeBase = cwd.endsWith(plugins.path.sep) ? cwd : `${cwd}${plugins.path.sep}`;
|
|
22
|
+
this.options = {
|
|
23
|
+
...options,
|
|
24
|
+
localPaths: options.localPaths ? [...options.localPaths] : undefined,
|
|
25
|
+
binaryPath: typeof options.binaryPath === 'string' && options.binaryPath.length > 0
|
|
26
|
+
? (plugins.path.isAbsolute(options.binaryPath) ? options.binaryPath : `${relativeBase}${options.binaryPath}`)
|
|
27
|
+
: options.binaryPath,
|
|
28
|
+
};
|
|
19
29
|
this.logger = logger || defaultLogger;
|
|
20
30
|
}
|
|
21
31
|
/**
|
|
22
32
|
* Find the binary path.
|
|
23
|
-
* Returns null if no binary
|
|
33
|
+
* Returns null if discovery finds no binary. An unusable explicit path
|
|
34
|
+
* rejects with RustBinaryLocatorError without trying discovery or chmod.
|
|
24
35
|
*/
|
|
25
36
|
async findBinary() {
|
|
37
|
+
if (this.options.binaryPath !== undefined) {
|
|
38
|
+
return this.validateExplicitPath();
|
|
39
|
+
}
|
|
26
40
|
if (this.cachedPath !== null) {
|
|
27
|
-
|
|
41
|
+
if (await this.isExecutable(this.cachedPath))
|
|
42
|
+
return this.cachedPath;
|
|
43
|
+
this.cachedPath = null;
|
|
28
44
|
}
|
|
29
45
|
const path = await this.searchBinary();
|
|
30
46
|
this.cachedPath = path;
|
|
@@ -38,14 +54,6 @@ export class RustBinaryLocator {
|
|
|
38
54
|
}
|
|
39
55
|
async searchBinary() {
|
|
40
56
|
const { binaryName } = this.options;
|
|
41
|
-
// 1. Explicit binary path override
|
|
42
|
-
if (this.options.binaryPath) {
|
|
43
|
-
if (await this.isExecutable(this.options.binaryPath)) {
|
|
44
|
-
this.logger.log('info', `Binary found via explicit path: ${this.options.binaryPath}`);
|
|
45
|
-
return this.options.binaryPath;
|
|
46
|
-
}
|
|
47
|
-
this.logger.log('warn', `Explicit binary path not executable: ${this.options.binaryPath}`);
|
|
48
|
-
}
|
|
49
57
|
// 2. Environment variable override
|
|
50
58
|
if (this.options.envVarName) {
|
|
51
59
|
const envPath = process.env[this.options.envVarName];
|
|
@@ -112,6 +120,17 @@ export class RustBinaryLocator {
|
|
|
112
120
|
return null;
|
|
113
121
|
}
|
|
114
122
|
async isExecutable(filePath) {
|
|
123
|
+
// Discovery may repair a regular installed binary's execute bits. Explicit
|
|
124
|
+
// caller-owned selections use the separate read-only validator below.
|
|
125
|
+
let stats;
|
|
126
|
+
try {
|
|
127
|
+
stats = await plugins.fs.promises.stat(filePath);
|
|
128
|
+
if (!stats.isFile())
|
|
129
|
+
return false;
|
|
130
|
+
}
|
|
131
|
+
catch {
|
|
132
|
+
return false;
|
|
133
|
+
}
|
|
115
134
|
try {
|
|
116
135
|
await plugins.fs.promises.access(filePath, plugins.fs.constants.X_OK);
|
|
117
136
|
return true;
|
|
@@ -121,7 +140,7 @@ export class RustBinaryLocator {
|
|
|
121
140
|
// Try to make it executable.
|
|
122
141
|
try {
|
|
123
142
|
await plugins.fs.promises.access(filePath, plugins.fs.constants.F_OK);
|
|
124
|
-
await plugins.fs.promises.chmod(filePath,
|
|
143
|
+
await plugins.fs.promises.chmod(filePath, stats.mode | 0o111);
|
|
125
144
|
this.logger.log('info', `Auto-fixed missing execute permission on: ${filePath}`);
|
|
126
145
|
return true;
|
|
127
146
|
}
|
|
@@ -130,6 +149,26 @@ export class RustBinaryLocator {
|
|
|
130
149
|
}
|
|
131
150
|
}
|
|
132
151
|
}
|
|
152
|
+
async validateExplicitPath() {
|
|
153
|
+
const binaryPath = this.options.binaryPath;
|
|
154
|
+
if (typeof binaryPath !== 'string' || binaryPath.length === 0 || binaryPath.includes('\0')) {
|
|
155
|
+
throw new RustBinaryLocatorError('Explicit binaryPath must be a non-empty filesystem path', typeof binaryPath === 'string' ? binaryPath : undefined);
|
|
156
|
+
}
|
|
157
|
+
try {
|
|
158
|
+
const stats = await plugins.fs.promises.stat(binaryPath);
|
|
159
|
+
if (!stats.isFile()) {
|
|
160
|
+
throw new RustBinaryLocatorError(`Explicit binaryPath is not a regular file: ${binaryPath}`, binaryPath);
|
|
161
|
+
}
|
|
162
|
+
await plugins.fs.promises.access(binaryPath, plugins.fs.constants.X_OK);
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
if (error instanceof RustBinaryLocatorError)
|
|
166
|
+
throw error;
|
|
167
|
+
throw new RustBinaryLocatorError(`Explicit binaryPath is missing or not executable: ${binaryPath}`, binaryPath, error);
|
|
168
|
+
}
|
|
169
|
+
this.logger.log('info', `Binary selected via explicit path: ${binaryPath}`);
|
|
170
|
+
return binaryPath;
|
|
171
|
+
}
|
|
133
172
|
getPlatformSuffix() {
|
|
134
173
|
const archMap = { x64: 'amd64', arm64: 'arm64' };
|
|
135
174
|
const platformMap = { linux: 'linux', darwin: 'darwin', win32: 'windows' };
|
|
@@ -148,4 +187,4 @@ export class RustBinaryLocator {
|
|
|
148
187
|
return null;
|
|
149
188
|
}
|
|
150
189
|
}
|
|
151
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.rustbinarylocator.js","sourceRoot":"","sources":["../ts/classes.rustbinarylocator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/** Failure to use the caller's explicit executable selection. */
|
|
2
|
+
export declare class RustBinaryLocatorError extends Error {
|
|
3
|
+
readonly binaryPath: string | undefined;
|
|
4
|
+
readonly code: "ERR_RUST_BINARY_EXPLICIT_PATH_INVALID";
|
|
5
|
+
constructor(message: string, binaryPath: string | undefined, cause?: unknown);
|
|
6
|
+
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** Failure to use the caller's explicit executable selection. */
|
|
2
|
+
export class RustBinaryLocatorError extends Error {
|
|
3
|
+
binaryPath;
|
|
4
|
+
code = 'ERR_RUST_BINARY_EXPLICIT_PATH_INVALID';
|
|
5
|
+
constructor(message, binaryPath, cause) {
|
|
6
|
+
super(message, cause === undefined ? undefined : { cause });
|
|
7
|
+
this.binaryPath = binaryPath;
|
|
8
|
+
this.name = 'RustBinaryLocatorError';
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5ydXN0YmluYXJ5bG9jYXRvcmVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2xhc3Nlcy5ydXN0YmluYXJ5bG9jYXRvcmVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGlFQUFpRTtBQUNqRSxNQUFNLE9BQU8sc0JBQXVCLFNBQVEsS0FBSztJQUs3QjtJQUpGLElBQUksR0FBRyx1Q0FBZ0QsQ0FBQztJQUV4RSxZQUNFLE9BQWUsRUFDQyxVQUE4QixFQUM5QyxLQUFlO1FBRWYsS0FBSyxDQUFDLE9BQU8sRUFBRSxLQUFLLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztRQUg1QyxlQUFVLEdBQVYsVUFBVSxDQUFvQjtRQUk5QyxJQUFJLENBQUMsSUFBSSxHQUFHLHdCQUF3QixDQUFDO0lBQ3ZDLENBQUM7Q0FDRiJ9
|
|
@@ -26,6 +26,7 @@ export declare class RustBridge<TCommands extends TCommandMap = TCommandMap> ext
|
|
|
26
26
|
/**
|
|
27
27
|
* Spawn the Rust binary and wait for it to signal readiness.
|
|
28
28
|
* Returns true if the binary was found and spawned successfully.
|
|
29
|
+
* Rejects with RustBinaryLocatorError for an invalid explicit binaryPath.
|
|
29
30
|
*/
|
|
30
31
|
spawn(): Promise<boolean>;
|
|
31
32
|
/**
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
3
|
+
import { RustBinaryLocatorError } from './classes.rustbinarylocatorerror.js';
|
|
3
4
|
import { RustBridgeRequestError } from './classes.rustbridgerequesterror.js';
|
|
4
5
|
import { StreamingResponse } from './classes.streamingresponse.js';
|
|
5
6
|
import { StdioTransport } from './classes.stdiotransport.js';
|
|
@@ -64,6 +65,7 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
64
65
|
/**
|
|
65
66
|
* Spawn the Rust binary and wait for it to signal readiness.
|
|
66
67
|
* Returns true if the binary was found and spawned successfully.
|
|
68
|
+
* Rejects with RustBinaryLocatorError for an invalid explicit binaryPath.
|
|
67
69
|
*/
|
|
68
70
|
spawn() {
|
|
69
71
|
return this.activate(async (generationArg) => {
|
|
@@ -140,6 +142,8 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
140
142
|
if (this.isStartingGeneration(generation)) {
|
|
141
143
|
this.lifecycleState = 'idle';
|
|
142
144
|
}
|
|
145
|
+
if (error instanceof RustBinaryLocatorError)
|
|
146
|
+
throw error;
|
|
143
147
|
return false;
|
|
144
148
|
}
|
|
145
149
|
})();
|
|
@@ -231,6 +235,12 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
231
235
|
return;
|
|
232
236
|
}
|
|
233
237
|
const intentional = this.lifecycleState === 'stopping';
|
|
238
|
+
const disconnected = {
|
|
239
|
+
intentional,
|
|
240
|
+
reconnecting: !intentional && transportArg.reconnecting === true,
|
|
241
|
+
code: typeof args[0] === 'number' ? args[0] : null,
|
|
242
|
+
signal: typeof args[1] === 'string' ? args[1] : null,
|
|
243
|
+
};
|
|
234
244
|
this.logger.log('info', 'Transport closed');
|
|
235
245
|
this.isRunning = false;
|
|
236
246
|
this.rejectAllPendingRequests(`${this.options.binaryName} process exited`);
|
|
@@ -240,11 +250,17 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
240
250
|
reconnectReadyTimeout = null;
|
|
241
251
|
}
|
|
242
252
|
this.lifecycleState = 'starting';
|
|
253
|
+
// Idle capability owners must observe loss before any reconnect timer
|
|
254
|
+
// can restore transport readiness. Pending calls are already rejected.
|
|
255
|
+
this.emit('disconnected', disconnected);
|
|
243
256
|
return;
|
|
244
257
|
}
|
|
245
258
|
this.transport = null;
|
|
246
259
|
if (!intentional) {
|
|
247
260
|
this.lifecycleState = 'idle';
|
|
261
|
+
}
|
|
262
|
+
this.emit('disconnected', disconnected);
|
|
263
|
+
if (!intentional) {
|
|
248
264
|
this.emit('exit', ...args);
|
|
249
265
|
}
|
|
250
266
|
settle(false);
|
|
@@ -563,7 +579,9 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
563
579
|
else if (activationPromise) {
|
|
564
580
|
// No transport exists yet (for example, binary lookup is pending). The
|
|
565
581
|
// stopping state prevents that activation from publishing a transport.
|
|
566
|
-
|
|
582
|
+
// The spawn caller retains its original rejection. With no transport
|
|
583
|
+
// created, a locator failure leaves nothing for termination to reap.
|
|
584
|
+
await activationPromise.catch(() => undefined);
|
|
567
585
|
}
|
|
568
586
|
if (this.lifecycleGeneration !== generation) {
|
|
569
587
|
throw new Error('RustBridge lifecycle generation changed during termination');
|
|
@@ -784,4 +802,4 @@ export class RustBridge extends plugins.events.EventEmitter {
|
|
|
784
802
|
return error instanceof Error ? error.message : String(error);
|
|
785
803
|
}
|
|
786
804
|
}
|
|
787
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.rustbridge.js","sourceRoot":"","sources":["../ts/classes.rustbridge.ts"],"names":[],"mappings":"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"}
|
|
805
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.rustbridge.js","sourceRoot":"","sources":["../ts/classes.rustbridge.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export { RustBridge } from './classes.rustbridge.js';
|
|
2
2
|
export { RustBridgeRequestError, type IRustBridgeRequestErrorOptions, type TRustBridgeRequestErrorCode, } from './classes.rustbridgerequesterror.js';
|
|
3
3
|
export { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
4
|
+
export { RustBinaryLocatorError } from './classes.rustbinarylocatorerror.js';
|
|
4
5
|
export { StreamingResponse } from './classes.streamingresponse.js';
|
|
5
6
|
export { StdioTransport } from './classes.stdiotransport.js';
|
|
6
7
|
export { SocketTransport } from './classes.sockettransport.js';
|
package/dist_ts/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
export { RustBridge } from './classes.rustbridge.js';
|
|
2
2
|
export { RustBridgeRequestError, } from './classes.rustbridgerequesterror.js';
|
|
3
3
|
export { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
4
|
+
export { RustBinaryLocatorError } from './classes.rustbinarylocatorerror.js';
|
|
4
5
|
export { StreamingResponse } from './classes.streamingresponse.js';
|
|
5
6
|
export { StdioTransport } from './classes.stdiotransport.js';
|
|
6
7
|
export { SocketTransport } from './classes.sockettransport.js';
|
|
7
8
|
export { LineScanner } from './classes.linescanner.js';
|
|
8
9
|
export * from './interfaces/index.js';
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckQsT0FBTyxFQUNMLHNCQUFzQixHQUd2QixNQUFNLHFDQUFxQyxDQUFDO0FBQzdDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzdFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDL0QsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZELGNBQWMsdUJBQXVCLENBQUMifQ==
|
|
@@ -35,7 +35,12 @@ export interface IBinaryLocatorOptions {
|
|
|
35
35
|
localPaths?: string[];
|
|
36
36
|
/** Whether to search the system PATH (default: true) */
|
|
37
37
|
searchSystemPath?: boolean;
|
|
38
|
-
/**
|
|
38
|
+
/**
|
|
39
|
+
* Select only this executable, without discovery or permission repair.
|
|
40
|
+
* Relative paths resolve against cwd when the locator/bridge is constructed.
|
|
41
|
+
* Every lookup validates a regular executable target; invalid selections
|
|
42
|
+
* reject with RustBinaryLocatorError, including empty paths.
|
|
43
|
+
*/
|
|
39
44
|
binaryPath?: string;
|
|
40
45
|
}
|
|
41
46
|
/**
|
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
import type * as plugins from '../plugins.js';
|
|
2
|
+
/** Current bridge transport closure, including the automatic reconnect gap.
|
|
3
|
+
* This is an observation; await terminate() for confirmed lifecycle teardown. */
|
|
4
|
+
export interface IRustBridgeDisconnectedEvent {
|
|
5
|
+
intentional: boolean;
|
|
6
|
+
reconnecting: boolean;
|
|
7
|
+
/** Stdio exit code, or null when unavailable (including socket transport). */
|
|
8
|
+
code: number | null;
|
|
9
|
+
/** Stdio exit signal, or null when unavailable. */
|
|
10
|
+
signal: string | null;
|
|
11
|
+
}
|
|
2
12
|
/** Options for confirmed transport disconnection. */
|
|
3
13
|
export interface IRustTransportDisconnectOptions {
|
|
4
14
|
/** Grace period before escalating process termination, in milliseconds. */
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartrust",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "2.1.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": "^4.4.
|
|
12
|
+
"@git.zone/tsbuild": "^4.4.3",
|
|
13
13
|
"@git.zone/tsrun": "^2.0.6",
|
|
14
|
-
"@git.zone/tstest": "^
|
|
15
|
-
"@types/node": "^26.
|
|
14
|
+
"@git.zone/tstest": "^6.0.0",
|
|
15
|
+
"@types/node": "^26.5.0"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@push.rocks/smartpath": "^6.0.0"
|
package/readme.md
CHANGED
|
@@ -391,6 +391,22 @@ The `RustBinaryLocator` searches for your binary using a priority-ordered strate
|
|
|
391
391
|
| 4 | Local dev paths | `./rust/target/release/<name>` and `./rust/target/debug/<name>` |
|
|
392
392
|
| 5 | System PATH | Standard `$PATH` lookup |
|
|
393
393
|
|
|
394
|
+
Supplying `binaryPath` selects only that filesystem path. Relative paths resolve
|
|
395
|
+
against the working directory at construction, and a bare name such as `node`
|
|
396
|
+
does not search PATH; use `process.execPath` to select the running Node executable.
|
|
397
|
+
The locator snapshots its options and checks the selected target on every lookup,
|
|
398
|
+
including restarts. Missing paths, empty/invalid values, directories and files
|
|
399
|
+
without execute permission reject with `RustBinaryLocatorError` and code
|
|
400
|
+
`ERR_RUST_BINARY_EXPLICIT_PATH_INVALID`. Explicit selection never changes file
|
|
401
|
+
permissions or falls back to environment variables, packages, local builds or
|
|
402
|
+
PATH. These guarantees also apply to `RustBridge.spawn()`; confirmed termination
|
|
403
|
+
remains available after selection fails. No global environment is modified.
|
|
404
|
+
|
|
405
|
+
When `binaryPath` is omitted, the normal discovery strategy remains available.
|
|
406
|
+
Discovered paths are cached and revalidated before reuse; a missing cached target
|
|
407
|
+
triggers discovery again. Permission repair applies only to regular discovery
|
|
408
|
+
candidates and preserves their existing read/write permission bits.
|
|
409
|
+
|
|
394
410
|
You can also use the locator standalone:
|
|
395
411
|
|
|
396
412
|
```typescript
|
|
@@ -403,7 +419,7 @@ const locator = new RustBinaryLocator({
|
|
|
403
419
|
});
|
|
404
420
|
|
|
405
421
|
const binaryPath = await locator.findBinary();
|
|
406
|
-
//
|
|
422
|
+
// Discovery results are cached and revalidated; clearCache() forces re-search.
|
|
407
423
|
```
|
|
408
424
|
|
|
409
425
|
### Configuration Reference ⚙️
|
|
@@ -452,11 +468,22 @@ interface ISocketConnectOptions {
|
|
|
452
468
|
| Event | Payload | Description |
|
|
453
469
|
|-------|---------|-------------|
|
|
454
470
|
| `ready` | — | Bridge connected and binary reported ready |
|
|
455
|
-
| `
|
|
471
|
+
| `disconnected` | `IRustBridgeDisconnectedEvent` | Current transport closed, including intentional closure and the automatic reconnect gap |
|
|
472
|
+
| `exit` | `(code, signal)` | Unexpected transport closure with no reconnect pending, or exhausted reconnect attempts |
|
|
456
473
|
| `stderr` | `string` | A line from the binary's stderr (stdio mode only) |
|
|
457
474
|
| `reconnected` | — | Socket transport reconnected after unexpected disconnect |
|
|
458
475
|
| `management:<name>` | `any` | Custom event from Rust (e.g. `management:configChanged`) |
|
|
459
476
|
|
|
477
|
+
Use `disconnected` to invalidate capabilities tied to an uninterrupted IPC
|
|
478
|
+
connection, including when there is no pending request. Before emitting it the
|
|
479
|
+
bridge marks itself unavailable and rejects pending calls. The payload contains
|
|
480
|
+
`intentional`, `reconnecting`, `code` and `signal`; socket closures have null code
|
|
481
|
+
and signal. During automatic reconnect it precedes `reconnected` and the next
|
|
482
|
+
`ready`. A listener can call `terminate()` to stop further reconnection.
|
|
483
|
+
Stale transports from a replaced lifecycle cannot emit this event. It does not
|
|
484
|
+
prove that a separately supervised daemon stopped or replace awaited
|
|
485
|
+
`terminate()` for confirmed teardown.
|
|
486
|
+
|
|
460
487
|
### Custom Logger 📝
|
|
461
488
|
|
|
462
489
|
Plug in your own logger by implementing the `IRustBridgeLogger` interface:
|
|
@@ -626,7 +653,7 @@ fn main() {
|
|
|
626
653
|
| Method / Property | Signature | Description |
|
|
627
654
|
|---|---|---|
|
|
628
655
|
| `constructor` | `new RustBridge<T>(options: IRustBridgeOptions)` | Create a new bridge instance |
|
|
629
|
-
| `spawn()` | `Promise<boolean>` | **Stdio mode**: Spawn
|
|
656
|
+
| `spawn()` | `Promise<boolean>` | **Stdio mode**: Spawn and wait for ready; rejects invalid explicit selection, returns `false` for ordinary discovery/startup failure |
|
|
630
657
|
| `connect(socketPath, options?)` | `Promise<boolean>` | **Socket mode**: Connect to a running daemon; returns `false` on connection/readiness failure and rejects when a non-empty `inheritedFileDescriptors` list is configured |
|
|
631
658
|
| `sendCommand(method, params, options?)` | `Promise<TCommands[K]['result']>` | Send a typed command with an optional per-call timeout or abort signal |
|
|
632
659
|
| `sendCommandStreaming(method, params)` | `StreamingResponse<TChunk, TResult>` | Send a streaming command; returns immediately |
|
|
@@ -646,7 +673,7 @@ fn main() {
|
|
|
646
673
|
| Method / Property | Signature | Description |
|
|
647
674
|
|---|---|---|
|
|
648
675
|
| `constructor` | `new RustBinaryLocator(options: IBinaryLocatorOptions, logger?)` | Create a locator instance |
|
|
649
|
-
| `findBinary()` | `Promise<string \| null>` |
|
|
676
|
+
| `findBinary()` | `Promise<string \| null>` | Validate explicit selection or discover a binary; rejects invalid explicit selection; revalidates cached discovery results |
|
|
650
677
|
| `clearCache()` | `void` | Clear the cached path to force a fresh search |
|
|
651
678
|
|
|
652
679
|
### `StdioTransport`
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { RustBinaryLocatorError } from './classes.rustbinarylocatorerror.js';
|
|
2
3
|
import type { IBinaryLocatorOptions, IRustBridgeLogger } from './interfaces/index.js';
|
|
3
4
|
|
|
4
5
|
const defaultLogger: IRustBridgeLogger = {
|
|
@@ -19,17 +20,31 @@ export class RustBinaryLocator {
|
|
|
19
20
|
private cachedPath: string | null = null;
|
|
20
21
|
|
|
21
22
|
constructor(options: IBinaryLocatorOptions, logger?: IRustBridgeLogger) {
|
|
22
|
-
|
|
23
|
+
// Anchor relative paths without collapsing symlink/.. traversal into another executable.
|
|
24
|
+
const cwd = process.cwd();
|
|
25
|
+
const relativeBase = cwd.endsWith(plugins.path.sep) ? cwd : `${cwd}${plugins.path.sep}`;
|
|
26
|
+
this.options = {
|
|
27
|
+
...options,
|
|
28
|
+
localPaths: options.localPaths ? [...options.localPaths] : undefined,
|
|
29
|
+
binaryPath: typeof options.binaryPath === 'string' && options.binaryPath.length > 0
|
|
30
|
+
? (plugins.path.isAbsolute(options.binaryPath) ? options.binaryPath : `${relativeBase}${options.binaryPath}`)
|
|
31
|
+
: options.binaryPath,
|
|
32
|
+
};
|
|
23
33
|
this.logger = logger || defaultLogger;
|
|
24
34
|
}
|
|
25
35
|
|
|
26
36
|
/**
|
|
27
37
|
* Find the binary path.
|
|
28
|
-
* Returns null if no binary
|
|
38
|
+
* Returns null if discovery finds no binary. An unusable explicit path
|
|
39
|
+
* rejects with RustBinaryLocatorError without trying discovery or chmod.
|
|
29
40
|
*/
|
|
30
41
|
public async findBinary(): Promise<string | null> {
|
|
42
|
+
if (this.options.binaryPath !== undefined) {
|
|
43
|
+
return this.validateExplicitPath();
|
|
44
|
+
}
|
|
31
45
|
if (this.cachedPath !== null) {
|
|
32
|
-
return this.cachedPath;
|
|
46
|
+
if (await this.isExecutable(this.cachedPath)) return this.cachedPath;
|
|
47
|
+
this.cachedPath = null;
|
|
33
48
|
}
|
|
34
49
|
const path = await this.searchBinary();
|
|
35
50
|
this.cachedPath = path;
|
|
@@ -46,15 +61,6 @@ export class RustBinaryLocator {
|
|
|
46
61
|
private async searchBinary(): Promise<string | null> {
|
|
47
62
|
const { binaryName } = this.options;
|
|
48
63
|
|
|
49
|
-
// 1. Explicit binary path override
|
|
50
|
-
if (this.options.binaryPath) {
|
|
51
|
-
if (await this.isExecutable(this.options.binaryPath)) {
|
|
52
|
-
this.logger.log('info', `Binary found via explicit path: ${this.options.binaryPath}`);
|
|
53
|
-
return this.options.binaryPath;
|
|
54
|
-
}
|
|
55
|
-
this.logger.log('warn', `Explicit binary path not executable: ${this.options.binaryPath}`);
|
|
56
|
-
}
|
|
57
|
-
|
|
58
64
|
// 2. Environment variable override
|
|
59
65
|
if (this.options.envVarName) {
|
|
60
66
|
const envPath = process.env[this.options.envVarName];
|
|
@@ -127,6 +133,15 @@ export class RustBinaryLocator {
|
|
|
127
133
|
}
|
|
128
134
|
|
|
129
135
|
private async isExecutable(filePath: string): Promise<boolean> {
|
|
136
|
+
// Discovery may repair a regular installed binary's execute bits. Explicit
|
|
137
|
+
// caller-owned selections use the separate read-only validator below.
|
|
138
|
+
let stats: plugins.fs.Stats;
|
|
139
|
+
try {
|
|
140
|
+
stats = await plugins.fs.promises.stat(filePath);
|
|
141
|
+
if (!stats.isFile()) return false;
|
|
142
|
+
} catch {
|
|
143
|
+
return false;
|
|
144
|
+
}
|
|
130
145
|
try {
|
|
131
146
|
await plugins.fs.promises.access(filePath, plugins.fs.constants.X_OK);
|
|
132
147
|
return true;
|
|
@@ -135,7 +150,7 @@ export class RustBinaryLocator {
|
|
|
135
150
|
// Try to make it executable.
|
|
136
151
|
try {
|
|
137
152
|
await plugins.fs.promises.access(filePath, plugins.fs.constants.F_OK);
|
|
138
|
-
await plugins.fs.promises.chmod(filePath,
|
|
153
|
+
await plugins.fs.promises.chmod(filePath, stats.mode | 0o111);
|
|
139
154
|
this.logger.log('info', `Auto-fixed missing execute permission on: ${filePath}`);
|
|
140
155
|
return true;
|
|
141
156
|
} catch {
|
|
@@ -144,6 +159,26 @@ export class RustBinaryLocator {
|
|
|
144
159
|
}
|
|
145
160
|
}
|
|
146
161
|
|
|
162
|
+
private async validateExplicitPath(): Promise<string> {
|
|
163
|
+
const binaryPath = this.options.binaryPath;
|
|
164
|
+
if (typeof binaryPath !== 'string' || binaryPath.length === 0 || binaryPath.includes('\0')) {
|
|
165
|
+
throw new RustBinaryLocatorError('Explicit binaryPath must be a non-empty filesystem path',
|
|
166
|
+
typeof binaryPath === 'string' ? binaryPath : undefined);
|
|
167
|
+
}
|
|
168
|
+
try {
|
|
169
|
+
const stats = await plugins.fs.promises.stat(binaryPath);
|
|
170
|
+
if (!stats.isFile()) {
|
|
171
|
+
throw new RustBinaryLocatorError(`Explicit binaryPath is not a regular file: ${binaryPath}`, binaryPath);
|
|
172
|
+
}
|
|
173
|
+
await plugins.fs.promises.access(binaryPath, plugins.fs.constants.X_OK);
|
|
174
|
+
} catch (error) {
|
|
175
|
+
if (error instanceof RustBinaryLocatorError) throw error;
|
|
176
|
+
throw new RustBinaryLocatorError(`Explicit binaryPath is missing or not executable: ${binaryPath}`, binaryPath, error);
|
|
177
|
+
}
|
|
178
|
+
this.logger.log('info', `Binary selected via explicit path: ${binaryPath}`);
|
|
179
|
+
return binaryPath;
|
|
180
|
+
}
|
|
181
|
+
|
|
147
182
|
private getPlatformSuffix(): string {
|
|
148
183
|
const archMap: Record<string, string> = { x64: 'amd64', arm64: 'arm64' };
|
|
149
184
|
const platformMap: Record<string, string> = { linux: 'linux', darwin: 'darwin', win32: 'windows' };
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/** Failure to use the caller's explicit executable selection. */
|
|
2
|
+
export class RustBinaryLocatorError extends Error {
|
|
3
|
+
public readonly code = 'ERR_RUST_BINARY_EXPLICIT_PATH_INVALID' as const;
|
|
4
|
+
|
|
5
|
+
constructor(
|
|
6
|
+
message: string,
|
|
7
|
+
public readonly binaryPath: string | undefined,
|
|
8
|
+
cause?: unknown,
|
|
9
|
+
) {
|
|
10
|
+
super(message, cause === undefined ? undefined : { cause });
|
|
11
|
+
this.name = 'RustBinaryLocatorError';
|
|
12
|
+
}
|
|
13
|
+
}
|
package/ts/classes.rustbridge.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
3
|
+
import { RustBinaryLocatorError } from './classes.rustbinarylocatorerror.js';
|
|
3
4
|
import { RustBridgeRequestError } from './classes.rustbridgerequesterror.js';
|
|
4
5
|
import { StreamingResponse } from './classes.streamingresponse.js';
|
|
5
6
|
import { StdioTransport } from './classes.stdiotransport.js';
|
|
@@ -18,6 +19,7 @@ import type {
|
|
|
18
19
|
TExtractChunk,
|
|
19
20
|
IRustTransport,
|
|
20
21
|
IRustTransportDisconnectOptions,
|
|
22
|
+
IRustBridgeDisconnectedEvent,
|
|
21
23
|
} from './interfaces/index.js';
|
|
22
24
|
|
|
23
25
|
const defaultLogger: IRustBridgeLogger = {
|
|
@@ -113,6 +115,7 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
113
115
|
/**
|
|
114
116
|
* Spawn the Rust binary and wait for it to signal readiness.
|
|
115
117
|
* Returns true if the binary was found and spawned successfully.
|
|
118
|
+
* Rejects with RustBinaryLocatorError for an invalid explicit binaryPath.
|
|
116
119
|
*/
|
|
117
120
|
public spawn(): Promise<boolean> {
|
|
118
121
|
return this.activate(async (generationArg) => {
|
|
@@ -203,6 +206,7 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
203
206
|
if (this.isStartingGeneration(generation)) {
|
|
204
207
|
this.lifecycleState = 'idle';
|
|
205
208
|
}
|
|
209
|
+
if (error instanceof RustBinaryLocatorError) throw error;
|
|
206
210
|
return false;
|
|
207
211
|
}
|
|
208
212
|
})();
|
|
@@ -310,6 +314,12 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
310
314
|
return;
|
|
311
315
|
}
|
|
312
316
|
const intentional = this.lifecycleState === 'stopping';
|
|
317
|
+
const disconnected: IRustBridgeDisconnectedEvent = {
|
|
318
|
+
intentional,
|
|
319
|
+
reconnecting: !intentional && transportArg.reconnecting === true,
|
|
320
|
+
code: typeof args[0] === 'number' ? args[0] : null,
|
|
321
|
+
signal: typeof args[1] === 'string' ? args[1] : null,
|
|
322
|
+
};
|
|
313
323
|
this.logger.log('info', 'Transport closed');
|
|
314
324
|
this.isRunning = false;
|
|
315
325
|
this.rejectAllPendingRequests(`${this.options.binaryName} process exited`);
|
|
@@ -319,12 +329,18 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
319
329
|
reconnectReadyTimeout = null;
|
|
320
330
|
}
|
|
321
331
|
this.lifecycleState = 'starting';
|
|
332
|
+
// Idle capability owners must observe loss before any reconnect timer
|
|
333
|
+
// can restore transport readiness. Pending calls are already rejected.
|
|
334
|
+
this.emit('disconnected', disconnected);
|
|
322
335
|
return;
|
|
323
336
|
}
|
|
324
337
|
|
|
325
338
|
this.transport = null;
|
|
326
339
|
if (!intentional) {
|
|
327
340
|
this.lifecycleState = 'idle';
|
|
341
|
+
}
|
|
342
|
+
this.emit('disconnected', disconnected);
|
|
343
|
+
if (!intentional) {
|
|
328
344
|
this.emit('exit', ...args);
|
|
329
345
|
}
|
|
330
346
|
settle(false);
|
|
@@ -735,7 +751,9 @@ export class RustBridge<TCommands extends TCommandMap = TCommandMap> extends plu
|
|
|
735
751
|
} else if (activationPromise) {
|
|
736
752
|
// No transport exists yet (for example, binary lookup is pending). The
|
|
737
753
|
// stopping state prevents that activation from publishing a transport.
|
|
738
|
-
|
|
754
|
+
// The spawn caller retains its original rejection. With no transport
|
|
755
|
+
// created, a locator failure leaves nothing for termination to reap.
|
|
756
|
+
await activationPromise.catch(() => undefined);
|
|
739
757
|
}
|
|
740
758
|
|
|
741
759
|
if (this.lifecycleGeneration !== generation) {
|
package/ts/index.ts
CHANGED
|
@@ -5,6 +5,7 @@ export {
|
|
|
5
5
|
type TRustBridgeRequestErrorCode,
|
|
6
6
|
} from './classes.rustbridgerequesterror.js';
|
|
7
7
|
export { RustBinaryLocator } from './classes.rustbinarylocator.js';
|
|
8
|
+
export { RustBinaryLocatorError } from './classes.rustbinarylocatorerror.js';
|
|
8
9
|
export { StreamingResponse } from './classes.streamingresponse.js';
|
|
9
10
|
export { StdioTransport } from './classes.stdiotransport.js';
|
|
10
11
|
export { SocketTransport } from './classes.sockettransport.js';
|
package/ts/interfaces/config.ts
CHANGED
|
@@ -38,7 +38,12 @@ export interface IBinaryLocatorOptions {
|
|
|
38
38
|
localPaths?: string[];
|
|
39
39
|
/** Whether to search the system PATH (default: true) */
|
|
40
40
|
searchSystemPath?: boolean;
|
|
41
|
-
/**
|
|
41
|
+
/**
|
|
42
|
+
* Select only this executable, without discovery or permission repair.
|
|
43
|
+
* Relative paths resolve against cwd when the locator/bridge is constructed.
|
|
44
|
+
* Every lookup validates a regular executable target; invalid selections
|
|
45
|
+
* reject with RustBinaryLocatorError, including empty paths.
|
|
46
|
+
*/
|
|
42
47
|
binaryPath?: string;
|
|
43
48
|
}
|
|
44
49
|
|
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
import type * as plugins from '../plugins.js';
|
|
2
2
|
|
|
3
|
+
/** Current bridge transport closure, including the automatic reconnect gap.
|
|
4
|
+
* This is an observation; await terminate() for confirmed lifecycle teardown. */
|
|
5
|
+
export interface IRustBridgeDisconnectedEvent {
|
|
6
|
+
intentional: boolean;
|
|
7
|
+
reconnecting: boolean;
|
|
8
|
+
/** Stdio exit code, or null when unavailable (including socket transport). */
|
|
9
|
+
code: number | null;
|
|
10
|
+
/** Stdio exit signal, or null when unavailable. */
|
|
11
|
+
signal: string | null;
|
|
12
|
+
}
|
|
13
|
+
|
|
3
14
|
/** Options for confirmed transport disconnection. */
|
|
4
15
|
export interface IRustTransportDisconnectOptions {
|
|
5
16
|
/** Grace period before escalating process termination, in milliseconds. */
|