core-3nweb-client-lib 0.31.8 → 0.32.1

package/build/core/asmail/asmail-cap-ipc.d.ts

@@ -1,5 +1,5 @@
-import { ExposedObj, Caller, ExposedServices } from '../../ipc-via-protobuf/connector';
+import { ExposedObj, Caller, CoreSideServices } from '../../ipc-via-protobuf/connector';
 type ASMailService = web3n.asmail.Service;
-export declare function exposeASMailCAP(cap: ASMailService, expServices: ExposedServices): ExposedObj<ASMailService>;
+export declare function exposeASMailCAP(cap: ASMailService, expServices: CoreSideServices): ExposedObj<ASMailService>;
 export declare function makeASMailCaller(caller: Caller, objPath: string[]): ASMailService;
 export {};

package/build/core/storage/storage-cap-ipc.d.ts

@@ -1,6 +1,6 @@
-import { ExposedObj, Caller, ExposedServices } from '../../ipc-via-protobuf/connector';
+import { ExposedObj, Caller, CoreSideServices } from '../../ipc-via-protobuf/connector';
 type Storage = web3n.storage.Service;
-export declare function exposeStorageCAP(cap: Storage, expServices: ExposedServices): ExposedObj<Storage>;
+export declare function exposeStorageCAP(cap: Storage, expServices: CoreSideServices): ExposedObj<Storage>;
 export declare function makeStorageCaller(caller: Caller, objPath: string[]): Storage;
 export declare function promiseStorageCaller(caller: Caller, objPath: string[]): Promise<Storage>;
 export {};

package/build/core-ipc/bytes.d.ts

@@ -1,9 +1,9 @@
 import { ObjectReference } from '../ipc-via-protobuf/protobuf-msg';
-import { ExposedServices, Caller } from '../ipc-via-protobuf/connector';
+import { CoreSideServices, Caller } from '../ipc-via-protobuf/connector';
 type FileByteSink = web3n.files.FileByteSink;
 type FileByteSource = web3n.files.FileByteSource;
 export declare function makeSinkCaller(caller: Caller, ref: ObjectReference<'FileByteSink'>): FileByteSink;
-export declare function exposeSinkService(sink: FileByteSink, expServices: ExposedServices): ObjectReference<'FileByteSink'>;
+export declare function exposeSinkService(sink: FileByteSink, expServices: CoreSideServices): ObjectReference<'FileByteSink'>;
 export declare function makeSrcCaller(caller: Caller, ref: ObjectReference<'FileByteSource'>): FileByteSource;
-export declare function exposeSrcService(src: FileByteSource, expServices: ExposedServices): ObjectReference<'FileByteSource'>;
+export declare function exposeSrcService(src: FileByteSource, expServices: CoreSideServices): ObjectReference<'FileByteSource'>;
 export {};

package/build/core-ipc/common-caps.d.ts

@@ -1,7 +1,7 @@
-import { Caller, ExposedServices } from "../ipc-via-protobuf/connector";
+import { Caller, CoreSideServices } from "../ipc-via-protobuf/connector";
 import { ClientCAPsWraps, CAPsExposures, TypeDifference } from "./generic";
 type W3N = web3n.caps.common.W3N;
-export declare function exposeW3N<T extends W3N>(coreSide: ExposedServices, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
+export declare function exposeW3N<T extends W3N>(coreSide: CoreSideServices, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
 export declare function makeW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): T;
 export declare function promiseW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): Promise<T>;
 export {};

package/build/core-ipc/file.d.ts

@@ -1,6 +1,6 @@
 import { ObjectReference, Value } from "../ipc-via-protobuf/protobuf-msg";
 import { ProtoType } from '../lib-client/protobuf-type';
-import { ExposedFn, EnvelopeBody, Caller, ExposedServices } from "../ipc-via-protobuf/connector";
+import { ExposedFn, EnvelopeBody, Caller, CoreSideServices } from "../ipc-via-protobuf/connector";
 type ReadonlyFile = web3n.files.ReadonlyFile;
 type ReadonlyFileVersionedAPI = web3n.files.ReadonlyFileVersionedAPI;
 type WritableFile = web3n.files.WritableFile;
@@ -15,7 +15,7 @@ type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
 type VersionedReadFlags = web3n.files.VersionedReadFlags;
 export declare function makeFileCaller(caller: Caller, fileMsg: FileMsg): File;
