@indigoai-us/hq-cloud 6.16.70-alpha.3 → 6.16.71-alpha.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/bin/sync-runner-watch-loop.d.ts +12 -0
- package/dist/bin/sync-runner-watch-loop.d.ts.map +1 -1
- package/dist/bin/sync-runner-watch-loop.js +44 -8
- package/dist/bin/sync-runner-watch-loop.js.map +1 -1
- package/dist/bin/sync-runner-watch-loop.test.js +58 -1
- package/dist/bin/sync-runner-watch-loop.test.js.map +1 -1
- package/dist/bin/sync-runner.test.js +39 -4
- package/dist/bin/sync-runner.test.js.map +1 -1
- package/dist/cli/rescue-core.d.ts +8 -0
- package/dist/cli/rescue-core.d.ts.map +1 -1
- package/dist/cli/rescue-core.js +51 -8
- package/dist/cli/rescue-core.js.map +1 -1
- package/dist/cli/rescue-rsync-preflight.test.js +94 -12
- package/dist/cli/rescue-rsync-preflight.test.js.map +1 -1
- package/dist/sync/realtime-telemetry.d.ts +1 -1
- package/dist/sync/realtime-telemetry.d.ts.map +1 -1
- package/dist/sync/realtime-telemetry.js +1 -0
- package/dist/sync/realtime-telemetry.js.map +1 -1
- package/dist/sync/realtime-telemetry.test.js +10 -0
- package/dist/sync/realtime-telemetry.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -39,6 +39,14 @@ interface RsyncLauncher {
|
|
|
39
39
|
command: string;
|
|
40
40
|
leadingArgs: string[];
|
|
41
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* Scan PATH `entries` for an rsync binary. On win32, a real `rsync.exe` (or
|
|
44
|
+
* any non-shim candidate) found ANYWHERE on PATH always wins over a
|
|
45
|
+
* `.cmd`/`.bat` shim, even if the shim appears earlier in PATH order — shims
|
|
46
|
+
* must be routed through cmd.exe (see `buildRsyncLauncher`) and are strictly
|
|
47
|
+
* less reliable, so we only fall back to one when no real executable exists
|
|
48
|
+
* anywhere on PATH.
|
|
49
|
+
*/
|
|
42
50
|
export declare function findRsyncOnPath(entries: string[], env: NodeJS.ProcessEnv): RsyncPathCandidate | undefined;
|
|
43
51
|
/** The overlay requires rsync; do not allocate a recovery copy when it cannot run. */
|
|
44
52
|
export declare function requireWorkingRsync(env: NodeJS.ProcessEnv, err: (s: string) => void): RsyncLauncher;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rescue-core.d.ts","sourceRoot":"","sources":["../../src/cli/rescue-core.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAM7B,OAAO,EAOL,KAAK,gBAAgB,EAEtB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;CAChB;AA0CD,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;CACzB;AA6CD,oFAAoF;AACpF,wBAAgB,QAAQ,CACtB,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CASpB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAS3D;AA0BD,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;
|
|
1
|
+
{"version":3,"file":"rescue-core.d.ts","sourceRoot":"","sources":["../../src/cli/rescue-core.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAM7B,OAAO,EAOL,KAAK,gBAAgB,EAEtB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;CAChB;AA0CD,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;CACzB;AA6CD,oFAAoF;AACpF,wBAAgB,QAAQ,CACtB,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CASpB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAS3D;AA0BD,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAyBD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EAAE,EACjB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,kBAAkB,GAAG,SAAS,CAkChC;AAsBD,sFAAsF;AACtF,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,GACvB,aAAa,CAwCf;AAmED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAwMtD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;CAAO,GACrC,eAAe,CAmCjB;AA0kBD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,gBAAgB,GACzB,IAAI,CAEN;AA+ND;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,YAAY,GAAE,IAAI,CAAC,YAAmB,GACrC,OAAO,CAGT;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,CAwB1E;AA0pCD,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC7B;IAAE,IAAI,EAAE,wBAAwB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,qBAAqB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,0BAA0B,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,uBAAuB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,0BAA0B,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,4BAA4B,CAAC;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAE,CAAC;AAuevE,KAAK,SAAS,GACZ,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAAE,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAM9E,sFAAsF;AACtF,wBAAgB,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,OAAO,CAajE;AAWD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,WAAW,GAAE,MAAM,EAAiB,EACpC,UAAU,SAAK,GACd,SAAS,GAAG,SAAS,CAkDvB;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAClC,KAAK,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAChC;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAkB5B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAClC,IAAI,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAChC,IAAI,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC/B,IAAI,CAcN;AA8BD,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,eAAe,GAAG,cAAc,CAAC;IAC/C;uDACmD;IACnD,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAeD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,YAAY,EACjB,qBAAqB,EAAE,MAAM,GAAG,IAAI,EACpC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,EACxB,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,GACvB,IAAI,CA8LN;AA+wBD,uEAAuE;AACvE,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,sBAAsB,CAAC,EAAE,MAAM,GAC9B,MAAM,CAmBR;AAED,8EAA8E;AAC9E,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,MAAM,CAcR;AAsCD;;;;GAIG;AACH,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,CAAC;IACrB,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC,CAAC,GACD,MAAM,EAAE,CAwBV"}
|
package/dist/cli/rescue-core.js
CHANGED
|
@@ -164,8 +164,22 @@ function rsyncCandidateNames(env) {
|
|
|
164
164
|
];
|
|
165
165
|
return [...new Set(["rsync", ...extensions.map((extension) => `rsync${extension.toLowerCase()}`)])];
|
|
166
166
|
}
|
|
167
|
+
/** True for the Windows shim extensions that require cmd.exe rather than a direct launch. */
|
|
168
|
+
function isWindowsShimPath(candidatePath) {
|
|
169
|
+
return /\.(?:cmd|bat)$/i.test(candidatePath);
|
|
170
|
+
}
|
|
171
|
+
/**
|
|
172
|
+
* Scan PATH `entries` for an rsync binary. On win32, a real `rsync.exe` (or
|
|
173
|
+
* any non-shim candidate) found ANYWHERE on PATH always wins over a
|
|
174
|
+
* `.cmd`/`.bat` shim, even if the shim appears earlier in PATH order — shims
|
|
175
|
+
* must be routed through cmd.exe (see `buildRsyncLauncher`) and are strictly
|
|
176
|
+
* less reliable, so we only fall back to one when no real executable exists
|
|
177
|
+
* anywhere on PATH.
|
|
178
|
+
*/
|
|
167
179
|
export function findRsyncOnPath(entries, env) {
|
|
168
180
|
let firstUnexecutable;
|
|
181
|
+
let firstShim;
|
|
182
|
+
let firstUnexecutableShim;
|
|
169
183
|
for (const entry of entries) {
|
|
170
184
|
for (const name of rsyncCandidateNames(env)) {
|
|
171
185
|
const candidate = path.resolve(entry || ".", name);
|
|
@@ -176,30 +190,59 @@ export function findRsyncOnPath(entries, env) {
|
|
|
176
190
|
catch {
|
|
177
191
|
continue;
|
|
178
192
|
}
|
|
193
|
+
const shim = process.platform === "win32" && isWindowsShimPath(candidate);
|
|
179
194
|
try {
|
|
180
195
|
fs.accessSync(candidate, fs.constants.X_OK);
|
|
181
|
-
|
|
196
|
+
if (!shim)
|
|
197
|
+
return { path: candidate, executable: true };
|
|
198
|
+
firstShim ??= { path: candidate, executable: true };
|
|
182
199
|
}
|
|
183
200
|
catch {
|
|
184
|
-
|
|
201
|
+
if (shim) {
|
|
202
|
+
firstUnexecutableShim ??= candidate;
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
firstUnexecutable ??= candidate;
|
|
206
|
+
}
|
|
185
207
|
}
|
|
186
208
|
}
|
|
187
209
|
}
|
|
210
|
+
// No real executable anywhere on PATH: fall back to a shim (executable
|
|
211
|
+
// preferred over a present-but-unexecutable one), then to whatever
|
|
212
|
+
// non-executable candidate we saw first.
|
|
213
|
+
if (firstShim)
|
|
214
|
+
return firstShim;
|
|
215
|
+
if (firstUnexecutableShim)
|
|
216
|
+
return { path: firstUnexecutableShim, executable: false };
|
|
188
217
|
return firstUnexecutable
|
|
189
218
|
? { path: firstUnexecutable, executable: false }
|
|
190
219
|
: undefined;
|
|
191
220
|
}
|
|
221
|
+
/**
|
|
222
|
+
* Build the launcher for a resolved rsync candidate path. Shared by the
|
|
223
|
+
* preflight probe and both overlay run call sites so they can never diverge.
|
|
224
|
+
*
|
|
225
|
+
* Node documents that Windows `.cmd`/`.bat` files require cmd.exe rather than
|
|
226
|
+
* a direct child-process launch. `/s` makes cmd.exe strip the outer quotes of
|
|
227
|
+
* the whole command string, which mis-splits a shim path containing a space
|
|
228
|
+
* (e.g. the default "Indigo HQ" install folder) and aborts before rsync ever
|
|
229
|
+
* runs. Use `/d /c` instead (verified: `/d /s /c <path with space> --version`
|
|
230
|
+
* exits 1; `/d /c <path with space> --version` exits 0). Keep the path and
|
|
231
|
+
* fixed argument as distinct array elements instead of enabling shell:true
|
|
232
|
+
* for a constructed command string.
|
|
233
|
+
*/
|
|
234
|
+
function buildRsyncLauncher(candidatePath) {
|
|
235
|
+
if (process.platform === "win32" && isWindowsShimPath(candidatePath ?? "")) {
|
|
236
|
+
return { command: "cmd.exe", leadingArgs: ["/d", "/c", candidatePath] };
|
|
237
|
+
}
|
|
238
|
+
return { command: "rsync", leadingArgs: [] };
|
|
239
|
+
}
|
|
192
240
|
/** The overlay requires rsync; do not allocate a recovery copy when it cannot run. */
|
|
193
241
|
export function requireWorkingRsync(env, err) {
|
|
194
242
|
const resolvedPath = envValue(env, "PATH");
|
|
195
243
|
const entries = pathEntries(resolvedPath);
|
|
196
244
|
const foundRsync = findRsyncOnPath(entries, env);
|
|
197
|
-
|
|
198
|
-
// direct child-process launch. Keep the path and fixed argument as distinct
|
|
199
|
-
// arguments instead of enabling shell:true for a constructed command string.
|
|
200
|
-
const launcher = process.platform === "win32" && /\.(?:cmd|bat)$/i.test(foundRsync?.path ?? "")
|
|
201
|
-
? { command: "cmd.exe", leadingArgs: ["/d", "/s", "/c", foundRsync.path] }
|
|
202
|
-
: { command: "rsync", leadingArgs: [] };
|
|
245
|
+
const launcher = buildRsyncLauncher(foundRsync?.path);
|
|
203
246
|
const probe = runWithSpawnError(launcher.command, [...launcher.leadingArgs, "--version"], {
|
|
204
247
|
env,
|
|
205
248
|
});
|