core-3nweb-client-lib 0.44.8 → 0.44.10

package/build/core/storage/common/obj-info-file.d.ts

@@ -41,7 +41,6 @@ export declare function rmNonArchVersionsIn(versions: VersionsInfo, ver: number)
 export declare function rmArchVersionFrom(versions: VersionsInfo, ver: number): boolean;
 export declare function setCurrentVersionIn(versions: VersionsInfo, version: number, baseVer: number | undefined): void;
 export declare function rmCurrentVersionIn(versions: VersionsInfo): number | undefined;
-export declare function rmVersionIn(version: number, vers: VersionsInfo): void;
 export declare function nonGarbageVersionsIn(versions: VersionsInfo): Set<number>;
 export interface NonGarbageVersions {
     gcMaxVer?: number;

package/build/core/storage/common/obj-info-file.js

@@ -23,7 +23,6 @@ exports.rmNonArchVersionsIn = rmNonArchVersionsIn;
 exports.rmArchVersionFrom = rmArchVersionFrom;
 exports.setCurrentVersionIn = setCurrentVersionIn;
 exports.rmCurrentVersionIn = rmCurrentVersionIn;
-exports.rmVersionIn = rmVersionIn;
 exports.nonGarbageVersionsIn = nonGarbageVersionsIn;
 exports.addWithBasesTo = addWithBasesTo;
 exports.addArchived = addArchived;
@@ -131,15 +130,6 @@ function rmCurrentVersionIn(versions) {
     }
     return current;
 }
-function rmVersionIn(version, vers) {
-    if (vers.current === version) {
-        vers.current = undefined;
-        rmNonArchVersionsIn(vers, version);
-    }
-    if (isVersionIn(version, vers)) {
-        rmArchVersionFrom(vers, version);
-    }
-}
 function nonGarbageVersionsIn(versions) {
     const nonGarbage = new Set();
     addWithBasesTo(nonGarbage, versions.current, versions);

package/build/core/storage/synced/obj-files.js

@@ -307,7 +307,7 @@ class SyncedObj {
             const objVer = await this.instanceOfLocalObjVer(version);
             for (const localBase of localBases) {
                 await objVer.absorbImmediateBaseVersion(localBase, this.localVerPath(localBase));
-                this.status.absorbLocalVersionBase(version, localBase);
+                await this.status.absorbLocalVersionBase(version, localBase);
             }
         }
         return syncedBase;

package/build/core/storage/synced/obj-status.js

@@ -474,15 +474,11 @@ class ObjStatus {
         const local = this.status.local;
         (0, assert_1.assert)(local.diffToBase[version] === localBase);
         const lowerBase = local.diffToBase[localBase];
-        if (localBase) {
-            local.diffToBase[version] = lowerBase;
-            local.baseToDiff[lowerBase] = version;
+        if (lowerBase) {
+            // flip version's base to be new value before removing
+            (0, obj_info_file_1.addBaseToDiffLinkInVersInfo)(local, version, lowerBase);
         }
-        else {
-            delete local.diffToBase[version];
-        }
-        delete local.diffToBase[localBase];
-        delete local.baseToDiff[localBase];
+        (0, obj_info_file_1.rmNonArchVersionsIn)(local, localBase);
         return this.triggerSaveProc();
     }
     latestSyncedVersion() {

package/build/lib-client/objs-on-disk/obj-on-disk.d.ts

@@ -35,7 +35,7 @@ export declare class ObjOnDisk {
     private readBaseBytesFromOtherFilesOnDisk;
     getSrc(): ObjSource;
     getBaseVersion(): number | undefined;
-    absorbImmediateBaseVersion(baseVer: number, path: string): Promise<void>;
+    absorbImmediateBaseVersion(baseVer: number, basePath: string): Promise<void>;
     diffFromBase(): {
         diff: DiffInfo;
         newSegsPackOrder: FiniteChunk[];

package/build/lib-client/objs-on-disk/obj-on-disk.js

@@ -195,8 +195,8 @@ class ObjOnDisk {
     getBaseVersion() {
         return this.objFile.getBaseVersion();
     }
-    absorbImmediateBaseVersion(baseVer, path) {
-        return this.objFile.absorbImmediateBaseVersion(baseVer, path);
+    absorbImmediateBaseVersion(baseVer, basePath) {
+        return this.objFile.absorbImmediateBaseVersion(baseVer, basePath);
     }
     diffFromBase() {
         return this.objFile.diffFromBase();

package/build/lib-common/objs-on-disk/obj-version-file.d.ts

@@ -34,7 +34,7 @@ export declare class ObjVersionFile {
     setSegsLayout(layout: Layout, saveLayout: boolean): Promise<void>;
     truncateEndlessLayout(): void;
     isFileComplete(): boolean;
-    absorbImmediateBaseVersion(baseVer: number, path: string): Promise<void>;
+    absorbImmediateBaseVersion(baseVer: number, basePath: string): Promise<void>;
     diffFromBase(): {
         diff: DiffInfo;
         newSegsPackOrder: FiniteChunk[];

package/build/lib-common/objs-on-disk/obj-version-file.js

@@ -251,11 +251,11 @@ class ObjVersionFile {
     isFileComplete() {
         return this.layout.isFileComplete();
     }
-    async absorbImmediateBaseVersion(baseVer, path) {
+    async absorbImmediateBaseVersion(baseVer, basePath) {
         (0, assert_1.assert)(Number.isInteger(baseVer) && (baseVer === this.layout.getBaseVersion()));
-        const baseLayout = await readLayoutFrom(path);
+        const baseLayout = await readLayoutFrom(basePath);
         const absorptionParams = this.layout.calcBaseAbsorptionParams(baseLayout);
-        const src = await fs.open(path, 'r');
+        const src = await fs.open(basePath, 'r');
         await this.withRWFile(async (fh) => {
             if (absorptionParams.copyOps.length > 0) {
                 await this.recordLayout(fh, absorptionParams.newBytesEnd);
@@ -264,8 +264,7 @@ class ObjVersionFile {
                     if (buf.length < op.len) {
                         buf = Buffer.allocUnsafe(op.len);
                     }
-                    const chunk = ((op.len < buf.length) ?
-                        buf.slice(0, op.len) : buf);
+                    const chunk = ((op.len < buf.length) ? buf.subarray(0, op.len) : buf);
                     await fs.readToBuf(src, op.ofsInSrcFile, chunk);
                     await fs.writeFromBuf(fh, op.ofsInDstFile, chunk);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.44.8",
+  "version": "0.44.10",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -41,7 +41,7 @@
     "@types/ws": "^8.18.1",
     "jasmine": "^5.13.0",
     "protobufjs-cli": "^1.0.2",
-    "spec-3nweb-server": "^1.8.0",
+    "spec-3nweb-server": "^1.8.5",
     "tsuml2": "^0.17.1",
     "typescript": "^5.5.3"
   }