core-3nweb-client-lib 0.27.1 → 0.27.3

package/build/lib-client/3nstorage/service.js

@@ -28,23 +28,39 @@ const keyGen = require("../key-derivation");
 const exceptions_1 = require("./exceptions");
 const ws_ipc_1 = require("../../lib-common/ipc/ws-ipc");
 const assert_1 = require("../../lib-common/assert");
+function toInitServiceUriGetter(net, mainUrlGetter) {
+    return async () => {
+        const serviceUrl = await mainUrlGetter();
+        const info = await (0, service_locator_1.storageInfoAt)(net, serviceUrl);
+        if (!info.owner) {
+            throw new Error(`Missing owner service url in 3NStorage information at ${serviceUrl}`);
+        }
+        return info.owner;
+    };
+}
 class StorageOwner extends user_with_mid_session_1.ServiceUser {
-    constructor(user, getSigner, mainUrlGetter, net) {
+    constructor(user, getSigner, getInitServiceURI, net) {
         super(user, {
             login: api.midLogin.MID_URL_PART,
             logout: api.closeSession.URL_END,
             canBeRedirected: true
-        }, getSigner, async () => {
-            const serviceUrl = await mainUrlGetter();
-            const info = await (0, service_locator_1.storageInfoAt)(this.net, serviceUrl);
-            if (!info.owner) {
-                throw new Error(`Missing owner service url in 3NStorage information at ${serviceUrl}`);
-            }
-            return info.owner;
-        }, net);
+        }, getSigner, getInitServiceURI, net);
         this.maxChunkSize = undefined;
         Object.seal(this);
     }
