core-3nweb-client-lib 0.27.11 → 0.28.1

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

@@ -45,6 +45,8 @@ declare namespace web3n.asmail {
 				idOnDelivery?: string;
 				err?: any;
 				bytesSent: number;
+				// XXX
+				nonFstAttempt?: boolean;
 			}
 		};
 	}
@@ -60,6 +62,12 @@ declare namespace web3n.asmail {
 		 * associated with particular delivery.
 		 */
 		localMeta?: any;
+
+		retryRecipient?: {
+			numOfAttempts: number;
+			// XXX default client says "ASAP" => figgure it out
+			timeBetweenAttempts?: number;
+		};
 	}
 
 	interface DeliveryService {
@@ -232,6 +240,7 @@ declare namespace web3n.asmail {
 		sender: string;
 		establishedSenderKeyChain: boolean;
 		attachments?: files.ReadonlyFS;
+		// XXX info if not from the first attempt
 	}
 	
 	interface OutgoingMessage extends MsgStruct {

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

@@ -22,6 +22,7 @@ declare namespace web3n.files {
 		type: 'file';
 		code: string|undefined;
 		path: string;
+		fsEtityType?: 'file' | 'link' | 'folder';
 	}
 
 	interface FileExceptionFlag {

package/build/core/asmail/inbox/index.js

@@ -99,6 +99,7 @@ class InboxOnServer {
     async removeMsgFromServerAndCache(msgId) {
         await Promise.all([
             this.cache.deleteMsg(msgId),
+            // XXX the following is suspicious, as it swallows other exceptions too
             this.msgReceiver.removeMsg(msgId).catch(() => { })
         ]);
     }

package/build/core/asmail/inbox/msg-indexing.js

@@ -24,6 +24,8 @@ const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const fs_sync_utils_1 = require("../../../lib-client/fs-sync-utils");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+// XXX Use TableColumnsAndParams from lib-with-sql.
+//     And should we update here sqlite from that project?
 const indexTab = 'inbox_index';
 const column = {
     msgId: 'msg_id',

package/build/core/asmail/sending-params/own-params.js

@@ -55,7 +55,7 @@ class OwnSendingParams extends file_based_json_1.JsonFileProc {
             };
             p.suggested.timestamp = Date.now();
             this.params.set(p.address, p);
-            await this.persist();
+            await this.changesProc.startOrChain(() => this.persist());
             return p.suggested;
         };
         this.setAsInUse = async (address, invite) => {

package/build/core/storage/synced/obj-status.js

@@ -22,7 +22,7 @@ const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
 const json_saving_1 = require("../common/json-saving");
 const obj_info_file_1 = require("../common/obj-info-file");
 const assert_1 = require("../../../lib-common/assert");
-const file_1 = require("../../../lib-common/exceptions/file");
+const runtime_1 = require("../../../lib-common/exceptions/runtime");
 function makeVersions() {
     return {
         baseToDiff: {},
@@ -195,7 +195,10 @@ class ObjStatus {
                 return;
             }
             else {
-                throw (0, file_1.makeFileException)('concurrentUpdate', 'obj-status', `Upload is in progress`);
+                throw (0, runtime_1.makeRuntimeException)('file', {
+                    path: (0, path_1.join)(this.objFolder, exports.STATUS_FILE_NAME),
+                    fsEtityType: 'file', message: `Upload is in progress`
+                }, { concurrentUpdate: true });
             }
         }
         if (!remote.isArchived && remote.current) {

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

@@ -7,8 +7,9 @@ export declare class ClientsSideImpl implements ClientsSide {
     private readonly asyncReqToListObj;
     private readonly fnCalls;
     private fnCallCounter;
-    private readonly weakRefs;
     private readonly srvRefs;
+    private readonly weakSrvByRefs;
+    private readonly srvFinalRegistry;
     private isStopped;
     constructor(sendMsg: (msg: Envelope) => void, syncReqToListObj: Caller['listObj'], asyncReqToListObj: Caller['listObjAsync']);
     stop(exc: IPCException): void;
@@ -25,9 +26,10 @@ export declare class ClientsSideImpl implements ClientsSide {
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
     startObservableCall(path: string[], req: EnvelopeBody, obs: Subject<EnvelopeBody>): () => void;
     registerClientDrop(o: any, srvRef: ObjectReference<any>): void;
-    private makeClientDropCB;
+    private doOnClientObjDrop;
     private sendObjDropMsg;
     srvRefOf(clientObj: any): ObjectReference<any>;
+    findCallingObjByRef<T>(ref: ObjectReference<any>): T | undefined;
     listObj(path: string[]): string[];
     listObjAsync(path: string[]): Promise<string[]>;
 }

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2022 3NSoft Inc.
+ Copyright (C) 2020 - 2023 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
@@ -19,11 +19,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientsSideImpl = void 0;
 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 {
     constructor(sendMsg, syncReqToListObj, asyncReqToListObj) {
         this.sendMsg = sendMsg;
@@ -31,8 +28,9 @@ class ClientsSideImpl {
         this.asyncReqToListObj = asyncReqToListObj;
         this.fnCalls = new Map();
         this.fnCallCounter = 1;
-        this.weakRefs = new Set();
         this.srvRefs = new WeakMap();
+        this.weakSrvByRefs = new Map();
+        this.srvFinalRegistry = new FinalizationRegistry(this.doOnClientObjDrop.bind(this));
         this.isStopped = false;
         if ((this.asyncReqToListObj && this.syncReqToListObj)
             || (!this.asyncReqToListObj && !this.syncReqToListObj)) {
@@ -54,10 +52,6 @@ class ClientsSideImpl {
             }
         }
         this.fnCalls.clear();
-        for (const clientRef of this.weakRefs.values()) {
-            clientRef.removeCallbacks();
-        }
-        this.weakRefs.clear();
     }
     sendCallCancellation(fnCallNum) {
         this.sendMsg({
@@ -169,7 +163,8 @@ class ClientsSideImpl {
             registerClientDrop: this.registerClientDrop.bind(this),
             srvRefOf: this.srvRefOf.bind(this),
             startObservableCall: this.startObservableCall.bind(this),
-            startPromiseCall: this.startPromiseCall.bind(this)
+            startPromiseCall: this.startPromiseCall.bind(this),
+            findCallingObjByRef: this.findCallingObjByRef.bind(this)
         };
         return callerWrap;
     }
@@ -217,19 +212,14 @@ class ClientsSideImpl {
         }
     }
     registerClientDrop(o, srvRef) {
-        const clientRef = (0, weakref_1.makeWeakRefFor)(o);
-        this.weakRefs.add(clientRef);
-        clientRef.addCallback(this.makeClientDropCB(clientRef, srvRef));
+        o._isObjectFromCore = true;
+        this.srvFinalRegistry.register(o, srvRef);
+        this.weakSrvByRefs.set(srvRef.path[0], new WeakRef(o));
         this.srvRefs.set(o, srvRef);
-        if (global['runningInIsolatedContext']) {
-            o['--srv-ref'] = srvRef;
-        }
     }
-    makeClientDropCB(clientRef, srvRef) {
-        return () => {
-            this.weakRefs.delete(clientRef);
-            this.sendObjDropMsg(srvRef);
-        };
+    doOnClientObjDrop(srvRef) {
+        this.weakSrvByRefs.delete(srvRef.path[0]);
+        this.sendObjDropMsg(srvRef);
     }
     sendObjDropMsg(srvRef) {
         if (this.isStopped) {
@@ -238,23 +228,26 @@ class ClientsSideImpl {
         this.sendMsg({ headers: { msgType: 'drop', path: srvRef.path } });
     }
     srvRefOf(clientObj) {
-        if (global['runningInIsolatedContext']) {
-            const srvRef = clientObj['--srv-ref'];
-            if (srvRef) {
-                return srvRef;
-            }
-            else {
-                throw new Error(`Given object has never been registered as one referencing respective object in the core`);
-            }
+        const srvRef = this.srvRefs.get(clientObj);
+        if (srvRef) {
+            return srvRef;
         }
         else {
-            const srvRef = this.srvRefs.get(clientObj);
-            if (srvRef) {
-                return srvRef;
-            }
-            else {
-                throw (0, connector_1.makeIPCException)({ 'objectNotFound': true });
-            }
+            throw (0, connector_1.makeIPCException)({ 'objectNotFound': true });
+        }
+    }
+    findCallingObjByRef(ref) {
+        const weakRef = this.weakSrvByRefs.get(ref.path[0]);
+        if (!weakRef) {
+            return;
+        }
+        const o = weakRef.deref();
+        if (o) {
+            return o;
+        }
+        else {
+            this.weakSrvByRefs.delete(ref.path[0]);
+            return;
         }
     }
     listObj(path) {

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

@@ -1,5 +1,5 @@
 import { ObjectReference } from "./protobuf-msg";
-import { ServicesSide, Envelope, EnvelopeBody, ExposedFn, ExposedObj, ExposedServices } from "./connector";
+import { ServicesSide, Envelope, EnvelopeBody, ExposedFn, ExposedObj, ExposedServices, TransferableObj } from "./connector";
 export declare class ServicesSideImpl implements ServicesSide {
     private readonly sendMsg;
     readonly exposedObjs: ExposedObjs;
@@ -16,8 +16,11 @@ export declare class ServicesSideImpl implements ServicesSide {
 }
 export declare class ExposedObjs {
     private readonly objs;
-    exposeDroppableService<T>(objType: T, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference<T>;
+    private readonly objToRefs;
+    exposeDroppableService<T extends string>(objType: T, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference<T>;
     getOriginalObj<T>(ref: ObjectReference<any>): T;
+    getObjForTransfer<T extends string>(ref: ObjectReference<T>): TransferableObj<T>;
+    findRefIfAlreadyExposed(o: any): ObjectReference<any> | undefined;
     exposeW3NService(exp: ExposedFn | ExposedObj<any>): void;
     drop(name: string): void;
     find(path: string[] | undefined): ExposedFn | ExposedObj<any> | undefined;

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2021 3NSoft Inc.
+ Copyright (C) 2020 - 2021, 2023 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
@@ -136,7 +136,9 @@ class ServicesSideImpl {
             listObj: path => {
                 const obj = this.exposedObjs.find(path);
                 return (obj ? Object.keys(obj) : null);
-            }
+            },
+            getObjForTransfer: this.exposedObjs.getObjForTransfer.bind(this.exposedObjs),
+            findRefIfAlreadyExposed: this.exposedObjs.findRefIfAlreadyExposed.bind(this.exposedObjs)
         };
         return expSrv;
     }
@@ -147,14 +149,19 @@ Object.freeze(ServicesSideImpl);
 class ExposedObjs {
     constructor() {
         this.objs = new Map();
+        this.objToRefs = new Map();
     }
     exposeDroppableService(objType, exp, original) {
         let id;
         do {
             id = (0, random_node_1.stringOfB64CharsSync)(20);
         } while (this.objs.has(id));
-        this.objs.set(id, { exp, original });
-        return { objType, path: [id] };
+        const ref = {
+            objType, path: [id]
+        };
+        this.objs.set(id, { exp, original, objType });
+        this.objToRefs.set(original, ref);
+        return ref;
     }
     getOriginalObj(ref) {
         const o = this.objs.get(ref.path[0]);
@@ -165,15 +172,36 @@ class ExposedObjs {
             throw (0, connector_1.makeIPCException)({ 'objectNotFound': true });
         }
     }
+    getObjForTransfer(ref) {
+        const o = this.objs.get(ref.path[0]);
+        if (!o) {
+            throw (0, connector_1.makeIPCException)({ 'objectNotFound': true });
+        }
+        else if (ref.objType !== o.objType) {
+            throw (0, connector_1.makeIPCException)({ 'invalidReference': true });
+        }
+        else {
+            return { o: o.original, type: o.objType };
+        }
+    }
+    findRefIfAlreadyExposed(o) {
+        return this.objToRefs.get(o);
+    }
     exposeW3NService(exp) {
         if (this.objs.has(connector_1.W3N_NAME)) {
             throw new Error(`${connector_1.W3N_NAME} object has already been added`);
         }
-        this.objs.set(connector_1.W3N_NAME, { exp, original: undefined });
+        this.objs.set(connector_1.W3N_NAME, {
+            exp, original: undefined, objType: 'non-transferable'
+        });
     }
     drop(name) {
         if (name !== connector_1.W3N_NAME) {
-            this.objs.delete(name);
+            const o = this.objs.get(name);
+            if (o) {
+                this.objs.delete(name);
+                this.objToRefs.delete(o);
+            }
         }
     }
     find(path) {
@@ -204,6 +232,7 @@ class ExposedObjs {
     }
     dropAll() {
         this.objs.clear();
+        this.objToRefs.clear();
     }
 }
 exports.ExposedObjs = ExposedObjs;

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

@@ -3,10 +3,16 @@ import { Observer, SubjectLike, Subscribable } from "rxjs";
 import { ObjectReference, Value } from "./protobuf-msg";
 import { ProtoType } from '../lib-client/protobuf-type';
 export interface ExposedServices {
-    exposeDroppableService<T>(objType: T, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference<T>;
+    exposeDroppableService<T extends string>(objType: T, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference<T>;
     getOriginalObj<T>(ref: ObjectReference<any>): T;
     exposeW3NService(exp: ExposedFn | ExposedObj<any>): void;
     listObj(path: string[]): string[] | null;
+    getObjForTransfer<T extends string>(ref: ObjectReference<T>): TransferableObj<T>;
+    findRefIfAlreadyExposed(o: any): ObjectReference<any> | undefined;
+}
+export interface TransferableObj<T extends string> {
+    type: T;
+    o: any;
 }
 export interface ServicesSide {
     exposedServices(): ExposedServices;
@@ -23,6 +29,10 @@ export interface Caller {
     srvRefOf(clientObj: any): ObjectReference<any>;
     listObj?: (path: string[]) => string[];
     listObjAsync?: (path: string[]) => Promise<string[]>;
+    findCallingObjByRef<T>(ref: ObjectReference<any>): T | undefined;
+}
+export interface ObjectFromCore {
+    _isObjectFromCore: true;
 }
 export interface ClientsSide {
     caller(): Caller;

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2022 3NSoft Inc.
+ Copyright (C) 2020 - 2023 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

package/build/ipc.d.ts

@@ -3,4 +3,5 @@ export * from "./core-ipc/startup-caps";
 export * from "./ipc-via-protobuf/connector";
 export { FileMsg, makeFileCaller, exposeFileService } from "./ipc-via-protobuf/file";
 export { FSMsg, makeFSCaller, exposeFSService } from "./ipc-via-protobuf/fs";
+export { makeSinkCaller, exposeSinkService, makeSrcCaller, exposeSrcService } from "./ipc-via-protobuf/bytes";
 export { makeLogCaller, exposeLogger } from "./ipc-via-protobuf/log-cap";

package/build/ipc.js

@@ -30,7 +30,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exposeLogger = exports.makeLogCaller = exports.exposeFSService = exports.makeFSCaller = exports.exposeFileService = exports.makeFileCaller = void 0;
+exports.exposeLogger = exports.makeLogCaller = exports.exposeSrcService = exports.makeSrcCaller = exports.exposeSinkService = exports.makeSinkCaller = exports.exposeFSService = exports.makeFSCaller = exports.exposeFileService = exports.makeFileCaller = void 0;
 __exportStar(require("./core-ipc/common-caps"), exports);
 __exportStar(require("./core-ipc/startup-caps"), exports);
 __exportStar(require("./ipc-via-protobuf/connector"), exports);
@@ -40,6 +40,11 @@ Object.defineProperty(exports, "exposeFileService", { enumerable: true, get: fun
 var fs_1 = require("./ipc-via-protobuf/fs");
 Object.defineProperty(exports, "makeFSCaller", { enumerable: true, get: function () { return fs_1.makeFSCaller; } });
 Object.defineProperty(exports, "exposeFSService", { enumerable: true, get: function () { return fs_1.exposeFSService; } });
+var bytes_1 = require("./ipc-via-protobuf/bytes");
+Object.defineProperty(exports, "makeSinkCaller", { enumerable: true, get: function () { return bytes_1.makeSinkCaller; } });
+Object.defineProperty(exports, "exposeSinkService", { enumerable: true, get: function () { return bytes_1.exposeSinkService; } });
+Object.defineProperty(exports, "makeSrcCaller", { enumerable: true, get: function () { return bytes_1.makeSrcCaller; } });
+Object.defineProperty(exports, "exposeSrcService", { enumerable: true, get: function () { return bytes_1.exposeSrcService; } });
 var log_cap_1 = require("./ipc-via-protobuf/log-cap");
 Object.defineProperty(exports, "makeLogCaller", { enumerable: true, get: function () { return log_cap_1.makeLogCaller; } });
 Object.defineProperty(exports, "exposeLogger", { enumerable: true, get: function () { return log_cap_1.exposeLogger; } });

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

@@ -30,6 +30,7 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const attrs_1 = require("./attrs");
 const assert_1 = require("../../../lib-common/assert");
+const runtime_1 = require("../../../lib-common/exceptions/runtime");
 class NodeInFS {
     constructor(storage, type, name, objId, currentVersion, parentId) {
         this.storage = storage;
@@ -212,11 +213,14 @@ class NodeInFS {
             this.writeProc = new synced_1.SingleProc();
         }
         if (!awaitPrevChange && this.writeProc.isProcessing()) {
-            throw (0, file_1.makeFileException)('concurrentUpdate', this.name + ` type ${this.type}`);
+            throw (0, runtime_1.makeRuntimeException)('file', { path: this.name, fsEtityType: this.type }, { concurrentUpdate: true });
         }
         const res = await this.writeProc.startOrChain(async () => {
             if (this.currentVersion < 0) {
-                throw (0, file_1.makeFileException)('notFound', this.name, `Object is marked removed`);
+                throw (0, runtime_1.makeRuntimeException)('file', {
+                    path: this.name, fsEtityType: this.type,
+                    message: `NodeInFS is marked removed`
+                }, { notFound: true });
             }
             try {
                 const res = await change();