core-3nweb-client-lib 0.37.0 → 0.37.2

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

@@ -36,6 +36,13 @@ declare namespace web3n.asmail {
 
 	}
 
+	interface PreFlightOnlyService {
+		getUserId: Service['getUserId'];
+		delivery: {
+			preFlight: DeliveryService['preFlight'];
+		}
+	}
+
 	interface DeliveryProgress {
 		notConnected?: true;
 		allDone?: 'all-ok' | 'with-errors';

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

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2016 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2016 - 2018, 2020, 2025 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
@@ -33,6 +33,21 @@ declare namespace web3n {
 		message?: string;
 	}
 
+	interface HTTPErrorDetails extends web3n.RuntimeException {
+		url: string;
+		method: string;
+		message?: string;
+	}
+	
+	interface ConnectException extends HTTPErrorDetails {
+		type: 'http-connect';
+	}
+	
+	interface HTTPException extends HTTPErrorDetails {
+		type: 'http-request';
+		status: number;
+	}
+	
 	interface EncryptionException {
 		failedCipherVerification?: true;
 		failedSignatureVerification?: true;

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

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

package/build/core/asmail/asmail-cap-ipc.js

@@ -18,6 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exposeASMailCAP = exposeASMailCAP;
 exports.makeASMailCaller = makeASMailCaller;
+exports.promiseASMailCaller = promiseASMailCaller;
 const protobuf_msg_1 = require("../../ipc-via-protobuf/protobuf-msg");
 const protobuf_type_1 = require("../../lib-client/protobuf-type");
 const asmail_proto_1 = require("../../protos/asmail.proto");
@@ -31,48 +32,87 @@ const service_side_wrap_1 = require("../../core-ipc/json-ipc-wrapping/service-si
 function exposeASMailCAP(cap, expServices) {
     const out = cap.delivery;
     const box = cap.inbox;
-    return {
-        getUserId: getUserId.wrapService(cap.getUserId),
-        delivery: {
-            addMsg: addMsg.wrapService(out.addMsg, expServices),
-            currentState: currentState.wrapService(out.currentState),
-            listMsgs: delivListMsgs.wrapService(out.listMsgs),
-            observeAllDeliveries: observeAllDeliveries.wrapService(out.observeAllDeliveries),
-            observeDelivery: observeDelivery.wrapService(out.observeDelivery),
-            preFlight: preFlight.wrapService(out.preFlight),
-            rmMsg: rmMsg.wrapService(out.rmMsg)
-        },
-        inbox: {
-            getMsg: getMsg.wrapService(box.getMsg, expServices),
-            listMsgs: inboxListMsgs.wrapService(box.listMsgs),
-            removeMsg: removeMsg.wrapService(box.removeMsg),
-            subscribe: inboxSubscribe.wrapService(box.subscribe, expServices)
-        },
-        config: exposeCofigCAP(cap.config)
-    };
+    if (!box && !out.addMsg) {
+        return {
+            getUserId: getUserId.wrapService(cap.getUserId),
+            delivery: {
+                preFlight: preFlight.wrapService(out.preFlight),
+            }
+        };
+    }
+    else {
+        return {
+            getUserId: getUserId.wrapService(cap.getUserId),
+            delivery: {
+                addMsg: addMsg.wrapService(out.addMsg, expServices),
+                currentState: currentState.wrapService(out.currentState),
+                listMsgs: delivListMsgs.wrapService(out.listMsgs),
+                observeAllDeliveries: observeAllDeliveries.wrapService(out.observeAllDeliveries),
+                observeDelivery: observeDelivery.wrapService(out.observeDelivery),
+                preFlight: preFlight.wrapService(out.preFlight),
+                rmMsg: rmMsg.wrapService(out.rmMsg)
+            },
+            inbox: {
+                getMsg: getMsg.wrapService(box.getMsg, expServices),
+                listMsgs: inboxListMsgs.wrapService(box.listMsgs),
+                removeMsg: removeMsg.wrapService(box.removeMsg),
+                subscribe: inboxSubscribe.wrapService(box.subscribe, expServices)
+            },
+            config: exposeCofigCAP(cap.config)
+        };
+    }
 }
-function makeASMailCaller(caller, objPath) {
+function makeASMailBasedOnListing(caller, objPath, capLists) {
     const delivPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'delivery');
     const inboxPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'inbox');
-    return {
-        getUserId: getUserId.makeCaller(caller, objPath),
-        delivery: {
-            addMsg: addMsg.makeCaller(caller, delivPath),
-            currentState: currentState.makeCaller(caller, delivPath),
-            listMsgs: delivListMsgs.makeCaller(caller, delivPath),
-            observeAllDeliveries: observeAllDeliveries.makeCaller(caller, delivPath),
-            observeDelivery: observeDelivery.makeCaller(caller, delivPath),
-            preFlight: preFlight.makeCaller(caller, delivPath),
-            rmMsg: rmMsg.makeCaller(caller, delivPath)
-        },
-        inbox: {
-            getMsg: getMsg.makeCaller(caller, inboxPath),
-            listMsgs: inboxListMsgs.makeCaller(caller, inboxPath),
-            removeMsg: removeMsg.makeCaller(caller, inboxPath),
-            subscribe: inboxSubscribe.makeCaller(caller, inboxPath)
-        },
-        config: makeConfigCaller(caller, objPath.concat('config'))
-    };
+    if (capLists === 'asmail') {
+        return {
+            getUserId: getUserId.makeCaller(caller, objPath),
+            delivery: {
+                addMsg: addMsg.makeCaller(caller, delivPath),
+                currentState: currentState.makeCaller(caller, delivPath),
+                listMsgs: delivListMsgs.makeCaller(caller, delivPath),
+                observeAllDeliveries: observeAllDeliveries.makeCaller(caller, delivPath),
+                observeDelivery: observeDelivery.makeCaller(caller, delivPath),
+                preFlight: preFlight.makeCaller(caller, delivPath),
+                rmMsg: rmMsg.makeCaller(caller, delivPath)
+            },
+            inbox: {
+                getMsg: getMsg.makeCaller(caller, inboxPath),
+                listMsgs: inboxListMsgs.makeCaller(caller, inboxPath),
+                removeMsg: removeMsg.makeCaller(caller, inboxPath),
+                subscribe: inboxSubscribe.makeCaller(caller, inboxPath)
+            },
+            config: makeConfigCaller(caller, objPath.concat('config'))
+        };
+    }
+    else if (capLists === 'preflight') {
+        return {
+            getUserId: getUserId.makeCaller(caller, objPath),
+            delivery: {
+                preFlight: preFlight.makeCaller(caller, delivPath),
+            }
+        };
+    }
+    else {
+        throw new Error(`Unknown capLists value ${capLists}`);
+    }
+}
+function makeASMailCaller(caller, objPath) {
+    if (!caller.listObj) {
+        throw new Error(`Caller here expects to have method 'listObj'`);
+    }
+    const topLst = caller.listObj(objPath);
+    const capLists = (topLst.includes('inbox') ? 'asmail' : 'preflight');
+    return makeASMailBasedOnListing(caller, objPath, capLists);
+}
+async function promiseASMailCaller(caller, objPath) {
+    if (!caller.listObjAsync) {
+        throw new Error(`Caller here expects to have method 'listObjAsync'`);
+    }
+    const topLst = await caller.listObjAsync(objPath);
+    const capLists = (topLst.includes('inbox') ? 'asmail' : 'preflight');
+    return makeASMailBasedOnListing(caller, objPath, capLists);
 }
 var getUserId;
 (function (getUserId) {

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

@@ -174,7 +174,7 @@ class Msg {
         if (typeof this.msgToSend.plainTxtBody === 'string') {
             msg.setPlainTextBody(this.msgToSend.plainTxtBody);
         }
-        else if (typeof this.msgToSend.htmlTxtBody === 'string') {
+        if (typeof this.msgToSend.htmlTxtBody === 'string') {
             msg.setHtmlTextBody(this.msgToSend.htmlTxtBody);
         }
         if (this.msgToSend.jsonBody !== undefined) {

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

@@ -33,9 +33,9 @@ class OpenedMsg {
         if (!this.msgKeyRole) {
             throw new Error(`Key role is not set in incoming message ${this.msgId}`);
         }
-        return (this.msgKeyRole === 'suggested') ||
+        return ((this.msgKeyRole === 'suggested') ||
             (this.msgKeyRole === 'in_use') ||
-            (this.msgKeyRole === 'old');
+            (this.msgKeyRole === 'old'));
     }
     setMsgKeyRole(msgKeyRole) {
         if (this.msgKeyRole) {

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

@@ -73,9 +73,9 @@ export declare class MsgPacker {
     setPlainTextBody(text: string): void;
     /**
      * This sets a plain html body.
-     * @param html
+     * @param htmlTxt
      */
-    setHtmlTextBody(html: string): void;
+    setHtmlTextBody(htmlTxt: string): void;
     /**
      * This sets a json body.
      * @param json

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

@@ -186,18 +186,18 @@ class MsgPacker {
         if (!this.mainBody.text) {
             this.mainBody.text = {};
         }
-        this.mainBody.text = { plain: text };
+        this.mainBody.text.plain = text;
         this.wasBodySet = true;
     }
     /**
      * This sets a plain html body.
-     * @param html
+     * @param htmlTxt
      */
-    setHtmlTextBody(html) {
+    setHtmlTextBody(htmlTxt) {
         if (!this.mainBody.text) {
             this.mainBody.text = {};
         }
-        this.mainBody.text = { html };
+        this.mainBody.text.html = htmlTxt;
         this.wasBodySet = true;
     }
     /**

package/build/core-ipc/common-caps.js

@@ -54,7 +54,7 @@ function makeW3Nclient(clientSide, extraCAPs) {
 async function promiseW3Nclient(clientSide, extraCAPs) {
     const mainCAPs = {
         log: log_cap_1.makeLogCaller,
-        mail: asmail_cap_ipc_1.makeASMailCaller,
+        mail: asmail_cap_ipc_1.promiseASMailCaller,
         mailerid: mailerid_cap_ipc_1.makeMailerIdCaller,
         storage: storage_cap_ipc_1.promiseStorageCaller,
         keyrings: keyrings_cap_ipc_1.makeKeyringsCaller,

package/build/lib-common/exceptions/http.d.ts

@@ -1,19 +1,4 @@
-/**
- * This module contains some code and type declarations that are common for
- * both main and worker processes.
- */
-interface HTTPErrorDetails extends web3n.RuntimeException {
-    url: string;
-    method: string;
-    message?: string;
-}
-export interface ConnectException extends HTTPErrorDetails {
-    type: 'http-connect';
-}
-export interface HTTPException extends HTTPErrorDetails {
-    type: 'http-request';
-    status: number;
-}
+export type ConnectException = web3n.ConnectException;
+export type HTTPException = web3n.HTTPException;
 export declare function makeConnectionException(url: string | undefined, method: string | undefined, msg?: string, cause?: any): ConnectException;
 export declare function makeHTTPException(url: string, method: string, status: number, msg?: string, cause?: any): HTTPException;
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.37.0",
+  "version": "0.37.2",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",