sliftutils 1.7.68 → 1.7.70

package/storage/remoteStorage/storageController.d.ts

@@ -73,7 +73,7 @@ export declare const RemoteStorageController: import("socket-function/SocketFunc
         size: number;
     } | undefined>;
     set: (account: string, bucketName: string, path: string, data: Buffer, lastModified?: number, forceSetImmutable?: boolean, internal?: boolean) => Promise<void>;
-    del: (account: string, bucketName: string, path: string) => Promise<void>;
+    del: (account: string, bucketName: string, path: string, lastModified?: number, internal?: boolean) => Promise<void>;
     getInfo: (account: string, bucketName: string, path: string, includeTombstones?: boolean) => Promise<{
         writeTime: number;
         size: number;

package/storage/remoteStorage/storageController.ts

@@ -308,14 +308,17 @@ class RemoteStorageControllerBase {
     async set(account: string, bucketName: string, path: string, data: Buffer, lastModified?: number, forceSetImmutable?: boolean, internal?: boolean): Promise<void> {
         assertValidName(bucketName, "bucket name");
         assertValidPath(path);
+        if (!data.length) {
+            throw new Error(`set was called with an empty buffer for ${JSON.stringify(path)} in bucket ${account}/${bucketName}: an empty file IS a deletion in this system and would read back as missing - call del instead`);
+        }
         trackAccess({ account, operation: "set", path: `${bucketName}/${path}`, size: data.length });
         await writeBucketFile(account, bucketName, path, Buffer.from(data), { lastModified, forceSetImmutable, internal });
     }
-    async del(account: string, bucketName: string, path: string): Promise<void> {
+    async del(account: string, bucketName: string, path: string, lastModified?: number, internal?: boolean): Promise<void> {
         assertValidName(bucketName, "bucket name");
         assertValidPath(path);
         trackAccess({ account, operation: "del", path: `${bucketName}/${path}` });
-        await deleteBucketFile(account, bucketName, path);
+        await deleteBucketFile(account, bucketName, path, { lastModified, internal });
     }
     async getInfo(account: string, bucketName: string, path: string, includeTombstones?: boolean): Promise<{ writeTime: number; size: number } | undefined> {
         assertValidPath(path);

package/storage/remoteStorage/storageServer.ts

@@ -104,7 +104,6 @@ export async function hostStorageServer(config: HostStorageServerConfig): Promis
             .catch(e => console.error(`Disk space check failed for ${folder}:`, e));
     }, DISK_SPACE_CHECK_INTERVAL_MS);
     (interval as { unref?: () => void }).unref?.();
-    SocketFunction.MAX_MESSAGE_SIZE = 1024 * 1024 * 384;
 
     await hostServer({
         domain,

package/storage/remoteStorage/storageServerState.d.ts

@@ -111,5 +111,8 @@ export declare function getActiveBucket(account: string, bucketName: string): Pr
 /** Loads a bucket that exists on this server's disk into memory, which starts its synchronization and window timers, and returns its live state. Nothing is written and no other server is contacted - unlike building an ArchivesChain for it, which would probe every source and could write the routing config. Already-loaded buckets just return their state. */
 export declare function activateBucket(account: string, bucketName: string): Promise<ActiveBucketInfo | string>;
 export declare function listAccountBuckets(account: string): Promise<ServerBucketInfo[]>;
-export declare function deleteBucketFile(account: string, bucketName: string, filePath: string): Promise<void>;
+export declare function deleteBucketFile(account: string, bucketName: string, filePath: string, config?: {
+    lastModified?: number;
+    internal?: boolean;
+}): Promise<void>;
 export declare function getLocalArchives(account: string, bucketName: string): IArchives;

package/storage/remoteStorage/storageServerState.ts

@@ -10,7 +10,7 @@ import { ArchivesDisk } from "../ArchivesDisk";
 import { BlobStore, IBucketStore, DEFAULT_FAST_WRITE_DELAY, WINDOW_END_FLUSH_MARGIN } from "./blobStore";
 import {
     RemoteConfig, HostedConfig, BackblazeConfig, IArchives, ArchivesSource, ArchiveFileInfo, ArchivesConfig,
-    ArchivesSyncStatus, ChangesAfterConfig, GetConfig, GetInfoConfig, SetConfig,
+    ArchivesSyncStatus, ChangesAfterConfig, DelConfig, GetConfig, GetInfoConfig, SetConfig,
     STORAGE_WRONG_VALID_WINDOW, STORAGE_WRONG_ROUTE, FULL_ROUTE,
 } from "../IArchives";
 import { ROUTING_FILE, parseRoutingData, serializeRemoteConfig, parseHostedUrl, replaceHostedUrlPort, buildFileUrl, getConfigVersion, getRoute, routeContains, routeIntersection, normalizeSource } from "./remoteConfig";
@@ -1061,13 +1061,33 @@ export async function listAccountBuckets(account: string): Promise<ServerBucketI
     }
 }
 
-export async function deleteBucketFile(account: string, bucketName: string, filePath: string): Promise<void> {
+export async function deleteBucketFile(account: string, bucketName: string, filePath: string, config?: { lastModified?: number; internal?: boolean }): Promise<void> {
+    assertWritesAllowed();
     if (filePath === ROUTING_FILE) {
         throw new Error(`The routing config ${JSON.stringify(ROUTING_FILE)} cannot be deleted (overwrite it to change the bucket's configuration)`);
     }
     let loaded = await getLoadedBucket(account, bucketName);
     if (!loaded) return;
-    await loaded.store.del(filePath, getWriteConfig(loaded, Date.now(), getRoute(filePath)));
+    let writeTime = config?.lastModified || Date.now();
+    let route = getRoute(filePath);
+    if (config?.internal) {
+        if (!config.lastModified) {
+            throw new Error(`Internal deletions must carry lastModified (they are synchronization pushes, ordered by their write time), deleting ${JSON.stringify(filePath)} in bucket ${account}/${bucketName}`);
+        }
+        // Same acceptance rule as internal writes (see SetConfig.internal): the stamp must land inside SOME window+route this server is configured for
+        let covered = loaded.selfEntries.some(x => writeTime >= x.validWindow[0] && writeTime < x.validWindow[1] && routeContains(x.route, route));
+        if (!covered) {
+            throw new Error(`Internal deletion of ${JSON.stringify(filePath)} in bucket ${account}/${bucketName} rejected: writeTime ${writeTime} (${new Date(writeTime).toISOString()}) at route ${route} is outside every window/route this server is configured for: ${JSON.stringify(loaded.selfEntries.map(x => ({ validWindow: x.validWindow, route: x.route || FULL_ROUTE })))}`);
+        }
+        if (loaded.store.setInternal) {
+            // setInternal treats an empty buffer as exactly a deletion: disk removal plus a tombstone index entry, no fan-out
+            await loaded.store.setInternal(filePath, Buffer.alloc(0), { lastModified: writeTime });
+            return;
+        }
+        await loaded.store.del(filePath);
+        return;
+    }
+    await loaded.store.del(filePath, { ...getWriteConfig(loaded, writeTime, route), lastModified: writeTime });
 }
 
 const LARGE_FILE_PART_SIZE = 8 * 1024 * 1024;
@@ -1098,8 +1118,8 @@ class ArchivesLocalBucket implements IArchives {
         await writeBucketFile(this.account, this.bucketName, fileName, data, config);
         return fileName;
     }
-    public async del(fileName: string): Promise<void> {
-        await deleteBucketFile(this.account, this.bucketName, fileName);
+    public async del(fileName: string, config?: DelConfig): Promise<void> {
+        await deleteBucketFile(this.account, this.bucketName, fileName, config);
     }
     public async setLargeFile(config: { path: string; lastModified?: number; getNextData(): Promise<Buffer | undefined> }): Promise<void> {
         assertWritesAllowed();

package/yarn.lock

@@ -1944,10 +1944,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.27:
-  version "1.2.27"
-  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-1.2.27.tgz#7340b3a8c68fd467080e2158c94b87e6ef793c77"
-  integrity sha512-tOitwcUWz23JLzq7mBNFIRyPZtBPkA/+/a+DHoxWP30lMkZ5so5HTlF7vspOMpAPQFPpufgVJnWuOi87F/cxzg==
+socket-function@^1.2.29:
+  version "1.2.29"
+  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-1.2.29.tgz#d92d996e1a30a05360623c5d8287b592c5d8b054"
+  integrity sha512-THzX+uYytt7w5ck0lsNvVSAbb+j0CXtVaOraYbkBiQYS4F3S4o3ZNhWekewZ0Kp9tMSKgt+74fFtuwn5634m5Q==
   dependencies:
     "@types/pako" "^2.0.3"
     "@types/ws" "^8.5.3"