core-3nweb-client-lib 0.25.2 → 0.25.6

package/build/ipc-via-protobuf/asmail-cap.js

@@ -75,7 +75,7 @@ var getUserId;
     function wrapService(fn) {
         return () => {
             const promise = fn()
-                .then(userId => Buffer.from(userId, 'utf8'));
+                .then(userId => protobuf_msg_1.encodeToUtf8(userId));
             return { promise };
         };
     }
@@ -87,7 +87,7 @@ var getUserId;
             if (!buf) {
                 throw connector_1.makeIPCException({ missingBodyBytes: true });
             }
-            return buf.toString('utf8');
+            return protobuf_msg_1.decodeFromUtf8(buf);
         });
     }
     getUserId.makeCaller = makeCaller;

package/build/ipc-via-protobuf/connector.js

@@ -92,13 +92,13 @@ class ObjectsConnector {
         if (!this.messagingProc) {
             return;
         }
+        this.messagingProc.unsubscribe();
         if (err) {
             this.msgSink.error(err);
         }
         else {
             this.msgSink.complete();
         }
-        this.messagingProc.unsubscribe();
         this.stop(false, err);
     }
     processIncomingMsg(msg) {

package/build/ipc-via-protobuf/file.js

@@ -276,7 +276,7 @@ var readTxt;
     function wrapService(fn) {
         return () => {
             const promise = fn()
-                .then(txt => Buffer.from(txt, 'utf8'));
+                .then(txt => protobuf_msg_1.encodeToUtf8(txt));
             return { promise };
         };
     }
@@ -285,13 +285,13 @@ var readTxt;
         const path = objPath.concat('readTxt');
         return () => caller
             .startPromiseCall(path, undefined)
-            .then(buf => (buf ? buf.toString('utf8') : ''));
+            .then(buf => (buf ? protobuf_msg_1.decodeFromUtf8(buf) : ''));
     }
     readTxt.makeCaller = makeCaller;
 })(readTxt || (readTxt = {}));
 Object.freeze(readTxt);
 function packJSON(json) {
-    return Buffer.from(JSON.stringify(json), 'utf8');
+    return protobuf_msg_1.encodeToUtf8(JSON.stringify(json));
 }
 exports.packJSON = packJSON;
 function unpackJSON(buf) {
@@ -299,7 +299,7 @@ function unpackJSON(buf) {
         throw connector_1.makeIPCException({ missingBodyBytes: true });
     }
     try {
-        return JSON.parse(buf.toString('utf8'));
+        return JSON.parse(protobuf_msg_1.decodeFromUtf8(buf));
     }
     catch (err) {
         throw error_1.errWithCause(err, `Can't parse ipc reply as json`);

package/build/ipc-via-protobuf/fs.js

@@ -531,7 +531,7 @@ var readTxtFile;
         return buf => {
             const { path } = reqWithPathType.unpack(buf);
             const promise = fn(path)
-                .then(txt => Buffer.from(txt, 'utf8'));
+                .then(txt => protobuf_msg_1.encodeToUtf8(txt));
             return { promise };
         };
     }
@@ -540,7 +540,7 @@ var readTxtFile;
         const ipcPath = objPath.concat('readTxtFile');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
-            .then(buf => (buf ? buf.toString('utf8') : ''));
+            .then(buf => (buf ? protobuf_msg_1.decodeFromUtf8(buf) : ''));
     }
     readTxtFile.makeCaller = makeCaller;
 })(readTxtFile || (readTxtFile = {}));

package/build/ipc-via-protobuf/mailerid.js

@@ -20,6 +20,7 @@ exports.makeMailerIdCaller = exports.exposeMailerIdCAP = void 0;
 const connector_1 = require("./connector");
 const protobuf_type_1 = require("../lib-client/protobuf-type");
 const mailerid_proto_1 = require("../protos/mailerid.proto");
