@indigoai-us/hq-cloud 6.16.68-alpha.0 → 6.16.68-alpha.2
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.map +1 -1
- package/dist/bin/sync-runner-watch-loop.js +56 -9
- package/dist/bin/sync-runner-watch-loop.js.map +1 -1
- package/dist/bin/sync-runner.test.js +106 -0
- package/dist/bin/sync-runner.test.js.map +1 -1
- package/dist/cli/share.d.ts +3 -6
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +33 -11
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/share.test.js +45 -0
- package/dist/cli/share.test.js.map +1 -1
- package/dist/journal-row-cache.d.ts +102 -0
- package/dist/journal-row-cache.d.ts.map +1 -0
- package/dist/journal-row-cache.heap.test.d.ts +2 -0
- package/dist/journal-row-cache.heap.test.d.ts.map +1 -0
- package/dist/journal-row-cache.heap.test.js +102 -0
- package/dist/journal-row-cache.heap.test.js.map +1 -0
- package/dist/journal-row-cache.js +549 -0
- package/dist/journal-row-cache.js.map +1 -0
- package/dist/journal-row-cache.test.d.ts +2 -0
- package/dist/journal-row-cache.test.d.ts.map +1 -0
- package/dist/journal-row-cache.test.js +155 -0
- package/dist/journal-row-cache.test.js.map +1 -0
- package/dist/journal-row-store.d.ts +14 -0
- package/dist/journal-row-store.d.ts.map +1 -1
- package/dist/journal-row-store.js +19 -0
- package/dist/journal-row-store.js.map +1 -1
- package/dist/journal-snapshot-rows.d.ts +4 -0
- package/dist/journal-snapshot-rows.d.ts.map +1 -1
- package/dist/journal-snapshot-rows.js +12 -0
- package/dist/journal-snapshot-rows.js.map +1 -1
- package/dist/journal.d.ts +11 -0
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +59 -3
- package/dist/journal.js.map +1 -1
- package/dist/journal.test.js +24 -1
- package/dist/journal.test.js.map +1 -1
- package/package.json +1 -1
package/dist/cli/share.d.ts
CHANGED
|
@@ -4,8 +4,9 @@
|
|
|
4
4
|
* Broadcasts local file(s) to the company's S3 vault bucket.
|
|
5
5
|
* Refuses to overwrite a newer remote version without prompting.
|
|
6
6
|
*/
|
|
7
|
-
import type { EntityContext, VaultServiceConfig
|
|
7
|
+
import type { EntityContext, VaultServiceConfig } from "../types.js";
|
|
8
8
|
import type { UploadAuthor } from "../s3.js";
|
|
9
|
+
import { journalFingerprintMatchesStat } from "../journal.js";
|
|
9
10
|
import type { ConflictStrategy } from "./conflict.js";
|
|
10
11
|
import type { SyncProgressEvent } from "./sync.js";
|
|
11
12
|
import { type CompanyTombstone } from "./tombstones.js";
|
|
@@ -221,11 +222,7 @@ interface StatSnapshot {
|
|
|
221
222
|
mtimeMs: number;
|
|
222
223
|
ctimeMs: number;
|
|
223
224
|
}
|
|
224
|
-
|
|
225
|
-
* True when `absolutePath` provably has not been written since its journal
|
|
226
|
-
* entry was stamped, judged from stat alone. See `journalEntryMatchesStat`.
|
|
227
|
-
*/
|
|
228
|
-
declare function statMatchesJournal(absolutePath: string, entry: JournalEntry | undefined): boolean;
|
|
225
|
+
declare function statMatchesJournal(absolutePath: string, entry: Parameters<typeof journalFingerprintMatchesStat>[0]): boolean;
|
|
229
226
|
export interface ShareOptions {
|
|
230
227
|
/** Path(s) to share (files or directories) */
|
|
231
228
|
paths: 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,
|
|
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
|
@@ -14,7 +14,7 @@ import { localPathForVaultKey, vaultKeyForLocalPath } from "../local-path-codec.
|
|
|
14
14
|
import { uploadFile, uploadSymlink, toPosixKey, headRemoteFile, readVerifiedRemoteSymlinkTarget, deleteRemoteFile, downloadFile, primeObjectTransport, primeUploads, publishedContentHash, setUploadContentHash, WindowsSymlinkPrivilegeError, WINDOWS_SYMLINK_PRIVILEGE_REMEDY, WindowsRenameBlockedError, WINDOWS_RENAME_BLOCKED_REMEDY, renameOrRaiseWindowsBlocked, } from "../s3.js";
|
|
15
15
|
import * as crypto from "crypto";
|
|
16
16
|
import { RateLimitedError } from "../object-io.js";
|
|
17
|
-
import { isUnderAnyRoot, readJournalForPass, readJournalScoped, writeJournal, hashFile, hashSymlinkTarget, journalRows, journalEntryMatchesStat, timestampsTooCoarseToTrust, updateEntry, PrematureJournalEntryError, removeEntry, isTombstone, normalizeEtag, PERSONAL_VAULT_JOURNAL_SLUG, migratePersonalVaultJournal, migrateToV2, } from "../journal.js";
|
|
17
|
+
import { isUnderAnyRoot, readJournalForPass, readJournalScoped, writeJournal, hashFile, hashSymlinkTarget, journalRows, journalEntryMatchesStat, journalFingerprintMatchesStat, timestampsTooCoarseToTrust, updateEntry, PrematureJournalEntryError, removeEntry, isTombstone, normalizeEtag, PERSONAL_VAULT_JOURNAL_SLUG, migratePersonalVaultJournal, migrateToV2, } from "../journal.js";
|
|
18
18
|
import { createIgnoreFilter, hasControlCharacters, isExpectedIgnore, isWithinSizeLimit, } from "../ignore.js";
|
|
19
19
|
import { wrapFilterWithPersonalVaultDefaults, } from "../personal-vault-exclusions.js";
|
|
20
20
|
import { isGeneratedCoreMirrorKey, isPersonalVaultDeletionExcluded, isSessionLogDeletionKey, purgeExcludedPersonalVaultJournalEntries, } from "../personal-vault.js";
|
|
@@ -303,6 +303,10 @@ function ctimeToStamp(hashedStat, lstat) {
|
|
|
303
303
|
* True when `absolutePath` provably has not been written since its journal
|
|
304
304
|
* entry was stamped, judged from stat alone. See `journalEntryMatchesStat`.
|
|
305
305
|
*/
|
|
306
|
+
function skipFingerprint(journal, relativePath) {
|
|
307
|
+
const rows = journalRows(journal);
|
|
308
|
+
return rows.statFingerprint?.(relativePath) ?? rows.get(relativePath);
|
|
309
|
+
}
|
|
306
310
|
function statMatchesJournal(absolutePath, entry) {
|
|
307
311
|
if (!entry)
|
|
308
312
|
return false;
|
|
@@ -315,6 +319,10 @@ function statMatchesJournal(absolutePath, entry) {
|
|
|
315
319
|
}
|
|
316
320
|
// The entry checks and the ctime argument live in `journalEntryMatchesStat`
|
|
317
321
|
// (journal.ts) so the pull planner applies the identical gate.
|
|
322
|
+
if (journalFingerprintMatchesStat(entry, lstat))
|
|
323
|
+
return true;
|
|
324
|
+
if (!("syncedAt" in entry))
|
|
325
|
+
return false;
|
|
318
326
|
return journalEntryMatchesStat(entry, lstat);
|
|
319
327
|
}
|
|
320
328
|
/**
|
|
@@ -342,6 +350,7 @@ async function yieldToCooperativeCheckpoint(work, cooperativeCheckpoint, force =
|
|
|
342
350
|
}
|
|
343
351
|
function computePushPlan(filesToShare, journal, skipUnchanged, onHeartbeat) {
|
|
344
352
|
const items = [];
|
|
353
|
+
let omittedSkips = 0;
|
|
345
354
|
for (const entry of filesToShare) {
|
|
346
355
|
onHeartbeat?.();
|
|
347
356
|
const { absolutePath, relativePath } = entry;
|
|
@@ -364,12 +373,12 @@ function computePushPlan(filesToShare, journal, skipUnchanged, onHeartbeat) {
|
|
|
364
373
|
if (entry.kind === "symlink") {
|
|
365
374
|
const localHash = hashSymlinkTarget(entry.target);
|
|
366
375
|
if (skipUnchanged) {
|
|
367
|
-
const existing =
|
|
376
|
+
const existing = skipFingerprint(journal, relativePath);
|
|
368
377
|
// `!localDiverges`: see the regular-file gate below — a divergent entry
|
|
369
378
|
// stores the current LOCAL hash, so hash equality here proves only that
|
|
370
379
|
// local has not moved since the pull-side hold, never that it matches remote.
|
|
371
380
|
if (existing && existing.hash === localHash && !existing.localDiverges) {
|
|
372
|
-
|
|
381
|
+
omittedSkips += 1;
|
|
373
382
|
continue;
|
|
374
383
|
}
|
|
375
384
|
}
|
|
@@ -406,8 +415,8 @@ function computePushPlan(filesToShare, journal, skipUnchanged, onHeartbeat) {
|
|
|
406
415
|
// by the restamp below so the next pass is free;
|
|
407
416
|
// - `localDiverges` entries — see the hash gate below for why equality
|
|
408
417
|
// proves nothing about them.
|
|
409
|
-
if (skipUnchanged && statMatchesJournal(absolutePath,
|
|
410
|
-
|
|
418
|
+
if (skipUnchanged && statMatchesJournal(absolutePath, skipFingerprint(journal, relativePath))) {
|
|
419
|
+
omittedSkips += 1;
|
|
411
420
|
continue;
|
|
412
421
|
}
|
|
413
422
|
// Snapshot stat either side of the read. If the two differ the file was
|
|
@@ -459,7 +468,10 @@ function computePushPlan(filesToShare, journal, skipUnchanged, onHeartbeat) {
|
|
|
459
468
|
existing.size !== statAtHash.size)) {
|
|
460
469
|
restamp = statAtHash;
|
|
461
470
|
}
|
|
462
|
-
|
|
471
|
+
if (restamp)
|
|
472
|
+
items.push({ action: "skip-unchanged", absolutePath, relativePath, restamp });
|
|
473
|
+
else
|
|
474
|
+
omittedSkips += 1;
|
|
463
475
|
continue;
|
|
464
476
|
}
|
|
465
477
|
}
|
|
@@ -486,7 +498,8 @@ function computePushPlan(filesToShare, journal, skipUnchanged, onHeartbeat) {
|
|
|
486
498
|
filesToSkip++;
|
|
487
499
|
}
|
|
488
500
|
}
|
|
489
|
-
|
|
501
|
+
filesToSkip += omittedSkips;
|
|
502
|
+
return { items, filesToUpload, bytesToUpload, filesToSkip, preplannedFilesSkipped: omittedSkips };
|
|
490
503
|
}
|
|
491
504
|
/**
|
|
492
505
|
* Build a full-pass plan in bounded row batches. A scoped replan deliberately
|
|
@@ -498,6 +511,7 @@ async function computePushPlanCooperatively(filesToShare, journal, skipUnchanged
|
|
|
498
511
|
let filesToUpload = 0;
|
|
499
512
|
let bytesToUpload = 0;
|
|
500
513
|
let filesToSkip = 0;
|
|
514
|
+
let preplannedFilesSkipped = 0;
|
|
501
515
|
const cooperativeWork = { rowsSinceYield: 0 };
|
|
502
516
|
for (let start = 0; start < filesToShare.length; start += FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE) {
|
|
503
517
|
const slice = filesToShare.slice(start, start + FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE);
|
|
@@ -506,12 +520,13 @@ async function computePushPlanCooperatively(filesToShare, journal, skipUnchanged
|
|
|
506
520
|
filesToUpload += plan.filesToUpload;
|
|
507
521
|
bytesToUpload += plan.bytesToUpload;
|
|
508
522
|
filesToSkip += plan.filesToSkip;
|
|
523
|
+
preplannedFilesSkipped += plan.preplannedFilesSkipped;
|
|
509
524
|
for (const entry of slice) {
|
|
510
525
|
noteCooperativeRowVisit("plan", entry.relativePath);
|
|
511
526
|
}
|
|
512
527
|
await yieldToCooperativeCheckpoint(cooperativeWork, cooperativeCheckpoint, true, start + slice.length);
|
|
513
528
|
}
|
|
514
|
-
return { items, filesToUpload, bytesToUpload, filesToSkip };
|
|
529
|
+
return { items, filesToUpload, bytesToUpload, filesToSkip, preplannedFilesSkipped };
|
|
515
530
|
}
|
|
516
531
|
/** Re-read one collected path at the execution seam. */
|
|
517
532
|
function recollectPushEntry(item) {
|
|
@@ -1712,6 +1727,7 @@ function refreshPushJournalAfterWalk(run, collectedKeys = [], deleteScopeRoots =
|
|
|
1712
1727
|
}
|
|
1713
1728
|
}
|
|
1714
1729
|
async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
1730
|
+
counters.filesSkipped += pushPlan.preplannedFilesSkipped;
|
|
1715
1731
|
const TRANSFER_CONCURRENCY = resolveTransferConcurrency(run.hostLoadAtStart);
|
|
1716
1732
|
let conflictPromptChain = Promise.resolve();
|
|
1717
1733
|
const resolveConflictSerialized = (info) => {
|
|
@@ -2467,7 +2483,8 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2467
2483
|
// scheduler until the full pass ends.
|
|
2468
2484
|
let admittedSinceCooperativeCheckpoint = 0;
|
|
2469
2485
|
let skippedSinceCooperativeCheckpoint = 0;
|
|
2470
|
-
|
|
2486
|
+
let remainingPreplannedSkips = pushPlan.preplannedFilesSkipped;
|
|
2487
|
+
while (queue.length > 0 || inFlight.size > 0 || remainingPreplannedSkips > 0) {
|
|
2471
2488
|
while (!aborted &&
|
|
2472
2489
|
!sessionAuthAborted &&
|
|
2473
2490
|
(!run.options.cooperativeCheckpoint ||
|
|
@@ -2476,7 +2493,12 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2476
2493
|
skippedSinceCooperativeCheckpoint <
|
|
2477
2494
|
FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE)) &&
|
|
2478
2495
|
inFlight.size < TRANSFER_CONCURRENCY &&
|
|
2479
|
-
queue.length > 0) {
|
|
2496
|
+
(queue.length > 0 || remainingPreplannedSkips > 0)) {
|
|
2497
|
+
if (remainingPreplannedSkips > 0) {
|
|
2498
|
+
remainingPreplannedSkips -= 1;
|
|
2499
|
+
skippedSinceCooperativeCheckpoint += 1;
|
|
2500
|
+
continue;
|
|
2501
|
+
}
|
|
2480
2502
|
const previewItem = queue[0];
|
|
2481
2503
|
const item = replanPushItemAtExecution(previewItem, run.journal, run.skipUnchanged === true, run.options.onHeartbeat);
|
|
2482
2504
|
if (item === null) {
|
|
@@ -2541,7 +2563,7 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
|
|
|
2541
2563
|
FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE ||
|
|
2542
2564
|
skippedSinceCooperativeCheckpoint >=
|
|
2543
2565
|
FULL_PUSH_COOPERATIVE_CHECKPOINT_BATCH_SIZE ||
|
|
2544
|
-
queue.length === 0)) {
|
|
2566
|
+
(queue.length === 0 && remainingPreplannedSkips === 0))) {
|
|
2545
2567
|
// Every admitted upload has settled, so `processUploadItem` has
|
|
2546
2568
|
// finished its mutable journal updates. Persist that durable unit before
|
|
2547
2569
|
// yielding. Skip-only units have no new durable state; resume the
|