core-3nweb-client-lib 0.49.6 → 0.49.8

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

@@ -299,6 +299,7 @@ declare namespace web3n.asmail {
 		objNotFound?: true;
 		objId?: string;
 		msgIsBroken?: true;
+		failToDecrypt?: true;
 	}
 
 	interface ASMailSendException extends RuntimeException {

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

@@ -314,7 +314,7 @@ declare namespace web3n.files {
 		 * sink with this error. When err is given, no errors will be thrown back
 		 * to this call.
 		 */
-		done(err?: any, xattrChanges?: XAttrsChanges): Promise<void>;
+		done(err?: any): Promise<void>;
 
 	}
 
@@ -1178,27 +1178,33 @@ declare namespace web3n.files {
 	type RemoteEvent = RemoteVersionArchivalEvent | RemoteArchVerRemovalEvent |
 		RemoteRemovalEvent | RemoteChangeEvent;
 
+	/**
+	 * SyncStatus has fields that connect to item's parent, uploading, i.e. not just state of the item.
+	 * Hence, we pick only related fields.
+	 */
+	type ItemSyncStatus = Pick<SyncStatus, 'state' | 'remote' | 'synced' | 'local'>;
+
 	interface RemoteVersionArchivalEvent extends FSEvent {
 		type: 'remote-version-archival';
 		archivedVersion: number;
-		syncStatus: SyncStatus;
+		syncStatus: ItemSyncStatus;
 	}
 
 	interface RemoteArchVerRemovalEvent extends FSEvent {
 		type: 'remote-arch-ver-removal';
 		removedArchVer: number;
-		syncStatus: SyncStatus;
+		syncStatus: ItemSyncStatus;
 	}
 
 	interface RemoteRemovalEvent extends FSEvent {
 		type: 'remote-removal';
-		syncStatus: SyncStatus;
+		syncStatus: ItemSyncStatus;
 	}
 
 	interface RemoteChangeEvent extends FSEvent {
 		type: 'remote-change';
 		newRemoteVersion: number;
-		syncStatus: SyncStatus;
+		syncStatus: ItemSyncStatus;
 	}
 
 	type UploadEvent = UploadStartEvent | UploadProgressEvent | UploadDisconnectedEvent | UploadDoneEvent;

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

@@ -40,22 +40,17 @@ export interface ResourcesForSending {
          * @param address
          */
         needIntroKeyFor(address: string): boolean;
-        /**
-         * This function generates keys that are needed to send a message, i.e.
-         * current crypto encryptor and identifiers to place in message's meta.
-         * Returned object has following fields:
-         * (a) encryptor - with encryptor, which should be used to pack message's
-         * main part's key,
-         * (b) currentPair - contains sendable form for current key pair.
-         * (c) msgCount - message count for a current pair.
-         * @param address
-         * @param introPKeyFromServer is an optional recipient's key from a mail
-         * server.
-         */
-        generateKeysToSend: (address: string, introPKeyFromServer?: JsonKey) => Promise<{
+        getEstablishedKeysToSendMsg: (address: string) => Promise<{
+            encryptor: Encryptor;
+            currentPair: ASMailKeyPair;
+            msgCount: number;
+            nextMsgCrypto?: SuggestedNextKeyPair;
+        }>;
+        generateIntroKeysToSendMsg: (address: string, introPKey: JsonKey) => Promise<{
             encryptor: Encryptor;
             currentPair: ASMailKeyPair;
             msgCount: number;
+            nextMsgCrypto?: SuggestedNextKeyPair;
         }>;
         /**
          * This function returns sending parameters that should be used now to
@@ -64,11 +59,6 @@ export interface ResourcesForSending {
          * @param address
          */
         paramsForSendingTo: (address: string) => SendingParams | undefined;
-        /**
-         * This function returns next key pair
-         * @param address
-         */
-        nextCrypto: (address: string) => Promise<SuggestedNextKeyPair | undefined>;
         /**
          * This returns a new sending parameters that given address should use to
          * send messages back. Undefined is returned, if current parameters don't
@@ -89,14 +79,4 @@ export interface SavedMsgToSend {
     recipients: string[];
     retryOpts: DeliveryOptions['retryRecipient'];
 }
-/**
- * This is a utility function that adds a number into given number line
- * segments. Each segment is represented by an array, in which 0-th element is
- * the smallest number in the segment, while 1-st element is the largest.
- * Segments don't overlap and are ordered as they would on a number line:
- * segment with smaller numbers go first.
- * @param segments
- * @param n
- */
-export declare function addToNumberLineSegments(segments: number[][], n: number): void;
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2017, 2020 3NSoft Inc.
+ Copyright (C) 2016 - 2017, 2020, 2026 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
@@ -18,7 +18,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SEG_SIZE_IN_K_QUATS = exports.Attachments = void 0;
 exports.estimatePackedSizeOf = estimatePackedSizeOf;
-exports.addToNumberLineSegments = addToNumberLineSegments;
 const attachments_container_1 = require("../msg/attachments-container");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const ATTACHMENTS_NAME = 'attachments';
@@ -139,49 +138,4 @@ function estimatePackedSizeOf(size) {
     }
     return 148 + numOfCompleteSegs * exports.SEG_SIZE_IN_K_QUATS * 256 + lastSegSize;
 }
-/**
- * This is a utility function that adds a number into given number line
- * segments. Each segment is represented by an array, in which 0-th element is
- * the smallest number in the segment, while 1-st element is the largest.
- * Segments don't overlap and are ordered as they would on a number line:
- * segment with smaller numbers go first.
- * @param segments
- * @param n
- */
-function addToNumberLineSegments(segments, n) {
-    for (let i = (segments.length - 1); i >= 0; i -= 1) {
-        const [low, high] = segments[i];
-        if (high < n) {
-            if ((high + 1) >= n) {
-                // segment should be grown on a high side.
-                // But now bigger segment won't merge with higher segment, cause if
-                // it does, it would've merge from lower side of a higher segment.
-                segments[i][1] = n;
-            }
-            else {
-                // new segment should be added higher than this one
-                segments.splice(i + 1, 0, [n, n]);
-            }
-            return;
-        }
-        if ((low <= n) && (n <= high)) {
-            // do nothing as number falls into current segment
-            return;
-        }
-        if (low <= (n + 1)) {
-            // segment should be grown on a lower side
-            segments[i][0] = n;
-            if ((i - 1) >= 0) {
-                // bigger segment may overlap with a lower one
-                const lowerSeg = segments[i - 1];
-                if ((lowerSeg[1] + 1) >= n) {
-                    lowerSeg[1] = high;
-                    segments.splice(i, 1);
-                }
-            }
-            return;
-        }
-    }
-    segments.unshift([n, n]);
-}
 Object.freeze(exports);

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2017, 2020 - 2023 3NSoft Inc.
+ Copyright (C) 2016 - 2017, 2020 - 2023, 2026 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,8 +28,8 @@ const utils_for_observables_1 = require("../../../lib-common/utils-for-observabl
 const SMALL_MSG_SIZE = 1024 * 1024;
 const MSGS_FOLDER = 'msgs';
 function idToMsgFolder(id) {
-    if (id.indexOf('/') > -1) {
-        throw new Error(`Message id ${id} contains illegal character '/'.`);
+    if (id.includes('/') || id.includes('.')) {
+        throw new Error(`Message id ${id} contains illegal character(s).`);
     }
     return `${MSGS_FOLDER}/${id}`;
 }

package/build/core/asmail/delivery/per-recipient-wip.js

@@ -161,7 +161,9 @@ class WIP {
         const introPKeyFromServer = await this.getIntroKeyIfRecipientIsUnknown(recipient);
         this.packer = await this.msg.msgPacker();
         // get crypto parts for encrypting this message
-        const { currentPair, encryptor, msgCount } = await this.msg.r.correspondents.generateKeysToSend(recipient, introPKeyFromServer);
+        const { currentPair, encryptor, msgCount, nextMsgCrypto } = await (introPKeyFromServer ?
+            this.msg.r.correspondents.generateIntroKeysToSendMsg(recipient, introPKeyFromServer) :
+            this.msg.r.correspondents.getEstablishedKeysToSendMsg(recipient));
         // add crypto parameters to the message
         if (currentPair.pid) {
             this.packer.setEstablishedKeyPairInfo(currentPair.pid, msgCount);
@@ -176,7 +178,6 @@ class WIP {
             this.packer.setNewKeyInfo(currentPair.recipientKid, currentPair.senderPKey.k, pkCerts, msgCount);
         }
         // add next crypto parameters to the message
-        const nextMsgCrypto = await this.msg.r.correspondents.nextCrypto(recipient);
         if (nextMsgCrypto) {
             this.packer.setNextCrypto(nextMsgCrypto);
         }

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

@@ -72,36 +72,12 @@ export interface ResourcesForReceiving {
  * messages have not been removed via direct action or due to expiry.
  * This object is also responsible for expiring messages on the server.
  */
-export declare class InboxOnServer {
-    private readonly r;
-    private readonly msgReceiver;
-    private readonly storages;
-    private readonly cryptor;
-    private readonly random;
-    private readonly downloader;
-    private readonly cache;
-    private readonly index;
-    private readonly logError;
-    private readonly inboxEvents;
-    private readonly procs;
-    private readonly recentlyOpenedMsgs;
-    private constructor();
-    static makeAndStart(cachePath: string, syncedFS: WritableFS, r: ResourcesForReceiving): Promise<InboxOnServer>;
-    close(): Promise<void>;
-    makeCAP(): InboxService;
-    private removeMsg;
-    private removeMsgFromServerAndCache;
-    private msgFromDiskOrDownload;
-    private startCachingAndAddKeyToIndex;
-    private markOwnParams;
-    private absorbSendingParams;
-    private checkServerAuthIfPresent;
-    private listMsgs;
-    private listNewMsgs;
-    private getMsg;
-    private msgToUIForm;
-    suspendNetworkActivity(): void;
-    resumeNetworkActivity(): void;
-    get connectivityEvent$(): import("rxjs").Observable<import("./inbox-events").InboxConnectionStatus>;
-}
+export type InboxOnServer = Awaited<ReturnType<typeof makeInboxOnServer>>;
+export declare function makeInboxOnServer(cachePath: string, syncedFS: WritableFS, localFS: WritableFS, r: ResourcesForReceiving): Promise<{
+    connectivityEvent$: import("rxjs").Observable<import("./inbox-events").InboxConnectionStatus>;
+    resumeNetworkActivity: () => void;
+    suspendNetworkActivity: () => void;
+    close: () => Promise<void>;
+    makeCAP: () => InboxService;
+}>;
 export {};