+const protobuf_msg_1 = require("./protobuf-msg");
 function exposeMailerIdCAP(cap) {
     return {
         getUserId: getUserId.wrapService(cap.getUserId),
@@ -39,7 +40,7 @@ var getUserId;
     function wrapService(fn) {
         return () => {
             const promise = fn()
-                .then(userId => Buffer.from(userId, 'utf8'));
+                .then(userId => protobuf_msg_1.encodeToUtf8(userId));
             return { promise };
         };
     }
@@ -51,7 +52,7 @@ var getUserId;
             if (!buf) {
                 throw connector_1.makeIPCException({ missingBodyBytes: true });
             }
-            return buf.toString('utf8');
+            return protobuf_msg_1.decodeFromUtf8(buf);
         });
     }
     getUserId.makeCaller = makeCaller;

package/build/ipc-via-protobuf/protobuf-msg.d.ts

@@ -42,4 +42,6 @@ export interface AnyValue {
 }
 export declare function toOptAny(value: any | undefined): AnyValue | undefined;
 export declare function valOfOptAny(valObj: AnyValue | undefined): any | undefined;
+export declare function encodeToUtf8(str: string): Uint8Array;
+export declare function decodeFromUtf8(bytes: Uint8Array): string;
 export {};

package/build/ipc-via-protobuf/protobuf-msg.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.valOfOptAny = exports.toOptAny = exports.toOptJson = exports.valOfOptJson = exports.valOfOpt = exports.valOf = exports.toOptVal = exports.toVal = exports.errFromMsg = exports.errToMsg = exports.errBodyType = exports.unpackInt = exports.packInt = exports.valOfOptInt = exports.fixInt = exports.fixArray = exports.strArrValType = exports.boolValType = exports.objRefType = void 0;
+exports.decodeFromUtf8 = exports.encodeToUtf8 = exports.valOfOptAny = exports.toOptAny = exports.toOptJson = exports.valOfOptJson = exports.valOfOpt = exports.valOf = exports.toOptVal = exports.toVal = exports.errFromMsg = exports.errToMsg = exports.errBodyType = exports.unpackInt = exports.packInt = exports.valOfOptInt = exports.fixInt = exports.fixArray = exports.strArrValType = exports.boolValType = exports.objRefType = void 0;
 const connector_1 = require("./connector");
 const error_1 = require("../lib-common/exceptions/error");
 const buffer_utils_1 = require("../lib-common/buffer-utils");
@@ -152,4 +152,14 @@ function valOfOptAny(valObj) {
     }
 }
 exports.valOfOptAny = valOfOptAny;
+function encodeToUtf8(str) {
+    const enc = new TextEncoder();
+    return enc.encode(str);
+}
+exports.encodeToUtf8 = encodeToUtf8;
+function decodeFromUtf8(bytes) {
+    const dec = new TextDecoder();
+    return dec.decode(bytes);
+}
+exports.decodeFromUtf8 = decodeFromUtf8;
 Object.freeze(exports);

package/build/lib-client/logging/log-to-file.js

