@tempoxyz/mercator 0.0.741 → 0.0.762
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/command.d.ts +4 -0
- package/dist/command.js +77 -23
- package/dist/command.js.map +1 -1
- package/dist/setup-update.js +7 -2
- package/dist/setup-update.js.map +1 -1
- package/dist/update.js +7 -2
- package/dist/update.js.map +1 -1
- package/package.json +3 -2
package/dist/command.d.ts
CHANGED
|
@@ -26,8 +26,12 @@ export type InteractiveCommandOptions = {
|
|
|
26
26
|
export declare class CommandTimeoutError extends CommandExecutionError {
|
|
27
27
|
constructor(command: string, timeoutMs: number);
|
|
28
28
|
}
|
|
29
|
+
/** Restricts nested installer utilities to absolute PATH entries, preserving other environment values. */
|
|
30
|
+
export declare function commandEnvironment(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
|
|
29
31
|
/** Returns whether an executable is available on the current process PATH. */
|
|
30
32
|
export declare function commandAvailable(command: string): Promise<boolean>;
|
|
33
|
+
/** Resolves a command to an absolute executable path or fails without OS search fallback. */
|
|
34
|
+
export declare function resolveCommand(command: string, env?: NodeJS.ProcessEnv): string;
|
|
31
35
|
/** Runs a command while inheriting the current terminal. */
|
|
32
36
|
export declare function runInteractiveCommand(command: string, args: string[], options?: InteractiveCommandOptions): Promise<void>;
|
|
33
37
|
/** Runs a command and returns bounded text output without throwing for process failures. */
|
package/dist/command.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { spawn, spawnSync } from 'node:child_process';
|
|
2
|
-
import { constants } from 'node:fs';
|
|
3
|
-
import {
|
|
4
|
-
import { join } from 'node:path';
|
|
2
|
+
import { accessSync, constants, statSync } from 'node:fs';
|
|
3
|
+
import { posix, win32 } from 'node:path';
|
|
5
4
|
/** Maximum stderr retained from one interactive child process. */
|
|
6
5
|
const MAX_INTERACTIVE_STDERR_LENGTH = 4_096;
|
|
7
6
|
/** Child-process failure details available for sanitized verbose diagnostics. */
|
|
@@ -24,29 +23,77 @@ export class CommandTimeoutError extends CommandExecutionError {
|
|
|
24
23
|
this.message = `${command} timed out after ${timeoutMs / 1_000}s`;
|
|
25
24
|
}
|
|
26
25
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
26
|
+
function isPathKey(key) {
|
|
27
|
+
return process.platform === 'win32' ? key.toUpperCase() === 'PATH' : key === 'PATH';
|
|
28
|
+
}
|
|
29
|
+
function commandPath(env) {
|
|
30
|
+
const windows = process.platform === 'win32';
|
|
31
|
+
const path = windows ? win32 : posix;
|
|
32
|
+
// Node uses the first lexicographic PATH alias on Windows.
|
|
33
|
+
const key = Object.keys(env).sort().find(isPathKey);
|
|
34
|
+
return (key ? (env[key] ?? '') : '')
|
|
35
|
+
.split(path.delimiter)
|
|
36
|
+
.filter((directory) => path.isAbsolute(directory) && (!windows || path.parse(directory).root.length > 1));
|
|
37
|
+
}
|
|
38
|
+
/** Restricts nested installer utilities to absolute PATH entries, preserving other environment values. */
|
|
39
|
+
export function commandEnvironment(env) {
|
|
40
|
+
const entries = commandPath(env);
|
|
41
|
+
// An empty PATH still searches the working directory in Unix shells.
|
|
42
|
+
if (entries.length === 0)
|
|
43
|
+
throw new Error('Installer requires an absolute PATH entry');
|
|
44
|
+
return {
|
|
45
|
+
...Object.fromEntries(Object.entries(env).filter(([key]) => !isPathKey(key))),
|
|
46
|
+
PATH: entries.join(process.platform === 'win32' ? win32.delimiter : posix.delimiter),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
/** Resolves executables without implicitly searching the working directory. */
|
|
50
|
+
function findCommand(command, env = process.env) {
|
|
51
|
+
const windows = process.platform === 'win32';
|
|
52
|
+
const path = windows ? win32 : posix;
|
|
53
|
+
const isAbsolute = (value) => path.isAbsolute(value) && (!windows || path.parse(value).root.length > 1);
|
|
54
|
+
const names = windows && !path.extname(command) ? [`${command}.exe`, `${command}.cmd`] : [command];
|
|
55
|
+
const directories = commandPath(env);
|
|
56
|
+
// Relative PATH entries (including empty entries) grant repository files execution authority.
|
|
57
|
+
const candidates = isAbsolute(command)
|
|
58
|
+
? [command]
|
|
59
|
+
: path.basename(command) === command &&
|
|
60
|
+
!command.includes('/') &&
|
|
61
|
+
!command.includes('\\')
|
|
62
|
+
? directories.flatMap((directory) => names.map((name) => path.join(directory, name)))
|
|
63
|
+
: [];
|
|
64
|
+
for (const candidate of candidates) {
|
|
65
|
+
try {
|
|
66
|
+
accessSync(candidate, constants.X_OK);
|
|
67
|
+
if (statSync(candidate).isFile())
|
|
68
|
+
return candidate;
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
// Continue searching PATH.
|
|
40
72
|
}
|
|
41
73
|
}
|
|
42
|
-
return
|
|
74
|
+
return undefined;
|
|
75
|
+
}
|
|
76
|
+
/** Returns whether an executable is available on the current process PATH. */
|
|
77
|
+
export async function commandAvailable(command) {
|
|
78
|
+
return findCommand(command) !== undefined;
|
|
79
|
+
}
|
|
80
|
+
/** Resolves a command to an absolute executable path or fails without OS search fallback. */
|
|
81
|
+
export function resolveCommand(command, env = process.env) {
|
|
82
|
+
const resolved = findCommand(command, env);
|
|
83
|
+
if (resolved)
|
|
84
|
+
return resolved;
|
|
85
|
+
throw Object.assign(new Error(`Command not found on an absolute PATH entry: ${command}`), {
|
|
86
|
+
code: 'ENOENT',
|
|
87
|
+
});
|
|
43
88
|
}
|
|
44
89
|
/** Runs a command while inheriting the current terminal. */
|
|
45
90
|
export async function runInteractiveCommand(command, args, options = {}) {
|
|
46
91
|
options.signal?.throwIfAborted();
|
|
92
|
+
const executable = resolveCommand(command);
|
|
93
|
+
const bounded = options.timeoutMs !== undefined || options.signal !== undefined;
|
|
94
|
+
const taskkill = bounded && process.platform === 'win32' ? resolveCommand('taskkill.exe') : undefined;
|
|
47
95
|
await new Promise((resolve, reject) => {
|
|
48
|
-
const
|
|
49
|
-
const child = spawn(command, args, {
|
|
96
|
+
const child = spawn(executable, args, {
|
|
50
97
|
stdio: options.captureStderr ? ['inherit', 'inherit', 'pipe'] : 'inherit',
|
|
51
98
|
// Isolate the whole shim/native process tree so timeout cleanup reaches descendants.
|
|
52
99
|
detached: bounded && process.platform !== 'win32',
|
|
@@ -54,8 +101,8 @@ export async function runInteractiveCommand(command, args, options = {}) {
|
|
|
54
101
|
const terminate = () => {
|
|
55
102
|
if (!child.pid)
|
|
56
103
|
return;
|
|
57
|
-
if (
|
|
58
|
-
spawnSync(
|
|
104
|
+
if (taskkill) {
|
|
105
|
+
spawnSync(taskkill, ['/pid', String(child.pid), '/T', '/F'], {
|
|
59
106
|
stdio: 'ignore',
|
|
60
107
|
timeout: 5_000,
|
|
61
108
|
windowsHide: true,
|
|
@@ -132,8 +179,11 @@ export async function runInteractiveCommand(command, args, options = {}) {
|
|
|
132
179
|
}
|
|
133
180
|
/** Runs a command and returns bounded text output without throwing for process failures. */
|
|
134
181
|
export async function runCapturedCommand(command, args, options = {}) {
|
|
182
|
+
const executable = findCommand(command);
|
|
183
|
+
if (!executable)
|
|
184
|
+
return { code: 1, errorCode: 'ENOENT', output: '' };
|
|
135
185
|
return new Promise((resolve) => {
|
|
136
|
-
const child = spawn(
|
|
186
|
+
const child = spawn(executable, args, {
|
|
137
187
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
138
188
|
...(options.timeoutMs === undefined
|
|
139
189
|
? {}
|
|
@@ -159,6 +209,10 @@ export async function runCapturedCommand(command, args, options = {}) {
|
|
|
159
209
|
...(signal ? { errorCode: 'PROCESS_TERMINATED' } : {}),
|
|
160
210
|
output,
|
|
161
211
|
}));
|
|
162
|
-
})
|
|
212
|
+
}).catch((error) => ({
|
|
213
|
+
code: 1,
|
|
214
|
+
...(error.code ? { errorCode: error.code } : {}),
|
|
215
|
+
output: '',
|
|
216
|
+
}));
|
|
163
217
|
}
|
|
164
218
|
//# sourceMappingURL=command.js.map
|
package/dist/command.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAExC,kEAAkE;AAClE,MAAM,6BAA6B,GAAG,KAAK,CAAA;AAgB3C,iFAAiF;AACjF,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IACtC,QAAQ,CAAe;IACvB,MAAM,CAAS;IAExB,YAAY,OAAe,EAAE,QAAuB,EAAE,MAAe;QACpE,KAAK,CAAC,GAAG,OAAO,uBAAuB,QAAQ,IAAI,SAAS,EAAE,CAAC,CAAA;QAC/D,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAA;QACnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACjC,CAAC;CACD;AASD,0FAA0F;AAC1F,MAAM,OAAO,mBAAoB,SAAQ,qBAAqB;IAC7D,YAAY,OAAe,EAAE,SAAiB;QAC7C,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAA;QACjC,IAAI,CAAC,OAAO,GAAG,GAAG,OAAO,oBAAoB,SAAS,GAAG,KAAK,GAAG,CAAA;IAClE,CAAC;CACD;AAED,SAAS,SAAS,CAAC,GAAW;IAC7B,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAA;AACpF,CAAC;AAED,SAAS,WAAW,CAAC,GAAsB;IAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAA;IAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;IACpC,2DAA2D;IAC3D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACnD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAClC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;SACrB,MAAM,CACN,CAAC,SAAS,EAAE,EAAE,CACb,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAClF,CAAA;AACH,CAAC;AAED,0GAA0G;AAC1G,MAAM,UAAU,kBAAkB,CAAC,GAAsB;IACxD,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;IAChC,qEAAqE;IACrE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;IACtF,OAAO;QACN,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7E,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;KACpF,CAAA;AACF,CAAC;AAED,+EAA+E;AAC/E,SAAS,WAAW,CACnB,OAAe,EACf,GAAG,GAAsB,OAAO,CAAC,GAAG;IAEpC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAA;IAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;IACpC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,CACpC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC1E,MAAM,KAAK,GACV,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM,EAAE,GAAG,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IACrF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;IACpC,8FAA8F;IAC9F,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC;QACrC,CAAC,CAAC,CAAC,OAAO,CAAC;QACX,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,OAAO;YAClC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;YACtB,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;YACxB,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAClC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAC/C;YACF,CAAC,CAAC,EAAE,CAAA;IACN,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACpC,IAAI,CAAC;YACJ,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;YACrC,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE;gBAAE,OAAO,SAAS,CAAA;QACnD,CAAC;QAAC,MAAM,CAAC;YACR,2BAA2B;QAC5B,CAAC;IACF,CAAC;IACD,OAAO,SAAS,CAAA;AACjB,CAAC;AAED,8EAA8E;AAC9E,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAe;IACrD,OAAO,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,CAAA;AAC1C,CAAC;AAED,6FAA6F;AAC7F,MAAM,UAAU,cAAc,CAC7B,OAAe,EACf,GAAG,GAAsB,OAAO,CAAC,GAAG;IAEpC,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAC1C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAA;IAC7B,MAAM,MAAM,CAAC,MAAM,CAClB,IAAI,KAAK,CAAC,gDAAgD,OAAO,EAAE,CAAC,EACpE;QACC,IAAI,EAAE,QAAQ;KACd,CACD,CAAA;AACF,CAAC;AAED,4DAA4D;AAC5D,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAC1C,OAAe,EACf,IAAc,EACd,OAAO,GAA8B,EAAE;IAEvC,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAA;IAChC,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;IAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,CAAA;IAC/E,MAAM,QAAQ,GACb,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACrF,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE;YACrC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;YACzE,qFAAqF;YACrF,QAAQ,EAAE,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;SACjD,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,GAAG,EAAE;YACtB,IAAI,CAAC,KAAK,CAAC,GAAG;gBAAE,OAAM;YACtB,IAAI,QAAQ,EAAE,CAAC;gBACd,SAAS,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE;oBAC5D,KAAK,EAAE,QAAQ;oBACf,OAAO,EAAE,KAAK;oBACd,WAAW,EAAE,IAAI;iBACjB,CAAC,CAAA;gBACF,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACtB,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC;oBACJ,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;gBACpC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO;wBAAE,MAAM,KAAK,CAAA;gBACnE,CAAC;YACF,CAAC;QACF,CAAC,CAAA;QACD,MAAM,OAAO,GAAG,GAAG,EAAE;YACpB,YAAY,CAAC,KAAK,CAAC,CAAA;YACnB,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACrD,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;YAC7C,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;QAC/C,CAAC,CAAA;QACD,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,EAAE;YACjC,IAAI,CAAC;gBACJ,SAAS,EAAE,CAAA;YACZ,CAAC;YAAC,OAAO,gBAAgB,EAAE,CAAC;gBAC3B,MAAM,CAAC,gBAAgB,CAAC,CAAA;YACzB,CAAC;oBAAS,CAAC;gBACV,OAAO,EAAE,CAAA;gBACT,MAAM,CAAC,KAAK,CAAC,CAAA;YACd,CAAC;QACF,CAAC,CAAA;QACD,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACpD,MAAM,QAAQ,GAAG,CAAC,MAA4B,EAAE,EAAE;YACjD,SAAS,EAAE,CAAA;YACX,OAAO,EAAE,CAAA;YACT,8EAA8E;YAC9E,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAClC,CAAC,CAAA;QACD,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAC5C,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;QACnC,MAAM,KAAK,GACV,SAAS,KAAK,SAAS;YACtB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;QACpF,IAAI,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;YACnC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;QACrC,CAAC;QACD,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAClE,IAAI,OAAO,CAAC,MAAM,EAAE,OAAO;YAAE,OAAO,EAAE,CAAA;QACtC,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3B,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAc,EAAE,EAAE;gBAC3C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAmB,CAAC,CAAA;gBACzC,MAAM,GAAG,GAAG,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,6BAA6B,CAAC,CAAA;YAC3E,CAAC,CAAC,CAAA;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,EAAE,CAAA;YACT,MAAM,CAAC,KAAK,CAAC,CAAA;QACd,CAAC,CAAC,CAAA;QACF,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC3B,OAAO,EAAE,CAAA;YACT,IAAI,IAAI,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAA;;gBACpB,MAAM,CAAC,IAAI,qBAAqB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACH,CAAC;AAED,4FAA4F;AAC5F,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,OAAe,EACf,IAAc,EACd,OAAO,GAA2B,EAAE;IAEpC,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;IACvC,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;IACpE,OAAO,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;QAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE;YACrC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS;gBAClC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,SAAkB,EAAE,CAAC;SAClE,CAAC,CAAA;QACF,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,EAAE;YACjC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAA;YACvB,IACC,OAAO,CAAC,cAAc,KAAK,SAAS;gBACpC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,EACjD,CAAC;gBACF,KAAK,CAAC,IAAI,EAAE,CAAA;YACb,CAAC;QACF,CAAC,CAAA;QACD,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAChC,IAAI,OAAO,CAAC,aAAa;YAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;;YACtD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAA;QAC3B,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAA4B,EAAE,EAAE,CACpD,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAC9E,CAAA;QACD,mFAAmF;QACnF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CACpC,OAAO,CAAC;YACP,IAAI,EAAE,IAAI,IAAI,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,MAAM;SACN,CAAC,CACF,CAAA;IACF,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAA4B,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,EAAE,CAAC;QACP,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,MAAM,EAAE,EAAE;KACV,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
package/dist/setup-update.js
CHANGED
|
@@ -2,6 +2,7 @@ import { execFileSync } from 'node:child_process';
|
|
|
2
2
|
import { dirname, win32 } from 'node:path';
|
|
3
3
|
import { Binary } from 'incur';
|
|
4
4
|
import packageMetadata from '../package.json' with { type: 'json' };
|
|
5
|
+
import { commandEnvironment, resolveCommand } from './command.js';
|
|
5
6
|
import { compareReleaseVersions, inspectRelease } from './release.js';
|
|
6
7
|
import { validateSetupOptions } from './setup.js';
|
|
7
8
|
/** Serializes validated setup options as arguments, never shell source. */
|
|
@@ -42,7 +43,11 @@ export async function ensureSetupCurrent(options, overrides = {}) {
|
|
|
42
43
|
inspect: inspectRelease,
|
|
43
44
|
announce: (message) => console.error(message),
|
|
44
45
|
run: (command, args, env) => {
|
|
45
|
-
execFileSync(command,
|
|
46
|
+
execFileSync(resolveCommand(command, env), args, {
|
|
47
|
+
env: commandEnvironment(env),
|
|
48
|
+
stdio: 'inherit',
|
|
49
|
+
windowsHide: true,
|
|
50
|
+
});
|
|
46
51
|
},
|
|
47
52
|
...overrides,
|
|
48
53
|
};
|
|
@@ -102,7 +107,7 @@ export async function ensureSetupCurrent(options, overrides = {}) {
|
|
|
102
107
|
'-NoProfile',
|
|
103
108
|
'-NonInteractive',
|
|
104
109
|
'-Command',
|
|
105
|
-
`Start-Process powershell.exe -ArgumentList '-NoProfile -NonInteractive -ExecutionPolicy Bypass -EncodedCommand ${encoded}' -NoNewWindow`,
|
|
110
|
+
`Start-Process (Join-Path $PSHOME 'powershell.exe') -ArgumentList '-NoProfile -NonInteractive -ExecutionPolicy Bypass -EncodedCommand ${encoded}' -NoNewWindow`,
|
|
106
111
|
], installEnv);
|
|
107
112
|
return { release, restarted: true, deferred: true };
|
|
108
113
|
}
|
package/dist/setup-update.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-update.js","sourceRoot":"","sources":["../src/setup-update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC9B,OAAO,eAAe,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AACnE,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAsB,MAAM,cAAc,CAAA;AACzF,OAAO,EAAqB,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAuBpE,2EAA2E;AAC3E,MAAM,UAAU,cAAc,CAAC,OAAqB;IACnD,IAAI,OAAO,CAAC,OAAO;QAClB,OAAO;YACN,SAAS;YACT,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACxC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY;SACxC,CAAA;IACF,OAAO;QACN,OAAO;QACP,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC3D,GAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAChE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,EAAE,CACzC;QACD,GAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,KAAK,CAAW;aAC3E,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;aAC7B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC;QAClF,OAAO;QACP,OAAO,CAAC,GAAG;KACX,CAAA;AACF,CAAC;AAED,oGAAoG;AACpG,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,OAAqB,EACrB,SAAS,GAAgC,EAAE;IAE3C,MAAM,YAAY,GAAuB;QACxC,cAAc,EAAE,eAAe,CAAC,OAAO;QACvC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;QAChC,IAAI,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACzD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACvB,CAAC,CAAC,SAAS;QACZ,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,GAAG;QACvD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;QACtD,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QAC7C,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;YAC3B,YAAY,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"setup-update.js","sourceRoot":"","sources":["../src/setup-update.ts"],"names":[],"mappings":"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"}
|
package/dist/update.js
CHANGED
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import { execFileSync } from 'node:child_process';
|
|
2
2
|
import { dirname, win32 } from 'node:path';
|
|
3
3
|
import { Binary } from 'incur';
|
|
4
|
+
import { commandEnvironment, resolveCommand } from './command.js';
|
|
4
5
|
import { inspectRelease } from './release.js';
|
|
5
6
|
const INSTALLER_BASE_URL = 'https://mercator.sh/downloads/latest';
|
|
6
7
|
/** Runs one installer command and reports launch or exit failures. */
|
|
7
8
|
function run(command, args, env) {
|
|
8
|
-
execFileSync(command,
|
|
9
|
+
execFileSync(resolveCommand(command, env), args, {
|
|
10
|
+
env: commandEnvironment(env),
|
|
11
|
+
stdio: 'inherit',
|
|
12
|
+
windowsHide: true,
|
|
13
|
+
});
|
|
9
14
|
}
|
|
10
15
|
/** Uses the official release pointer for every distribution's update check. */
|
|
11
16
|
export function standaloneUpdate(overrides = {}) {
|
|
@@ -32,7 +37,7 @@ export function standaloneUpdate(overrides = {}) {
|
|
|
32
37
|
'-NoProfile',
|
|
33
38
|
'-NonInteractive',
|
|
34
39
|
'-Command',
|
|
35
|
-
`Start-Process powershell.exe -ArgumentList '-NoProfile -NonInteractive -ExecutionPolicy Bypass -EncodedCommand ${encoded}' -NoNewWindow`,
|
|
40
|
+
`Start-Process (Join-Path $PSHOME 'powershell.exe') -ArgumentList '-NoProfile -NonInteractive -ExecutionPolicy Bypass -EncodedCommand ${encoded}' -NoNewWindow`,
|
|
36
41
|
], env);
|
|
37
42
|
},
|
|
38
43
|
};
|
package/dist/update.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAY,MAAM,OAAO,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,kBAAkB,GAAG,sCAAsC,CAAA;AAejE,sEAAsE;AACtE,SAAS,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,GAAsB;IACnE,YAAY,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAY,MAAM,OAAO,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,kBAAkB,GAAG,sCAAsC,CAAA;AAejE,sEAAsE;AACtE,SAAS,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,GAAsB;IACnE,YAAY,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE;QAChD,GAAG,EAAE,kBAAkB,CAAC,GAAG,CAAC;QAC5B,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,IAAI;KACjB,CAAC,CAAA;AACH,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,gBAAgB,CAC/B,SAAS,GAA8B,EAAE;IAEzC,MAAM,KAAK,GAAsC,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACtE,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,aAAa,CAAA;IACxD,IAAI,CAAC,CAAC,SAAS,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAE5D,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAA;IACvD,MAAM,OAAO,GAAG,QAAQ,KAAK,OAAO,CAAA;IACpC,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAA;IACvD,MAAM,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC9E,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,CAAA;IACpC,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,CAAA;IAEtE,OAAO;QACN,KAAK;QACL,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7C,KAAK,CAAC,OAAO;YACZ,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,OAAO,CACZ,IAAI,EACJ,CAAC,IAAI,EAAE,cAAc,kBAAkB,kBAAkB,CAAC,EAC1D,GAAG,CACH,CAAA;gBACD,OAAM;YACP,CAAC;YAED,MAAM,MAAM,GAAG,4DAA4D,OAAO,CAAC,GAAG,wCAAwC,kBAAkB,0BAA0B,CAAA;YAC1K,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YACjE,MAAM,OAAO,CACZ,gBAAgB,EAChB;gBACC,YAAY;gBACZ,iBAAiB;gBACjB,UAAU;gBACV,wIAAwI,OAAO,gBAAgB;aAC/J,EACD,GAAG,CACH,CAAA;QACF,CAAC;KACD,CAAA;AACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tempoxyz/mercator",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.762",
|
|
4
4
|
"description": "Connect agent clients to the Mercator remote MCP server",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -37,7 +37,8 @@
|
|
|
37
37
|
"build": "tsc --project tsconfig.json && node scripts/copy-plugin.mjs",
|
|
38
38
|
"check:types": "tsc --project tsconfig.json --noEmit",
|
|
39
39
|
"prepack": "pnpm build",
|
|
40
|
-
"test": "vitest run",
|
|
40
|
+
"test": "vitest run && pnpm test:commands",
|
|
41
|
+
"test:commands": "node --test scripts/command-resolution.test.mjs",
|
|
41
42
|
"test:coverage": "vitest run --coverage --coverage.provider=istanbul",
|
|
42
43
|
"test:mutation": "stryker run",
|
|
43
44
|
"test:package": "node scripts/package-smoke.mjs"
|