core-3nweb-client-lib 0.21.0 → 0.24.0

package/build/api-defs/common-caps.d.ts

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2017 - 2018, 2020 - 2021 3NSoft Inc.
+ Copyright (C) 2017 - 2018, 2020 - 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
@@ -28,14 +28,11 @@ declare namespace web3n.caps.common {
 
 	type DevPathChecker = (path: string) => 'w'|'r'|false;
 
-	interface AppManifest {
-		appDomain: string;
-		capsRequested: {
-			mail?: MailCAPSetting;
-			storage?: StorageCAPSetting;
-			mailerid?: true;
-			log?: LogCAPSetting;
-		};
+	interface RequestedCAPs {
+		mail?: MailCAPSetting;
+		storage?: StorageCAPSetting;
+		mailerid?: true;
+		log?: LogCAPSetting;
 	}
 
 	interface StorageCAPSetting {

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

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2016 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2016 - 2018, 2020, 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
@@ -39,6 +39,7 @@ declare namespace web3n.files {
 		notImplemented?: true;
 		attrsNotEnabledInFS?: true;
 		versionMismatch?: true;
+		isEndless?: true;
 	}
 
 	interface exceptionCode {
@@ -56,6 +57,7 @@ declare namespace web3n.files {
 		concurrentUpdate: 'concurrent-update';
 		parsingError: 'parsing-error';
 		notImplemented: 'ENOSYS';
+		isEndless: 'is-endless';
 	}
 
 	/**
@@ -99,6 +101,11 @@ declare namespace web3n.files {
 		 */
 		size?: number;
 
+		/**
+		 * Flag indicating if file is an endless (unknown place of end) stream.
+		 */
+		isEndless?: boolean;
+
 		/**
 		 * Last content modification time stamp.
 		 * If such information cannot be provided, this field will be absent.
@@ -152,12 +159,6 @@ declare namespace web3n.files {
 		getPosition(): Promise<number>;
 	}
 
-	interface FileSection {
-		hasContent: boolean;
-		ofs: number;
-		len: number;
-	}
-
 	interface LayoutSection {
 		src: 'new' | 'base' | 'empty';
 		ofs: number;

package/build/core/asmail/inbox/attachments/fs.d.ts

@@ -1,6 +1,6 @@
-import { StorageGetter, FolderInfoWithAttrs } from '../../../../lib-client/3nstorage/xsp-fs/common';
+import { StorageGetter, FolderInJSON } from '../../../../lib-client/3nstorage/xsp-fs/common';
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { MsgOnDisk } from '../msg-on-disk';
 declare type ReadonlyFS = web3n.files.ReadonlyFS;
-export declare function fsForAttachments(msg: MsgOnDisk, rootJson: FolderInfoWithAttrs, storages: StorageGetter, cryptor: AsyncSBoxCryptor): ReadonlyFS;
+export declare function fsForAttachments(msg: MsgOnDisk, rootJson: FolderInJSON, storages: StorageGetter, cryptor: AsyncSBoxCryptor): ReadonlyFS;
 export {};

package/build/core/asmail/inbox/attachments/fs.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2019 3NSoft Inc.
+ Copyright (C) 2016 - 2019, 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
@@ -13,7 +13,8 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fsForAttachments = void 0;
 const common_1 = require("../../../../lib-client/3nstorage/xsp-fs/common");

package/build/core/asmail/msg/common.d.ts

@@ -1,5 +1,5 @@
 import { JsonKeyShort } from '../../../lib-common/jwkeys';
-import { FolderInfoWithAttrs } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { FolderInJSON } from '../../../lib-client/3nstorage/xsp-fs/common';
 import * as confApi from '../../../lib-common/service-api/asmail/config';
 /**
  * Metadata for message that uses established key pair.
@@ -24,7 +24,7 @@ export interface MsgEnvelope {
     'Msg Type': string;
     'Subject'?: string;
     'Body': MainBody;
-    'Attachments'?: FolderInfoWithAttrs;
+    'Attachments'?: FolderInJSON;
     'Flow Params': FlowParams;
     'From': string;
     'To'?: string[];

package/build/core/asmail/msg/common.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 2020, 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
@@ -13,6 +13,7 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 Object.freeze(exports);

package/build/core/asmail/msg/opener.d.ts

@@ -1,7 +1,7 @@
 import * as confApi from '../../../lib-common/service-api/asmail/config';
 import { MsgEnvelope, MainBody, SuggestedNextKeyPair, SendingParams } from './common';
 import { AsyncSBoxCryptor, ObjSource } from 'xsp-files';
-import { FolderInfoWithAttrs } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { FolderInJSON } from '../../../lib-client/3nstorage/xsp-fs/common';
 import { MsgKeyRole } from '../keyring';
 export { SuggestedNextKeyPair } from './common';
 export declare class OpenedMsg {
@@ -18,6 +18,6 @@ export declare class OpenedMsg {
     get msgCount(): number;
     get nextSendingParams(): SendingParams | undefined;
     get introCryptoCerts(): confApi.p.initPubKey.Certs;
-    get attachmentsJSON(): FolderInfoWithAttrs | undefined;
+    get attachmentsJSON(): FolderInJSON | undefined;
 }
 export declare function openMsg(msgId: string, mainObjId: string, mainObj: ObjSource, headerOfs: number, fKey: Uint8Array, cryptor: AsyncSBoxCryptor): Promise<OpenedMsg>;

package/build/core/asmail/msg/opener.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2020, 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
@@ -13,7 +13,8 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openMsg = exports.OpenedMsg = void 0;
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");

package/build/core/asmail/msg/packer.d.ts

@@ -1,6 +1,6 @@
 import { AsyncSBoxCryptor, ObjSource } from 'xsp-files';
 import * as delivApi from '../../../lib-common/service-api/asmail/delivery';
-import { FolderInfoWithAttrs } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { FolderInJSON } from '../../../lib-client/3nstorage/xsp-fs/common';
 import * as confApi from '../../../lib-common/service-api/asmail/config';
 import { MsgEnvelope, SuggestedNextKeyPair, SendingParams } from './common';
 import { Encryptor } from '../../../lib-common/async-cryptor-wrap';
@@ -24,7 +24,7 @@ export interface PackJSON {
 }
 export interface MsgObj {
     json?: any;
-    folder?: FolderInfoWithAttrs;
+    folder?: FolderInJSON;
     file?: PathInMsg;
     /**
      * This is object's id in the message

package/build/core/asmail/msg/packer.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 2020, 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
@@ -13,7 +13,8 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgPacker = void 0;
 const ecma_nacl_1 = require("ecma-nacl");
@@ -139,7 +140,7 @@ class MsgPacker {
         };
     }
     async addFolderInto(outerFolder, fName, fs, fsPath) {
-        const folder = { nodes: {} };
+        const folder = { nodes: {}, ctime: outerFolder.ctime };
         const list = await fs.listFolder('.');
         for (const entry of list) {
             const fName = entry.name;
@@ -282,7 +283,7 @@ class MsgPacker {
             throw new Error(`Attachments are already set.`);
         }
         // attachments folder json to insert into main
-        const attachments = { nodes: {} };
+        const attachments = { nodes: {}, ctime: Date.now() };
         // populate attachments json
         const path = { start: 'attachments', path: [] };
         if (att.container && !attachments_container_1.isContainerEmpty(att.container)) {
@@ -346,7 +347,7 @@ class MsgPacker {
         }
         const msgKeyPack = await msgKeyEnc.pack(obj.key);
         const bytes = buffer_utils_1.utf8.pack(JSON.stringify(obj.json));
-        const segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs }, random.bytes, cryptor);
+        const segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
         // make source that inserts message key pack into header
         return makeMainObjSrc(msgKeyPack, bytes, segWriter);
     }
@@ -412,7 +413,7 @@ class MsgPacker {
             segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'restart', header }, random.bytes, cryptor);
         }
         else {
-            segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs }, random.bytes, cryptor);
+            segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
         }
         // make object source
         let src;

package/build/core/index.d.ts

@@ -2,7 +2,7 @@ import { FactoryOfFSs } from './storage';
 import { makeCryptor } from '../lib-client/cryptor/cryptor';
 import { NetClient } from '../lib-client/request-utils';
 import { ServiceLocatorMaker } from '../lib-client/service-locator';
-declare type RequestedCAPs = web3n.caps.common.AppManifest['capsRequested'];
+declare type RequestedCAPs = web3n.caps.common.RequestedCAPs;
 declare type W3N = web3n.caps.common.W3N;
 export interface CoreConf {
     dataDir: string;

package/build/core/index.js

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

package/build/core/storage/index.js

@@ -36,13 +36,13 @@ function makeBadAppNameExc(appName) {
         appName
     };
 }
-function makeNotAllowedToOpenAppFSExc(appName) {
+function makeNotAllowedToOpenAppFSExc(appFolder) {
     return {
         runtimeException: true,
         type: 'storage',
         storageSegment: 'app',
         notAllowedToOpenFS: true,
-        appName
+        appName: reverseDomain(appFolder)
     };
 }
 function makeNotAllowedToOpenUserFSExc(storageType) {

package/build/core/storage/local/obj-files.js

@@ -23,8 +23,6 @@ const processes_1 = require("../../../lib-common/processes");
 const path_1 = require("path");
 const obj_files_gc_1 = require("./obj-files-gc");
 const obj_status_1 = require("./obj-status");
-const operators_1 = require("rxjs/operators");
-const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
 class ObjFiles {
     constructor(folders, logError) {
@@ -141,12 +139,17 @@ class LocalObj {
         }
         const fPath = this.path(version);
         const { obj, write$ } = await obj_on_disk_1.ObjOnDisk.createFileForWriteOfNewVersion(this.objId, version, fPath, encSub, undefined, this.objSegsGetterFromDisk);
-        // this.verObjs.set(version, obj);
-        await write$.pipe(operators_1.tap(undefined, err => {
+        try {
+            await write$.toPromise();
+        }
+        catch (err) {
             if (this.verObjs.get(version) === obj) {
                 this.verObjs.delete(version);
             }
-        }), utils_for_observables_1.flatTap(undefined, undefined, () => this.status.setNewCurrentVersion(version, obj.getBaseVersion()))).toPromise();
+            throw err;
+        }
+        this.verObjs.set(version, obj);
+        await this.status.setNewCurrentVersion(version, obj.getBaseVersion());
         this.scheduleGC(this);
     }
     isArchived() {

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2020 3NSoft Inc.
+ Copyright (C) 2016 - 2020, 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
@@ -13,7 +13,8 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjStatus = void 0;
 const fs = require("../../../lib-common/async-fs-node");
@@ -63,7 +64,6 @@ class ObjStatus {
         };
     }
     async setNewCurrentVersion(newVersion, baseVer) {
-        this.status.currentVersion = newVersion;
         if (baseVer !== undefined) {
             // base->diff links should be added before removals
             addBaseToDiffLinkInStatus(this.status, newVersion, baseVer);
@@ -71,6 +71,7 @@ class ObjStatus {
         if (typeof this.status.currentVersion === 'number') {
             rmNonArchVersionsIn(this.status, this.status.currentVersion);
         }
+        this.status.currentVersion = newVersion;
         await this.saveProc.trigger();
     }
     async removeCurrentVersion(verObjs) {

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2020 3NSoft Inc.
+ Copyright (C) 2016 - 2020, 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
@@ -13,7 +13,8 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjStatus = void 0;
 const processes_1 = require("../../../lib-common/processes");
@@ -184,7 +185,6 @@ function rmNonArchVersionsIn(status, ver) {
 // 	status: ObjStatusInfo, newVersion: number, baseVer: number|undefined
 // ): void {
 // 	if (status.isArchived) { return; }
-// 	status.versions.current = newVersion;
 // 	if (status.syncState === 'synced') {
 // 		status.syncState = 'unsynced';
 // 	}
@@ -195,6 +195,7 @@ function rmNonArchVersionsIn(status, ver) {
 // 	if (status.versions.current) {
 // 		rmNonArchVersionsIn(status, status.versions.current);
 // 	}
+// 	status.versions.current = newVersion;
 // }
 // export function addConflictingRemoteVersionTo(
 // 	status: ObjStatusInfo, conflictVersion: number

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

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

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

@@ -147,7 +147,7 @@ var sinkShowLayout;
     }
     function unpackLayout(msg) {
         return {
-            base: protobuf_msg_1.valOfOpt(msg.base),
+            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)
             }))

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

@@ -20,9 +20,9 @@ export declare class ClientsSideImpl implements ClientsSide {
     private startCall;
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
     startObservableCall(path: string[], req: EnvelopeBody, obs: Subject<EnvelopeBody>): () => void;
-    registerClientDrop(o: any, srvRef: ObjectReference): void;
+    registerClientDrop(o: any, srvRef: ObjectReference<any>): void;
     private makeClientDropCB;
     private sendObjDropMsg;
-    srvRefOf(clientObj: any): ObjectReference;
+    srvRefOf(clientObj: any): ObjectReference<any>;
     listObj(path: string[]): string[];
 }

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

@@ -1,4 +1,4 @@
-import { ObjectReference, ExposedObjType } from "./protobuf-msg";
+import { ObjectReference } from "./protobuf-msg";
 import { ServicesSide, Envelope, EnvelopeBody, ExposedFn, ExposedObj, ExposedServices } from "./connector";
 export declare class ServicesSideImpl implements ServicesSide {
     private readonly sendMsg;
@@ -16,8 +16,8 @@ export declare class ServicesSideImpl implements ServicesSide {
 }
 export declare class ExposedObjs {
     private readonly objs;
-    exposeDroppableService(objType: ExposedObjType, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference;
-    getOriginalObj<T>(ref: ObjectReference): T;
+    exposeDroppableService<T>(objType: T, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference<T>;
+    getOriginalObj<T>(ref: ObjectReference<any>): T;
     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

@@ -149,7 +149,6 @@ class ExposedObjs {
         this.objs = new Map();
     }
     exposeDroppableService(objType, exp, original) {
-        connector_1.ensureCorrectRefObjType(objType);
         let id;
         do {
             id = random_node_1.stringOfB64CharsSync(20);

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

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { Observable, Observer, Subject } from "rxjs";
-import { ObjectReference, ExposedObjType, Value } from "./protobuf-msg";
+import { ObjectReference, Value } from "./protobuf-msg";
 export interface ExposedServices {
-    exposeDroppableService(objType: ExposedObjType, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference;
-    getOriginalObj<T>(ref: ObjectReference): T;
+    exposeDroppableService<T>(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;
 }
@@ -18,8 +18,8 @@ export interface ServicesSide {
 export interface Caller {
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
     startObservableCall(path: string[], req: EnvelopeBody, obs: Subject<EnvelopeBody>): () => void;
-    registerClientDrop(o: any, srvRef: ObjectReference): void;
-    srvRefOf(clientObj: any): ObjectReference;
+    registerClientDrop(o: any, srvRef: ObjectReference<any>): void;
+    srvRefOf(clientObj: any): ObjectReference<any>;
     listObj(path: string[]): string[];
 }
 export interface ClientsSide {
@@ -43,7 +43,6 @@ export declare class ObjectsConnector {
     private sendCallError;
 }
 export declare const W3N_NAME = "w3n";
-export declare function ensureCorrectRefObjType(objType: ExposedObjType): void;
 /**
  * Envelope is a message form that is sent in IPC channel.
  */
@@ -86,4 +85,4 @@ export interface IPCException extends web3n.RuntimeException {
     path?: string[];
 }
 export declare function makeIPCException(fields: Partial<IPCException>): IPCException;
-export declare function checkRefObjTypeIs(expected: ExposedObjType, ref: ObjectReference): void;
+export declare function checkRefObjTypeIs<T>(expected: T, ref: ObjectReference<T>): void;

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

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkRefObjTypeIs = exports.makeIPCException = exports.msgProtoType = exports.ensureCorrectRefObjType = exports.W3N_NAME = exports.ObjectsConnector = void 0;
+exports.checkRefObjTypeIs = exports.makeIPCException = exports.msgProtoType = exports.W3N_NAME = exports.ObjectsConnector = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
 // 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
@@ -156,21 +156,6 @@ exports.ObjectsConnector = ObjectsConnector;
 Object.freeze(ObjectsConnector.prototype);
 Object.freeze(ObjectsConnector);
 exports.W3N_NAME = 'w3n';
-function ensureCorrectRefObjType(objType) {
-    switch (objType) {
-        case 'FileByteSink':
-        case 'FileByteSource':
-        case 'FileImpl':
-        case 'FSImpl':
-        case 'SymLinkImpl':
-        case 'FSCollection':
-        case 'FSItemsIter':
-            return;
-        default:
-            throw new Error(`Object type ${objType} is not known`);
-    }
-}
-exports.ensureCorrectRefObjType = ensureCorrectRefObjType;
 exports.msgProtoType = protobuf_msg_1.makeProtobufTypeFrom('ipc.proto', 'ipc.Envelope');
 function makeIPCException(fields) {
     const exc = {

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

@@ -20,7 +20,7 @@ export interface FileMsg {
     isVersioned: boolean;
     name: string;
     isNew: boolean;
-    impl: ObjectReference;
+    impl: ObjectReference<'FileImpl'>;
 }
 export declare function packXAttrValue(val: any): EnvelopeBody;
 export declare function unpackXAttrValue(buf: EnvelopeBody): any;
@@ -42,6 +42,10 @@ export declare namespace vGetXAttr {
         bytes?: Value<Buffer>;
     }
     const replyType: ProtoType<Reply>;
+    function unpackReply(buf: EnvelopeBody): {
+        attr: any;
+        version: number;
+    };
     function wrapService(fn: ReadonlyFileVersionedAPI['getXAttr']): ExposedFn;
     function makeCaller(caller: Caller, objPath: string[]): ReadonlyFileVersionedAPI['getXAttr'];
 }
@@ -87,7 +91,7 @@ export declare namespace vReadJSON {
 export declare namespace vGetByteSource {
     interface Reply {
         version: number;
-        src: ObjectReference;
+        src: ObjectReference<'FileByteSource'>;
     }
     const replyType: ProtoType<Reply>;
     function wrapService(fn: ReadonlyFileVersionedAPI['getByteSource'], expServices: ExposedServices): ExposedFn;
@@ -116,7 +120,7 @@ export declare namespace updateXAttrs {
 export declare namespace vGetByteSink {
     interface Reply {
         version: number;
-        sink: ObjectReference;
+        sink: ObjectReference<'FileByteSink'>;
     }
     const replyType: ProtoType<Reply>;
     function wrapService(fn: WritableFileVersionedAPI['getByteSink'], expServices: ExposedServices): ExposedFn;

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

@@ -214,8 +214,8 @@ var getXAttr;
     getXAttr.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const path = objPath.concat('getXAttr');
-        return () => caller
-            .startPromiseCall(path, undefined)
+        return xaName => caller
+            .startPromiseCall(path, requestType.pack({ xaName }))
             .then(unpackXAttrValue);
     }
     getXAttr.makeCaller = makeCaller;
@@ -413,6 +413,20 @@ var vGetXAttr;
 (function (vGetXAttr) {
     const requestType = makeFileType('GetXAttrRequestBody');
     vGetXAttr.replyType = makeFileType('VersionedGetXAttrReplyBody');
+    function unpackReply(buf) {
+        const { json, str, bytes, version: v } = vGetXAttr.replyType.unpack(buf);
+        const version = protobuf_msg_1.fixInt(v);
+        if (bytes) {
+            return { version, attr: protobuf_msg_1.valOf(bytes) };
+        }
+        else if (str) {
+            return { version, attr: protobuf_msg_1.valOf(str) };
+        }
+        else {
+            return { version, attr: protobuf_msg_1.valOfOptJson(json) };
+        }
+    }
+    vGetXAttr.unpackReply = unpackReply;
     function wrapService(fn) {
         return buf => {
             const { xaName } = requestType.unpack(buf);
@@ -436,19 +450,7 @@ var vGetXAttr;
         const path = objPath.concat('getXAttr');
         return () => caller
             .startPromiseCall(path, undefined)
-            .then(buf => {
-            const { json, str, bytes, version: v } = vGetXAttr.replyType.unpack(buf);
-            const version = protobuf_msg_1.fixInt(v);
-            if (bytes) {
-                return { version, attr: protobuf_msg_1.valOf(bytes) };
-            }
-            else if (str) {
-                return { version, attr: protobuf_msg_1.valOf(str) };
-            }
-            else {
-                return { version, attr: protobuf_msg_1.valOfOptJson(json) };
-            }
-        });
+            .then(unpackReply);
     }
     vGetXAttr.makeCaller = makeCaller;
 })(vGetXAttr = exports.vGetXAttr || (exports.vGetXAttr = {}));

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

@@ -11,7 +11,7 @@ export interface FSMsg {
     isVersioned: boolean;
     writable: boolean;
     name: string;
-    impl: ObjectReference;
+    impl: ObjectReference<'FSImpl'>;
 }
 export declare const fsMsgType: ProtoType<FSMsg>;
 export declare namespace fsItem {
@@ -23,7 +23,7 @@ export declare namespace fsItem {
         item?: {
             fs?: FSMsg;
             file?: FileMsg;
-            collection?: ObjectReference;
+            collection?: ObjectReference<'FSCollection'>;
         };
         location?: {
             fs: FSMsg;

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

@@ -1043,7 +1043,7 @@ var vGetXAttr;
         const ipcPath = objPath.concat('getXAttr');
         return (path, xaName) => caller
             .startPromiseCall(ipcPath, getXAttr.requestType.pack({ path, xaName }))
-            .then(file_1.unpackXAttrValue);
+            .then(file.vGetXAttr.unpackReply);
     }
     vGetXAttr.makeCaller = makeCaller;
 })(vGetXAttr || (vGetXAttr = {}));

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

@@ -3,12 +3,11 @@ import { EnvelopeBody } from './connector';
 import { ProtoType } from '../lib-client/protobuf-loader';
 declare type RuntimeException = web3n.RuntimeException;
 export declare function makeProtobufTypeFrom<T extends object>(protoFile: string, typeName: string): ProtoType<T>;
-export declare type ExposedObjType = 'FileByteSink' | 'FileByteSource' | 'FileImpl' | 'FSImpl' | 'SymLinkImpl' | 'FSCollection' | 'FSItemsIter';
-export interface ObjectReference {
-    objType: ExposedObjType;
+export interface ObjectReference<T> {
+    objType: T;
     path: string[];
 }
-export declare const objRefType: ProtoType<ObjectReference>;
+export declare const objRefType: ProtoType<ObjectReference<any>>;
 export interface BooleanValue {
     value: boolean;
 }