core-3nweb-client-lib 0.25.6 → 0.26.0

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

@@ -21,7 +21,7 @@ exports.NodeInFS = void 0;
  * Everything in this module is assumed to be inside of a file system
  * reliance set.
  */
-const processes_1 = require("../../../lib-common/processes");
+const synced_1 = require("../../../lib-common/processes/synced");
 const file_1 = require("../../../lib-common/exceptions/file");
 const error_1 = require("../../../lib-common/exceptions/error");
 const rxjs_1 = require("rxjs");
@@ -96,7 +96,7 @@ class NodeInFS {
     getAttrs() {
         return this.attrs;
     }
-    processRemoteEvent(event) {
+    async processRemoteEvent(event) {
         this.bufferRemoteEvent(event);
         return this.doChange(true, async () => {
             const event = this.getBufferedEvent();
@@ -104,6 +104,10 @@ class NodeInFS {
                 return;
             }
             if (event.type === 'remote-change') {
+                // TODO
+                // uploader should show if there is process for this obj uploads with version
+                // in the event, and if so, wait for completion of that process to either ignore
+                // remote event, or to set conflict, or whatever
                 // XXX should we use here synced storage methods here?
                 //     This method is called only in synced storage.
                 // XXX detect if there is a conflict
@@ -127,6 +131,9 @@ class NodeInFS {
             this.remoteEvents = [];
         }
         this.remoteEvents.push(event);
+        if (this.remoteEvents.length > 1) {
+            // XXX attempt to compress events
+        }
     }
     getBufferedEvent() {
         if (!this.remoteEvents) {
@@ -141,13 +148,27 @@ class NodeInFS {
     localDelete() {
         return this.doChange(true, () => this.delete());
     }
+    broadcastUpSyncEvent(task) {
+        if (task.type === 'upload') {
+            this.broadcastEvent({
+                type: 'sync-upload',
+                path: this.name,
+                current: this.version,
+                uploaded: task.version
+            });
+        }
+    }
     /**
      * This non-synchronized method deletes object from storage, and detaches
      * this node from storage. Make sure to call it inside access synchronization
      * construct.
      */
     async delete(remoteEvent) {
-        if (!remoteEvent) {
+        if (remoteEvent) {
+            // XXX
+            throw Error(`Removal from remote side is not implemented, yet.`);
+        }
+        else {
             await this.storage.removeObj(this.objId);
         }
         this.storage.nodes.delete(this);
@@ -173,34 +194,32 @@ class NodeInFS {
      */
     async doChange(awaitPrevChange, change) {
         if (!this.writeProc) {
-            this.writeProc = new processes_1.SingleProc();
+            this.writeProc = new synced_1.SingleProc();
         }
         if (!awaitPrevChange && this.writeProc.isProcessing()) {
             throw file_1.makeFileException(file_1.Code.concurrentUpdate, this.name + ` type ${this.type}`);
         }
-        try {
-            const res = await this.writeProc.startOrChain(() => {
-                if (this.currentVersion < 0) {
-                    throw file_1.makeFileException(file_1.Code.notFound, this.name);
-                }
-                return change();
-            });
-            return res;
-        }
-        catch (exc) {
-            if (!exc.runtimeException) {
-                throw error_1.errWithCause(exc, `Cannot save changes to ${this.type} ${this.name}, version ${this.version}`);
+        const res = await this.writeProc.startOrChain(() => {
+            if (this.currentVersion < 0) {
+                throw file_1.makeFileException(file_1.Code.notFound, this.name, `Object is marked removed`);
             }
-            if (exc.type === 'storage') {
-                if (exc.concurrentTransaction) {
-                    throw file_1.makeFileException(file_1.Code.concurrentUpdate, this.name, exc);
+            return change()
+                .catch((exc) => {
+                if (!exc.runtimeException) {
+                    throw error_1.errWithCause(exc, `Cannot save changes to ${this.type} ${this.name}, version ${this.version}`);
                 }
-                else if (exc.objNotFound) {
-                    throw file_1.makeFileException(file_1.Code.notFound, this.name, exc);
+                if (exc.type === 'storage') {
+                    if (exc.concurrentTransaction) {
+                        throw file_1.makeFileException(file_1.Code.concurrentUpdate, this.name, exc);
+                    }
+                    else if (exc.objNotFound) {
+                        throw file_1.makeFileException(file_1.Code.notFound, this.name, exc);
+                    }
                 }
-            }
-            throw file_1.makeFileException(file_1.Code.ioError, this.name, exc);
-        }
+                throw file_1.makeFileException(file_1.Code.ioError, this.name, exc);
+            });
+        });
+        return res;
     }
     /**
      * This method is called on conflict with remote version. This method
@@ -238,12 +257,14 @@ class NodeInFS {
         this.broadcastEvent(event);
     }
     broadcastEvent(event, complete) {
+        this.storage.broadcastNodeEvent(this.objId, this.parentId, event);
         if (!this.events) {
             return;
         }
         this.events.next(event);
         if (complete) {
             this.events.complete();
+            this.events = undefined;
         }
     }
     get event$() {
@@ -252,6 +273,12 @@ class NodeInFS {
         }
         return this.events.asObservable().pipe(operators_1.share());
     }
+    async sync() {
+        if ((this.storage.type === 'synced')
+            || (this.storage.type === 'share')) {
+            return this.storage.getObjSyncInfo(this.objId);
+        }
+    }
 }
 exports.NodeInFS = NodeInFS;
 Object.freeze(NodeInFS.prototype);

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

@@ -23,7 +23,7 @@ exports.NodePersistance = void 0;
  */
 const xsp_files_1 = require("xsp-files");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
-const processes_1 = require("../../../lib-common/processes");
+const deferred_1 = require("../../../lib-common/processes/deferred");
 const random = require("../../../lib-common/random-node");
 const pv1 = require("./xsp-payload-v1");
 const pv2 = require("./xsp-payload-v2");
@@ -148,7 +148,7 @@ class NodePersistance {
             this.segWriterWithBase(newVersion, base) :
             this.segWriter(newVersion));
         const { sink, sub } = xsp_files_1.makeEncryptingByteSink(segWriter);
-        const defSink = processes_1.defer();
+        const defSink = deferred_1.defer();
         return {
             sinkPromise: defSink.promise,
             sub: (obs, backpressure) => {

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

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeReadonlyPayload = void 0;
 const assert_1 = require("../../../lib-common/assert");
 const file_1 = require("../../../lib-common/exceptions/file");
-const processes_1 = require("../../../lib-common/processes");
+const synced_1 = require("../../../lib-common/processes/synced");
 const attrs_1 = require("./attrs");
 async function makeReadonlyPayload(src) {
     const payload = await ReadonlyPayloadV1.makeFor(src);
@@ -31,7 +31,7 @@ class ReadonlyPayloadV1 {
         this.src = src;
         this.size = size;
         this.isEndless = isEndless;
-        this.syncProc = new processes_1.SingleProc();
+        this.syncProc = new synced_1.SingleProc();
         this.xattrs = undefined;
         this.isEndless = (this.size === undefined);
         Object.seal(this);

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

@@ -20,7 +20,7 @@ exports.makeWritablePayloadFromBase = exports.makeWritablePayload = exports.make
 const assert_1 = require("../../../lib-common/assert");
 const big_endian_1 = require("../../../lib-common/big-endian");
 const attrs_1 = require("./attrs");
-const processes_1 = require("../../../lib-common/processes");
+const synced_1 = require("../../../lib-common/processes/synced");
 const wrapping_1 = require("../../../lib-common/byte-streaming/wrapping");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 async function makeReadonlyPayload(src) {
@@ -47,7 +47,7 @@ class ReadonlyPayloadV2 {
         this.attrs = attrs;
         this.contentSections = contentSections;
         this.xattrsSections = xattrsSections;
-        this.syncProc = new processes_1.SingleProc();
+        this.syncProc = new synced_1.SingleProc();
         this.xattrs = undefined;
         this.size = sizeOfContent(this.contentSections);
         Object.seal(this);
@@ -247,7 +247,7 @@ class WritablePayloadV2 {
         this.attrs = attrs;
         this.contentSections = contentSections;
         this.xattrsSections = xattrsSections;
-        this.syncProc = new processes_1.SingleProc();
+        this.syncProc = new synced_1.SingleProc();
         this.completionErr = undefined;
         assert_1.assert(!!this.sink);
         if ((this.contentSections.length + this.xattrsSections.length) === 0) {

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

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeInWorkerWasmCryptor = exports.makeInWorkerCryptor = void 0;
 const worker_threads_1 = require("worker_threads");
 const os_1 = require("os");
-const processes_1 = require("../../lib-common/processes");
+const deferred_1 = require("../../lib-common/processes/deferred");
 const error_1 = require("../../lib-common/exceptions/error");
 const path_1 = require("path");
 const protobuf_type_1 = require("../protobuf-type");
@@ -82,7 +82,7 @@ class Workers {
             return this.makeWorker();
         }
         else {
-            const deferred = processes_1.defer();
+            const deferred = deferred_1.defer();
             this.waitingForIdle.push(deferred);
             const worker = await deferred.promise;
             return worker;
@@ -216,7 +216,7 @@ class JsWorkers extends Workers {
         super(workerScriptFor('js'), logErr, logWarning, maxThreads);
     }
     call(func, args, trans, interim) {
-        return this.doRequest({ func, args }, trans, { res: processes_1.defer(), interim });
+        return this.doRequest({ func, args }, trans, { res: deferred_1.defer(), interim });
     }
     processReply(reply) {
         return reply;
@@ -270,7 +270,7 @@ class WasmWorkers extends Workers {
     }
     call(req, interim) {
         const msg = this.reqType.pack(req);
-        return this.doRequest(msg, undefined, { res: processes_1.defer(), interim });
+        return this.doRequest(msg, undefined, { res: deferred_1.defer(), interim });
     }
     processReply(replyBytes) {
         const { res, interim, err } = this.replyType.unpack(replyBytes);