sliftutils 0.33.0 → 0.35.0

package/index.d.ts

@@ -803,13 +803,13 @@ declare module "sliftutils/storage/TransactionStorage" {
         private writeDelay;
         cache: Map<string, TransactionEntry>;
         private currentChunk;
-        private currentChunkSize;
         private entryCount;
         private static allStorage;
         constructor(rawStorage: IStorageRaw, debugName: string, writeDelay?: number);
         static compressAll(): Promise<void>;
         private init;
-        private getChunk;
+        private getCurrentChunk;
+        private onAddToChunk;
         get(key: string): Promise<Buffer | undefined>;
         set(key: string, value: Buffer): Promise<void>;
         remove(key: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sliftutils",
-    "version": "0.33.0",
+    "version": "0.35.0",
     "main": "index.js",
     "license": "MIT",
     "files": [
@@ -48,7 +48,7 @@
         "mobx": "^6.13.3",
         "preact": "10.24.3",
         "shell-quote": "^1.8.3",
-        "socket-function": "^0.160.0",
+        "socket-function": "^0.161.0",
         "typenode": "^6.0.0",
         "typesafecss": "*",
         "ws": "^8.18.3",

package/storage/TransactionStorage.d.ts

@@ -13,13 +13,13 @@ export declare class TransactionStorage implements IStorage<Buffer> {
     private writeDelay;
     cache: Map<string, TransactionEntry>;
     private currentChunk;
-    private currentChunkSize;
     private entryCount;
     private static allStorage;
     constructor(rawStorage: IStorageRaw, debugName: string, writeDelay?: number);
     static compressAll(): Promise<void>;
     private init;
-    private getChunk;
+    private getCurrentChunk;
+    private onAddToChunk;
     get(key: string): Promise<Buffer | undefined>;
     set(key: string, value: Buffer): Promise<void>;
     remove(key: string): Promise<void>;

package/storage/TransactionStorage.ts

@@ -1,4 +1,4 @@
-import { PromiseObj, sort, throttleFunction } from "socket-function/src/misc";
+import { PromiseObj, compareArray, sort, throttleFunction, timeInMinute } from "socket-function/src/misc";
 import { IStorage, IStorageRaw } from "./IStorage";
 import { Zip } from "../misc/zip";
 import { runInSerial } from "socket-function/src/batching";
@@ -40,6 +40,7 @@ IMPORTANT! If there are multiple writers, we clobber writes from other writers w
 
 
 const FILE_CHUNK_SIZE = 1024 * 1024;
+const FILE_MAX_LIFETIME = timeInMinute * 30;
 
 const FILE_ZIP_THRESHOLD = 16 * 1024 * 1024;
 
@@ -66,11 +67,26 @@ const fileLockSection = runInSerial(async (fnc: () => Promise<void>) => {
 
 const CHUNK_EXT = ".chunk";
 const ourId = Date.now() + Math.random();
+let seqNum = 0;
+
+function getNextChunkPath(): string {
+    return `${Date.now()}_${seqNum++}_${ourId}.chunk`;
+}
+function sortChunks(chunks: string[]): string[] {
+    function getChunkParts(chunk: string): unknown[] {
+        const parts = chunk.split("_");
+        return parts.map(part => +part);
+    }
+    return chunks.sort((a, b) => compareArray(getChunkParts(a), getChunkParts(b)));
+}
 
 export class TransactionStorage implements IStorage<Buffer> {
     public cache: Map<string, TransactionEntry> = new Map();
-    private currentChunk = 0;
-    private currentChunkSize = 0;
+    private currentChunk: {
+        path: string;
+        size: number;
+        timeCreated: number;
+    } | undefined = undefined;
     private entryCount = 0;
 
     private static allStorage: TransactionStorage[] = [];
@@ -91,7 +107,26 @@ export class TransactionStorage implements IStorage<Buffer> {
 
     private init: Promise<void> | undefined = this.loadAllTransactions();
 
-    private getChunk(chunk: number) { return `${chunk}_${ourId}${CHUNK_EXT}`; }
+    private getCurrentChunk(): string {
+        if (this.currentChunk && this.currentChunk.timeCreated < Date.now() - FILE_MAX_LIFETIME) {
+            this.currentChunk = undefined;
+        }
+        if (!this.currentChunk) {
+            this.currentChunk = {
+                path: getNextChunkPath(),
+                size: 0,
+                timeCreated: Date.now()
+            };
+        }
+        return this.currentChunk.path;
+    }
+    private onAddToChunk(size: number): void {
+        if (!this.currentChunk) return;
+        this.currentChunk.size += size;
+        if (this.currentChunk.size >= FILE_CHUNK_SIZE) {
+            this.currentChunk = undefined;
+        }
+    }
 
     public async get(key: string): Promise<Buffer | undefined> {
         await this.init;
@@ -173,18 +208,14 @@ export class TransactionStorage implements IStorage<Buffer> {
 
                 let newChunks = this.chunkBuffers(buffers);
                 for (let chunk of newChunks) {
-                    let file = this.getChunk(this.currentChunk);
+                    let file = this.getCurrentChunk();
                     if (!await this.rawStorage.get(file)) {
                         let { header, headerBuffer } = this.getHeader(false);
                         await this.rawStorage.set(file, headerBuffer);
                     }
                     let content = chunk.buffer;
                     await this.rawStorage.append(file, content);
-                    this.currentChunkSize += content.length;
-                    if (this.currentChunkSize >= FILE_CHUNK_SIZE) {
-                        this.currentChunk++;
-                        this.currentChunkSize = 0;
-                    }
+                    this.onAddToChunk(content.length);
                 }
 
                 await this.compressTransactionLog();
@@ -219,21 +250,16 @@ export class TransactionStorage implements IStorage<Buffer> {
         const keys = await this.rawStorage.getKeys();
         const transactionFiles = keys.filter(key => key.endsWith(CHUNK_EXT));
 
-        sort(transactionFiles, x => parseInt(x));
+        sortChunks(transactionFiles);
 
         let size = 0;
         for (const file of transactionFiles) {
-            let chunk = parseInt(file);
             let curSize = await this.loadTransactionFile(file);
-            if (chunk >= this.currentChunk) {
-                this.currentChunk = chunk;
-                this.currentChunkSize = curSize;
-            }
             size += curSize;
         }
         time = Date.now() - time;
         if (time > 50) {
-            console.log(`Loaded ${this.debugName} in ${formatTime(time)}, ${formatNumber(this.cache.size)} keys, ${formatNumber(size)}B`);
+            console.log(`Loaded ${this.debugName} in ${formatTime(time)}, ${formatNumber(this.cache.size)} keys, from ${formatNumber(transactionFiles.length)} files, ${formatNumber(size)}B`, transactionFiles);
         }
 
         this.init = undefined;
@@ -424,14 +450,13 @@ export class TransactionStorage implements IStorage<Buffer> {
         // Load off disk, in case there are other writes. We still race with them, but at least
         //  this reduces the race condition considerably
 
-        sort(existingDiskEntries, x => parseInt(x));
+        sortChunks(existingDiskEntries);
         for (let entry of existingDiskEntries) {
             await this.loadTransactionFile(entry);
         }
 
         this.entryCount = this.cache.size;
 
-        let nextStart = Math.max(...existingDiskEntries.map(x => parseInt(x))) + 1;
 
         let buffers: Buffer[] = [];
         for (const entry of this.cache.values()) {
@@ -441,9 +466,9 @@ export class TransactionStorage implements IStorage<Buffer> {
 
         let newChunks = this.chunkBuffers(buffers);
 
-        let curChunk = nextStart;
         for (let chunk of newChunks) {
-            let file = this.getChunk(curChunk++);
+            let file = this.getCurrentChunk();
+            this.currentChunk = undefined;
             let content = chunk.buffer;
             let { header, headerBuffer } = this.getHeader(
                 // AND, never compress the last one, otherwise we can't append to it!
@@ -462,8 +487,6 @@ export class TransactionStorage implements IStorage<Buffer> {
         for (const file of existingDiskEntries) {
             await this.rawStorage.remove(file);
         }
-
-        this.currentChunk = curChunk;
     }
 
     public async reset() {
@@ -477,8 +500,7 @@ export class TransactionStorage implements IStorage<Buffer> {
 
             this.pendingAppends = [];
             this.cache.clear();
-            this.currentChunk = 0;
-            this.currentChunkSize = 0;
+            this.currentChunk = undefined;
             this.entryCount = 0;
         });
     }

package/yarn.lock

@@ -1494,10 +1494,10 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-socket-function@^0.160.0:
-  version "0.160.0"
-  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-0.160.0.tgz#63faff26a65242723df5ac15a35455991ca04e0b"
-  integrity sha512-l7UHdN+k3y4p+dSg6AE2gjUEHvyx8n+TaKe/GNNjfGKsIGSrNQ/2e3v3AYkkh/zdLjZDqy9c+410kMuTIBJIbA==
+socket-function@^0.161.0:
+  version "0.161.0"
+  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-0.161.0.tgz#93c49123dad9677e87ddd5c954d43f23302110dc"
+  integrity sha512-Znik/F2EZzzLotAXuz37cmLC15sSxju2w6waLLf9yAQHiyWsqimfGa247EWUvl99XXBY2k/8WkkghEM1pVvyVQ==
   dependencies:
     "@types/pako" "^2.0.3"
     "@types/ws" "^8.5.3"