core-3nweb-client-lib 0.27.0 → 0.27.4

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2019, 2021 3NSoft Inc.
+ Copyright (C) 2015 - 2019, 2021 - 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
@@ -28,7 +28,7 @@ const path_1 = require("path");
 var fs_2 = require("fs");
 Object.defineProperty(exports, "Stats", { enumerable: true, get: function () { return fs_2.Stats; } });
 function makeFileExceptionFromNodes(nodeExc) {
-    return (0, file_1.makeFileException)(nodeExc.code, nodeExc.path);
+    return (0, file_1.makeFileExceptionFromCode)(nodeExc.code, nodeExc.path);
 }
 function readFile(path, options) {
     return new Promise((resolve, reject) => {
@@ -307,7 +307,7 @@ async function readToBuf(fd, pos, buf) {
     while (bytesRead < buf.length) {
         const bNum = await readOrig(fd, buf, bytesRead, buf.length - bytesRead, pos);
         if (bNum === 0) {
-            throw (0, file_1.makeFileException)(file_1.Code.endOfFile, '<file descriptor>');
+            throw (0, file_1.makeFileException)('endOfFile', '<file descriptor>');
         }
         bytesRead += bNum;
         pos += bNum;
@@ -379,7 +379,7 @@ async function existsFolder(path) {
             return true;
         }
         else {
-            throw (0, file_1.makeFileException)(file_1.Code.notDirectory, path);
+            throw (0, file_1.makeFileException)('notDirectory', path);
         }
     }
     catch (e) {
@@ -400,7 +400,7 @@ function existsFolderSync(path) {
             return true;
         }
         else {
-            throw (0, file_1.makeFileException)(file_1.Code.notDirectory, path);
+            throw (0, file_1.makeFileException)('notDirectory', path);
         }
     }
     catch (e) {
@@ -421,7 +421,7 @@ function existsFileSync(path) {
             return true;
         }
         else {
-            throw (0, file_1.makeFileException)(file_1.Code.notFile, path);
+            throw (0, file_1.makeFileException)('notFile', path);
         }
     }
     catch (e) {
@@ -586,7 +586,7 @@ async function streamToExistingFile(filePath, pos, len, src, bufSize) {
         if (doneReading) {
             return;
         }
-        complete((0, file_1.makeFileException)(file_1.Code.endOfFile, '<input stream>'));
+        complete((0, file_1.makeFileException)('endOfFile', '<input stream>'));
     });
     src.on('error', (err) => {
         complete(err);
@@ -614,7 +614,7 @@ async function read(fd, pos, buf) {
     while (bytesRead < buf.length) {
         const bNum = await readOrig(fd, buf, bytesRead, buf.length - bytesRead, pos);
         if (bNum === 0) {
-            throw (0, file_1.makeFileException)(file_1.Code.endOfFile, '<file descriptor>');
+            throw (0, file_1.makeFileException)('endOfFile', '<file descriptor>');
         }
         bytesRead += bNum;
         pos += bNum;

package/build/lib-common/exceptions/file.d.ts

@@ -1,6 +1,8 @@
-export declare const Code: web3n.files.exceptionCode;
 export declare type FileException = web3n.files.FileException;
-export declare function makeFileException(code: string | undefined, path: string, cause?: any): FileException;
+export declare type FileExceptionFlag = web3n.files.FileExceptionFlag;
+export declare const Code: web3n.files.exceptionCode;
+export declare function makeFileExceptionFromCode(code: string | undefined, path: string, cause?: any): FileException;
+export declare function makeFileException(flag: keyof FileExceptionFlag, path: string, cause?: any): FileException;
 export declare function maskPathInExc(pathPrefixMaskLen: number, exc: any): FileException;
 export declare function ensureCorrectFS(fs: web3n.files.FS, type: web3n.files.FSType, writable: boolean): void;
 export declare function makeNoAttrsExc(path: string): FileException;

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

@@ -16,28 +16,26 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeVersionMismatchExc = exports.makeNoAttrsExc = exports.ensureCorrectFS = exports.maskPathInExc = exports.makeFileException = exports.Code = void 0;
+exports.makeVersionMismatchExc = exports.makeNoAttrsExc = exports.ensureCorrectFS = exports.maskPathInExc = exports.makeFileException = exports.makeFileExceptionFromCode = exports.Code = void 0;
 exports.Code = {
     notFound: 'ENOENT',
     alreadyExists: 'EEXIST',
     notDirectory: 'ENOTDIR',
     notFile: 'ENOTFILE',
-    notLink: 'not-link',
     isDirectory: 'EISDIR',
     notEmpty: 'ENOTEMPTY',
     endOfFile: 'EEOF',
     opNotPermitted: 'EPERM',
     busy: 'EBUSY',
     ioError: 'EIO',
-    concurrentUpdate: 'concurrent-update',
-    parsingError: 'parsing-error',
     notImplemented: 'ENOSYS',
-    isEndless: 'is-endless',
-    storageClosed: 'storage-closed',
-    versionMismatch: 'version-mismatch',
 };
 Object.freeze(exports.Code);
-function makeFileException(code, path, cause) {
+const codeToFlag = {};
+for (const [flag, code] of Object.entries(exports.Code)) {
+    codeToFlag[code] = flag;
+}
+function makeFileExceptionFromCode(code, path, cause) {
     const err = {
         runtimeException: true,
         type: 'file',
@@ -45,59 +43,27 @@ function makeFileException(code, path, cause) {
         path,
         cause
     };
-    if (code === exports.Code.alreadyExists) {
-        err.alreadyExists = true;
-    }
-    else if (code === exports.Code.notFound) {
-        err.notFound = true;
-    }
-    else if (code === exports.Code.isDirectory) {
-        err.isDirectory = true;
-    }
-    else if (code === exports.Code.notDirectory) {
-        err.notDirectory = true;
-    }
-    else if (code === exports.Code.notFile) {
-        err.notFile = true;
-    }
-    else if (code === exports.Code.notLink) {
-        err.notLink = true;
-    }
-    else if (code === exports.Code.endOfFile) {
-        err.endOfFile = true;
-    }
-    else if (code === exports.Code.busy) {
-        err.busy = true;
-    }
-    else if (code === exports.Code.ioError) {
-        err.ioError = true;
-    }
-    else if (code === exports.Code.notEmpty) {
-        err.notEmpty = true;
-    }
-    else if (code === exports.Code.opNotPermitted) {
-        err.opNotPermitted = true;
-    }
-    else if (code === exports.Code.concurrentUpdate) {
-        err.concurrentUpdate = true;
-    }
-    else if (code === exports.Code.parsingError) {
-        err.parsingError = true;
-    }
-    else if (code === exports.Code.notImplemented) {
-        err.notImplemented = true;
-    }
-    else if (code === exports.Code.isEndless) {
-        err.isEndless = true;
-    }
-    else if (code === exports.Code.storageClosed) {
-        err.storageClosed = true;
-    }
-    else if (code === exports.Code.versionMismatch) {
-        err.versionMismatch = true;
+    if (code) {
+        const flag = codeToFlag[code];
+        if (flag) {
+            err[flag] = true;
+        }
     }
     return err;
 }
+exports.makeFileExceptionFromCode = makeFileExceptionFromCode;
+function makeFileException(flag, path, cause) {
+    const code = exports.Code[flag];
+    const err = {
+        runtimeException: true,
+        type: 'file',
+        code,
+        path,
+        cause
+    };
+    err[flag] = true;
+    return err;
+}
 exports.makeFileException = makeFileException;
 function maskPathInExc(pathPrefixMaskLen, exc) {
     if (!exc.runtimeException || !exc.code) {

package/build/lib-common/ipc/generic-ipc.js

@@ -278,11 +278,12 @@ function makeRequestServer(channel, comm) {
     return (new ReplyingSide(channel, comm)).wrap();
 }
 exports.makeRequestServer = makeRequestServer;
-function makeUnknownEventException() {
+function makeUnknownEventException(message) {
     return {
         runtimeException: true,
         type: 'events',
-        unknownEvent: true
+        unknownEvent: true,
+        message
     };
 }
 const SUBSCRIBE_REQ_NAME = 'subscribe';
@@ -307,7 +308,7 @@ class EventsSendingSide extends ReplyingSide {
         const event = env.req;
         const gr = this.findGroup(event);
         if (!gr) {
-            throw makeUnknownEventException();
+            throw makeUnknownEventException(`Events' channel ${event} is not found in handling subscribe`);
         }
         this.subscribedEvents.add(event);
         await gr.subscribe(event);
@@ -316,7 +317,7 @@ class EventsSendingSide extends ReplyingSide {
         const event = env.req;
         const gr = this.findGroup(event);
         if (!gr) {
-            throw makeUnknownEventException();
+            throw makeUnknownEventException(`Events' channel ${event} is not found in handling unsubscribe`);
         }
         this.subscribedEvents.delete(event);
         if (gr.unsubscribe) {

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

@@ -83,7 +83,7 @@ class ObjVersionBytesLayout {
     isFileComplete() {
         for (const chunk of this.segsChunks) {
             if ((chunk.type === 'new') || (chunk.type === 'new-endless')) {
-                return true;
+                return false;
             }
         }
         return true;

package/build/lib-common/objs-on-disk/utils.js

@@ -111,7 +111,7 @@ async function streamToObjFile(file, content, src, maxBufferLen) {
     });
     src.on('end', () => {
         if (chunk) {
-            complete((0, file_1.makeFileException)(file_1.Code.endOfFile, '<input stream>'));
+            complete((0, file_1.makeFileException)('endOfFile', '<input stream>'));
         }
         else {
             complete();

package/build/lib-common/service-api/3nstorage/owner.d.ts

@@ -66,10 +66,6 @@ export interface GetObjQueryOpts {
     ver?: number;
 }
 export interface PutObjFirstQueryOpts {
-    /**
-     * This is a flag to indicate that new object should be created.
-     */
-    create?: boolean;
     /**
      * This parameter is object's new version.
      */
@@ -132,9 +128,10 @@ export declare namespace currentObj {
         mismatchedObjVer: number;
         objIncomplete: number;
     };
-    interface MismatchedObjVerReply extends ErrorReply {
-        current_version: number;
-    }
+    type MismatchedObjVerReply = MismatchedObjVerErrReply;
+}
+export interface MismatchedObjVerErrReply extends ErrorReply {
+    current_version: number;
 }
 export declare namespace currentRootObj {
     const EXPRESS_URL_END = "root/current";
@@ -240,23 +237,25 @@ export declare namespace rootStatus {
 export declare namespace archiveObj {
     const EXPRESS_URL_END = "obj/:objId/archive";
     function postAndDelReqUrlEnd(objId: string, version: number): string;
-    type VersionsList = number[];
+    type MismatchedObjVerReply = MismatchedObjVerErrReply;
     const SC: {
         okPost: number;
         okDelete: number;
         unknownObj: number;
         unknownObjVer: number;
+        mismatchedObjVer: number;
     };
 }
 export declare namespace archiveRoot {
     const EXPRESS_URL_END = "root/archive";
     function postAndDelReqUrlEnd(version: number): string;
-    type VersionsList = archiveObj.VersionsList;
+    type MismatchedObjVerReply = archiveObj.MismatchedObjVerReply;
     const SC: {
         okPost: number;
         okDelete: number;
         unknownObj: number;
         unknownObjVer: number;
+        mismatchedObjVer: number;
     };
 }
 export interface ErrorReply {

package/build/lib-common/service-api/3nstorage/owner.js

@@ -258,7 +258,8 @@ var archiveObj;
         okPost: 200,
         okDelete: 200,
         unknownObj: 474,
-        unknownObjVer: 494
+        unknownObjVer: 494,
+        mismatchedObjVer: 495
     };
 })(archiveObj = exports.archiveObj || (exports.archiveObj = {}));
 Object.freeze(archiveObj);