sliftutils 1.7.115 → 1.7.117

package/storage/remoteStorage/storageController.d.ts

@@ -139,6 +139,7 @@ export declare const RemoteStorageController: import("socket-function/SocketFunc
         sourceConfig: SourceConfig;
         time: number;
         routes?: [number, number][];
+        internal?: boolean;
     }) => Promise<ArchiveFileInfo[]>;
     getArchivesConfig: (config: {
         account: string;

package/storage/remoteStorage/storageController.ts

@@ -336,7 +336,7 @@ class RemoteStorageControllerBase {
     }
     @assertValidArgs
     @trackAccessCall("getChangesAfter")
-    async getChangesAfter2(config: { account: string; bucketName: string; sourceConfig: SourceConfig; time: number; routes?: [number, number][] }): Promise<ArchiveFileInfo[]> {
+    async getChangesAfter2(config: { account: string; bucketName: string; sourceConfig: SourceConfig; time: number; routes?: [number, number][]; internal?: boolean }): Promise<ArchiveFileInfo[]> {
         return await withStore(config, store => store.getChangesAfter2(config));
     }
     @assertValidArgs

package/storage/remoteStorage/storeSync.ts

@@ -240,7 +240,7 @@ export class StoreSync {
     public async boundaryScanRemote(source: IArchives, config: { since: number; route?: [number, number] }): Promise<void> {
         let scanStart = Date.now();
         logSyncEvent({ event: "boundaryScanStart", store: this.store.folder, source: source.getDebugName(), since: config.since, route: config.route || FULL_ROUTE });
-        let changes = await source.getChangesAfter2({ time: config.since, routes: config.route && [config.route] || undefined });
+        let changes = await source.getChangesAfter2({ time: config.since, routes: config.route && [config.route] || undefined, internal: true });
         let tally = newScanTally();
         for (let file of changes) {
             if (file.path === ROUTING_FILE) {
@@ -258,7 +258,7 @@ export class StoreSync {
                 tally.tombstone++;
                 continue;
             }
-            let copied = await copyArchiveFile({ from: source, to: this.store.sources[0].source, path: file.path, forceSetImmutable: true, noChecks: true, internal: true });
+            let copied = await copyArchiveFile({ from: source, to: this.store.sources[0].source, path: file.path, preserveWriteTime: true, forceSetImmutable: true, noChecks: true, internal: true });
             if (!copied) {
                 // Undefined is two cases (see copyArchiveFile): our own disk already holding something newer is the boundary scan working as intended (our writes since the boundary outrank the neighbor's), only a genuinely unreadable file is worth a warning
                 let local = await this.store.sources[0].source.getInfo(file.path);
@@ -387,7 +387,7 @@ export class StoreSync {
         try {
             let attempts = 0;
             while (true) {
-                files = await source.findInfo("");
+                files = await source.findInfo("", { internal: true });
                 if (this.store.stopped.stop || state.stopped.stop) break;
                 // What we believe the source has: whichever is larger of its previous listing and the index entries naming it as holder. Files do not just vanish - a listing far below this means the other end is briefly broken, and believing it would purge everything it held.
                 let held = 0;
@@ -494,7 +494,7 @@ export class StoreSync {
                 }
                 let holder = await this.store.getEntryHolder(entry);
                 if (!holder) continue;
-                let copied = await copyArchiveFile({ from: holder, to: source, path: key, forceSetImmutable: true, noChecks: true, internal: true });
+                let copied = await copyArchiveFile({ from: holder, to: source, path: key, preserveWriteTime: true, forceSetImmutable: true, noChecks: true, internal: true });
                 if (!copied) {
                     // Undefined is two cases (see copyArchiveFile). The source having a NEWER file than our index (the listing we pushed from was stale) is adopted exactly the way the pull direction adopts a listing entry - and pushing our stale copy stops. Otherwise the HOLDER could not produce the file, which the next round's pull re-resolves; either way, silence here was the bug.
                     let theirs = await source.getInfo(key);
@@ -557,7 +557,7 @@ export class StoreSync {
         let { source, route } = this.store.sources[sourceIndex];
         let state = this.states[sourceIndex];
         let pollStart = Date.now();
-        let changes = await source.getChangesAfter2({ time: state.changesAfterTime, routes: route && [route] || undefined });
+        let changes = await source.getChangesAfter2({ time: state.changesAfterTime, routes: route && [route] || undefined, internal: true });
         let tally = newScanTally();
         for (let file of changes) {
             tally[this.updateScanIndex(sourceIndex, file)]++;
@@ -648,7 +648,7 @@ export class StoreSync {
                     if (index >= pending.length) return;
                     let { key, entry } = pending[index];
                     try {
-                        let copied = await copyArchiveFile({ from: source, to: this.store.sources[0].source, path: key, forceSetImmutable: true, noChecks: true, internal: true });
+                        let copied = await copyArchiveFile({ from: source, to: this.store.sources[0].source, path: key, preserveWriteTime: true, forceSetImmutable: true, noChecks: true, internal: true });
                         if (copied) {
                             copiedFiles++;
                             copiedBytes += copied.size;

package/yarn.lock

@@ -1937,10 +1937,10 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-socket-function@^1.2.32:
-  version "1.2.32"
-  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-1.2.32.tgz#9cd6ff3daf2e365bfaef5da0f35271f1c9fd89d3"
-  integrity sha512-d/nuXNXnikLG1eefi099+pG0Lqeibk7Pv92k01YXfTy3W1QjXCef0B9/0hrNJoSyB96r8mtSGk0JdKhCNMqGVQ==
+socket-function@^1.2.33:
+  version "1.2.33"
+  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-1.2.33.tgz#9137a8cc81f586e6650f837097e44202ec5e071e"
+  integrity sha512-kdbwUDCtBnjqdfvH0JgmJZujP3IeuofSg5OsF2IcWCQ9YDiUisd5ydBzwBbjOLomErOnJgj6dySBp3dlTSzQIw==
   dependencies:
     "@types/pako" "^2.0.3"
     "@types/ws" "^8.5.3"