core-3nweb-client-lib 0.26.0 → 0.27.1

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

@@ -22,7 +22,7 @@ const protobuf_type_1 = require("../lib-client/protobuf-type");
 const bytes_proto_1 = require("../protos/bytes.proto");
 const connector_1 = require("./connector");
 function makeSinkCaller(caller, ref) {
-    connector_1.checkRefObjTypeIs('FileByteSink', ref);
+    (0, connector_1.checkRefObjTypeIs)('FileByteSink', ref);
     const objPath = ref.path;
     const sink = {
         done: sinkDone.makeCaller(caller, objPath),
@@ -48,7 +48,7 @@ function exposeSinkService(sink, expServices) {
 }
 exports.exposeSinkService = exposeSinkService;
 function makeSrcCaller(caller, ref) {
-    connector_1.checkRefObjTypeIs('FileByteSource', ref);
+    (0, connector_1.checkRefObjTypeIs)('FileByteSource', ref);
     const objPath = ref.path;
     const src = {
         getPosition: srcGetPosition.makeCaller(caller, objPath),
@@ -96,7 +96,7 @@ var sinkSplice;
     function wrapService(fn) {
         return buf => {
             const { pos, del, bytes } = requestType.unpack(buf);
-            const promise = fn(protobuf_msg_1.fixInt(pos), protobuf_msg_1.fixInt(del), protobuf_msg_1.valOfOpt(bytes));
+            const promise = fn((0, protobuf_msg_1.fixInt)(pos), (0, protobuf_msg_1.fixInt)(del), (0, protobuf_msg_1.valOfOpt)(bytes));
             return { promise };
         };
     }
@@ -106,8 +106,7 @@ var sinkSplice;
         return async (pos, del, bytes) => {
             await caller
                 .startPromiseCall(path, requestType.pack({
-                pos, del,
-                bytes: protobuf_msg_1.toOptVal(bytes)
+                pos, del, bytes: (0, protobuf_msg_1.toOptVal)(bytes)
             }));
         };
     }
@@ -120,7 +119,7 @@ var sinkTruncate;
     function wrapService(fn) {
         return buf => {
             const { size } = requestType.unpack(buf);
-            const promise = fn(protobuf_msg_1.fixInt(size));
+            const promise = fn((0, protobuf_msg_1.fixInt)(size));
             return { promise };
         };
     }
@@ -140,15 +139,15 @@ var sinkShowLayout;
     const replyType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.FileLayoutMsg);
     function packLayout(l) {
         return {
-            base: protobuf_msg_1.toOptVal(l.base),
+            base: (0, protobuf_msg_1.toOptVal)(l.base),
             sections: l.sections
         };
     }
     function unpackLayout(msg) {
         return {
-            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)
+            base: (0, protobuf_msg_1.valOfOptInt)(msg.base),
+            sections: (0, protobuf_msg_1.fixArray)(msg.sections).map(({ src, ofs, len }) => ({
+                src, ofs: (0, protobuf_msg_1.fixInt)(ofs), len: (0, protobuf_msg_1.fixInt)(len)
             }))
         };
     }
@@ -175,7 +174,7 @@ var sinkDone;
     function wrapService(fn) {
         return buf => {
             const { err } = requestType.unpack(buf);
-            const promise = (err ? fn(protobuf_msg_1.errFromMsg(err)) : fn());
+            const promise = (err ? fn((0, protobuf_msg_1.errFromMsg)(err)) : fn());
             return { promise };
         };
     }
@@ -183,7 +182,7 @@ var sinkDone;
     function makeCaller(caller, objPath) {
         const path = objPath.concat('done');
         return async (err) => {
-            const req = (err ? { err: protobuf_msg_1.errToMsg(err) } : {});
+            const req = (err ? { err: (0, protobuf_msg_1.errToMsg)(err) } : {});
             await caller
                 .startPromiseCall(path, requestType.pack(req));
         };
@@ -236,8 +235,8 @@ var srcRead;
     function wrapService(fn) {
         return buf => {
             const { len } = requestType.unpack(buf);
-            const promise = fn(protobuf_msg_1.valOfOptInt(len))
-                .then(bytes => replyType.pack({ bytes: protobuf_msg_1.toOptVal(bytes) }));
+            const promise = fn((0, protobuf_msg_1.valOfOptInt)(len))
+                .then(bytes => replyType.pack({ bytes: (0, protobuf_msg_1.toOptVal)(bytes) }));
             return { promise };
         };
     }
@@ -245,8 +244,8 @@ var srcRead;
     function makeCaller(caller, objPath) {
         const path = objPath.concat('read');
         return len => caller
-            .startPromiseCall(path, requestType.pack({ len: protobuf_msg_1.toOptVal(len) }))
-            .then(buf => protobuf_msg_1.valOfOpt(replyType.unpack(buf).bytes));
+            .startPromiseCall(path, requestType.pack({ len: (0, protobuf_msg_1.toOptVal)(len) }))
+            .then(buf => (0, protobuf_msg_1.valOfOpt)(replyType.unpack(buf).bytes));
     }
     srcRead.makeCaller = makeCaller;
 })(srcRead || (srcRead = {}));
