core-3nweb-client-lib 0.21.0 → 0.22.0

package/build/api-defs/files.d.ts

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2016 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2016 - 2018, 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
@@ -39,6 +39,7 @@ declare namespace web3n.files {
 		notImplemented?: true;
 		attrsNotEnabledInFS?: true;
 		versionMismatch?: true;
+		isEndless?: true;
 	}
 
 	interface exceptionCode {
@@ -56,6 +57,7 @@ declare namespace web3n.files {
 		concurrentUpdate: 'concurrent-update';
 		parsingError: 'parsing-error';
 		notImplemented: 'ENOSYS';
+		isEndless: 'is-endless';
 	}
 
 	/**
@@ -99,6 +101,11 @@ declare namespace web3n.files {
 		 */
 		size?: number;
 
+		/**
+		 * Flag indicating if file is an endless (unknown place of end) stream.
+		 */
+		isEndless?: boolean;
+
 		/**
 		 * Last content modification time stamp.
 		 * If such information cannot be provided, this field will be absent.
@@ -152,12 +159,6 @@ declare namespace web3n.files {
 		getPosition(): Promise<number>;
 	}
 
-	interface FileSection {
-		hasContent: boolean;
-		ofs: number;
-		len: number;
-	}
-
 	interface LayoutSection {
 		src: 'new' | 'base' | 'empty';
 		ofs: number;

package/build/core/asmail/inbox/attachments/fs.d.ts

@@ -1,6 +1,6 @@
-import { StorageGetter, FolderInfoWithAttrs } from '../../../../lib-client/3nstorage/xsp-fs/common';
+import { StorageGetter, FolderInJSON } from '../../../../lib-client/3nstorage/xsp-fs/common';
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { MsgOnDisk } from '../msg-on-disk';
 declare type ReadonlyFS = web3n.files.ReadonlyFS;
-export declare function fsForAttachments(msg: MsgOnDisk, rootJson: FolderInfoWithAttrs, storages: StorageGetter, cryptor: AsyncSBoxCryptor): ReadonlyFS;
+export declare function fsForAttachments(msg: MsgOnDisk, rootJson: FolderInJSON, storages: StorageGetter, cryptor: AsyncSBoxCryptor): ReadonlyFS;
 export {};

package/build/core/asmail/inbox/attachments/fs.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2019 3NSoft Inc.
+ Copyright (C) 2016 - 2019, 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.fsForAttachments = void 0;
 const common_1 = require("../../../../lib-client/3nstorage/xsp-fs/common");

package/build/core/asmail/msg/common.d.ts

@@ -1,5 +1,5 @@
 import { JsonKeyShort } from '../../../lib-common/jwkeys';
-import { FolderInfoWithAttrs } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { FolderInJSON } from '../../../lib-client/3nstorage/xsp-fs/common';
 import * as confApi from '../../../lib-common/service-api/asmail/config';
 /**
  * Metadata for message that uses established key pair.
@@ -24,7 +24,7 @@ export interface MsgEnvelope {
     'Msg Type': string;
     'Subject'?: string;
     'Body': MainBody;
-    'Attachments'?: FolderInfoWithAttrs;
+    'Attachments'?: FolderInJSON;
     'Flow Params': FlowParams;
     'From': string;
     'To'?: string[];

package/build/core/asmail/msg/common.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 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,6 +13,7 @@
  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 });
 Object.freeze(exports);

package/build/core/asmail/msg/opener.d.ts

@@ -1,7 +1,7 @@
 import * as confApi from '../../../lib-common/service-api/asmail/config';
 import { MsgEnvelope, MainBody, SuggestedNextKeyPair, SendingParams } from './common';
 import { AsyncSBoxCryptor, ObjSource } from 'xsp-files';
-import { FolderInfoWithAttrs } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { FolderInJSON } from '../../../lib-client/3nstorage/xsp-fs/common';
 import { MsgKeyRole } from '../keyring';
 export { SuggestedNextKeyPair } from './common';
 export declare class OpenedMsg {
@@ -18,6 +18,6 @@ export declare class OpenedMsg {
     get msgCount(): number;
     get nextSendingParams(): SendingParams | undefined;
     get introCryptoCerts(): confApi.p.initPubKey.Certs;
-    get attachmentsJSON(): FolderInfoWithAttrs | undefined;
+    get attachmentsJSON(): FolderInJSON | undefined;
 }
 export declare function openMsg(msgId: string, mainObjId: string, mainObj: ObjSource, headerOfs: number, fKey: Uint8Array, cryptor: AsyncSBoxCryptor): Promise<OpenedMsg>;

package/build/core/asmail/msg/opener.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2020 3NSoft Inc.
+ Copyright (C) 2015 - 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.openMsg = exports.OpenedMsg = void 0;
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");

package/build/core/asmail/msg/packer.d.ts

@@ -1,6 +1,6 @@
 import { AsyncSBoxCryptor, ObjSource } from 'xsp-files';
 import * as delivApi from '../../../lib-common/service-api/asmail/delivery';
-import { FolderInfoWithAttrs } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { FolderInJSON } from '../../../lib-client/3nstorage/xsp-fs/common';
 import * as confApi from '../../../lib-common/service-api/asmail/config';
 import { MsgEnvelope, SuggestedNextKeyPair, SendingParams } from './common';
 import { Encryptor } from '../../../lib-common/async-cryptor-wrap';
@@ -24,7 +24,7 @@ export interface PackJSON {
 }
 export interface MsgObj {
     json?: any;
-    folder?: FolderInfoWithAttrs;
+    folder?: FolderInJSON;
     file?: PathInMsg;
     /**
      * This is object's id in the message

package/build/core/asmail/msg/packer.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 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.MsgPacker = void 0;
 const ecma_nacl_1 = require("ecma-nacl");
@@ -139,7 +140,7 @@ class MsgPacker {
         };
     }
     async addFolderInto(outerFolder, fName, fs, fsPath) {
-        const folder = { nodes: {} };
+        const folder = { nodes: {}, ctime: outerFolder.ctime };
         const list = await fs.listFolder('.');
         for (const entry of list) {
             const fName = entry.name;
@@ -282,7 +283,7 @@ class MsgPacker {
             throw new Error(`Attachments are already set.`);
         }
         // attachments folder json to insert into main
-        const attachments = { nodes: {} };
+        const attachments = { nodes: {}, ctime: Date.now() };
         // populate attachments json
         const path = { start: 'attachments', path: [] };
         if (att.container && !attachments_container_1.isContainerEmpty(att.container)) {
@@ -346,7 +347,7 @@ class MsgPacker {
         }
         const msgKeyPack = await msgKeyEnc.pack(obj.key);
         const bytes = buffer_utils_1.utf8.pack(JSON.stringify(obj.json));
-        const segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs }, random.bytes, cryptor);
+        const segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
         // make source that inserts message key pack into header
         return makeMainObjSrc(msgKeyPack, bytes, segWriter);
     }
@@ -412,7 +413,7 @@ class MsgPacker {
             segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'restart', header }, random.bytes, cryptor);
         }
         else {
-            segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs }, random.bytes, cryptor);
+            segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
         }
         // make object source
         let src;

package/build/core/storage/index.js

@@ -36,13 +36,13 @@ function makeBadAppNameExc(appName) {
         appName
     };
 }
-function makeNotAllowedToOpenAppFSExc(appName) {
+function makeNotAllowedToOpenAppFSExc(appFolder) {
     return {
         runtimeException: true,
         type: 'storage',
         storageSegment: 'app',
         notAllowedToOpenFS: true,
-        appName
+        appName: reverseDomain(appFolder)
     };
 }
 function makeNotAllowedToOpenUserFSExc(storageType) {

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

@@ -23,8 +23,6 @@ const processes_1 = require("../../../lib-common/processes");
 const path_1 = require("path");
 const obj_files_gc_1 = require("./obj-files-gc");
 const obj_status_1 = require("./obj-status");
-const operators_1 = require("rxjs/operators");
-const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
 class ObjFiles {
     constructor(folders, logError) {
@@ -141,12 +139,17 @@ class LocalObj {
         }
         const fPath = this.path(version);
         const { obj, write$ } = await obj_on_disk_1.ObjOnDisk.createFileForWriteOfNewVersion(this.objId, version, fPath, encSub, undefined, this.objSegsGetterFromDisk);
-        // this.verObjs.set(version, obj);
-        await write$.pipe(operators_1.tap(undefined, err => {
+        try {
+            await write$.toPromise();
+        }
+        catch (err) {
             if (this.verObjs.get(version) === obj) {
                 this.verObjs.delete(version);
             }
-        }), utils_for_observables_1.flatTap(undefined, undefined, () => this.status.setNewCurrentVersion(version, obj.getBaseVersion()))).toPromise();
+            throw err;
+        }
+        this.verObjs.set(version, obj);
+        await this.status.setNewCurrentVersion(version, obj.getBaseVersion());
         this.scheduleGC(this);
     }
     isArchived() {

package/build/core/storage/local/obj-status.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.ObjStatus = void 0;
 const fs = require("../../../lib-common/async-fs-node");
@@ -63,7 +64,6 @@ class ObjStatus {
         };
     }
     async setNewCurrentVersion(newVersion, baseVer) {
-        this.status.currentVersion = newVersion;
         if (baseVer !== undefined) {
             // base->diff links should be added before removals
             addBaseToDiffLinkInStatus(this.status, newVersion, baseVer);
@@ -71,6 +71,7 @@ class ObjStatus {
         if (typeof this.status.currentVersion === 'number') {
             rmNonArchVersionsIn(this.status, this.status.currentVersion);
         }
+        this.status.currentVersion = newVersion;
         await this.saveProc.trigger();
     }
     async removeCurrentVersion(verObjs) {

package/build/core/storage/synced/obj-status.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.ObjStatus = void 0;
 const processes_1 = require("../../../lib-common/processes");
@@ -184,7 +185,6 @@ function rmNonArchVersionsIn(status, ver) {
 // 	status: ObjStatusInfo, newVersion: number, baseVer: number|undefined
 // ): void {
 // 	if (status.isArchived) { return; }
-// 	status.versions.current = newVersion;
 // 	if (status.syncState === 'synced') {
 // 		status.syncState = 'unsynced';
 // 	}
@@ -195,6 +195,7 @@ function rmNonArchVersionsIn(status, ver) {
 // 	if (status.versions.current) {
 // 		rmNonArchVersionsIn(status, status.versions.current);
 // 	}
+// 	status.versions.current = newVersion;
 // }
 // export function addConflictingRemoteVersionTo(
 // 	status: ObjStatusInfo, conflictVersion: number

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

@@ -147,7 +147,7 @@ var sinkShowLayout;
     }
     function unpackLayout(msg) {
         return {
-            base: protobuf_msg_1.valOfOpt(msg.base),
+            base: protobuf_msg_1.valOfOptInt(msg.base),
             sections: protobuf_msg_1.fixArray(msg.sections).map(({ src, ofs, len }) => ({
                 src, ofs: protobuf_msg_1.fixInt(ofs), len: protobuf_msg_1.fixInt(len)
             }))

package/build/lib-client/3nstorage/xsp-fs/attrs.d.ts

@@ -0,0 +1,28 @@
+/// <reference types="node" />
+import { Attrs } from "./node-persistence";
+export declare class CommonAttrs {
+    ctime: number;
+    mtime: number;
+    constructor(ctime: number, mtime: number);
+    static makeForTimeNow(): CommonAttrs;
+    static fromAttrs(attrs: Attrs): CommonAttrs;
+    static readonly PACK_LEN: number;
+    static parse(bytes: Uint8Array): CommonAttrs;
+    pack(): Buffer;
+    copy(): CommonAttrs;
+    updateMTime(): void;
+}
+export declare class XAttrs {
+    private readonly attrs;
+    private constructor();
+    static makeEmpty(): XAttrs;
+    static parseFrom(sections: Uint8Array[]): XAttrs;
+    copy(): XAttrs;
+    makeUpdated(changes: XAttrsChanges): XAttrs;
+    get(xaName: string): any;
+    list(): string[];
+    get isEmpty(): boolean;
+    pack(): Uint8Array[] | undefined;
+}
+declare type XAttrsChanges = web3n.files.XAttrsChanges;
+export {};