@indigoai-us/hq-cloud 6.16.17 → 6.16.18
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/cli/share.d.ts +12 -12
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +38 -62
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/share.test.js +37 -0
- package/dist/cli/share.test.js.map +1 -1
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +15 -4
- package/dist/cli/sync.js.map +1 -1
- package/dist/cli/sync.test.js +68 -0
- package/dist/cli/sync.test.js.map +1 -1
- package/dist/journal.d.ts +41 -0
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +69 -1
- package/dist/journal.js.map +1 -1
- package/dist/journal.test.js +33 -1
- package/dist/journal.test.js.map +1 -1
- package/package.json +1 -1
package/dist/cli/share.d.ts
CHANGED
|
@@ -214,18 +214,7 @@ interface StatSnapshot {
|
|
|
214
214
|
}
|
|
215
215
|
/**
|
|
216
216
|
* True when `absolutePath` provably has not been written since its journal
|
|
217
|
-
* entry was stamped, judged from stat alone.
|
|
218
|
-
*
|
|
219
|
-
* Fails closed. Anything unusual about the entry — no stat recorded, a
|
|
220
|
-
* tombstone, a pending local delete, a pull-held divergence, a symlink record,
|
|
221
|
-
* or a local object that is no longer a plain file — returns false and sends
|
|
222
|
-
* the caller down the hashing path, which is the pre-fast-path behaviour.
|
|
223
|
-
*
|
|
224
|
-
* The three fields are compared exactly, on purpose. `mtimeMs` from `lstat`
|
|
225
|
-
* carries sub-millisecond precision that `utimes` cannot reproduce, so a
|
|
226
|
-
* restored timestamp differs from the original anyway — but that is an
|
|
227
|
-
* accident of precision, not a guarantee, and nothing here leans on it.
|
|
228
|
-
* `ctimeMs` is the field doing the real work.
|
|
217
|
+
* entry was stamped, judged from stat alone. See `journalEntryMatchesStat`.
|
|
229
218
|
*/
|
|
230
219
|
declare function statMatchesJournal(absolutePath: string, entry: JournalEntry | undefined): boolean;
|
|
231
220
|
export interface ShareOptions {
|
|
@@ -686,6 +675,17 @@ type CollectedEntry = {
|
|
|
686
675
|
kind: "file";
|
|
687
676
|
absolutePath: string;
|
|
688
677
|
relativePath: string;
|
|
678
|
+
/**
|
|
679
|
+
* A hash of this file computed earlier in the same pass, with the stat it
|
|
680
|
+
* was computed against. `computePushPlan` reuses it instead of reading the
|
|
681
|
+
* body again when the current stat still matches (same ctime argument as
|
|
682
|
+
* the journal gate); any change falls back to hashing. Set only by the
|
|
683
|
+
* execution-seam re-plan — the whole-run plan never carries one.
|
|
684
|
+
*/
|
|
685
|
+
knownHash?: {
|
|
686
|
+
hash: string;
|
|
687
|
+
stat: StatSnapshot;
|
|
688
|
+
};
|
|
689
689
|
} | {
|
|
690
690
|
kind: "symlink";
|
|
691
691
|
absolutePath: string;
|
package/dist/cli/share.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/cli/share.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAe,YAAY,EAAE,MAAM,aAAa,CAAC;AAqBhG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/cli/share.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/share.js
CHANGED
|
@@ -12,7 +12,7 @@ import { createSyncProgressRecorder } from "../sync-progress.js";
|
|
|
12
12
|
import { localPathForVaultKey, vaultKeyForLocalPath } from "../local-path-codec.js";
|
|
13
13
|
import { uploadFile, uploadSymlink, toPosixKey, headRemoteFile, readVerifiedRemoteSymlinkTarget, deleteRemoteFile, downloadFile, primeObjectTransport, primeUploads, WindowsSymlinkPrivilegeError, WINDOWS_SYMLINK_PRIVILEGE_REMEDY, WindowsRenameBlockedError, WINDOWS_RENAME_BLOCKED_REMEDY, renameOrRaiseWindowsBlocked, } from "../s3.js";
|
|
14
14
|
import * as crypto from "crypto";
|
|
15
|
-
import { isUnderAnyRoot, readJournal, readJournalScoped, writeJournal, hashFile, hashSymlinkTarget, updateEntry, removeEntry, isTombstone, normalizeEtag, PERSONAL_VAULT_JOURNAL_SLUG, migratePersonalVaultJournal, migrateToV2, } from "../journal.js";
|
|
15
|
+
import { isUnderAnyRoot, readJournal, readJournalScoped, writeJournal, hashFile, hashSymlinkTarget, journalEntryMatchesStat, timestampsTooCoarseToTrust, updateEntry, removeEntry, isTombstone, normalizeEtag, PERSONAL_VAULT_JOURNAL_SLUG, migratePersonalVaultJournal, migrateToV2, } from "../journal.js";
|
|
16
16
|
import { createIgnoreFilter, hasControlCharacters, isExpectedIgnore, isWithinSizeLimit, } from "../ignore.js";
|
|
17
17
|
import { wrapFilterWithPersonalVaultDefaults, } from "../personal-vault-exclusions.js";
|
|
18
18
|
import { isGeneratedCoreMirrorKey, isPersonalVaultDeletionExcluded, purgeExcludedPersonalVaultJournalEntries, } from "../personal-vault.js";
|
|
@@ -266,56 +266,13 @@ function ctimeToStamp(hashedStat, lstat) {
|
|
|
266
266
|
};
|
|
267
267
|
return sameStatSnapshot(hashedStat, current) ? lstat.ctimeMs : undefined;
|
|
268
268
|
}
|
|
269
|
-
/**
|
|
270
|
-
* True when a timestamp pair is too coarse to be evidence of anything.
|
|
271
|
-
*
|
|
272
|
-
* FAT/exFAT, some FUSE mounts and cached network filesystems round timestamps
|
|
273
|
-
* to whole seconds (FAT's mtime granularity is two), and may synthesize ctime
|
|
274
|
-
* from mtime. On such a volume a same-size rewrite inside one tick leaves both
|
|
275
|
-
* fields equal to the journal's, and the skip gate would strand the edit
|
|
276
|
-
* forever. Every filesystem this gate can safely run on — APFS, ext4, NTFS —
|
|
277
|
-
* records sub-second precision, so a pair sitting exactly on the second is
|
|
278
|
-
* treated as untrustworthy and sent back to hashing.
|
|
279
|
-
*
|
|
280
|
-
* The cost of the false positive is one hash: on a real filesystem a file whose
|
|
281
|
-
* mtime AND ctime both land exactly on a second boundary is rare, and it is
|
|
282
|
-
* simply hashed as it was before the fast path existed.
|
|
283
|
-
*/
|
|
284
|
-
function timestampsTooCoarseToTrust(mtimeMs, ctimeMs) {
|
|
285
|
-
return mtimeMs % 1000 === 0 && ctimeMs % 1000 === 0;
|
|
286
|
-
}
|
|
287
269
|
/**
|
|
288
270
|
* True when `absolutePath` provably has not been written since its journal
|
|
289
|
-
* entry was stamped, judged from stat alone.
|
|
290
|
-
*
|
|
291
|
-
* Fails closed. Anything unusual about the entry — no stat recorded, a
|
|
292
|
-
* tombstone, a pending local delete, a pull-held divergence, a symlink record,
|
|
293
|
-
* or a local object that is no longer a plain file — returns false and sends
|
|
294
|
-
* the caller down the hashing path, which is the pre-fast-path behaviour.
|
|
295
|
-
*
|
|
296
|
-
* The three fields are compared exactly, on purpose. `mtimeMs` from `lstat`
|
|
297
|
-
* carries sub-millisecond precision that `utimes` cannot reproduce, so a
|
|
298
|
-
* restored timestamp differs from the original anyway — but that is an
|
|
299
|
-
* accident of precision, not a guarantee, and nothing here leans on it.
|
|
300
|
-
* `ctimeMs` is the field doing the real work.
|
|
271
|
+
* entry was stamped, judged from stat alone. See `journalEntryMatchesStat`.
|
|
301
272
|
*/
|
|
302
273
|
function statMatchesJournal(absolutePath, entry) {
|
|
303
274
|
if (!entry)
|
|
304
275
|
return false;
|
|
305
|
-
if (!entry.hash)
|
|
306
|
-
return false;
|
|
307
|
-
if (entry.kind === "symlink")
|
|
308
|
-
return false;
|
|
309
|
-
if (entry.localDiverges)
|
|
310
|
-
return false;
|
|
311
|
-
if (entry.removedAt !== undefined)
|
|
312
|
-
return false;
|
|
313
|
-
if (entry.localDeleteIntent !== undefined)
|
|
314
|
-
return false;
|
|
315
|
-
if (entry.mtimeMs === undefined || entry.ctimeMs === undefined)
|
|
316
|
-
return false;
|
|
317
|
-
if (timestampsTooCoarseToTrust(entry.mtimeMs, entry.ctimeMs))
|
|
318
|
-
return false;
|
|
319
276
|
let lstat;
|
|
320
277
|
try {
|
|
321
278
|
lstat = fs.lstatSync(absolutePath);
|
|
@@ -323,11 +280,9 @@ function statMatchesJournal(absolutePath, entry) {
|
|
|
323
280
|
catch {
|
|
324
281
|
return false;
|
|
325
282
|
}
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
return (
|
|
329
|
-
lstat.mtimeMs === entry.mtimeMs &&
|
|
330
|
-
lstat.ctimeMs === entry.ctimeMs);
|
|
283
|
+
// The entry checks and the ctime argument live in `journalEntryMatchesStat`
|
|
284
|
+
// (journal.ts) so the pull planner applies the identical gate.
|
|
285
|
+
return journalEntryMatchesStat(entry, lstat);
|
|
331
286
|
}
|
|
332
287
|
function computePushPlan(filesToShare, journal, skipUnchanged, onHeartbeat) {
|
|
333
288
|
const items = [];
|
|
@@ -403,11 +358,28 @@ function computePushPlan(filesToShare, journal, skipUnchanged, onHeartbeat) {
|
|
|
403
358
|
// rewritten while we hashed it, so `localHash` may describe bytes that are
|
|
404
359
|
// already gone — and nothing downstream may stamp a timestamp against it.
|
|
405
360
|
const statBeforeHash = statSnapshot(absolutePath);
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
361
|
+
let localHash;
|
|
362
|
+
let statAtHash;
|
|
363
|
+
if (entry.knownHash !== undefined &&
|
|
364
|
+
statBeforeHash !== null &&
|
|
365
|
+
sameStatSnapshot(entry.knownHash.stat, statBeforeHash) &&
|
|
366
|
+
!timestampsTooCoarseToTrust(statBeforeHash.mtimeMs, statBeforeHash.ctimeMs)) {
|
|
367
|
+
// The execution seam re-plans every upload candidate up to three times
|
|
368
|
+
// (admission, dispatch, after HEAD). Each re-plan hashed the body again,
|
|
369
|
+
// so a candidate that never changes — on a real install ~3.5k archived
|
|
370
|
+
// transcripts, 6.3 GB, skipped after HEAD — was read four times per pass.
|
|
371
|
+
// size + mtime + ctime unchanged since the earlier hash proves the bytes
|
|
372
|
+
// are the same (ctime cannot be set from userspace), so reuse it.
|
|
373
|
+
localHash = entry.knownHash.hash;
|
|
374
|
+
statAtHash = statBeforeHash;
|
|
375
|
+
}
|
|
376
|
+
else {
|
|
377
|
+
localHash = hashFile(absolutePath);
|
|
378
|
+
const statAfterHash = statSnapshot(absolutePath);
|
|
379
|
+
statAtHash = sameStatSnapshot(statBeforeHash, statAfterHash)
|
|
380
|
+
? statAfterHash ?? undefined
|
|
381
|
+
: undefined;
|
|
382
|
+
}
|
|
411
383
|
if (skipUnchanged) {
|
|
412
384
|
const existing = journal.files[relativePath];
|
|
413
385
|
// A `localDiverges` entry records the hash of the KEPT LOCAL body, so
|
|
@@ -480,13 +452,17 @@ function recollectPushEntry(item) {
|
|
|
480
452
|
target,
|
|
481
453
|
};
|
|
482
454
|
}
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
455
|
+
if (!lstat.isFile())
|
|
456
|
+
return null;
|
|
457
|
+
const entry = {
|
|
458
|
+
kind: "file",
|
|
459
|
+
absolutePath: item.absolutePath,
|
|
460
|
+
relativePath: item.relativePath,
|
|
461
|
+
};
|
|
462
|
+
if (item.action === "upload" && item.kind === "file" && item.statAtHash) {
|
|
463
|
+
entry.knownHash = { hash: item.localHash, stat: item.statAtHash };
|
|
464
|
+
}
|
|
465
|
+
return entry;
|
|
490
466
|
}
|
|
491
467
|
/**
|
|
492
468
|
* Turn the whole-run push plan into a preview only. The item returned here was
|