@@ -257,7 +256,7 @@ var srcSeek;
     function wrapService(fn) {
         return buf => {
             const { offset } = requestType.unpack(buf);
-            const promise = fn(protobuf_msg_1.fixInt(offset));
+            const promise = fn((0, protobuf_msg_1.fixInt)(offset));
             return { promise };
         };
     }

package/build/ipc-via-protobuf/connector-clients-side.d.ts

@@ -16,9 +16,12 @@ export declare class ClientsSideImpl implements ClientsSide {
     processInterimCallReply(fnCallNum: number, body: EnvelopeBody): void;
     processEndCallReply(fnCallNum: number, body: EnvelopeBody): void;
     processCallError(fnCallNum: number, body: EnvelopeBody): void;
+    private retryWithOtherCallNum;
     private nextFnCallNum;
     caller(): Caller;
+    private throwIfStopped;
     private startCall;
+    private setupFnCall;
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
     startObservableCall(path: string[], req: EnvelopeBody, obs: Subject<EnvelopeBody>): () => void;
     registerClientDrop(o: any, srvRef: ObjectReference<any>): void;

package/build/ipc-via-protobuf/connector-clients-side.js

@@ -21,6 +21,7 @@ const protobuf_msg_1 = require("./protobuf-msg");
 const deferred_1 = require("../lib-common/processes/deferred");
 const weakref_1 = require("../lib-common/weakref");
 const connector_1 = require("./connector");
+const MAX_DUPLICATE_ATTEMPTS = 100;
 // XXX can have an optimized use of WeakRef and FinalizationRegistry, when
 // these are available.
 class ClientsSideImpl {
@@ -60,7 +61,7 @@ class ClientsSideImpl {
     }
     sendCallCancellation(fnCallNum) {
         this.sendMsg({
-            headers: { fnCallNum: protobuf_msg_1.toVal(fnCallNum), msgType: 'cancel' }
+            headers: { fnCallNum: (0, protobuf_msg_1.toVal)(fnCallNum), msgType: 'cancel' }
         });
     }
     processInterimCallReply(fnCallNum, body) {
@@ -104,7 +105,13 @@ class ClientsSideImpl {
         if (!call) {
             return;
         }
-        const err = (body ? protobuf_msg_1.errFromMsg(protobuf_msg_1.errBodyType.unpack(body)) : undefined);
+        this.fnCalls.delete(fnCallNum);
+        const err = (body ? (0, protobuf_msg_1.errFromMsg)(protobuf_msg_1.errBodyType.unpack(body)) : undefined);
+        if (err && (err.type === 'ipc')
+            && err.duplicateFnCallNum) {
+            this.retryWithOtherCallNum(call);
+            return;
+        }
         if (call.obs) {
             call.obs.error(err);
         }
@@ -114,7 +121,32 @@ class ClientsSideImpl {
         else {
             // XXX log presence of fn call without fields to signal reply
         }
-        this.fnCalls.delete(fnCallNum);
+    }
+    retryWithOtherCallNum(call) {
+        if (call.countOfDuplicateFnCallNum) {
+            call.countOfDuplicateFnCallNum += 1;
+            if (call.countOfDuplicateFnCallNum >= MAX_DUPLICATE_ATTEMPTS) {
+                return;
+            }
+        }
+        else {
+            call.countOfDuplicateFnCallNum = 1;
+        }
+        const fnCallNum = this.nextFnCallNum();
+        call.reqEnv.headers.fnCallNum.value = fnCallNum;
+        this.fnCalls.set(fnCallNum, call);
+        try {
+            this.sendMsg(call.reqEnv);
+        }
+        catch (err) {
+            this.fnCalls.delete(fnCallNum);
+            if (call.deferred) {
+                call.deferred.reject(err);
+            }
+            else if (call.obs) {
+                call.obs.error(err);
+            }
+        }
     }
     nextFnCallNum() {
         while (this.fnCalls.has(this.fnCallCounter)) {
@@ -141,21 +173,30 @@ class ClientsSideImpl {
         };
         return callerWrap;
     }
-    startCall(fnCallNum, path, body) {
+    throwIfStopped() {
         if (this.isStopped) {
-            throw connector_1.makeIPCException({ 'ipcNotConnected': true });
+            throw (0, connector_1.makeIPCException)({ ipcNotConnected: true });
         }
-        this.sendMsg({
-            headers: { fnCallNum: protobuf_msg_1.toVal(fnCallNum), msgType: 'start', path },
-            body: protobuf_msg_1.toOptVal(body)
-        });
     }
-    startPromiseCall(path, req) {
-        const deferred = deferred_1.defer();
+    startCall(reqEnv) {
+        this.throwIfStopped();
+        this.sendMsg(reqEnv);
+    }
+    setupFnCall(path, body, deferred, obs) {
         const fnCallNum = this.nextFnCallNum();
-        this.fnCalls.set(fnCallNum, { deferred });
+        const reqEnv = {
+            headers: { fnCallNum: (0, protobuf_msg_1.toVal)(fnCallNum), msgType: 'start', path },
+            body: (0, protobuf_msg_1.toOptVal)(body)
+        };
+        this.fnCalls.set(fnCallNum, { deferred, obs, reqEnv });
+        return reqEnv;
+    }
+    startPromiseCall(path, req) {
+        const deferred = (0, deferred_1.defer)();
+        const reqEnv = this.setupFnCall(path, req, deferred, undefined);
+        const fnCallNum = reqEnv.headers.fnCallNum.value;
         try {
-            this.startCall(fnCallNum, path, req);
+            this.startCall(reqEnv);
             return deferred.promise;
         }
         catch (err) {
@@ -164,10 +205,10 @@ class ClientsSideImpl {
         }
     }
     startObservableCall(path, req, obs) {
-        const fnCallNum = this.nextFnCallNum();
-        this.fnCalls.set(fnCallNum, { obs });
+        const reqEnv = this.setupFnCall(path, req, undefined, obs);
+        const fnCallNum = reqEnv.headers.fnCallNum.value;
         try {
-            this.startCall(fnCallNum, path, req);
+            this.startCall(reqEnv);
             return () => this.sendCallCancellation(fnCallNum);
         }
         catch (err) {
@@ -176,7 +217,7 @@ class ClientsSideImpl {
         }
     }
     registerClientDrop(o, srvRef) {
-        const clientRef = weakref_1.makeWeakRefFor(o);
+        const clientRef = (0, weakref_1.makeWeakRefFor)(o);
         this.weakRefs.add(clientRef);
         clientRef.addCallback(this.makeClientDropCB(clientRef, srvRef));
         this.srvRefs.set(o, srvRef);
@@ -199,19 +240,15 @@ class ClientsSideImpl {
             return srvRef;
         }
         else {
-            throw connector_1.makeIPCException({ 'objectNotFound': true });
+            throw (0, connector_1.makeIPCException)({ 'objectNotFound': true });
         }
     }
     listObj(path) {
-        if (this.isStopped) {
-            throw connector_1.makeIPCException({ 'ipcNotConnected': true });
-        }
+        this.throwIfStopped();
         return this.syncReqToListObj(path);
     }
     listObjAsync(path) {
-        if (this.isStopped) {
-            throw connector_1.makeIPCException({ 'ipcNotConnected': true });
-        }
+        this.throwIfStopped();
         return this.asyncReqToListObj(path);
     }
 }

package/build/ipc-via-protobuf/connector-services-side.js

@@ -41,22 +41,22 @@ class ServicesSideImpl {
     }
     sendCallError(fnCallNum, err) {
         this.sendMsg({
-            headers: { fnCallNum: protobuf_msg_1.toVal(fnCallNum), msgType: 'error' },
-            body: protobuf_msg_1.toVal(protobuf_msg_1.errBodyType.pack(protobuf_msg_1.errToMsg(err)))
+            headers: { fnCallNum: (0, protobuf_msg_1.toVal)(fnCallNum), msgType: 'error' },
+            body: (0, protobuf_msg_1.toVal)(protobuf_msg_1.errBodyType.pack((0, protobuf_msg_1.errToMsg)(err)))
         });
     }
     sendCallReply(fnCallNum, last, body) {
         this.sendMsg({
             headers: {
-                fnCallNum: protobuf_msg_1.toVal(fnCallNum),
+                fnCallNum: (0, protobuf_msg_1.toVal)(fnCallNum),
                 msgType: (last ? 'end' : 'interim')
             },
-            body: protobuf_msg_1.toOptVal(body)
+            body: (0, protobuf_msg_1.toOptVal)(body)
         });
     }
     processCallStart(fnCallNum, path, body) {
         if (this.fnCallProcs.has(fnCallNum)) {
-            this.sendCallError(fnCallNum, connector_1.makeIPCException({ duplicateFnCallNum: true }));
+            this.sendCallError(fnCallNum, (0, connector_1.makeIPCException)({ duplicateFnCallNum: true }));
             return;
         }
         try {
@@ -113,7 +113,7 @@ class ServicesSideImpl {
             this.exposedObjs.drop(path[0]);
         }
         else {
-            throw connector_1.makeIPCException({ invalidPath: true, path });
+            throw (0, connector_1.makeIPCException)({ invalidPath: true, path });
         }
     }
     processListObj(fnCallNum, path) {
@@ -124,7 +124,7 @@ class ServicesSideImpl {
             this.sendCallReply(fnCallNum, true, buf);
         }
         else {
-            const exc = connector_1.makeIPCException({ 'objectNotFound': true });
+            const exc = (0, connector_1.makeIPCException)({ 'objectNotFound': true });
             this.sendCallError(fnCallNum, exc);
         }
     }
@@ -151,7 +151,7 @@ class ExposedObjs {
     exposeDroppableService(objType, exp, original) {
         let id;
         do {
-            id = random_node_1.stringOfB64CharsSync(20);
+            id = (0, random_node_1.stringOfB64CharsSync)(20);
         } while (this.objs.has(id));
         this.objs.set(id, { exp, original });
         return { objType, path: [id] };
@@ -162,7 +162,7 @@ class ExposedObjs {
             return o.original;
         }
         else {
-            throw connector_1.makeIPCException({ 'objectNotFound': true });
+            throw (0, connector_1.makeIPCException)({ 'objectNotFound': true });
         }
     }
     exposeW3NService(exp) {
@@ -199,7 +199,7 @@ class ExposedObjs {
             return fn;
         }
         else {
-            throw connector_1.makeIPCException({ callFnNotFound: true, path });
+            throw (0, connector_1.makeIPCException)({ callFnNotFound: true, path });
         }
     }
     dropAll() {

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

@@ -104,8 +104,8 @@ class ObjectsConnector {
     processIncomingMsg(msg) {
         var _a, _b, _c, _d, _e, _f, _g;
         const { msgType, path, fnCallNum: cNum } = msg.headers;
-        const fnCallNum = protobuf_msg_1.valOfOptInt(cNum);
-        const body = protobuf_msg_1.valOfOpt(msg.body);
+        const fnCallNum = (0, protobuf_msg_1.valOfOptInt)(cNum);
+        const body = (0, protobuf_msg_1.valOfOpt)(msg.body);
         try {
             if (typeof fnCallNum === 'number') {
                 if (msgType === 'start') {
@@ -149,8 +149,8 @@ class ObjectsConnector {
             return;
         }
         const msg = {
-            headers: { fnCallNum: protobuf_msg_1.toVal(fnCallNum), msgType: 'error' },
-            body: protobuf_msg_1.toVal(protobuf_msg_1.errBodyType.pack(protobuf_msg_1.errToMsg(err)))
+            headers: { fnCallNum: (0, protobuf_msg_1.toVal)(fnCallNum), msgType: 'error' },
+            body: (0, protobuf_msg_1.toVal)(protobuf_msg_1.errBodyType.pack((0, protobuf_msg_1.errToMsg)(err)))
         };
         this.msgSink.next(msg);
     }

package/build/ipc-via-protobuf/file.d.ts

@@ -8,20 +8,27 @@ declare type WritableFile = web3n.files.WritableFile;
 declare type WritableFileVersionedAPI = web3n.files.WritableFileVersionedAPI;
 declare type File = web3n.files.File;
 declare type Stats = web3n.files.Stats;
+declare type SyncStatus = web3n.files.SyncStatus;
 declare type XAttrsChanges = web3n.files.XAttrsChanges;
 declare type FileEvent = web3n.files.FileEvent;
+declare type RemoteEvent = web3n.files.RemoteEvent;
+declare type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
+declare type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
 export declare function makeFileCaller(caller: Caller, fileMsg: FileMsg): File;
 export declare function exposeFileService(file: File, expServices: ExposedServices): FileMsg;
-export declare const fileMsgType: ProtoType<FileMsg>;
-export declare function packStats(s: Stats): Buffer;
-export declare function unpackStats(buf: Buffer | void): Stats;
 export interface FileMsg {
     writable: boolean;
     isVersioned: boolean;
+    isSynced: boolean;
     name: string;
     isNew: boolean;
     impl: ObjectReference<'FileImpl'>;
 }
+export declare const fileMsgType: ProtoType<FileMsg>;
+export declare function packStats(s: Stats): Buffer;
+export declare function unpackStats(buf: Buffer | void): Stats;
+export declare function packSyncStatus(s: SyncStatus): Buffer;
+export declare function unpackSyncStatus(buf: Buffer | void): SyncStatus;
 export declare function packXAttrValue(val: any): EnvelopeBody;
 export declare function unpackXAttrValue(buf: EnvelopeBody): any;
 export declare namespace readBytes {
@@ -32,8 +39,8 @@ export declare namespace readBytes {
 }
 export declare function packJSON(json: any): EnvelopeBody;
 export declare function unpackJSON(buf: EnvelopeBody): any;
-export declare function packFileEvent(e: FileEvent): Buffer;
-export declare function unpackFileEvent(buf: EnvelopeBody): FileEvent;
+export declare function packFileEvent(e: FileEvent | RemoteEvent): Buffer;
+export declare function unpackFileEvent(buf: EnvelopeBody): FileEvent | RemoteEvent;
 export declare namespace vGetXAttr {
     interface Reply {
         version: number;
@@ -97,16 +104,21 @@ export declare namespace vGetByteSource {
     function wrapService(fn: ReadonlyFileVersionedAPI['getByteSource'], expServices: ExposedServices): ExposedFn;
     function makeCaller(caller: Caller, objPath: string[]): ReadonlyFileVersionedAPI['getByteSource'];
 }
+export interface XAttrMsg {
+    xaName: string;
+    str?: Value<string>;
+    json?: Value<string>;
+    bytes?: Value<Buffer>;
+}
+export declare function xattrToMsg(xaName: string, val: any): XAttrMsg;
+export declare function xattrFromMsg(msg: XAttrMsg): {
+    name: string;
+    value: any;
+};
 export declare namespace updateXAttrs {
-    interface Attr {
-        xaName: string;
-        str?: Value<string>;
-        json?: Value<string>;
-        bytes?: Value<Buffer>;
-    }
     interface Request {
         changes: {
-            set: Attr[];
+            set: XAttrMsg[];
             remove: string[];
         };
     }
@@ -126,4 +138,28 @@ export declare namespace vGetByteSink {
     function wrapService(fn: WritableFileVersionedAPI['getByteSink'], expServices: ExposedServices): ExposedFn;
     function makeCaller(caller: Caller, objPath: string[]): WritableFileVersionedAPI['getByteSink'];
 }
+export interface OptionsToUploadLocalMsg {
+    localVersion?: Value<number>;
+    uploadVersion?: Value<number>;
+}
+export declare function optionsToUploadLocalToMsg(opts?: OptionsToUploadLocal): OptionsToUploadLocalMsg | undefined;
+export declare function optionsToUploadLocalFromMsg(opts?: OptionsToUploadLocalMsg): OptionsToUploadLocal | undefined;
+export interface OptionsToAdopteRemoteMsg {
+    dropLocalVer?: Value<boolean>;
+    remoteVersion?: Value<number>;
+}
+export declare function remoteAdoptionOptsToMsg(opts: OptionsToAdopteRemote | undefined): OptionsToAdopteRemoteMsg | undefined;
+export declare function remoteAdoptionOptsFromMsg(msg: OptionsToAdopteRemoteMsg | undefined): OptionsToAdopteRemote | undefined;
+export declare namespace vListVersions {
+    function packReply(v: {
+        current?: number;
+        archived?: number[];
+    }): Buffer;
+    function unpackReply(b: Buffer): {
+        current?: number;
+        archived?: number[];
+    };
+    function wrapService(fn: ReadonlyFileVersionedAPI['listVersions']): ExposedFn;
+    function makeCaller(caller: Caller, objPath: string[]): ReadonlyFileVersionedAPI['listVersions'];
+}
 export {};