core-3nweb-client-lib 0.44.6 → 0.44.8

package/build/lib-common/exceptions/runtime.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2021 3NSoft Inc.
+ Copyright (C) 2021, 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -17,7 +17,8 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeRuntimeException = makeRuntimeException;
-function makeRuntimeException(type, params, flags) {
+exports.getStackHere = getStackHere;
+function makeRuntimeException(type, params, flags, addStack = false) {
     const exc = {
         runtimeException: true,
         type,
@@ -32,6 +33,19 @@ function makeRuntimeException(type, params, flags) {
             exc[field] = val;
         }
     }
+    if (addStack) {
+        exc.stack = getStackHere(1);
+    }
     return exc;
 }
+/**
+ *
+ * @param numOfTopLayersToRemove
+ * @returns
+ */
+function getStackHere(numOfTopLayersToRemove = 0) {
+    var _a;
+    const err = new Error('stack');
+    return (_a = err.stack) === null || _a === void 0 ? void 0 : _a.split('\n').slice(2 + numOfTopLayersToRemove).join('\n');
+}
 Object.freeze(exports);

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

@@ -13,7 +13,7 @@ export declare class ObjVersionFile {
     removeFile(): Promise<void>;
     saveLayout(): Promise<void>;
     /**
-     * @param fd already openned file descriptor
+     * @param fh already opened file handle
      * @param ofs is an optional offset at which layout is written, when we need
      * value different from current one in layout.
      */

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2019 - 2020, 2022 3NSoft Inc.
+ Copyright (C) 2019 - 2020, 2022, 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -28,6 +28,7 @@ const fs_1 = require("fs");
 const file_layout_1 = require("./file-layout");
 const big_endian_1 = require("../big-endian");
 const assert_1 = require("../assert");
+const runtime_1 = require("../exceptions/runtime");
 class ObjVersionFile {
     constructor(path, layout) {
         this.path = path;
@@ -56,12 +57,12 @@ class ObjVersionFile {
             if (newHeader) {
                 (0, assert_1.assert)(newHeader.length === ((_a = this.layout.headerLocation()) === null || _a === void 0 ? void 0 : _a.len));
                 const headerOfs = this.layout.headerLocation().fileOfs;
-                const fd = await fs.open(this.path, 'r+');
+                const fh = await fs.open(this.path, 'r+');
                 try {
-                    await fs.write(fd, headerOfs, (0, buffer_utils_1.toBuffer)(newHeader));
+                    await fs.write(fh, headerOfs, (0, buffer_utils_1.toBuffer)(newHeader));
                 }
                 finally {
-                    await fs.close(fd).catch(noop);
+                    await fh.close().catch(noop);
                 }
             }
         });
@@ -73,30 +74,30 @@ class ObjVersionFile {
         return this.withRWFile(fd => this.recordLayout(fd));
     }
     /**
-     * @param fd already openned file descriptor
+     * @param fh already opened file handle
      * @param ofs is an optional offset at which layout is written, when we need
      * value different from current one in layout.
      */
-    async recordLayout(fd, ofs) {
+    async recordLayout(fh, ofs) {
         const layoutBytes = this.layout.toBytes();
         if (!ofs) {
             ofs = this.layout.getLayoutOfs();
         }
-        await fs.writeFromBuf(fd, ofs, layoutBytes);
-        await recordLayoutOffsetInV1(fd, ofs);
-        await fs.ftruncate(fd, ofs + layoutBytes.length);
+        await fs.writeFromBuf(fh, ofs, layoutBytes);
+        await recordLayoutOffsetInV1(fh, ofs);
+        await fh.truncate(ofs + layoutBytes.length);
     }
     withRWFile(action) {
         return this.writeProc.startOrChain(async () => {
-            const fd = await fs.open(this.path, 'r+')
+            const fh = await fs.open(this.path, 'r+')
                 .catch(exc => {
                 throw (0, error_1.errWithCause)(exc, `Can't open for writing obj-version file ${this.path}`);
             });
             try {
-                return await action(fd);
+                return await action(fh);
             }
             finally {
-                await fs.close(fd).catch(noop);
+                await fh.close().catch(noop);
             }
         });
     }
@@ -136,16 +137,16 @@ class ObjVersionFile {
     }
     async withROFile(action) {
         const path = this.path;
-        let fd;
+        let fh;
         try {
-            fd = await fs.open(path, 'r');
+            fh = await fs.open(path, 'r');
         }
         catch (exc) {
             // in some use cases version file can be moved, and for this reason
             // we make second attempt if path is newer
             if (exc.notFound && (path !== this.path)) {
                 try {
-                    fd = await fs.open(this.path, 'r');
+                    fh = await fs.open(this.path, 'r');
                 }
                 catch (exc) {
                     throw (0, error_1.errWithCause)(exc, `Can't open for reading obj version file ${this.path}`);
@@ -156,10 +157,10 @@ class ObjVersionFile {
             }
         }
         try {
-            return await action(fd);
+            return await action(fh);
         }
         finally {
-            await fs.close(fd).catch(err => { });
+            await fh.close().catch(noop);
         }
     }
     getHeaderLen() {
@@ -251,13 +252,13 @@ class ObjVersionFile {
         return this.layout.isFileComplete();
     }
     async absorbImmediateBaseVersion(baseVer, path) {
-        (0, assert_1.assert)(baseVer === this.layout.getBaseVersion());
+        (0, assert_1.assert)(Number.isInteger(baseVer) && (baseVer === this.layout.getBaseVersion()));
         const baseLayout = await readLayoutFrom(path);
         const absorptionParams = this.layout.calcBaseAbsorptionParams(baseLayout);
         const src = await fs.open(path, 'r');
-        await this.withRWFile(async (fd) => {
+        await this.withRWFile(async (fh) => {
             if (absorptionParams.copyOps.length > 0) {
-                await this.recordLayout(fd, absorptionParams.newBytesEnd);
+                await this.recordLayout(fh, absorptionParams.newBytesEnd);
                 let buf = Buffer.allocUnsafe(absorptionParams.copyOps[0].len);
                 for (const op of absorptionParams.copyOps) {
                     if (buf.length < op.len) {
@@ -266,14 +267,14 @@ class ObjVersionFile {
                     const chunk = ((op.len < buf.length) ?
                         buf.slice(0, op.len) : buf);
                     await fs.readToBuf(src, op.ofsInSrcFile, chunk);
-                    await fs.writeFromBuf(fd, op.ofsInDstFile, chunk);
+                    await fs.writeFromBuf(fh, op.ofsInDstFile, chunk);
                 }
             }
             this.layout.applyAbsorptionParams(absorptionParams);
-            await this.recordLayout(fd);
+            await this.recordLayout(fh);
         })
-            .then(() => fs.close(src).catch(noop), async (exc) => {
-            await fs.close(src).catch(noop);
+            .then(() => src.close().catch(noop), async (exc) => {
+            await src.close().catch(noop);
             throw exc;
         });
     }
@@ -303,16 +304,17 @@ function parsingException(msg, cause) {
         runtimeException: true,
         type: 'obj-file-parsing',
         cause, msg,
-        path: ''
+        path: '',
+        stack: (0, runtime_1.getStackHere)(1)
     };
 }
 /**
  * This parses obj version file's informational parts.
- * @param fd is an open file descriptor, of a file to parse
+ * @param fh is an open file handle, of a file to parse
  */
-async function parseObjVersionBytesLayout(fd) {
+async function parseObjVersionBytesLayout(fh) {
     const fstBytes = Buffer.allocUnsafe(12);
-    await fs.readToBuf(fd, 0, fstBytes).catch((exc) => {
+    await fs.readToBuf(fh, 0, fstBytes).catch((exc) => {
         if (exc.endOfFile) {
             throw parsingException('File is too short to contain object');
         }
@@ -327,12 +329,12 @@ async function parseObjVersionBytesLayout(fd) {
         if (layoutOfs > Number.MAX_SAFE_INTEGER) {
             throw parsingException(`This implementation can't handle files with length over 2^53`);
         }
-        const fileSize = (await fs.fstat(fd)).size;
+        const fileSize = (await fh.stat()).size;
         if (layoutOfs >= fileSize) {
             throw parsingException(`Layout offset is greater than file size`);
         }
         const layoutBytes = Buffer.allocUnsafe(fileSize - layoutOfs);
-        await fs.readToBuf(fd, layoutOfs, layoutBytes);
+        await fs.readToBuf(fh, layoutOfs, layoutBytes);
         return file_layout_1.ObjVersionBytesLayout.fromV1Bytes(layoutOfs, layoutBytes);
     }
     else {
@@ -354,9 +356,9 @@ async function recordLayoutOffsetInV1(fd, ofs) {
     });
 }
 async function readLayoutFrom(path) {
-    const fd = await fs.open(path, 'r');
+    const fh = await fs.open(path, 'r');
     try {
-        const layout = await parseObjVersionBytesLayout(fd)
+        const layout = await parseObjVersionBytesLayout(fh)
             .catch((err) => {
             if (err.type === 'obj-file-parsing') {
                 err.path = path;
@@ -366,7 +368,7 @@ async function readLayoutFrom(path) {
         return layout;
     }
     finally {
-        await fs.close(fd).catch(noop);
+        await fh.close().catch(noop);
     }
 }
 Object.freeze(exports);

package/build/lib-index.d.ts

@@ -6,7 +6,7 @@ export { Storages, FactoryOfFSs, reverseDomain } from './core/storage';
 export { SignIn, GenerateKey, CompleteInitWithoutCache } from './core/startup/sign-in';
 export { ASMail } from './core/asmail';
 export { makeServiceLocator, ServiceLocatorMaker } from "./lib-client/service-locator";
-export { makeNetClient } from "./lib-client/request-utils";
+export { makeNetClient, NetClient } from "./lib-client/request-utils";
 export { appDirs } from './core/app-files';
 export { sysFolders } from "./core/storage/system-folders";
 export { DeviceFS } from './lib-client/local-files/device-fs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.44.6",
+  "version": "0.44.8",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",