sliftutils 1.7.116 → 1.7.118

package/storage/remoteStorage/sourceWrapper.d.ts

@@ -43,6 +43,8 @@ export declare class SourceWrapper {
     seedLatency(ms: number): void;
     /** Median of the recent pings (API or URL-form, whichever this source measures), plus DISCONNECTED_LATENCY_PENALTY while the source is disconnected - so a down source still sorts and can still be picked, just after every connected one. Sources with no measurements yet sort last (Infinity), except our own in-process server, which is the best possible target (0). */
     getLatency(): number;
+    /** writeBlocked from missing backblaze credentials is re-checked on every write attempt: the secret load can fail TRANSIENTLY (early startup, a file-read hiccup), and one failed load must never permanently stop this process from writing to the bucket. The other writeBlocked reasons (read-only mode, browsers) are static properties of the process, so there is nothing to re-check. */
+    recheckWriteBlocked(): Promise<void>;
     /** Writes always go through the API, so a permission error throws to the caller on every write (and access granted in the meantime is picked up automatically). */
     write<T>(run: (archives: IArchives) => Promise<T>): Promise<T>;
     dispose(): void;

package/storage/remoteStorage/sourceWrapper.ts

@@ -269,8 +269,21 @@ export class SourceWrapper {
         return median;
     }
 
+    /** writeBlocked from missing backblaze credentials is re-checked on every write attempt: the secret load can fail TRANSIENTLY (early startup, a file-read hiccup), and one failed load must never permanently stop this process from writing to the bucket. The other writeBlocked reasons (read-only mode, browsers) are static properties of the process, so there is nothing to re-check. */
+    public async recheckWriteBlocked(): Promise<void> {
+        if (!this.writeBlocked || this.api || this.disposed) return;
+        if (this.config.type !== "backblaze") return;
+        if (!await hasBackblazeCreds()) return;
+        this.api = new ArchivesBackblaze({ bucketName: parseBackblazeUrl(this.config.url).bucketName, public: this.config.public, immutable: this.config.immutable, allowedOrigins: this.config.allowedOrigins });
+        console.log(`Backblaze credentials are now available for ${this.getDebugName()}, unblocking writes (was blocked: ${this.writeBlocked})`);
+        this.writeBlocked = undefined;
+    }
+
     /** Writes always go through the API, so a permission error throws to the caller on every write (and access granted in the meantime is picked up automatically). */
     public async write<T>(run: (archives: IArchives) => Promise<T>): Promise<T> {
+        if (this.writeBlocked) {
+            await this.recheckWriteBlocked();
+        }
         if (this.writeBlocked) {
             throw new Error(`Writes are blocked on this source: ${this.writeBlocked}`);
         }

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) {
@@ -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;
@@ -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)]++;

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"