core-3nweb-client-lib 0.50.5 → 0.51.0

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

@@ -34,6 +34,8 @@ declare namespace web3n.asmail {
 
 		config: ASMailConfigService;
 
+		getReportAddressForDomain(domain: string): Promise<string>;
+
 	}
 
 	interface PreFlightOnlyService {

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

@@ -58,7 +58,8 @@ function exposeASMailCAP(cap, expServices) {
                 removeMsg: removeMsg.wrapService(box.removeMsg),
                 subscribe: inboxSubscribe.wrapService(box.subscribe, expServices)
             },
-            config: exposeConfigCAP(cap.config)
+            config: exposeConfigCAP(cap.config),
+            getReportAddressForDomain: (0, service_side_wrap_1.wrapReqReplyFunc)(cap, cap.getReportAddressForDomain)
         };
     }
 }
@@ -83,7 +84,8 @@ function makeASMailBasedOnListing(caller, objPath, capLists) {
                 removeMsg: removeMsg.makeCaller(caller, inboxPath),
                 subscribe: inboxSubscribe.makeCaller(caller, inboxPath)
             },
-            config: makeConfigCaller(caller, objPath.concat('config'))
+            config: makeConfigCaller(caller, objPath.concat('config')),
+            getReportAddressForDomain: (0, caller_side_wrap_1.makeReqRepFuncCaller)(caller, objPath.concat('getReportAddressForDomain'))
         };
     }
     else if (capLists === 'preflight') {

package/build/core/asmail/inbox/msg-indexing/dataset/v1/sql-db.js

@@ -169,16 +169,19 @@ async function fileTSsOfDBShards(dbsFS) {
         if (!isFile || !name.endsWith(DB_EXT)) {
             continue;
         }
-        const numStr = name.substring(0, DB_EXT.length);
+        const numStr = name.substring(0, name.length - DB_EXT.length);
         const fileTS = parseInt(numStr);
         if (isNaN(fileTS)) {
             continue;
         }
         fileTSs.push(fileTS);
     }
-    fileTSs.sort();
+    fileTSs.sort(compareNumbers);
     return fileTSs;
 }
+function compareNumbers(a, b) {
+    return a - b;
+}
 const DB_EXT = '.sqlite';
 const LATEST_DB = `latest${DB_EXT}`;
 const MSG_INDEX_DB_ATTR = `msg-index-db`;
