core-3nweb-client-lib 0.51.0 → 0.52.1

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

@@ -32,10 +32,20 @@ async function makeSendingParamsHolder(fs, anonInvitesOnServer, random) {
         await thisSide.close();
         await otherSides.close();
     }
+    async function forgetCorrespondentAt(cAddr) {
+        await otherSides.forgetCorrespondentAt(cAddr);
+        await thisSide.forgetCorrespondentAt(cAddr);
+    }
+    async function forgetAllCorrespondentsAtDomain(domain) {
+        await otherSides.forgetAllCorrespondentsAtDomain(domain);
+        await thisSide.forgetAllCorrespondentsAtDomain(domain);
+    }
     return {
         thisSide,
         otherSides,
-        close
+        close,
+        forgetCorrespondentAt,
+        forgetAllCorrespondentsAtDomain
     };
 }
 Object.freeze(exports);

package/build/core/asmail/sending-params/own-params.d.ts

@@ -4,5 +4,7 @@ type WritableFS = web3n.files.WritableFS;
 export type OwnSendingParams = Awaited<ReturnType<typeof makeOwnSendingParams>>;
 export declare function makeOwnSendingParams(fs: WritableFS, fileName: string, anonInvites: AnonymousInvites): Promise<SendingParamsHolder['thisSide'] & {
     close: () => Promise<void>;
+    forgetCorrespondentAt(cAddr: string): Promise<void>;
+    forgetAllCorrespondentsAtDomain(domain: string): Promise<void>;
 }>;
 export {};

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

@@ -49,7 +49,7 @@ async function makeOwnSendingParams(fs, fileName, anonInvites) {
                     invitation
                 };
             }
-            await persist();
+            await saveParamsAndTriggerUpload();
         });
     }
     function currentToFileJSON() {
@@ -58,7 +58,7 @@ async function makeOwnSendingParams(fs, fileName, anonInvites) {
             senderSpecific: Object.values(params)
         };
     }
-    async function persist() {
+    async function saveParamsAndTriggerUpload() {
         await paramsFile.writeJSON(currentToFileJSON());
         triggerUpload();
     }
@@ -160,7 +160,7 @@ async function makeOwnSendingParams(fs, fileName, anonInvites) {
             };
             p.suggested.timestamp = Date.now();
             params[p.address] = p;
-            await persist();
+            await saveParamsAndTriggerUpload();
             return p.suggested;
         });
     }
@@ -172,17 +172,39 @@ async function makeOwnSendingParams(fs, fileName, anonInvites) {
             }
             p.inUse = p.suggested;
             p.suggested = undefined;
-            await persist();
+            await saveParamsAndTriggerUpload();
         });
     }
     async function close() {
         anonInvites.close();
         stopFileWatching();
     }
+    async function forgetCorrespondentAt(cAddr) {
+        return changeProc.startOrChain(async () => {
+            if (params[cAddr]) {
+                delete params[cAddr];
+                await saveParamsAndTriggerUpload();
+            }
+        });
+    }
+    async function forgetAllCorrespondentsAtDomain(domain) {
+        return changeProc.startOrChain(async () => {
+            const atDomain = `@${domain}`;
+            const addressesToRm = Object.keys(params).filter(addr => addr.endsWith(atDomain));
+            if (addressesToRm.length > 0) {
+                for (const addr of addressesToRm) {
+                    delete params[addr];
+                }
+                await saveParamsAndTriggerUpload();
+            }
+        });
+    }
     return {
         close,
         getUpdated,
-        setAsUsed
+        setAsUsed,
+        forgetCorrespondentAt,
+        forgetAllCorrespondentsAtDomain
     };
 }
 Object.freeze(exports);

package/build/core/asmail/sending-params/params-from-others.d.ts

@@ -4,4 +4,6 @@ type WritableFS = web3n.files.WritableFS;
 export type ParamsFromOthers = Awaited<ReturnType<typeof makeParamsFromOthers>>;
 export declare function makeParamsFromOthers(fs: WritableFS, fileName: string): Promise<SendingParamsHolder['otherSides'] & {
     close: () => Promise<void>;
+    forgetCorrespondentAt(cAddr: string): Promise<void>;
+    forgetAllCorrespondentsAtDomain(domain: string): Promise<void>;
 }>;

