core-3nweb-client-lib 0.26.1 → 0.27.3

package/build/lib-client/cryptor/cryptor.js

@@ -17,16 +17,18 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeInProcessWasmCryptor = exports.makeInProcessCryptor = exports.makeInWorkerWasmCryptor = exports.makeInWorkerCryptor = void 0;
-exports.makeInWorkerCryptor = (logErr, logWarning, maxThreads) => {
+const makeInWorkerCryptor = (logErr, logWarning, maxThreads) => {
     const mod = require('./cryptor-in-worker');
     const makeInWorkerCryptor = mod.makeInWorkerCryptor;
     return makeInWorkerCryptor(logErr, logWarning, maxThreads);
 };
-exports.makeInWorkerWasmCryptor = (logErr, logWarning, maxThreads) => {
+exports.makeInWorkerCryptor = makeInWorkerCryptor;
+const makeInWorkerWasmCryptor = (logErr, logWarning, maxThreads) => {
     const mod = require('./cryptor-in-worker');
     const makeInWorkerWasmCryptor = mod.makeInWorkerWasmCryptor;
     return makeInWorkerWasmCryptor(logErr, logWarning, maxThreads);
 };
+exports.makeInWorkerWasmCryptor = makeInWorkerWasmCryptor;
 function makeInProcessCryptor() {
     const mod = require('./in-proc-js');
     const makeInProcessCryptor = mod.makeInProcessCryptor;

package/build/lib-client/cryptor/in-proc-js.js

@@ -31,7 +31,7 @@ function inNextTick(f) {
 function makeInProcessCryptor() {
     const arrFactory = ecma_nacl_1.arrays.makeFactory();
     return {
-        scrypt: (passwd, salt, logN, r, p, dkLen, progressCB) => inNextTick(() => ecma_nacl_1.scrypt(passwd, salt, logN, r, p, dkLen, progressCB, arrFactory)),
+        scrypt: (passwd, salt, logN, r, p, dkLen, progressCB) => inNextTick(() => (0, ecma_nacl_1.scrypt)(passwd, salt, logN, r, p, dkLen, progressCB, arrFactory)),
         box: {
             calc_dhshared_key: (pk, sk) => inNextTick(() => ecma_nacl_1.box.calc_dhshared_key(pk, sk, arrFactory)),
             generate_pubkey: sk => inNextTick(() => ecma_nacl_1.box.generate_pubkey(sk, arrFactory))

package/build/lib-client/cryptor/in-proc-wasm.js

@@ -35,9 +35,9 @@ function wasmBytes() {
     const asarInd = __dirname.indexOf('app.asar');
     const dirWithThis = ((asarInd < 0) ?
         __dirname : `${__dirname.substring(0, asarInd + 8)}.unpacked${__dirname.substring(asarInd + 8)}`);
-    const wasmPath = path_1.join(dirWithThis, 'cryptor.wasm');
+    const wasmPath = (0, path_1.join)(dirWithThis, 'cryptor.wasm');
     try {
-        return fs_1.readFileSync(wasmPath);
+        return (0, fs_1.readFileSync)(wasmPath);
     }
     catch (err) {
         // chances are that error is due to wasm file not being packaged, so, we
@@ -65,7 +65,7 @@ const replyType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.Reply);
 const boolValType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.BoolVal);
 const kpairType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.Keypair);
 function makeInProcessWasmCryptor() {
-    const wasmInstance = wasm_mp1_modules_1.startWasmFrom(wasmBytes());
+    const wasmInstance = (0, wasm_mp1_modules_1.startWasmFrom)(wasmBytes());
     let deferred = undefined;
     let interimSink = undefined;
     async function call(req, interim) {
@@ -77,7 +77,7 @@ function makeInProcessWasmCryptor() {
             }
             catch (err) { }
         }
-        deferred = deferred_1.defer();
+        deferred = (0, deferred_1.defer)();
         if (interim) {
             interimSink = interim;
         }
@@ -92,7 +92,7 @@ function makeInProcessWasmCryptor() {
         return deferred.promise;
     }
     wasmInstance.setMsgListener(msg => {
-        assert_1.assert(!!deferred, `Deferred is expected to be available for this output from wasm`);
+        (0, assert_1.assert)(!!deferred, `Deferred is expected to be available for this output from wasm`);
         try {
             const reply = replyType.unpack(msg);
             if (reply.res) {
@@ -101,7 +101,7 @@ function makeInProcessWasmCryptor() {
                 interimSink = undefined;
             }
             else if (reply.err) {
-                deferred.reject(error_1.errWithCause(toLocalErr(reply.err), `Error in cryptor`));
+                deferred.reject((0, error_1.errWithCause)(toLocalErr(reply.err), `Error in cryptor`));
                 deferred = undefined;
                 interimSink = undefined;
             }

package/build/lib-client/cryptor/worker-js.js

@@ -40,7 +40,7 @@ const funcs = {
             const reply = { interim: n };
             worker_threads_1.parentPort.postMessage(reply);
         };
-        const res = ecma_nacl_1.scrypt(args[0], args[1], args[2], args[3], args[4], args[5], progressCB, arrFactory);
+        const res = (0, ecma_nacl_1.scrypt)(args[0], args[1], args[2], args[3], args[4], args[5], progressCB, arrFactory);
         wipe(args[0]);
         return { res };
         // electron v.11.0.3 worker thread fails on memory move
@@ -117,7 +117,7 @@ function wrapError(err) {
     }
     else {
         exc.message = `Error occured in cryptor worker thread`;
-        exc.cause = error_1.stringifyErr(err);
+        exc.cause = (0, error_1.stringifyErr)(err);
     }
     return exc;
 }

package/build/lib-client/cryptor/worker-wasm.js

@@ -24,8 +24,8 @@ if (!worker_threads_1.parentPort) {
     throw new Error(`Missing expected parentPort. Is this called within WebWorker process?`);
 }
 const wasmFName = 'cryptor.wasm';
-const wasmModPath = path_1.join(worker_threads_1.workerData.loadDir, wasmFName);
-const wasmInstance = wasm_mp1_modules_1.startWasmFrom(fs_1.readFileSync(wasmModPath));
+const wasmModPath = (0, path_1.join)(worker_threads_1.workerData.loadDir, wasmFName);
+const wasmInstance = (0, wasm_mp1_modules_1.startWasmFrom)((0, fs_1.readFileSync)(wasmModPath));
 wasmInstance.setMsgListener(msg => worker_threads_1.parentPort.postMessage(msg));
 worker_threads_1.parentPort.on('message', (msg) => {
     try {

package/build/lib-client/files-select.js

@@ -22,7 +22,7 @@ async function selectInFS(fs, path, criteria) {
     // besides limiting fs to path, turning fs into readonly subroot ensures
     // that fs object is a wrapped view and doesn't leak internals, 
     fs = await fs.readonlySubRoot(path);
-    const items = fs_collection_1.makeFSCollection();
+    const items = (0, fs_collection_1.makeFSCollection)();
     const iterCB = (parentPath, entry) => {
         if (match(entry, criteria)) {
             if (criteria.action === 'include') {

package/build/lib-client/files.d.ts

@@ -1,10 +1,10 @@
 declare type FS = web3n.files.FS;
+declare type FSType = web3n.files.FSType;
 declare type ReadonlyFS = web3n.files.ReadonlyFS;
 declare type WritableFS = web3n.files.WritableFS;
 declare type File = web3n.files.File;
 declare type ReadonlyFile = web3n.files.ReadonlyFile;
 declare type WritableFile = web3n.files.WritableFile;
-declare type FSType = web3n.files.FSType;
 export interface LinkParameters<T> {
     storageType: FSType;
     readonly?: boolean;

package/build/lib-client/files.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2018 3NSoft Inc.
+ Copyright (C) 2016 - 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
@@ -69,7 +69,24 @@ function wrapWritableFileVersionedAPI(vImpl) {
         readTxt: vImpl.readTxt.bind(vImpl),
         writeBytes: vImpl.writeBytes.bind(vImpl),
         writeJSON: vImpl.writeJSON.bind(vImpl),
-        writeTxt: vImpl.writeTxt.bind(vImpl)
+        writeTxt: vImpl.writeTxt.bind(vImpl),
+        archiveCurrent: vImpl.archiveCurrent.bind(vImpl),
+        listVersions: vImpl.listVersions.bind(vImpl),
+        sync: wrapWritableFileSyncAPI(vImpl.sync)
+    };
+    return Object.freeze(w);
+}
+function wrapWritableFileSyncAPI(sImpl) {
+    if (!sImpl) {
+        return;
+    }
+    const w = {
+        status: sImpl.status.bind(sImpl),
+        updateStatusInfo: sImpl.updateStatusInfo.bind(sImpl),
+        download: sImpl.download.bind(sImpl),
+        isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
+        upload: sImpl.upload.bind(sImpl),
+        adoptRemote: sImpl.adoptRemote.bind(sImpl),
     };
     return Object.freeze(w);
 }
@@ -106,7 +123,22 @@ function wrapReadonlyFileVersionedAPI(vImpl) {
         getByteSource: vImpl.getByteSource.bind(vImpl),
         readBytes: vImpl.readBytes.bind(vImpl),
         readJSON: vImpl.readJSON.bind(vImpl),
-        readTxt: vImpl.readTxt.bind(vImpl)
+        readTxt: vImpl.readTxt.bind(vImpl),
+        listVersions: vImpl.listVersions.bind(vImpl),
+        sync: wrapReadonlyFileSyncAPI(vImpl.sync)
+    };
+    return Object.freeze(w);
+}
+function wrapReadonlyFileSyncAPI(sImpl) {
+    if (!sImpl) {
+        return;
+    }
+    const w = {
+        status: sImpl.status.bind(sImpl),
+        updateStatusInfo: sImpl.updateStatusInfo.bind(sImpl),
+        download: sImpl.download.bind(sImpl),
+        isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
+        adoptRemote: sImpl.adoptRemote.bind(sImpl),
     };
     return Object.freeze(w);
 }
@@ -187,6 +219,25 @@ function wrapWritableFSVersionedAPI(vImpl) {
         readTxtFile: vImpl.readTxtFile.bind(vImpl),
         writeJSONFile: vImpl.writeJSONFile.bind(vImpl),
         writeTxtFile: vImpl.writeTxtFile.bind(vImpl),
+        archiveCurrent: vImpl.archiveCurrent.bind(vImpl),
+        listVersions: vImpl.listVersions.bind(vImpl),
+        sync: wrapWritableFSSyncAPI(vImpl.sync)
+    };
+    return Object.freeze(w);
+}
+function wrapWritableFSSyncAPI(sImpl) {
+    if (!sImpl) {
+        return;
+    }
+    const w = {
+        status: sImpl.status.bind(sImpl),
+        updateStatusInfo: sImpl.updateStatusInfo.bind(sImpl),
+        download: sImpl.download.bind(sImpl),
+        isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
+        adoptRemote: sImpl.adoptRemote.bind(sImpl),
+        diffCurrentAndRemoteFolderVersions: sImpl.diffCurrentAndRemoteFolderVersions.bind(sImpl),
+        upload: sImpl.upload.bind(sImpl),
+        adoptRemoteFolderItem: sImpl.adoptRemoteFolderItem.bind(sImpl),
     };
     return Object.freeze(w);
 }
@@ -230,7 +281,23 @@ function wrapReadonlyFSVersionedAPI(vImpl) {
         readBytes: vImpl.readBytes.bind(vImpl),
         listFolder: vImpl.listFolder.bind(vImpl),
         readJSONFile: vImpl.readJSONFile.bind(vImpl),
-        readTxtFile: vImpl.readTxtFile.bind(vImpl)
+        readTxtFile: vImpl.readTxtFile.bind(vImpl),
+        listVersions: vImpl.listVersions.bind(vImpl),
+        sync: wrapReadonlyFSSyncAPI(vImpl.sync)
+    };
+    return Object.freeze(w);
+}
+function wrapReadonlyFSSyncAPI(sImpl) {
+    if (!sImpl) {
+        return;
+    }
+    const w = {
+        status: sImpl.status.bind(sImpl),
+        updateStatusInfo: sImpl.updateStatusInfo.bind(sImpl),
+        download: sImpl.download.bind(sImpl),
+        isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
+        adoptRemote: sImpl.adoptRemote.bind(sImpl),
+        diffCurrentAndRemoteFolderVersions: sImpl.diffCurrentAndRemoteFolderVersions.bind(sImpl),
     };
     return Object.freeze(w);
 }
@@ -255,7 +322,6 @@ function wrapIntoVersionlessReadonlyFS(fs, type) {
         stat: async (path) => {
             const stats = await fs.stat(path);
             delete stats.version;
-            delete stats.sync;
             return stats;
         },
         readonlyFile: async (path) => toVersionlessReadonlyFile(await fs.readonlyFile(path)),
@@ -292,7 +358,6 @@ function toVersionlessReadonlyFile(f) {
         stat: async () => {
             const stats = await f.stat();
             delete stats.version;
-            delete stats.sync;
             return stats;
         },
         watch: f.watch.bind(f),

package/build/lib-client/fs-collection.js

@@ -70,7 +70,7 @@ class FSItemsCollection {
         return allItems;
     }
     watch(observer) {
-        const sub = this.change$.subscribe(utils_for_observables_1.toRxObserver(observer));
+        const sub = this.change$.subscribe((0, utils_for_observables_1.toRxObserver)(observer));
         return () => sub.unsubscribe();
     }
     wrap() {

package/build/lib-client/fs-sync-utils.d.ts

@@ -0,0 +1,5 @@
+declare type WritableFS = web3n.files.WritableFS;
+export declare function getRemoteFolderChanges(fs: WritableFS): Promise<void>;
+export declare function getOrMakeAndUploadFolderIn(fs: WritableFS, folder: string): Promise<WritableFS>;
+export declare function uploadFolderChangesIfAny(fs: WritableFS): Promise<void>;
+export {};

package/build/lib-client/fs-sync-utils.js

@@ -0,0 +1,61 @@
+"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.uploadFolderChangesIfAny = exports.getOrMakeAndUploadFolderIn = exports.getRemoteFolderChanges = void 0;
+const exceptions_1 = require("./3nstorage/exceptions");
+async function getRemoteFolderChanges(fs) {
+    const { state } = await fs.v.sync.updateStatusInfo('');
+    if (state === 'behind') {
+        await fs.v.sync.adoptRemote('');
+    }
+    else if (state === 'conflicting') {
+        const path = ((typeof fs.name === 'string') ? fs.name : '');
+        throw (0, exceptions_1.makeFSSyncException)(path, {
+            conflict: true,
+            message: `Getting remote changes can't settle conflict in this function`
+        });
+    }
+}
+exports.getRemoteFolderChanges = getRemoteFolderChanges;
+async function getOrMakeAndUploadFolderIn(fs, folder) {
+    try {
+        const childFolder = await fs.writableSubRoot(folder, { create: false });
+        return childFolder;
+    }
+    catch (exc) {
+        if ((exc.type === 'file')
+            && exc.notFound) {
+            const childFolder = await fs.writableSubRoot(folder);
+            await fs.v.sync.upload(folder);
+            return childFolder;
+        }
+        else {
+            throw exc;
+        }
+    }
+}
+exports.getOrMakeAndUploadFolderIn = getOrMakeAndUploadFolderIn;
+async function uploadFolderChangesIfAny(fs) {
+    const { state } = await fs.v.sync.updateStatusInfo('');
+    if ((state === 'synced') || (state === 'behind')) {
+        return;
+    }
+    await fs.v.sync.upload('');
+}
+exports.uploadFolderChangesIfAny = uploadFolderChangesIfAny;
+Object.freeze(exports);

package/build/lib-client/fs-view.d.ts

@@ -0,0 +1,14 @@
+declare type ReadonlyFS = web3n.files.ReadonlyFS;
+declare type WritableFS = web3n.files.WritableFS;
+declare type WritableFile = web3n.files.WritableFile;
+export interface FSReadView extends ReadonlyFS {
+}
+export interface FSWriteView extends WritableFS {
+    rollbackWrite(): Promise<void>;
+}
+export declare type FSWrite = FSReadView | FSWriteView;
+export interface FileWriteView extends WritableFile {
+    rollbackWrite(): Promise<void>;
+}
+export declare function readonlyFSView(fs: ReadonlyFS, state: any): Promise<FSReadView>;
+export {};

package/build/lib-client/fs-view.js

@@ -0,0 +1,33 @@
+"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.readonlyFSView = void 0;
+async function readonlyFSView(fs, state) {
+    // XXX
+    // Notes:
+    // - state info with objId->version can't expose objId to user here,
+    //   keeping it on core's side.
+    // ! Hiding objId is incompatible with idea of having syncWall info
+    //   accessible, if/when objId is used in it.
+    // - Map path->num-id-within-given-sync-wall
+    // - When anything is changed within FSWriteView, it is added to map,
+    //   as being part of sync wall.
+    throw new Error('Function not implemented.');
+}
+exports.readonlyFSView = readonlyFSView;
+Object.freeze(exports);

package/build/lib-client/key-derivation.js

@@ -46,7 +46,7 @@ async function deriveMidKeyPair(cryptor, pass, derivParams, progressCB, use = ''
     const saltBytes = buffer_utils_1.base64.open(derivParams.salt);
     const skey = await cryptor.scrypt(passBytes, saltBytes, derivParams.logN, derivParams.r, derivParams.p, ecma_nacl_1.box.KEY_LENGTH, progressCB);
     const pkey = await cryptor.box.generate_pubkey(skey);
-    const pkeyJSON = jwkeys_1.keyToJson({
+    const pkeyJSON = (0, jwkeys_1.keyToJson)({
         k: pkey,
         alg: ecma_nacl_1.box.JWK_ALG_NAME,
         use: use,

package/build/lib-client/local-files/dev-file-sink.js

@@ -29,9 +29,9 @@ class DevFileByteSink {
         Object.seal(this);
     }
     static make(path, pathPrefixMaskLen, stat) {
-        assert_1.assert(Number.isInteger(stat.size) && (stat.size >= 0));
+        (0, assert_1.assert)(Number.isInteger(stat.size) && (stat.size >= 0));
         const sink = new DevFileByteSink(path, pathPrefixMaskLen, stat.size);
-        return wrapping_1.wrapAndSyncFileSink(sink);
+        return (0, wrapping_1.wrapAndSyncFileSink)(sink);
     }
     async done() { }
     async getSize() {
@@ -44,12 +44,12 @@ class DevFileByteSink {
         };
     }
     async truncate(size) {
-        assert_1.assert(Number.isInteger(size) && (size >= 0), `Invalid parameters given`);
+        (0, assert_1.assert)(Number.isInteger(size) && (size >= 0), `Invalid parameters given`);
         await fs.truncate(this.path, size);
         this.size = size;
     }
     async splice(pos, del, bytes) {
-        assert_1.assert(Number.isInteger(pos) && (pos >= 0)
+        (0, assert_1.assert)(Number.isInteger(pos) && (pos >= 0)
             && Number.isInteger(del) && (del >= 0), `Invalid parameters given`);
         const ins = (bytes ? bytes.length : 0);
         if ((del === 0) && (ins === 0)) {
@@ -74,10 +74,10 @@ class DevFileByteSink {
         let fd = undefined;
         try {
             fd = await fs.open(this.path, 'r+');
-            await fs.writeFromBuf(fd, pos, buffer_utils_1.toBuffer(bytes));
+            await fs.writeFromBuf(fd, pos, (0, buffer_utils_1.toBuffer)(bytes));
         }
         catch (e) {
-            throw file_1.maskPathInExc(this.pathPrefixMaskLen, e);
+            throw (0, file_1.maskPathInExc)(this.pathPrefixMaskLen, e);
         }
         finally {
             if (fd !== undefined) {
@@ -89,7 +89,7 @@ class DevFileByteSink {
         if (delta === 0) {
             return;
         }
-        assert_1.assert(Number.isInteger(pos) && (pos >= 0)
+        (0, assert_1.assert)(Number.isInteger(pos) && (pos >= 0)
             && Number.isInteger(delta) && Number.isInteger(initFileLen)
             && (pos <= initFileLen), `Invalid parameters given`);
         if (delta > 0) {
@@ -120,7 +120,7 @@ class DevFileByteSink {
             }
         }
         catch (e) {
-            throw file_1.maskPathInExc(this.pathPrefixMaskLen, e);
+            throw (0, file_1.maskPathInExc)(this.pathPrefixMaskLen, e);
         }
         finally {
             if (fd !== undefined) {
@@ -149,7 +149,7 @@ class DevFileByteSink {
             await fs.ftruncate(fd, pos + bytesToMove);
         }
         catch (e) {
-            throw file_1.maskPathInExc(this.pathPrefixMaskLen, e);
+            throw (0, file_1.maskPathInExc)(this.pathPrefixMaskLen, e);
         }
         finally {
             if (fd !== undefined) {

package/build/lib-client/local-files/dev-file-src.js

@@ -29,7 +29,7 @@ class DevFileByteSource {
     }
     static make(path, pathPrefixMaskLen, stat) {
         const src = new DevFileByteSource(path, pathPrefixMaskLen, stat);
-        return wrapping_1.wrapAndSyncSource(src);
+        return (0, wrapping_1.wrapAndSyncSource)(src);
     }
     async getSize() {
         return { size: this.size, isEndless: false };
@@ -54,7 +54,7 @@ class DevFileByteSource {
             return buf;
         }
         catch (e) {
-            throw file_1.maskPathInExc(this.pathPrefixMaskLen, e);
+            throw (0, file_1.maskPathInExc)(this.pathPrefixMaskLen, e);
         }
         finally {
             if (fd !== undefined) {

package/build/lib-client/local-files/device-fs.d.ts

@@ -81,7 +81,7 @@ export declare class DeviceFS implements WritableFS, Linkable {
     writableFile(path: string, flags?: web3n.files.FileFlags): Promise<WritableFile>;
     watchFolder(path: string, observer: Observer<FolderEvent>): () => void;
     watchFile(path: string, observer: Observer<FileEvent>): () => void;
-    watchTree(path: string, observer: Observer<FolderEvent | FileEvent>): () => void;
+    watchTree(path: string, depth: number | undefined, observer: Observer<FolderEvent | FileEvent>): () => void;
     copyFile(src: string, dst: string, overwrite?: boolean): Promise<void>;
     copyFolder(src: string, dst: string, mergeAndOverwrite?: boolean): Promise<void>;
     saveFile(file: File, dst: string, overwrite?: boolean): Promise<void>;