@@ -267,7 +270,7 @@ async function makeSqliteDBs(dbsFS) {
     }
     async function* iterateDBsFromLatestToOldest() {
         yield { db: latest };
-        for (let i = (fileTSs.length - 1); i >= 0; i = -1) {
+        for (let i = (fileTSs.length - 1); i >= 0; i -= 1) {
             const fileTS = fileTSs[i];
             if (!fileTS) {
                 continue;
@@ -365,7 +368,7 @@ async function makeSqliteDBs(dbsFS) {
         if (!shardTS) {
             return;
         }
-        for (let i = fileTSs.length; i >= 0; i - 1) {
+        for (let i = fileTSs.length; i >= 0; i -= 1) {
             const ts = fileTSs[i];
             if (ts < shardTS) {
                 fileTSs.slice(i + 1, shardTS);

package/build/core/asmail/index.d.ts

@@ -23,6 +23,7 @@ export declare class ASMail {
     private delivery;
     private config;
     private sendingParams;
+    private getReportAddressForDomain;
     constructor(cryptor: AsyncSBoxCryptor, random: AsyncRNG, makeNet: MakeNet, inboxPathForUser: InboxPathForUser, logger: Logger);
     init(address: string, getSigner: GetSigner, syncedFS: WritableFS, localFS: WritableFS, getStorages: StorageGetter, makeResolver: ServiceLocatorMaker, config: ConfigOfASMailServer, keyring: KeyringForASMail): Promise<void>;
     private setupSendingParams;

package/build/core/asmail/index.js

@@ -38,11 +38,13 @@ class ASMail {
         this.delivery = undefined;
         this.config = undefined;
         this.sendingParams = undefined;
+        this.getReportAddressForDomain = undefined;
         Object.seal(this);
     }
     async init(address, getSigner, syncedFS, localFS, getStorages, makeResolver, config, keyring) {
         try {
             this.address = address;
+            this.getReportAddressForDomain = makeResolver('report', this.logger.logError);
             // XXX this should be part of proper syncing logic
             // await getRemoteFolderChanges(syncedFS);
             this.config = config;
@@ -112,7 +114,8 @@ class ASMail {
             getUserId: async () => this.address,
             delivery: this.delivery.makeCAP(),
             inbox: this.inbox.makeCAP(),
-            config: this.config.makeCAP()
+            config: this.config.makeCAP(),
+            getReportAddressForDomain: this.getReportAddressForDomain
         };
         return Object.freeze(w);
     }

package/build/core/storage/common/obj-info-file.js

@@ -160,9 +160,12 @@ function addArchived(versions, version) {
         return false;
     }
     versions.archived.push(version);
-    versions.archived.sort();
+    versions.archived.sort(compareNumbers);
     return true;
 }
+function compareNumbers(a, b) {
+    return a - b;
+}
 function isEmptyVersions(versions) {
     if (versions.current) {
         return false;

package/build/lib-client/service-locator.d.ts

@@ -28,7 +28,7 @@ export declare function mailerIdInfoAt(client: NetClient, url: string): Promise<
  */
 export declare function storageInfoAt(client: NetClient, url: string): Promise<StorageRootRoute>;
 export type ServiceTypeDNSLabel = 'mailerid' | 'asmail' | '3nstorage';
-export type ServiceLocatorMaker = (serviceLabel: ServiceTypeDNSLabel, logError: LogError) => ServiceLocator;
+export type ServiceLocatorMaker = (serviceLabel: ServiceTypeDNSLabel | 'report', logError: LogError) => ServiceLocator;
 export type ServiceLocator = (address: string) => Promise<string>;
 export interface DnsResolver {
     resolveTxt: (typeof dnsPromises)['resolveTxt'];

package/build/lib-client/service-locator.js

@@ -188,7 +188,8 @@ function extractPair(txtRecords, serviceLabel) {
 const recordsStarts = {
     "3nstorage": '3nstorage=',
     asmail: 'asmail=',
-    mailerid: 'mailerid='
+    mailerid: 'mailerid=',
+    report: 'report='
 };
 function getRecordAtStartOf(txt) {
     let service = undefined;
@@ -276,7 +277,12 @@ function makeServiceLocator(...resolvers) {
             }
             const recValue = extractPair(txtRecords, serviceLabel);
             if (recValue) {
-                return checkAndPrepareURL(recValue);
+                if (serviceLabel === 'report') {
+                    return recValue;
+                }
+                else {
+                    return checkAndPrepareURL(recValue);
+                }
             }
             else {
                 exc !== null && exc !== void 0 ? exc : (exc = noServiceRecordExc(address));

package/build/tests/caps-api/asmail.js

@@ -21,6 +21,7 @@ const setups_1 = require("../libs-for-tests/setups");
 const spec_module_1 = require("../libs-for-tests/spec-module");
 const path_1 = require("path");
 const assert_1 = require("../../lib-common/assert");
+const canonical_address_1 = require("../../lib-common/canonical-address");
 describe('ASMail', () => {
     const s = (0, setups_1.setupWithUsers)(true, ['Bob Perkins @company.inc', 'John Morrison @bank.com']);
     beforeAll(() => {
@@ -35,6 +36,7 @@ describe('ASMail', () => {
             expect(typeof w3n.mail.inbox).toBe('object');
             expect(typeof w3n.mail.config).toBe('object');
             expect(typeof w3n.mail.getUserId).toBe('function');
+            expect(typeof w3n.mail.getReportAddressForDomain).toBe('function');
         }
     }, undefined, s);
     (0, jasmine_utils_1.itCond)('gets current user id', async () => {
@@ -82,5 +84,14 @@ describe('ASMail', () => {
             expect(msgs.length).toBe(0);
         }
     }, undefined, s);
+    (0, jasmine_utils_1.itCond)('hosts report address getting', async () => {
+        (0, assert_1.assert)(s.users.length > 0);
+        for (const u of s.users) {
+            const w3n = s.testAppCapsByUser(u);
+            const address = await w3n.mail.getUserId();
+            expect(typeof address).toBe('string');
+            expect((0, canonical_address_1.checkAndTransformAddress)(address)).toBeTruthy();
+        }
+    }, undefined, s);
     (0, spec_module_1.loadSpecs)(s, (0, path_1.join)(__dirname, 'asmail', 'specs'));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.50.5",
+  "version": "0.51.0",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -51,7 +51,7 @@
     "lodash": "^4.18.1",
     "napi-nacl": "^1.2.1",
     "protobufjs-cli": "^1.0.2",
-    "spec-3nweb-server": "^1.8.6",
+    "spec-3nweb-server": "^1.8.11",
     "tsuml2": "^0.17.1",
     "typescript": "^5.5.3"
   }