@wireapp/core 32.0.5 → 32.0.7

package/package.json

@@ -81,6 +81,6 @@
     "test": "jest",
     "watch": "tsc ---watch"
   },
-  "version": "32.0.5",
-  "gitHead": "03b66bf602b6fd57eeca4725e1a0a9218332d78d"
+  "version": "32.0.7",
+  "gitHead": "b8b83908d9516f9dc79e8e7591c0401618956caf"
 }

package/src/main/Account.js

@@ -434,15 +434,20 @@ class Account extends events_1.EventEmitter {
             // Lock websocket in order to buffer any message that arrives while we handle the notification stream
             onConnectionStateChanged(ConnectionState.PROCESSING_NOTIFICATIONS);
             this.apiClient.transport.ws.lock();
-            await this.service.notification.handleNotificationStream(async (notification, source, progress) => {
+            const results = await this.service.notification.processNotificationStream(async (notification, source, progress) => {
                 await handleNotification(notification, source);
                 onNotificationStreamProgress(progress);
             }, onMissedNotifications, abortHandler);
+            this.logger.log(`Finished processing notifications ${JSON.stringify(results)}`, results);
+            if (abortHandler.isAborted()) {
+                this.logger.warn('Ending connection process as websocket was closed');
+                return;
+            }
             // We can now unlock the websocket and let the new messages being handled and decrypted
             this.apiClient.transport.ws.unlock();
             // We need to wait for the notification stream to be fully handled before releasing the message sending queue.
             // This is due to the nature of how message are encrypted, any change in mls epoch needs to happen before we start encrypting any kind of messages
-            this.logger.log(`resume message sending. ${(0, messageSender_1.getQueueLength)()} messages to be sent`);
+            this.logger.info(`Resuming message sending. ${(0, messageSender_1.getQueueLength)()} messages to be sent`);
             (0, messageSender_1.resumeMessageSending)();
             onConnectionStateChanged(ConnectionState.LIVE);
         };

package/src/main/conversation/ConversationService/ConversationService.d.ts

@@ -1,5 +1,5 @@
 import { APIClient } from '@wireapp/api-client';
-import { MessageSendingStatus, Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, UserClients, ClientMismatch } from '@wireapp/api-client/src/conversation';
+import { Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, UserClients } from '@wireapp/api-client/src/conversation';
 import { ConversationMemberLeaveEvent } from '@wireapp/api-client/src/event';
 import { QualifiedId, UserPreKeyBundleMap } from '@wireapp/api-client/src/user';
 import { MessageTimer, PayloadBundleState, RemoveUsersParams } from '../../conversation/';
@@ -7,9 +7,8 @@ import { RemoteData } from '../content';
 import { CryptographyService } from '../../cryptography/';
 import { MLSService } from '../../mls';
 import { NotificationService } from '../../notification';
-import { ClearConversationMessage } from '../message/OtrMessage';
 import { XOR } from '@wireapp/commons/src/main/util/TypeUtil';
-import { AddUsersParams, MessageSendingOptions, MLSReturnType, SendMlsMessageParams, SendProteusMessageParams } from './ConversationService.types';
+import { AddUsersParams, MLSReturnType, SendMlsMessageParams, SendProteusMessageParams } from './ConversationService.types';
 declare type SendResult = {
     /** The id of the message sent */
     id: string;
@@ -25,7 +24,6 @@ export declare class ConversationService {
     private readonly mlsService;
     readonly messageTimer: MessageTimer;
     private readonly messageService;
-    private selfConversationId?;
     constructor(apiClient: APIClient, cryptographyService: CryptographyService, config: {
         useQualifiedIds?: boolean;
     }, notificationService: NotificationService, mlsService: MLSService);
@@ -40,7 +38,6 @@ export declare class ConversationService {
      */
     private getQualifiedPreKeyBundle;
     getPreKeyBundleMap(conversationId: QualifiedId, userIds?: string[] | UserClients): Promise<UserPreKeyBundleMap>;
-    private getSelfConversationId;
     private getQualifiedRecipientsForConversation;
     private getRecipientsForConversation;
     /**
@@ -54,33 +51,6 @@ export declare class ConversationService {
     private sendGenericMessage;
     private extractUserIds;
     private extractQualifiedUserIds;
-    clearConversation(conversationId: string, timestamp?: number | Date, messageId?: string, sendAsProtobuf?: boolean): Promise<ClearConversationMessage>;
-    /**
-     * Sends a LastRead message to the current user's self conversation.
-     * This will allow all the user's devices to compute which messages are unread
-     *
-     * @param conversationId The conversation which has been read
-     * @param lastReadTimestamp The timestamp at which the conversation was read
-     * @param sendingOptions?
-     * @return Resolves when the message has been sent
-     */
-    sendLastRead(conversationId: QualifiedId, lastReadTimestamp: number, sendingOptions?: MessageSendingOptions): Promise<(MessageSendingStatus & {
-        errored?: boolean | undefined;
-    }) | (ClientMismatch & {
-        errored?: boolean | undefined;
-    })>;
-    /**
-     * Syncs all self user's devices with the countly id
-     *
-     * @param countlyId The countly id of the current device
-     * @param sendingOptions?
-     * @return Resolves when the message has been sent
-     */
-    sendCountlySync(countlyId: string, sendingOptions: MessageSendingOptions): Promise<(MessageSendingStatus & {
-        errored?: boolean | undefined;
-    }) | (ClientMismatch & {
-        errored?: boolean | undefined;
-    })>;
     /**
      * Get a fresh list from backend of clients for all the participants of the conversation.
      * This is a hacky way of getting all the clients for a conversation.

package/src/main/conversation/ConversationService/ConversationService.js

@@ -26,7 +26,6 @@ const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const conversation_2 = require("../../conversation/");
 const AssetCryptography_1 = require("../../cryptography/AssetCryptography");
 const TypePredicateUtil_1 = require("../../util/TypePredicateUtil");
-const MessageBuilder_1 = require("../message/MessageBuilder");
 const MessageService_1 = require("../message/MessageService");
 const ConversationService_types_1 = require("./ConversationService.types");
 const bazinga64_1 = require("bazinga64");
@@ -124,15 +123,6 @@ class ConversationService {
             return bundleMap;
         }, {});
     }
-    async getSelfConversationId() {
-        if (!this.selfConversationId) {
-            const { userId } = this.apiClient.context;
-            const { qualified_id, id } = await this.apiClient.api.conversation.getConversation(userId);
-            const domain = this.config.useQualifiedIds ? qualified_id.domain : '';
-            this.selfConversationId = { id, domain };
-        }
-        return this.selfConversationId;
-    }
     async getQualifiedRecipientsForConversation(conversationId, userIds) {
         if ((0, TypePredicateUtil_1.isQualifiedUserClients)(userIds)) {
             return userIds;
@@ -219,76 +209,6 @@ class ConversationService {
         }
         return userIds;
     }
-    async clearConversation(conversationId, timestamp = new Date(), messageId = (0, MessageBuilder_1.createId)(), sendAsProtobuf) {
-        if (timestamp instanceof Date) {
-            timestamp = timestamp.getTime();
-        }
-        const content = {
-            clearedTimestamp: timestamp,
-            conversationId,
-        };
-        const clearedMessage = protocol_messaging_1.Cleared.create(content);
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.CLEARED]: clearedMessage,
-            messageId,
-        });
-        const selfConversationId = await this.getSelfConversationId();
-        await this.sendGenericMessage(selfConversationId, this.apiClient.validatedClientId, genericMessage, {
-            sendAsProtobuf,
-        });
-        return {
-            content,
-            conversation: conversationId,
-            from: this.apiClient.context.userId,
-            id: messageId,
-            messageTimer: 0,
-            source: conversation_2.PayloadBundleSource.LOCAL,
-            state: conversation_2.PayloadBundleState.OUTGOING_SENT,
-            timestamp: Date.now(),
-            type: conversation_2.PayloadBundleType.CONVERSATION_CLEAR,
-        };
-    }
-    /**
-     * Sends a LastRead message to the current user's self conversation.
-     * This will allow all the user's devices to compute which messages are unread
-     *
-     * @param conversationId The conversation which has been read
-     * @param lastReadTimestamp The timestamp at which the conversation was read
-     * @param sendingOptions?
-     * @return Resolves when the message has been sent
-     */
-    async sendLastRead(conversationId, lastReadTimestamp, sendingOptions) {
-        const lastRead = new protocol_messaging_1.LastRead({
-            conversationId: conversationId.id,
-            lastReadTimestamp,
-        });
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.LAST_READ]: lastRead,
-            messageId: (0, MessageBuilder_1.createId)(),
-        });
-        const selfConversationId = await this.getSelfConversationId();
-        return this.sendGenericMessage(selfConversationId, this.apiClient.validatedClientId, genericMessage, Object.assign({}, sendingOptions));
-    }
-    /**
-     * Syncs all self user's devices with the countly id
-     *
-     * @param countlyId The countly id of the current device
-     * @param sendingOptions?
-     * @return Resolves when the message has been sent
-     */
-    async sendCountlySync(countlyId, sendingOptions) {
-        const dataTransfer = new protocol_messaging_1.DataTransfer({
-            trackingIdentifier: {
-                identifier: countlyId,
-            },
-        });
-        const genericMessage = new protocol_messaging_1.GenericMessage({
-            [conversation_2.GenericMessageType.DATA_TRANSFER]: dataTransfer,
-            messageId: (0, MessageBuilder_1.createId)(),
-        });
-        const selfConversationId = await this.getSelfConversationId();
-        return this.sendGenericMessage(selfConversationId, this.apiClient.validatedClientId, genericMessage, Object.assign({}, sendingOptions));
-    }
     /**
      * Get a fresh list from backend of clients for all the participants of the conversation.
      * This is a hacky way of getting all the clients for a conversation.

package/src/main/conversation/message/MessageBuilder.d.ts

@@ -1,5 +1,6 @@
 import { ButtonActionConfirmationMessage, ButtonActionMessage, CallMessage, ConfirmationMessage, DeleteMessage, EditedTextMessage, FileAssetAbortMessage, FileAssetMessage, FileAssetMetaDataMessage, HideMessage, ImageAssetMessageOutgoing, LocationMessage, PingMessage, ReactionMessage, TextMessage } from './OtrMessage';
 import { IComposite, GenericMessage } from '@wireapp/protocol-messaging';
+import { QualifiedId } from '@wireapp/api-client/src/user';
 export declare function createId(): string;
 export declare function buildButtonActionMessage(payloadBundle: ButtonActionMessage['content']): GenericMessage;
 export declare function buildButtonActionConfirmationMessage(payloadBundle: ButtonActionConfirmationMessage['content']): GenericMessage;
@@ -9,6 +10,9 @@ export declare function buildEditedTextMessage(payloadBundle: EditedTextMessage[
 export declare function buildFileDataMessage(payloadBundle: FileAssetMessage['content'], messageId?: string): GenericMessage;
 export declare function buildFileMetaDataMessage(payloadBundle: FileAssetMetaDataMessage['content']): GenericMessage;
 export declare function buildFileAbortMessage(payloadBundle: FileAssetAbortMessage['content'], messageId?: string): GenericMessage;
+export declare function buildLastReadMessage(conversationId: QualifiedId, lastReadTimestamp: number): GenericMessage;
+export declare function buildDataTransferMessage(identifier: string): GenericMessage;
+export declare function buildClearedMessage(conversationId: QualifiedId, timestamp?: number): GenericMessage;
 export declare function buildImageMessage(payloadBundle: ImageAssetMessageOutgoing['content'], messageId?: string): GenericMessage;
 export declare function buildLocationMessage(payloadBundle: LocationMessage['content']): GenericMessage;
 export declare function buildPingMessage(payloadBundle: PingMessage['content']): GenericMessage;

package/src/main/conversation/message/MessageBuilder.js

@@ -21,7 +21,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapInEphemeral = exports.buildTextMessage = exports.buildHideMessage = exports.buildDeleteMessage = exports.buildCallMessage = exports.buildSessionResetMessage = exports.buildReactionMessage = exports.buildPingMessage = exports.buildLocationMessage = exports.buildImageMessage = exports.buildFileAbortMessage = exports.buildFileMetaDataMessage = exports.buildFileDataMessage = exports.buildEditedTextMessage = exports.buildConfirmationMessage = exports.buildCompositeMessage = exports.buildButtonActionConfirmationMessage = exports.buildButtonActionMessage = exports.createId = void 0;
+exports.wrapInEphemeral = exports.buildTextMessage = exports.buildHideMessage = exports.buildDeleteMessage = exports.buildCallMessage = exports.buildSessionResetMessage = exports.buildReactionMessage = exports.buildPingMessage = exports.buildLocationMessage = exports.buildImageMessage = exports.buildClearedMessage = exports.buildDataTransferMessage = exports.buildLastReadMessage = exports.buildFileAbortMessage = exports.buildFileMetaDataMessage = exports.buildFileDataMessage = exports.buildEditedTextMessage = exports.buildConfirmationMessage = exports.buildCompositeMessage = exports.buildButtonActionConfirmationMessage = exports.buildButtonActionMessage = exports.createId = void 0;
 const uuidjs_1 = __importDefault(require("uuidjs"));
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const MessageToProtoMapper_1 = require("../message/MessageToProtoMapper");
@@ -130,6 +130,40 @@ function buildFileAbortMessage(payloadBundle, messageId = createId()) {
     return genericMessage;
 }
 exports.buildFileAbortMessage = buildFileAbortMessage;
+function buildLastReadMessage(conversationId, lastReadTimestamp) {
+    const lastRead = new protocol_messaging_1.LastRead({
+        conversationId: conversationId.id,
+        lastReadTimestamp,
+    });
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.LAST_READ]: lastRead,
+        messageId: createId(),
+    });
+}
+exports.buildLastReadMessage = buildLastReadMessage;
+function buildDataTransferMessage(identifier) {
+    const dataTransfer = new protocol_messaging_1.DataTransfer({
+        trackingIdentifier: {
+            identifier,
+        },
+    });
+    return new protocol_messaging_1.GenericMessage({
+        [GenericMessageType_1.GenericMessageType.DATA_TRANSFER]: dataTransfer,
+        messageId: createId(),
+    });
+}
+exports.buildDataTransferMessage = buildDataTransferMessage;
+function buildClearedMessage(conversationId, timestamp = Date.now()) {
+    const clearedMessage = protocol_messaging_1.Cleared.create({
+        clearedTimestamp: timestamp,
+        conversationId: conversationId.id,
+    });
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.CLEARED]: clearedMessage,
+        messageId: createId(),
+    });
+}
+exports.buildClearedMessage = buildClearedMessage;
 function buildImageMessage(payloadBundle, messageId = createId()) {
     const imageAsset = buildAsset(payloadBundle);
     const genericMessage = protocol_messaging_1.GenericMessage.create({

package/src/main/cryptography/CryptographyService.js

@@ -38,7 +38,7 @@ class CryptographyService {
         this.config = config;
         this.cryptobox = new cryptobox_1.Cryptobox(this.storeEngine, config.nbPrekeys);
         this.database = new CryptographyDatabaseRepository_1.CryptographyDatabaseRepository(this.storeEngine);
-        this.logger = (0, logdown_1.default)('@wireapp/core/cryptography/CryptographyService', {
+        this.logger = (0, logdown_1.default)('@wireapp/core/CryptographyService', {
             logger: console,
             markdown: false,
         });

package/src/main/cryptography/GenericMessageMapper.js

@@ -153,7 +153,7 @@ class GenericMessageMapper {
     }
 }
 exports.GenericMessageMapper = GenericMessageMapper;
-GenericMessageMapper.logger = (0, logdown_1.default)('@wireapp/core/cryptography/GenericMessageMapper', {
+GenericMessageMapper.logger = (0, logdown_1.default)('@wireapp/core/GenericMessageMapper', {
     logger: console,
     markdown: false,
 });

package/src/main/notification/NotificationService.d.ts

@@ -46,7 +46,11 @@ export declare class NotificationService extends EventEmitter {
     getNotificationEventList(): Promise<Events.BackendEvent[]>;
     setLastEventDate(eventDate: Date): Promise<Date>;
     setLastNotificationId(lastNotification: Notification): Promise<string>;
-    handleNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, abortHandler: AbortHandler): Promise<void>;
+    processNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, abortHandler: AbortHandler): Promise<{
+        total: number;
+        error: number;
+        success: number;
+    }>;
     /**
      * Checks if an event should be ignored.
      * An event that has a date prior to that last event that we have parsed should be ignored

package/src/main/notification/NotificationService.js

@@ -84,7 +84,7 @@ class NotificationService extends events_1.EventEmitter {
     constructor(apiClient, cryptographyService, mlsService, storeEngine) {
         super();
         this.mlsService = mlsService;
-        this.logger = (0, logdown_1.default)('@wireapp/core/notification/NotificationService', {
+        this.logger = (0, logdown_1.default)('@wireapp/core/NotificationService', {
             logger: console,
             markdown: false,
         });
@@ -93,10 +93,9 @@ class NotificationService extends events_1.EventEmitter {
         this.backend = new NotificationBackendRepository_1.NotificationBackendRepository(this.apiClient);
         this.database = new NotificationDatabaseRepository_1.NotificationDatabaseRepository(storeEngine);
     }
-    async getAllNotifications() {
+    async getAllNotifications(since) {
         const clientId = this.apiClient.clientId;
-        const lastNotificationId = await this.database.getLastNotificationId();
-        return this.backend.getAllNotifications(clientId, lastNotificationId);
+        return this.backend.getAllNotifications(clientId, since);
     }
     /** Should only be called with a completely new client. */
     async initializeNotificationStream() {
@@ -132,23 +131,39 @@ class NotificationService extends events_1.EventEmitter {
     async setLastNotificationId(lastNotification) {
         return this.database.updateLastNotificationId(lastNotification);
     }
-    async handleNotificationStream(notificationHandler, onMissedNotifications, abortHandler) {
-        const { notifications, missedNotification } = await this.getAllNotifications();
+    async processNotificationStream(notificationHandler, onMissedNotifications, abortHandler) {
+        const lastNotificationId = await this.database.getLastNotificationId();
+        const { notifications, missedNotification } = await this.getAllNotifications(lastNotificationId);
         if (missedNotification) {
             onMissedNotifications(missedNotification);
         }
+        const results = { total: notifications.length, error: 0, success: 0 };
+        const logMessage = notifications.length > 0
+            ? `Start processing ${notifications.length} notifications since notification id ${lastNotificationId}`
+            : `No notification to process from the stream`;
+        this.logger.log(logMessage);
         for (const [index, notification] of notifications.entries()) {
             if (abortHandler.isAborted()) {
                 /* Stop handling notifications if the websocket has been disconnected.
                  * Upon reconnecting we are going to restart handling the notification stream for where we left of
                  */
-                return;
+                this.logger.warn(`Stop processing notifications as connection to websocket was closed`);
+                return results;
+            }
+            try {
+                await notificationHandler(notification, conversation_1.PayloadBundleSource.NOTIFICATION_STREAM, {
+                    done: index + 1,
+                    total: notifications.length,
+                });
+                results.success++;
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : error;
+                this.logger.error(`Error while processing notification ${notification.id}: ${message}`, error);
+                results.error++;
             }
-            await notificationHandler(notification, conversation_1.PayloadBundleSource.NOTIFICATION_STREAM, {
-                done: index + 1,
-                total: notifications.length,
-            }).catch(error => this.logger.error(error));
         }
+        return results;
     }
     /**
      * Checks if an event should be ignored.

package/src/main/util/TaskScheduler/TaskScheduler.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskScheduler = void 0;
 const logdown_1 = __importDefault(require("logdown"));
-const logger = (0, logdown_1.default)('@wireapp/core/util/TaskScheduler/TaskScheduler', {
+const logger = (0, logdown_1.default)('@wireapp/core/TaskScheduler', {
     logger: console,
     markdown: false,
 });