+    static make(user, getSigner, mainUrlGetter, net) {
+        const srvUriGetter = toInitServiceUriGetter(net, mainUrlGetter);
+        const remote = new StorageOwner(user, getSigner, srvUriGetter, net);
+        return remote;
+    }
+    static makeBeforeMidSetup(user, mainUrlGetter, net) {
+        const srvUriGetter = toInitServiceUriGetter(net, mainUrlGetter);
+        const remote = new StorageOwner(user, undefined, srvUriGetter, net);
+        return {
+            remote,
+            setMid: getSigner => remote.setGetterOfSigner(getSigner)
+        };
+    }
     async getKeyDerivParams() {
         const rep = await this.doBodylessSessionRequest({
             appPath: api.keyDerivParams.URL_END,
@@ -144,7 +160,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             };
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
@@ -179,7 +195,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             return rep.data;
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
@@ -246,7 +262,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw (0, exceptions_1.makeObjExistsExc)(objId, undefined, true);
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else if (rep.status === api.currentObj.SC.concurrentTransaction) {
             throw (0, exceptions_1.makeConcurrentTransExc)(objId);
@@ -276,10 +292,10 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             return;
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else if (rep.status === api.currentObj.SC.unknownObjVer) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, currentVer, true);
+            throw (0, exceptions_1.makeObjVersionNotFoundExc)(objId, currentVer, true);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
@@ -298,7 +314,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             return rep.data;
         }
         else if (rep.status === api.objStatus.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');

package/build/lib-client/3nstorage/util/file-based-json.js

@@ -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.JsonFileProc = void 0;
 const rxjs_1 = require("rxjs");

package/build/lib-client/3nstorage/util/for-arrays.d.ts

@@ -0,0 +1 @@
+export declare function appendArray<T>(arr: T[], elems: T[] | T | undefined): T[];

package/build/lib-client/3nstorage/util/for-arrays.js

@@ -0,0 +1,32 @@
+"use strict";
+/*
+ Copyright (C) 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
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ 
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 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/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.appendArray = void 0;
+function appendArray(arr, elems) {
+    if (elems !== undefined) {
+        if (Array.isArray(elems)) {
+            arr.push(...elems);
+        }
+        else {
+            arr.push(elems);
+        }
+    }
+    return arr;
+}
+exports.appendArray = appendArray;
+Object.freeze(exports);

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

@@ -1,6 +1,7 @@
 import { ScryptGenParams } from '../../key-derivation';
 import { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
 import { Observable } from 'rxjs';
+import { LogError } from '../../logging/log-to-file';
 export { AsyncSBoxCryptor } from 'xsp-files';
 export { FolderInJSON } from './folder-node';
 declare type StorageType = web3n.files.FSType;
@@ -16,7 +17,6 @@ export interface Node {
     objId: string;
     name: string;
     type: NodeType;
-    removeObj(src?: FSChangeSrc): Promise<void>;
 }
 export declare type NodeType = 'file' | 'link' | 'folder';
 export declare type ObjId = string | null;
@@ -58,6 +58,7 @@ export interface Storage {
     readonly versioned: boolean;
     readonly cryptor: AsyncSBoxCryptor;
     readonly nodes: NodesContainer;
+    readonly logError: LogError;
     getNodeEvents(): Observable<NodeEvent>;
     broadcastNodeEvent(objId: ObjId, parentObjId: ObjId | undefined, childObjId: ObjId | undefined, ev: NodeEvent['event']): void;
     /**
@@ -73,10 +74,8 @@ export interface Storage {
     generateNewObjId(): Promise<string>;
     /**
      * This returns a promise, resolvable to source for a requested object.
-     * @param objId
-     * @param version
      */
-    getObjSrc(objId: ObjId, version?: number): Promise<ObjSource>;
+    getObjSrc(objId: ObjId, version?: number, allowArchived?: boolean): Promise<ObjSource>;
     /**
      * This saves given object, asynchronously.
      * @param objId
@@ -114,6 +113,7 @@ export interface SyncedStorage extends Storage {
     getRootKeyDerivParamsFromServer(): Promise<ScryptGenParams>;
     adoptRemote(objId: ObjId, opts: OptionsToAdopteRemote | undefined): Promise<number | undefined>;
     updateStatusInfo(objId: ObjId): Promise<SyncStatus>;
+    isObjOnDisk(objId: ObjId): Promise<boolean>;
     isRemoteVersionOnDisk(objId: ObjId, version: number): Promise<'partial' | 'complete' | 'none'>;
     download(objId: ObjId, version: number): Promise<void>;
     upload(objId: ObjId, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean): Promise<void>;
@@ -124,6 +124,7 @@ export interface SyncedStorage extends Storage {
 export interface SyncedObjStatus extends LocalObjStatus {
     syncStatus(): SyncStatus;
     neverUploaded(): boolean;
+    versionBeforeUnsyncedRemoval(): number | undefined;
 }
 export interface UploadHeaderChange {
     localVersion: number;

package/build/lib-client/3nstorage/xsp-fs/common.js

@@ -98,6 +98,7 @@ function wrapStorageImplementation(impl) {
         type: impl.type,
         versioned: impl.versioned,
         nodes: impl.nodes,
+        logError: impl.logError,
         getNodeEvents: impl.getNodeEvents.bind(impl),
         broadcastNodeEvent: impl.broadcastNodeEvent.bind(impl),
         storageForLinking: impl.storageForLinking.bind(impl),

package/build/lib-client/3nstorage/xsp-fs/file.js

@@ -178,7 +178,7 @@ class V {
     }
     async getByteSource() {
         if (!this.node) {
-            throw (0, file_1.makeFileException)(file_1.Code.notFound, this.name);
+            throw (0, file_1.makeFileException)('notFound', this.name);
         }
         return this.node.readSrc();
     }
@@ -196,7 +196,7 @@ class V {
     }
     async readBytes(start, end) {
         if (!this.node) {
-            throw (0, file_1.makeFileException)(file_1.Code.notFound, this.name);
+            throw (0, file_1.makeFileException)('notFound', this.name);
         }
         return await this.node.readBytes(start, end);
     }

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

@@ -1,4 +1,4 @@
-import { Storage, Node, NodeType, FSChangeSrc } from './common';
+import { Storage, NodeType } from './common';
 import { NodeInFS } from './node-in-fs';
 import { FileNode } from './file-node';
 import { LinkNode } from './link-node';
@@ -58,6 +58,7 @@ declare class FolderPersistance extends NodePersistance {
         attrs: CommonAttrs;
         xattrs?: XAttrs;
     }>;
+    static readFolderContent(objId: string | null, key: Uint8Array, src: ObjSource, cryptor: AsyncSBoxCryptor): Promise<FolderInfo>;
 }
 export interface FolderLinkParams {
     folderName: string;
@@ -74,15 +75,15 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     static rootFromJSON(storage: Storage, name: string | undefined, folderJson: FolderInJSON): FolderNode;
     protected setCurrentStateFrom(src: ObjSource): Promise<void>;
     adoptRemote(opts: OptionsToAdopteRemote | undefined): Promise<void>;
+    private callRemoveObjOn;
     list(): {
         lst: ListingEntry[];
         version: number;
     };
     childExistsInSyncedVersion(childObjId: string): Promise<boolean>;
-    listFolders(): string[];
     getNodeInfo(name: string, undefOnMissing?: boolean): NodeInfo | undefined;
     hasChild(childName: string, throwIfMissing?: boolean): boolean;
-    getNode<T extends Node>(type: NodeType | undefined, name: string, undefOnMissing?: boolean): Promise<T | undefined>;
+    getNode<T extends NodeInFS<any>>(type: NodeType | undefined, name: string, undefOnMissing?: boolean): Promise<T | undefined>;
     private getOrMakeChildNodeForInfo;
     getFolder(name: string, undefOnMissing?: boolean): Promise<FolderNode | undefined>;
     getFile(name: string, undefOnMissing?: boolean): Promise<FileNode | undefined>;
@@ -131,17 +132,22 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
      */
     isEmpty(): boolean;
     private getAllNodes;
-    protected delete(src: FSChangeSrc): Promise<void>;
+    private removeFolderObj;
+    private callRemoveObjOnAll;
+    private removeChildrenObjsInSyncedStorage;
+    private uploadRemovalOfObjs;
     getParamsForLink(): LinkParameters<FolderLinkParams>;
     upload(opts: OptionsToUploadLocal | undefined): Promise<void>;
+    private uploadRemovalOf;
+    private listRemovedInTreeToUploadRm;
     protected needUpload(localVersion: number | undefined): Promise<{
         localVersion: number;
         uploadVersion: number;
         createOnRemote: boolean;
     } | undefined>;
+    private getNodesRemovedBetweenVersions;
     adoptRemoteFolderItem(itemName: string, opts: OptionsToAdoptRemoteItem | undefined): Promise<number>;
     private addRemoteChild;
-    private setRemoteNodeInfo;
     private replaceLocalChildWithRemote;
     diffCurrentAndRemote(remoteVersion: number | undefined): Promise<FolderDiff | undefined>;
     private diffWithArchivedRemote;