@@ -114,20 +114,12 @@ ${error_1.stringifyErr(err)}`;
         }
     }
     function recordUnhandledRejectionsInProcess() {
-        const unhandlePromiseRejectionLogWait = 200;
-        const unhandledRejections = new Map();
-        process.on('unhandledRejection', (reason, p) => {
-            unhandledRejections.set(p, reason);
-            setTimeout(() => {
-                if (!unhandledRejections.has(p)) {
-                    return;
-                }
-                unhandledRejections.delete(p);
-                logError(reason, `Unhandled exception in promise (logged after ${unhandlePromiseRejectionLogWait} milliseconds wait)`).catch(noop);
-            }, unhandlePromiseRejectionLogWait).unref();
+        process.on('unhandledRejection', (err, p) => {
+            console.log(' -- Unhandled rejection of promise:', err);
+            logError(err, 'Unhandled rejection of promise');
         });
-        process.on('rejectionHandled', p => unhandledRejections.delete(p));
         process.on('uncaughtException', err => {
+            console.log(' -- Unhandled exception:', err);
             logError(err, 'Unhandled exception');
         });
     }

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

@@ -8,6 +8,17 @@ export interface Exception extends web3n.RuntimeException {
 }
 export declare function makeNotFoundExc(msg: string): Exception;
 export declare function makeAlreadyExistExc(msg: string): Exception;
+export interface GenerationCfg {
+    period: number;
+    lastDone: number;
+}
+export interface Cfg {
+    numOfSplits: number;
+    charsInSplit: number;
+}
+export interface CfgWithGens extends Cfg {
+    generations: GenerationCfg[];
+}
 export declare type CanMoveObjToDeeperCache = (objId: string, folderPath: string) => Promise<boolean>;
 export declare class ObjFolders {
     private readonly path;
@@ -27,7 +38,7 @@ export declare class ObjFolders {
     static makeSimple(path: string, logError: LogError): Promise<ObjFolders>;
     private readonly saveCfg;
     private idToPathSections;
-    private genBacketPath;
+    private genBucketPath;
     private findObjFolder;
     getFolderAccessFor(objId: ObjId, createIfMissing?: boolean): Promise<string | undefined>;
     removeFolderOf(objId: string): Promise<void>;

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2020 3NSoft Inc.
+ Copyright (C) 2016 - 2020, 2022 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
@@ -13,7 +13,8 @@
  See the GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjFolders = exports.makeAlreadyExistExc = exports.makeNotFoundExc = void 0;
 const fs = require("../../lib-common/async-fs-node");
@@ -79,6 +80,8 @@ class ObjFolders {
             numOfSplits: this.numOfSplits,
             generations: this.generations
         });
+        assert_1.assert(Number.isInteger(this.numOfSplits) && (this.numOfSplits > 0) &&
+            Number.isInteger(this.charsInSplit) && (this.charsInSplit > 0));
         this.accessFolder = path_1.join(this.path, ACCESS_DIR);
         if (this.generations) {
             if (!canMove) {
@@ -123,8 +126,8 @@ class ObjFolders {
         path.push(objId.substring(this.numOfSplits * this.charsInSplit));
         return path;
     }
-    genBacketPath(backetIndex) {
-        return path_1.join(this.generationsFolder, `${backetIndex}`);
+    genBucketPath(bucketIndex) {
+        return path_1.join(this.generationsFolder, `${bucketIndex}`);
     }
     async findObjFolder(pathSections) {
         const folder = path_1.join(this.accessFolder, ...pathSections);
@@ -135,7 +138,7 @@ class ObjFolders {
             return;
         }
         for (let i = 0; i < this.generations.length; i += 1) {
-            const folder = path_1.join(this.genBacketPath(i), ...pathSections);
+            const folder = path_1.join(this.genBucketPath(i), ...pathSections);
             if (await folderExists(folder)) {
                 return { folder, genBacket: i };
             }
@@ -162,7 +165,7 @@ class ObjFolders {
                 if (found.genBacket === undefined) {
                     return found.folder;
                 }
-                const folder = await move(this.genBacketPath(found.genBacket), pathSections, this.accessFolder);
+                const folder = await move(this.genBucketPath(found.genBacket), pathSections, this.accessFolder);
                 return folder;
             }
             if (!createIfMissing) {
@@ -181,20 +184,20 @@ class ObjFolders {
                 return;
             }
             const backetPath = ((found.genBacket === undefined) ?
-                this.accessFolder : this.genBacketPath(found.genBacket));
+                this.accessFolder : this.genBucketPath(found.genBacket));
             await deleteTree(backetPath, pathSections);
         });
     }
     async listRecent() {
-        const lst = (await allTreePaths(this.genBacketPath(0), this.numOfSplits, this.logError))
+        const lst = (await allTreePaths(this.accessFolder, this.numOfSplits, this.logError))
             .map(pathSections => ({
-            path: path_1.join(this.genBacketPath(0), ...pathSections),
-            objId: pathSections.join()
+            path: path_1.join(this.accessFolder, ...pathSections),
+            objId: pathSections.join('')
         }));
-        lst.unshift({
-            objId: null,
-            path: path_1.join(this.accessFolder, ROOT_OBJ_DIR)
-        });
+        const rootObjPath = path_1.join(this.accessFolder, ROOT_OBJ_DIR);
+        if (await fs.existsFolder(rootObjPath)) {
+            lst.unshift({ objId: null, path: rootObjPath });
+        }
         return lst;
     }
 }
@@ -475,19 +478,23 @@ function checkCfg(cfg, needGens = false) {
 async function allTreePaths(path, numOfSplits, logError) {
     const lst = await fs.readdir(path)
         .catch(async (exc) => {
-        if (!exc.notFound) {
-            await logError(exc, `Enumerating a split tree of objects, got an error while trying to directory list ${path}`);
+        if (exc.notFound) {
+            return;
         }
+        await logError(exc, `Enumerating a split tree of objects, got an error while trying to list directory ${path}`);
     });
     if (!lst) {
         return [];
     }
-    if (numOfSplits <= 1) {
+    if (numOfSplits <= 0) {
         return lst.map(f => [f]);
     }
     const sections = [];
     for (let i = 0; i < lst.length; i += 1) {
         const f = lst[i];
+        if (f === ROOT_OBJ_DIR) {
+            continue;
+        }
         const treePaths = await allTreePaths(path_1.join(path, f), numOfSplits - 1, logError);
         for (let j = 0; j < treePaths.length; j += 1) {
             const branch = treePaths[j];

package/build/lib-common/async-fs-node.d.ts

@@ -64,6 +64,12 @@ export declare function writeFromBuf(fd: number, pos: number, buf: Buffer): Prom
  * else return value is undefined and should be ignored.
  */
 export declare function createEmptyFile(filePath: string, fileSize: number, keepFileOpen?: boolean): Promise<number | undefined>;
+/**
+ * @param path
+ * @return a promise, resolvable to true, if given path represents directory,
+ * or false, if it does not.
+ */
+export declare function existsFolder(path: string): Promise<boolean>;
 /**
  * @param path
  * @return true, if given path represents directory, or false, if it does not.

package/build/lib-common/async-fs-node.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureFolderExists = exports.copyTree = exports.copyFile = exports.streamFromFile = exports.rmDirWithContent = exports.read = exports.streamToExistingFile = exports.append = exports.write = exports.getFolderContentSize = exports.getFileSize = exports.existsFileSync = exports.existsFolderSync = exports.createEmptyFile = exports.writeFromBuf = exports.readToBuf = exports.ftruncate = exports.truncate = exports.rename = exports.unlink = exports.rmdir = exports.readdir = exports.fstat = exports.stat = exports.lstat = exports.readlink = exports.symlink = exports.close = exports.open = exports.mkdir = exports.appendFile = exports.writeFile = exports.readFile = void 0;
+exports.ensureFolderExists = exports.copyTree = exports.copyFile = exports.streamFromFile = exports.rmDirWithContent = exports.read = exports.streamToExistingFile = exports.append = exports.write = exports.getFolderContentSize = exports.getFileSize = exports.existsFileSync = exports.existsFolderSync = exports.existsFolder = exports.createEmptyFile = exports.writeFromBuf = exports.readToBuf = exports.ftruncate = exports.truncate = exports.rename = exports.unlink = exports.rmdir = exports.readdir = exports.fstat = exports.stat = exports.lstat = exports.readlink = exports.symlink = exports.close = exports.open = exports.mkdir = exports.appendFile = exports.writeFile = exports.readFile = void 0;
 const fs = require("fs");
 const fs_1 = require("fs");
 const file_1 = require("./exceptions/file");
@@ -366,6 +366,29 @@ async function createEmptyFile(filePath, fileSize, keepFileOpen) {
     }
 }
 exports.createEmptyFile = createEmptyFile;
+/**
+ * @param path
+ * @return a promise, resolvable to true, if given path represents directory,
+ * or false, if it does not.
+ */
+async function existsFolder(path) {
+    try {
+        const stats = await stat(path);
+        if (stats.isDirectory()) {
+            return true;
+        }
+        else {
+            throw file_1.makeFileException(file_1.Code.notDirectory, path);
+        }
+    }
+    catch (e) {
+        if (e.code === file_1.Code.notFound) {
+            return false;
+        }
+        throw e;
+    }
+}
+exports.existsFolder = existsFolder;
 /**
  * @param path
  * @return true, if given path represents directory, or false, if it does not.

package/package.json

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