package/build/core/asmail/sending-params/params-from-others.js

@@ -103,17 +103,42 @@ async function makeParamsFromOthers(fs, fileName) {
                 return;
             }
             params[address] = copyParams(params);
-            await paramsFile.writeJSON(params);
-            triggerUpload();
+            await saveParamsAndTriggerUpload();
         });
     }
+    async function saveParamsAndTriggerUpload() {
+        await paramsFile.writeJSON(params);
+        triggerUpload();
+    }
     async function close() {
         stopFileWatching();
     }
+    async function forgetCorrespondentAt(cAddr) {
+        return changeProc.startOrChain(async () => {
+            if (params[cAddr]) {
+                delete params[cAddr];
+                await saveParamsAndTriggerUpload();
+            }
+        });
+    }
+    async function forgetAllCorrespondentsAtDomain(domain) {
+        return changeProc.startOrChain(async () => {
+            const atDomain = `@${domain}`;
+            const addressesToRm = Object.keys(params).filter(addr => addr.endsWith(atDomain));
+            if (addressesToRm.length > 0) {
+                for (const addr of addressesToRm) {
+                    delete params[addr];
+                }
+                await saveParamsAndTriggerUpload();
+            }
+        });
+    }
     return {
         get,
         set,
-        close
+        close,
+        forgetCorrespondentAt,
+        forgetAllCorrespondentsAtDomain
     };
 }
 /**

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

@@ -31,6 +31,8 @@ export interface KeyringForASMail {
     getEstablishedKeysToSendMsg: SendingResources['getEstablishedKeysToSendMsg'];
     decrypt: ReceptionResources['msgDecryptor'];
     close(): Promise<void>;
+    forgetCorrespondentAt(cAddr: string): Promise<void>;
+    forgetAllCorrespondentsAtDomain(domain: string): Promise<void>;
 }
 export declare function makeKeyrings(cryptor: AsyncSBoxCryptor, random: AsyncRNG, logger: Logger, fs: WritableFS, localFS: WritableFS, getSigner: GetSigner, pkeyOnServer: ParamOnServer<'init-pub-key'>): Promise<{
     close: () => Promise<void>;

package/build/core/keyring/index.js

@@ -209,13 +209,15 @@ async function makeKeyrings(cryptor, random, logger, fs, localFS, getSigner, pke
             decrypt,
             generateIntroKeysToSendMsg,
             getEstablishedKeysToSendMsg,
-            needIntroKeyFor: peerKeys.needIntroKeyFor
+            needIntroKeyFor: peerKeys.needIntroKeyFor,
+            forgetCorrespondentAt: peerKeys.forgetCorrespondentAt,
+            forgetAllCorrespondentsAtDomain: peerKeys.forgetAllCorrespondentsAtDomain
         };
     }
     return {
         close,
         makeKeyringsCAP,
-        forASMail
+        forASMail,
     };
 }
 Object.freeze(exports);

package/build/core/keyring/peer-keys/dataset/v2/logs.d.ts

@@ -29,7 +29,17 @@ export interface PeerStartedUsingPair {
     peerKId: string;
     recipientKId: string;
 }
-export type PairEvent = PairFromPeerLog | PairSuggestedToPeerLog | PeerStartedUsingPair;
+export interface RemovePeerAtAddress {
+    opType: 'remove-peer-at-address';
+    eventTS: number;
+    peerCAddr: string;
+}
+export interface RemoveAllPeersAtDomain {
+    opType: 'remove-all-peers-at-domain';
+    eventTS: number;
+    domain: string;
+}
+export type PairEvent = PairFromPeerLog | PairSuggestedToPeerLog | PeerStartedUsingPair | RemovePeerAtAddress | RemoveAllPeersAtDomain;
 export declare function sendingPairEntryFromJSON(json: PairFromPeerLog['sendingPairRecord']): SendingKeyPairDbEntry;
 export declare function recipientPairEntryFromJSON(json: PairSuggestedToPeerLog['receivingPairRecord']): RecipientKeyPairDbEntry;
 export declare function makePeerKeysChangeLogs(logsFS: WritableFS, localLogsFS: WritableFS, logError: LogError): Promise<{
@@ -39,5 +49,7 @@ export declare function makePeerKeysChangeLogs(logsFS: WritableFS, localLogsFS:
     numOfLogs: () => number;
     cutLogOnDatasetSyncAndUpload: (syncPointV: number, params?: any) => Promise<void> | undefined;
     watchAndApplyOpsFromOtherDevices: (changeProc: SingleProc, sink: (ops: import("../../../../../lib-common/dataset-sync/per-device-json-array-logs").LogEntry<PairEvent>[]) => Promise<void>) => () => void;
+    recordRemovalOfPeerAtAddress: (peerCAddr: string) => Promise<void>;
+    recordRemovalOfAllPeersAtDomain: (domain: string) => Promise<void>;
 }>;
 export {};

package/build/core/keyring/peer-keys/dataset/v2/logs.js

@@ -104,13 +104,29 @@ async function makePeerKeysChangeLogs(logsFS, localLogsFS, logError) {
             peerAddr
         });
     }
+    async function recordRemovalOfPeerAtAddress(peerCAddr) {
+        await appendLogsAndUpload({
+            opType: 'remove-peer-at-address',
+            eventTS: Date.now(),
+            peerCAddr
+        });
+    }
+    async function recordRemovalOfAllPeersAtDomain(domain) {
+        await appendLogsAndUpload({
+            opType: 'remove-all-peers-at-domain',
+            eventTS: Date.now(),
+            domain
+        });
+    }
     return {
         recordSuggestingCryptoToPeer,
         recordPeerStartedUsingPair,
         recordGettingCryptoFromPeer,
         numOfLogs,
         cutLogOnDatasetSyncAndUpload,
-        watchAndApplyOpsFromOtherDevices
+        watchAndApplyOpsFromOtherDevices,
+        recordRemovalOfPeerAtAddress,
+        recordRemovalOfAllPeersAtDomain
     };
 }
 Object.freeze(exports);

package/build/core/keyring/peer-keys/dataset/v2/peer-keys-db.d.ts

@@ -69,5 +69,7 @@ export declare function makePeerKeysDB(peerKeysFS: WritableFS, random: AsyncRNG)
     watchAndApplyOpsFromOtherDevices: (changeProc: SingleProc, resetSyncInterval: () => void) => () => void;
     saveAndSync: () => Promise<number>;
     getPeerKeysInfo: (peerAddr: string) => CorrespondentKeysInfo | undefined;
+    forgetCorrespondentAt: (peerCAddr: string) => Promise<void>;
+    forgetAllCorrespondentsAtDomain: (domain: string) => Promise<void>;
 }>;
 export {};

package/build/core/keyring/peer-keys/dataset/v2/peer-keys-db.js

@@ -399,6 +399,25 @@ async function makePeerKeysDB(peerKeysFS, random) {
             entryToLog: dbEntry
         };
     }
+    async function forgetCorrespondentAt(peerCAddr) {
+        for (const table of [
+            'reception_key_pairs_pids', 'reception_key_pairs', 'sending_key_pairs', 'peers'
+        ]) {
+            keys.db.exec(`--sql
+        DELETE FROM ${table} WHERE peerCAddr=$peerCAddr`, { $peerCAddr: peerCAddr });
+            noteDbMotificationForFileSaving();
+        }
+    }
+    async function forgetAllCorrespondentsAtDomain(domain) {
+        for (const table of [
+            'reception_key_pairs_pids', 'reception_key_pairs', 'sending_key_pairs', 'peers'
+        ]) {
+            const atDomain = `@${domain}`;
+            keys.db.exec(`--sql
+        DELETE FROM ${table} WHERE substr(peerCAddr,-${atDomain.length})=$atDomain`, { $atDomain: atDomain });
+            noteDbMotificationForFileSaving();
+        }
+    }
     async function generateRegularSuggestedPairIfNeeded(peerCAddr) {
         const pairsInUse = (0, for_sqlite_1.selectFromTable)(keys.db, 'reception_key_pairs', ['pairTS'], { peerCAddr, ratchetStage: 'in_use' }, receptionKeyPairsTabFields);
         if (pairsInUse && ((pairsInUse[0].pairTS + common_1.MIN_PERIOD_FOR_PAIR) > Date.now())) {
@@ -484,6 +503,14 @@ async function makePeerKeysDB(peerKeysFS, random) {
                         const { peerCAddr, peerKId, recipientKId } = op.p;
                         markPairAsInUse(peerCAddr, peerKId, recipientKId);
                     }
+                    else if (op.p.opType === 'remove-peer-at-address') {
+                        const { peerCAddr } = op.p;
+                        forgetCorrespondentAt(peerCAddr);
+                    }
+                    else if (op.p.opType === 'remove-all-peers-at-domain') {
+                        const { domain } = op.p;
+                        forgetAllCorrespondentsAtDomain(domain);
+                    }
                 }
                 else if (op.syncPoint) {
                     // XXX
@@ -497,6 +524,7 @@ async function makePeerKeysDB(peerKeysFS, random) {
             next: fsEvent => changeProc.startOrChain(async () => {
                 if (fsEvent.type === 'remote-change') {
                     // XXX get remote, compare,add to current what is missing, vs remote
+                    console.log(`need implementation in peer-keys-db/watchAndApplyOpsFromOtherDevices()`);
                     resetSyncInterval();
                 }
             })
@@ -522,7 +550,9 @@ async function makePeerKeysDB(peerKeysFS, random) {
         absorbOpsFromOtherDevices,
         watchAndApplyOpsFromOtherDevices,
         saveAndSync,
-        getPeerKeysInfo
+        getPeerKeysInfo,
+        forgetCorrespondentAt,
+        forgetAllCorrespondentsAtDomain
     };
 }
 function recipientKeyPairDbEntryIntoDisplayInfo(p) {

package/build/core/keyring/peer-keys/index.d.ts

@@ -20,5 +20,7 @@ export declare function makePeersKeyring(keyringFS: WritableFS, localFS: Writabl
     updateReceivedMsgCountIn: (peerCAddr: string, peerKId: string, recipientKId: string, msgCount: number, msgTS: number) => void;
     close: () => Promise<void>;
     getPeerKeysInfo: (peerAddr: string) => web3n.keys.CorrespondentKeysInfo | undefined;
+    forgetCorrespondentAt: (cAddr: string) => Promise<void>;
+    forgetAllCorrespondentsAtDomain: (domain: string) => Promise<void>;
 }>;
 export {};

package/build/core/keyring/peer-keys/index.js

@@ -190,6 +190,14 @@ async function makePeersKeyring(keyringFS, localFS, random, logger) {
     async function close() {
         stopSyncing();
     }
+    async function forgetCorrespondentAt(cAddr) {
+        keysDB.forgetCorrespondentAt(cAddr);
+        await logs.recordRemovalOfPeerAtAddress(cAddr);
+    }
+    async function forgetAllCorrespondentsAtDomain(domain) {
+        keysDB.forgetAllCorrespondentsAtDomain(domain);
+        await logs.recordRemovalOfAllPeersAtDomain(domain);
+    }
     return {
         getPeerAddressForCanonical: keysDB.getPeerAddressForCanonical,
         needIntroKeyFor,
@@ -200,7 +208,9 @@ async function makePeersKeyring(keyringFS, localFS, random, logger) {
         markPairAsInUse: (0, synced_1.makeSyncedFunc)(changeProc, undefined, markPairAsInUse),
         updateReceivedMsgCountIn: keysDB.updateReceivedMsgCountIn,
         close,
-        getPeerKeysInfo: keysDB.getPeerKeysInfo
+        getPeerKeysInfo: keysDB.getPeerKeysInfo,
+        forgetCorrespondentAt,
+        forgetAllCorrespondentsAtDomain
     };
 }
 function selectPid(pids) {

package/build/core/storage/synced/remote-events.d.ts

@@ -24,6 +24,7 @@ export declare class RemoteEvents {
     startListening(): void;
     close(): Promise<void>;
     whenConnected(): Promise<void>;
+    isConnected(): boolean;
     private absorbObjChange;
     private absorbObjRemoval;
     private absorbObjVersionArchival;

package/build/core/storage/synced/remote-events.js

@@ -77,6 +77,9 @@ class RemoteEvents {
     whenConnected() {
         return this.remoteStorage.connectedState.whenStateIsSet();
     }
+    isConnected() {
+        return this.remoteStorage.connectedState.isSet();
+    }
     absorbObjChange(client) {
         return (new rxjs_1.Observable(obs => client.subscribe(owner_1.events.objChanged.EVENT_NAME, obs)))
             .pipe((0, operators_1.mergeMap)(async ({ newVer: newRemoteVersion, objId }) => {

package/build/core/storage/synced/storage.d.ts

@@ -25,6 +25,7 @@ export declare class SyncedStore implements SyncedStorage {
     private readonly remoteEvents;
     private readonly uploader;
     private readonly events;
+    private stopConnectionCheckingProc;
     private constructor();
     static makeAndStart(path: string, user: string, getSigner: IGetMailerIdSigner, getStorages: StorageGetter, cryptor: AsyncSBoxCryptor, random: AsyncRNG, remoteServiceUrl: () => Promise<string>, net: NetClient, logError: LogError): Promise<{
         syncedStore: SyncedStorage;
@@ -65,5 +66,6 @@ export declare class SyncedStore implements SyncedStorage {
     resumeNetworkActivity(): void;
     get connectionEvent$(): Observable<import("./remote-events").StorageConnectionStatus>;
     whenConnected(): Promise<void>;
+    private startConnectionCheckingProc;
 }
 export {};

package/build/core/storage/synced/storage.js

@@ -27,6 +27,8 @@ const remote_events_1 = require("./remote-events");
 const upsyncer_1 = require("./upsyncer");
 const rxjs_1 = require("rxjs");
 const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
+const periodic_trigger_1 = require("../../../lib-common/periodic-trigger");
+const CONNECTION_CHECK_WAIT_SECS = 30;
 class SyncedStore {
     constructor(files, remoteStorage, getStorages, cryptor, random, logError) {
         this.files = files;
@@ -39,6 +41,7 @@ class SyncedStore {
         this.versioned = true;
         this.nodes = new common_1.NodesContainer();
         this.events = new utils_for_observables_1.Broadcast();
+        this.stopConnectionCheckingProc = undefined;
         this.remoteEvents = new remote_events_1.RemoteEvents(this.remoteStorage, this.files, this.broadcastNodeEvent.bind(this), this.logError);
         this.uploader = new upsyncer_1.UpSyncer(this.remoteStorage, this.logError);
         Object.seal(this);
@@ -52,6 +55,7 @@ class SyncedStore {
             syncedStore: (0, common_1.wrapSyncStorageImplementation)(s),
             startObjProcs: () => {
                 s.remoteEvents.startListening();
+                s.startConnectionCheckingProc();
             }
         };
     }
@@ -65,6 +69,7 @@ class SyncedStore {
                 setMid(getSigner);
                 s.uploader.start();
                 s.remoteEvents.startListening();
+                s.startConnectionCheckingProc();
             }
         };
     }
@@ -229,7 +234,9 @@ class SyncedStore {
         return obj.getNumOfBytesNeedingDownload(version);
     }
     async close() {
+        var _a;
         try {
+            (_a = this.stopConnectionCheckingProc) === null || _a === void 0 ? void 0 : _a.call(this);
             await this.uploader.stop();
             this.events.done();
             await this.remoteEvents.close();
@@ -251,6 +258,12 @@ class SyncedStore {
     whenConnected() {
         return this.remoteStorage.connectedState.whenStateIsSet();
     }
+    startConnectionCheckingProc() {
+        if (this.stopConnectionCheckingProc) {
+            this.stopConnectionCheckingProc();
+        }
+        this.stopConnectionCheckingProc = (0, periodic_trigger_1.startPeriodicConditionalTriggerProc)(() => !this.remoteStorage.connectedState.isSet(), () => this.remoteEvents.resumeNetworkActivity(), CONNECTION_CHECK_WAIT_SECS);
+    }
 }
 exports.SyncedStore = SyncedStore;
 Object.freeze(SyncedStore.prototype);

package/build/core/storage/synced/upsyncer.js

@@ -242,7 +242,8 @@ class UploadTask {
                 this.info.needUpload = undefined;
                 this.uploadCompletion.reject((0, exceptions_1.makeFSSyncException)(`obj-upload`, {
                     message: `Fail to upload version ${this.info.uploadVersion} of local version ${this.info.localVersion}`,
-                    localVersion: this.info.uploadVersion,
+                    localVersion: this.info.localVersion,
+                    uploadVersion: this.info.uploadVersion,
                     cause: exc
                 }));
                 await this.objStatus.recordUploadCancellation(this.info);

package/build/lib-client/3nstorage/storage-owner.js

@@ -262,8 +262,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw (0, exceptions_1.makeUnknownTransactionExc)(objId);
         }
         else if (rep.status === api.currentObj.SC.mismatchedObjVer) {
-            const curVer = rep.current_version;
-            // XXX is undefined expected, or, was that an error from server? Is it is a header?
+            const curVer = rep.data.current_version;
             if (!Number.isInteger(curVer)) {
                 throw new Error(`Got non-integer current object version value from a version mismatch reply ${curVer}`);
             }

package/build/lib-client/asmail/sender.d.ts

@@ -52,12 +52,6 @@ export declare class MailSender {
      */
     static resume(net: NetClient, recipient: string, session: SessionInfo): Promise<MailSender>;
     private setDeliveryUrl;