-export declare function exposeFileService(file: File, expServices: ExposedServices): FileMsg;
+export declare function exposeFileService(file: File, expServices: CoreSideServices): FileMsg;
 export interface FileMsg {
     writable: boolean;
     isVersioned: boolean;
@@ -107,7 +107,7 @@ export declare namespace vGetByteSource {
         src: ObjectReference<'FileByteSource'>;
     }
     const replyType: ProtoType<Reply>;
-    function wrapService(fn: ReadonlyFileVersionedAPI['getByteSource'], expServices: ExposedServices): ExposedFn;
+    function wrapService(fn: ReadonlyFileVersionedAPI['getByteSource'], expServices: CoreSideServices): ExposedFn;
     function makeCaller(caller: Caller, objPath: string[]): ReadonlyFileVersionedAPI['getByteSource'];
 }
 export interface XAttrMsg {
@@ -141,7 +141,7 @@ export declare namespace vGetByteSink {
         sink: ObjectReference<'FileByteSink'>;
     }
     const replyType: ProtoType<Reply>;
-    function wrapService(fn: WritableFileVersionedAPI['getByteSink'], expServices: ExposedServices): ExposedFn;
+    function wrapService(fn: WritableFileVersionedAPI['getByteSink'], expServices: CoreSideServices): ExposedFn;
     function makeCaller(caller: Caller, objPath: string[]): WritableFileVersionedAPI['getByteSink'];
 }
 export interface OptionsToUploadLocalMsg {

package/build/core-ipc/fs.d.ts

@@ -1,12 +1,12 @@
 import { ObjectReference, Value } from "../ipc-via-protobuf/protobuf-msg";
 import { ProtoType } from '../lib-client/protobuf-type';
-import { Caller, ExposedServices } from "../ipc-via-protobuf/connector";
+import { Caller, CoreSideServices } from "../ipc-via-protobuf/connector";
 import { FileMsg } from "./file";
 type FS = web3n.files.FS;
 type FSItem = web3n.files.FSItem;
 type OptionsToAdoptRemoteItem = web3n.files.OptionsToAdoptRemoteItem;
 export declare function makeFSCaller(caller: Caller, fsMsg: FSMsg): FS;
-export declare function exposeFSService(fs: FS, expServices: ExposedServices): FSMsg;
+export declare function exposeFSService(fs: FS, expServices: CoreSideServices): FSMsg;
 export interface FSMsg {
     type: string;
     isVersioned: boolean;
@@ -35,7 +35,7 @@ export declare namespace fsItem {
         };
     }
     const msgType: ProtoType<FSItemMsg>;
-    function exposeFSItem(expServices: ExposedServices, item: FSItem): FSItemMsg;
+    function exposeFSItem(expServices: CoreSideServices, item: FSItem): FSItemMsg;
     function fsItemFromMsg(caller: Caller, msg: FSItemMsg): FSItem;
 }
 interface OptionsToAdoptRemoteItemMsg {

package/build/core-ipc/generic.d.ts

@@ -1,11 +1,11 @@
-import { ExposedObj, ExposedFn, ExposedServices, Caller } from "../ipc-via-protobuf/connector";
+import { ExposedObj, ExposedFn, CoreSideServices, Caller } from "../ipc-via-protobuf/connector";
 export type CAPsExposures<T> = {
-    [cap in keyof Required<T>]: (cap: any, coreSide: ExposedServices) => ExposedObj<any> | ExposedFn;
+    [cap in keyof Required<T>]: (cap: any, coreSide: CoreSideServices) => ExposedObj<any> | ExposedFn;
 };
 export type TypeDifference<T extends TExc, TExc extends object> = {
     [cap in Exclude<keyof T, keyof TExc>]: T[cap];
 };
-export declare function exposeCAPs<T extends W3N, W3N extends object>(coreSide: ExposedServices, w3n: T, mainCAPs: CAPsExposures<W3N>, extraCAPs: CAPsExposures<TypeDifference<T, W3N>> | undefined): void;
+export declare function exposeCAPs<T extends W3N, W3N extends object>(coreSide: CoreSideServices, w3n: T, mainCAPs: CAPsExposures<W3N>, extraCAPs: CAPsExposures<TypeDifference<T, W3N>> | undefined): void;
 export type MakeCapClient = (clientSide: Caller, objPath: string[]) => any;
 export type ClientCAPsWraps<T> = {
     [cap in keyof Required<T>]: MakeCapClient;

package/build/core-ipc/startup-caps.d.ts

@@ -1,6 +1,6 @@
-import { ExposedServices, Caller } from "../ipc-via-protobuf/connector";
+import { CoreSideServices, Caller } from "../ipc-via-protobuf/connector";
 import { ClientCAPsWraps, CAPsExposures, TypeDifference } from "./generic";
 type W3N = web3n.startup.W3N;
-export declare function exposeStartupW3N<T extends W3N>(coreSide: ExposedServices, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
+export declare function exposeStartupW3N<T extends W3N>(coreSide: CoreSideServices, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
 export declare function makeStartupW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): W3N;
 export {};

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, TransferableObj } from "./connector";
+import { ServicesSide, Envelope, EnvelopeBody, ExposedFn, ExposedObj, ServicesImpl, TransferableObj } from "./connector";
 export declare class ServicesSideImpl implements ServicesSide {
     private readonly sendMsg;
     readonly exposedObjs: ExposedObjs;
@@ -12,7 +12,7 @@ export declare class ServicesSideImpl implements ServicesSide {
     processCallCancelation(fnCallNum: number): void;
     processObjectDrop(path: string[]): void;
     processListObj(fnCallNum: number, path: string[]): void;
-    exposedServices(): ExposedServices;
+    exposedServices(): ServicesImpl;
 }
 export declare class ExposedObjs {
     private readonly objs;
@@ -21,7 +21,7 @@ export declare class ExposedObjs {
     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;
+    exposeStaticService(name: string, exp: ExposedFn | ExposedObj<any>): void;
     drop(name: string): void;
     find(path: string[] | undefined): ExposedFn | ExposedObj<any> | undefined;
     findFn(path: string[] | undefined): ExposedFn;

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2021, 2023 3NSoft Inc.
+ Copyright (C) 2020 - 2021, 2023 - 2024 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
@@ -131,7 +131,7 @@ class ServicesSideImpl {
     exposedServices() {
         const expSrv = {
             exposeDroppableService: this.exposedObjs.exposeDroppableService.bind(this.exposedObjs),
-            exposeW3NService: this.exposedObjs.exposeW3NService.bind(this.exposedObjs),
+            exposeStaticService: this.exposedObjs.exposeStaticService.bind(this.exposedObjs),
             getOriginalObj: this.exposedObjs.getOriginalObj.bind(this.exposedObjs),
             listObj: path => {
                 const obj = this.exposedObjs.find(path);
@@ -187,11 +187,8 @@ class ExposedObjs {
     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, {
+    exposeStaticService(name, exp) {
+        this.objs.set(name, {
             exp, original: undefined, objType: 'non-transferable'
         });
     }

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

@@ -1,10 +1,10 @@
 import { Observer, SubjectLike, Subscribable } from "rxjs";
 import { ObjectReference, Value } from "./protobuf-msg";
 import { ProtoType } from '../lib-client/protobuf-type';
-export interface ExposedServices {
+export interface ServicesImpl {
     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;
+    exposeStaticService(name: string, 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;
@@ -14,13 +14,29 @@ export interface TransferableObj<T extends string> {
     o: any;
 }
 export interface ServicesSide {
-    exposedServices(): ExposedServices;
+    exposedServices(): ServicesImpl;
     processCallStart(fnCallNum: number, path: string[] | undefined, body: EnvelopeBody): void;
     processCallCancelation(fnCallNum: number): void;
     processListObj(fnCallNum: number, path: string[] | undefined): void;
     processObjectDrop(path: string[] | undefined): void;
     stop(): void;
 }
+export interface CoreSideServices {
+    exposeDroppableService: ServicesImpl['exposeDroppableService'];
+    getOriginalObj: ServicesImpl['getOriginalObj'];
+    exposeW3NService(exp: ExposedFn | ExposedObj<any>): void;
+    listObj: ServicesImpl['listObj'];
+    getObjForTransfer: ServicesImpl['getObjForTransfer'];
+    findRefIfAlreadyExposed: ServicesImpl['findRefIfAlreadyExposed'];
+}
+export interface CoreSide {
+    exposedServices: CoreSideServices;
+    close: (err?: any) => void;
+}
+export interface ClientSide {
+    caller: Caller;
+    close: (err?: any) => void;
+}
 export interface Caller {
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
     startObservableCall(path: string[], req: EnvelopeBody, obs: SubjectLike<EnvelopeBody>): () => void;
@@ -48,9 +64,9 @@ export declare class ObjectsConnector {
     private messagingProc;
     private readonly services;
     private readonly clients;
-    constructor(msgSink: Observer<Envelope>, msgSrc: Subscribable<Envelope>, sides: 'clients' | 'services' | 'clients-and-services', listObj?: Caller['listObj'], listObjAsync?: Caller['listObjAsync']);
-    get caller(): Caller;
-    get exposedServices(): ExposedServices;
+    private constructor();
+    static makeCoreSide(fromCore: Observer<Envelope>, toCore: Subscribable<Envelope>): CoreSide;
+    static makeClientSide(fromClient: Observer<Envelope>, toClient: Subscribable<Envelope>, listObj?: Caller['listObj'], listObjAsync?: Caller['listObjAsync']): ClientSide;
     private stop;
     close(err?: any): void;
     private processIncomingMsg;

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2023 3NSoft Inc.
+ Copyright (C) 2020 - 2024 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
@@ -23,8 +23,8 @@ const protobuf_msg_1 = require("./protobuf-msg");
 const protobuf_type_1 = require("../lib-client/protobuf-type");
 const ipc_proto_1 = require("../protos/ipc.proto");
 // Note that make_?_Side functions could've been imported normally, but client
-// side uses weakrefs, while services side doesn't, and services side is used
-// in embedding without weakrefs, needing to hide require points.
+// side uses weakrefs, while services side doesn't, and services side can be
+// used in embedding without weakrefs, needing to hide require points.
 function makeServicesSide(sendMsg) {
     const srvClassFn = require('./connector-services-side').ServicesSideImpl;
     return new srvClassFn(sendMsg);
@@ -34,7 +34,7 @@ function makeClientsSide(sendMsg, syncReqToListObj, asyncReqToListObj) {
     return new classFn(sendMsg, syncReqToListObj, asyncReqToListObj);
 }
 class ObjectsConnector {
-    constructor(msgSink, msgSrc, sides, listObj, listObjAsync) {
+    constructor(side, msgSink, msgSrc, listObj, listObjAsync) {
         this.msgSink = msgSink;
         this.messagingProc = undefined;
         this.messagingProc = msgSrc.subscribe({
@@ -48,31 +48,48 @@ class ObjectsConnector {
             }
             this.msgSink.next(msg);
         };
-        this.services = (((sides === 'services') || (sides === 'clients-and-services')) ?
-            makeServicesSide(sendMsg) : undefined);
-        if ((sides === 'clients') || (sides === 'clients-and-services')) {
-            if ((!listObj && !listObjAsync)
-                || (listObj && listObjAsync)) {
-                throw new Error(`Client side needs either listObj, or listObjAsync argument`);
-            }
-            this.clients = makeClientsSide(sendMsg, listObj, listObjAsync);
-        }
-        else {
-            this.clients = undefined;
+        switch (side) {
+            case 'core':
+                this.services = makeServicesSide(sendMsg);
+                this.clients = undefined;
+                break;
+            case "client":
+                if ((!listObj && !listObjAsync)
+                    || (listObj && listObjAsync)) {
+                    throw new Error(`Client side needs either listObj, or listObjAsync argument`);
+                }
+                this.clients = makeClientsSide(sendMsg, listObj, listObjAsync);
+                this.services = undefined;
+                break;
         }
         Object.seal(this);
     }
-    get caller() {
-        if (!this.clients) {
-            throw new Error(`Clients side is not set in this connector`);
-        }
-        return this.clients.caller();
+    static makeCoreSide(fromCore, toCore) {
+        const connector = new ObjectsConnector('core', fromCore, toCore);
+        const { exposeDroppableService, exposeStaticService, findRefIfAlreadyExposed, getObjForTransfer, getOriginalObj, listObj } = connector.services.exposedServices();
+        let w3nIsSet = false;
+        return {
+            exposedServices: {
+                exposeDroppableService,
+                exposeW3NService: exp => {
+                    if (w3nIsSet) {
+                        throw new Error(`${exports.W3N_NAME} object has already been added`);
+                    }
+                    exposeStaticService(exports.W3N_NAME, exp);
+                    w3nIsSet = true;
+                },
+                findRefIfAlreadyExposed, getObjForTransfer,
+                getOriginalObj, listObj
+            },
+            close: err => connector.close(err)
+        };
     }
-    get exposedServices() {
-        if (!this.services) {
-            throw new Error(`Services side is not set in this connector`);
-        }
-        return this.services.exposedServices();
+    static makeClientSide(fromClient, toClient, listObj, listObjAsync) {
+        const connector = new ObjectsConnector('client', fromClient, toClient, listObj, listObjAsync);
+        return {
+            caller: connector.clients.caller(),
+            close: err => connector.close(err)
+        };
     }
     stop(fromRemote, err) {
         this.messagingProc = undefined;