-    private badRedirectExc;
-    private unknownRecipientExc;
-    private senderNotAllowedExc;
-    private inboxIsFullExc;
-    private authFailedOnDeliveryExc;
-    private recipientHasNoPubKeyExc;
     /**
      * This method throws, if given message size is greater that a maximum
      * message size that server is willing to take.

package/build/lib-client/asmail/sender.js

@@ -19,6 +19,7 @@ exports.MailSender = void 0;
 const api = require("../../lib-common/service-api/asmail/delivery");
 const service_locator_1 = require("../service-locator");
 const http_1 = require("../../lib-common/exceptions/http");
+const common_1 = require("../../core/asmail/delivery/common");
 const LIMIT_ON_MAX_CHUNK = 1024 * 1024;
 const TOO_EARLY_RESTART_PERIOD = 5 * 60 * 1000;
 class MailSender {
@@ -86,54 +87,6 @@ class MailSender {
         }
         this.uri = info.delivery;
     }
-    badRedirectExc() {
-        return {
-            runtimeException: true,
-            type: 'asmail-delivery',
-            address: this.recipient,
-            badRedirect: true
-        };
-    }
-    unknownRecipientExc() {
-        return {
-            runtimeException: true,
-            type: 'asmail-delivery',
-            address: this.recipient,
-            unknownRecipient: true
-        };
-    }
-    senderNotAllowedExc() {
-        return {
-            runtimeException: true,
-            type: 'asmail-delivery',
-            address: this.recipient,
-            senderNotAllowed: true
-        };
-    }
-    inboxIsFullExc() {
-        return {
-            runtimeException: true,
-            type: 'asmail-delivery',
-            address: this.recipient,
-            inboxIsFull: true
-        };
-    }
-    authFailedOnDeliveryExc() {
-        return {
-            runtimeException: true,
-            type: 'asmail-delivery',
-            address: this.recipient,
-            authFailedOnDelivery: true
-        };
-    }
-    recipientHasNoPubKeyExc() {
-        return {
-            runtimeException: true,
-            type: 'asmail-delivery',
-            address: this.recipient,
-            recipientHasNoPubKey: true
-        };
-    }
     /**
      * This method throws, if given message size is greater that a maximum
      * message size that server is willing to take.
@@ -144,25 +97,28 @@ class MailSender {
             throw new Error(`Premature call to ensure size fit: maximum message length isn't set.`);
         }
         if (msgSize > this.maxMsgLength) {
-            const exc = {
-                runtimeException: true,
-                type: 'asmail-delivery',
+            throw (0, common_1.makeDeliveryException)({
                 address: this.recipient,
                 msgTooBig: true,
                 allowedSize: this.maxMsgLength
-            };
-            throw exc;
+            });
         }
     }
     prepareRedirectOrThrowUp(rep) {
         if (("string" !== typeof rep.redirect)
             || (rep.redirect.length === 0)
             || ((new URL(rep.redirect)).protocol !== 'https:')) {
-            throw this.badRedirectExc();
+            throw (0, common_1.makeDeliveryException)({
+                address: this.recipient, badRedirect: true,
+                message: `Server returns invalid url for redirect`
+            });
         }
         // refuse second redirect
         if (this.redirectedFrom !== undefined) {
-            throw this.badRedirectExc();
+            throw (0, common_1.makeDeliveryException)({
+                address: this.recipient, badRedirect: true,
+                message: `Recipient's server points to second redirect, which is one too many`
+            });
         }
         // set params
         this.redirectedFrom = this.deliveryURI;
@@ -204,13 +160,13 @@ class MailSender {
             return this.performPreFlight();
         }
         else if (rep.status == api.preFlight.SC.unknownRecipient) {
-            throw this.unknownRecipientExc();
+            throw (0, common_1.makeDeliveryException)({ address: this.recipient, unknownRecipient: true });
         }
         else if (rep.status == api.preFlight.SC.senderNotAllowed) {
-            throw this.senderNotAllowedExc();
+            throw (0, common_1.makeDeliveryException)({ address: this.recipient, senderNotAllowed: true });
         }
         else if (rep.status == api.preFlight.SC.inboxFull) {
-            throw this.inboxIsFullExc();
+            throw (0, common_1.makeDeliveryException)({ address: this.recipient, inboxIsFull: true });
         }
         else {
             throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
@@ -259,13 +215,13 @@ class MailSender {
             return this.startSession();
         }
         else if (rep.status == api.sessionStart.SC.unknownRecipient) {
-            throw this.unknownRecipientExc();
+            throw (0, common_1.makeDeliveryException)({ address: this.recipient, unknownRecipient: true });
         }
         else if (rep.status == api.sessionStart.SC.senderNotAllowed) {
-            throw this.senderNotAllowedExc();
+            throw (0, common_1.makeDeliveryException)({ address: this.recipient, senderNotAllowed: true });
         }
         else if (rep.status == api.sessionStart.SC.inboxFull) {
-            throw this.inboxIsFullExc();
+            throw (0, common_1.makeDeliveryException)({ address: this.recipient, inboxIsFull: true });
         }
         else {
             throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
@@ -307,7 +263,7 @@ class MailSender {
             return this.restartSession();
         }
         else if (rep.status == api.sessionRestart.SC.unknownRecipient) {
-            throw this.unknownRecipientExc();
+            throw (0, common_1.makeDeliveryException)({ address: this.recipient, unknownRecipient: true });
         }
         else {
             throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
@@ -337,7 +293,7 @@ class MailSender {
         }
         this.sessionId = undefined;
         if (rep.status === api.authSender.SC.authFailed) {
-            throw this.authFailedOnDeliveryExc();
+            throw (0, common_1.makeDeliveryException)({ address: this.recipient, authFailedOnDelivery: true });
         }
         else {
             throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
@@ -362,7 +318,7 @@ class MailSender {
             return this.recipientPubKeyCerts;
         }
         else if (rep.status === api.initPubKey.SC.pkeyNotRegistered) {
-            throw this.recipientHasNoPubKeyExc();
+            throw (0, common_1.makeDeliveryException)({ address: this.recipient, recipientHasNoPubKey: true });
         }
         else {
             throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);

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

@@ -1,5 +1,4 @@
 import { NetClient } from './request-utils';
-import type { promises as dnsPromises } from 'dns';
 import { StorageRootRoute } from '../lib-common/service-api/3nstorage/root-route';
 import { ASMailRootRoute } from '../lib-common/service-api/asmail/root-route';
 import { LogError } from './logging/log-to-file';
@@ -31,7 +30,7 @@ export type ServiceTypeDNSLabel = 'mailerid' | 'asmail' | '3nstorage';
 export type ServiceLocatorMaker = (serviceLabel: ServiceTypeDNSLabel | 'report', logError: LogError) => ServiceLocator;
 export type ServiceLocator = (address: string) => Promise<string>;
 export interface DnsResolver {
-    resolveTxt: (typeof dnsPromises)['resolveTxt'];
+    resolveTxt: (hostname: string) => Promise<string[][]>;
 }
 export declare const NODATA = "ENODATA";
 export declare const SERVFAIL = "ESERVFAIL";

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

@@ -23,7 +23,6 @@ exports.storageInfoAt = storageInfoAt;
 exports.makeServiceLocator = makeServiceLocator;
 exports.getMailerIdInfoFor = getMailerIdInfoFor;
 const jwkeys_1 = require("../lib-common/jwkeys");
-// import { CONNREFUSED, NODATA, NOTFOUND, SERVFAIL, TIMEOUT } from 'dns';
 const runtime_1 = require("../lib-common/exceptions/runtime");
 const http_1 = require("../lib-common/exceptions/http");
 async function readJSONLocatedAt(client, url) {