@wireapp/core 17.30.0 → 17.31.3

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [17.31.3](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.31.2...@wireapp/core@17.31.3) (2021-12-02)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [17.31.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.31.1...@wireapp/core@17.31.2) (2021-12-01)
+
+
+### Bug Fixes
+
+* **core:** Fix browser specific distribution ([#4186](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4186)) ([036325f](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/036325fb0483e994e353d019971194f0869ce199))
+
+
+
+
+
+## [17.31.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.31.0...@wireapp/core@17.31.1) (2021-11-29)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+# [17.31.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.30.0...@wireapp/core@17.31.0) (2021-11-25)
+
+
+### Features
+
+* **core:** Add more qualifiedIds when mapping messages ([#4184](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4184)) ([c81741b](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/c81741b6d0159fba14a32089b9f4ba520d6f6623))
+
+
+
+
+
 # [17.30.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.29.0...@wireapp/core@17.30.0) (2021-11-25)
 
 

package/package.json

@@ -1,11 +1,11 @@
 {
   "browser": {
-    "./src/cryptography/AssetCryptography.node": "./src/cryptography/AssetCryptography.browser.js"
+    "./src/main/cryptography/AssetCryptography.node": "./src/main/cryptography/AssetCryptography.browser.js"
   },
   "dependencies": {
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "15.6.0",
+    "@wireapp/api-client": "15.7.0",
     "@wireapp/cryptobox": "12.7.1",
     "bazinga64": "5.9.7",
     "hash.js": "1.1.7",
@@ -43,10 +43,10 @@
   },
   "description": "Wire for Web's communication core.",
   "files": [
-    "src/main",
-    "!src/main/**/!(*.d).ts",
-    "src/main/**/*.test.ts",
-    "src/main/test/**/*"
+    "src/main/**/*.d.ts",
+    "src/main/**/*.js",
+    "!src/main/**/*test*.js",
+    "!src/main/**/*test*.ts"
   ],
   "license": "GPL-3.0",
   "main": "src/main/Account",
@@ -69,6 +69,6 @@
     "test:project": "yarn dist && yarn test",
     "test:node": "nyc jasmine --config=jasmine.json"
   },
-  "version": "17.30.0",
-  "gitHead": "443684b3269bc54dc9c462fb09193fdbf9ed9cfc"
+  "version": "17.31.3",
+  "gitHead": "0c659966cfc754833feef2b4bddb6bce787c37bb"
 }

package/src/main/cryptography/GenericMessageMapper.d.ts

@@ -2,6 +2,5 @@ import type { ConversationOtrMessageAddEvent } from '@wireapp/api-client/src/eve
 import { PayloadBundle, PayloadBundleSource } from '../conversation';
 export declare class GenericMessageMapper {
     private static readonly logger;
-    private static mapButtonActionMessage;
     static mapGenericMessage(genericMessage: any, event: ConversationOtrMessageAddEvent, source: PayloadBundleSource): PayloadBundle;
 }

package/src/main/cryptography/GenericMessageMapper.js

@@ -25,24 +25,21 @@ exports.GenericMessageMapper = void 0;
 const logdown_1 = __importDefault(require("logdown"));
 const conversation_1 = require("../conversation");
 class GenericMessageMapper {
-    static mapButtonActionMessage(genericMessage, event, source) {
-        const { buttonAction, messageId } = genericMessage;
-        return {
-            content: buttonAction,
+    // TODO: Turn "any" into a specific type (or collection of types) and make the return type more specific based on the
+    // "genericMessage" input parameter.
+    static mapGenericMessage(genericMessage, event, source) {
+        const baseMessage = {
             conversation: event.conversation,
-            from: event.from,
+            qualifiedConversation: event.qualified_conversation,
+            qualifiedFrom: event.qualified_from,
             fromClientId: event.data.sender,
-            id: messageId,
-            messageTimer: 0,
-            source,
+            from: event.from,
             state: conversation_1.PayloadBundleState.INCOMING,
             timestamp: new Date(event.time).getTime(),
-            type: conversation_1.PayloadBundleType.BUTTON_ACTION,
+            id: genericMessage.messageId,
+            messageTimer: 0,
+            source,
         };
-    }
-    // TODO: Turn "any" into a specific type (or collection of types) and make the return type more specific based on the
-    // "genericMessage" input parameter.
-    static mapGenericMessage(genericMessage, event, source) {
         switch (genericMessage.content) {
             case conversation_1.GenericMessageType.TEXT: {
                 const { content: text, expectsReadConfirmation, legalHoldStatus, linkPreview: linkPreviews, mentions, quote, } = genericMessage[conversation_1.GenericMessageType.TEXT];
@@ -59,82 +56,27 @@ class GenericMessageMapper {
                 if (typeof legalHoldStatus !== 'undefined') {
                     content.legalHoldStatus = legalHoldStatus;
                 }
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.TEXT,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.TEXT });
             }
             case conversation_1.GenericMessageType.BUTTON_ACTION: {
-                return GenericMessageMapper.mapButtonActionMessage(genericMessage, event, source);
+                return Object.assign(Object.assign({}, baseMessage), { content: genericMessage.buttonAction, type: conversation_1.PayloadBundleType.BUTTON_ACTION });
             }
             case conversation_1.GenericMessageType.CALLING: {
-                return {
-                    content: genericMessage.calling.content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.CALL,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content: genericMessage.calling.content, type: conversation_1.PayloadBundleType.CALL });
             }
             case conversation_1.GenericMessageType.CONFIRMATION: {
                 const { firstMessageId, moreMessageIds, type } = genericMessage[conversation_1.GenericMessageType.CONFIRMATION];
                 const content = { firstMessageId, moreMessageIds, type };
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.CONFIRMATION,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.CONFIRMATION });
             }
             case conversation_1.GenericMessageType.CLEARED: {
                 const content = genericMessage[conversation_1.GenericMessageType.CLEARED];
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.CONVERSATION_CLEAR,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.CONVERSATION_CLEAR });
             }
             case conversation_1.GenericMessageType.DELETED: {
                 const originalMessageId = genericMessage[conversation_1.GenericMessageType.DELETED].messageId;
                 const content = { messageId: originalMessageId };
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.MESSAGE_DELETE,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.MESSAGE_DELETE });
             }
             case conversation_1.GenericMessageType.EDITED: {
                 const { expectsReadConfirmation, text: { content: editedText, legalHoldStatus, linkPreview: editedLinkPreviews, mentions: editedMentions, quote: editedQuote, }, replacingMessageId, } = genericMessage[conversation_1.GenericMessageType.EDITED];
@@ -153,18 +95,7 @@ class GenericMessageMapper {
                 if (editedQuote) {
                     content.quote = editedQuote;
                 }
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.MESSAGE_EDIT,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.MESSAGE_EDIT });
             }
             case conversation_1.GenericMessageType.HIDDEN: {
                 const { conversationId, messageId } = genericMessage[conversation_1.GenericMessageType.HIDDEN];
@@ -172,34 +103,12 @@ class GenericMessageMapper {
                     conversationId,
                     messageId,
                 };
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.MESSAGE_HIDE,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.MESSAGE_HIDE });
             }
             case conversation_1.GenericMessageType.KNOCK: {
                 const { expectsReadConfirmation, legalHoldStatus } = genericMessage[conversation_1.GenericMessageType.KNOCK];
                 const content = { expectsReadConfirmation, hotKnock: false, legalHoldStatus };
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.PING,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.PING });
             }
             case conversation_1.GenericMessageType.LOCATION: {
                 const { expectsReadConfirmation, latitude, legalHoldStatus, longitude, name, zoom } = genericMessage[conversation_1.GenericMessageType.LOCATION];
@@ -211,18 +120,7 @@ class GenericMessageMapper {
                     name,
                     zoom,
                 };
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.LOCATION,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.LOCATION });
             }
             case conversation_1.GenericMessageType.ASSET: {
                 const { expectsReadConfirmation, legalHoldStatus, notUploaded, original, preview, status, uploaded } = genericMessage[conversation_1.GenericMessageType.ASSET];
@@ -236,18 +134,7 @@ class GenericMessageMapper {
                     status,
                     uploaded,
                 };
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: isImage ? conversation_1.PayloadBundleType.ASSET_IMAGE : conversation_1.PayloadBundleType.ASSET,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: isImage ? conversation_1.PayloadBundleType.ASSET_IMAGE : conversation_1.PayloadBundleType.ASSET });
             }
             case conversation_1.GenericMessageType.REACTION: {
                 const { emoji, legalHoldStatus, messageId } = genericMessage[conversation_1.GenericMessageType.REACTION];
@@ -256,33 +143,11 @@ class GenericMessageMapper {
                     originalMessageId: messageId,
                     type: emoji,
                 };
-                return {
-                    content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.REACTION,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.REACTION });
             }
             default: {
                 this.logger.warn(`Unhandled event type "${genericMessage.content}": ${JSON.stringify(genericMessage)}`);
-                return {
-                    content: genericMessage.content,
-                    conversation: event.conversation,
-                    from: event.from,
-                    fromClientId: event.data.sender,
-                    id: genericMessage.messageId,
-                    messageTimer: 0,
-                    source,
-                    state: conversation_1.PayloadBundleState.INCOMING,
-                    timestamp: new Date(event.time).getTime(),
-                    type: conversation_1.PayloadBundleType.UNKNOWN,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content: genericMessage.content, type: conversation_1.PayloadBundleType.UNKNOWN });
             }
         }
     }

package/src/main/Account.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Account.js","sourceRoot":"","sources":["Account.ts"],"names":[],"mappings":"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"}

package/src/main/Account.test.browser.js

@@ -1,114 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * 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 Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import Dexie from 'dexie';
-import UUID from 'uuidjs';
-import {Account} from '@wireapp/core';
-import {IndexedDBEngine} from '@wireapp/store-engine-dexie';
-import {APIClient} from '@wireapp/api-client';
-
-describe('Account', () => {
-  describe('"initClient"', () => {
-    let storeName = undefined;
-
-    afterEach(done => {
-      if (storeName) {
-        const deleteRequest = window.indexedDB.deleteDatabase(storeName);
-        deleteRequest.onerror = done.fail;
-        deleteRequest.onsuccess = done;
-      } else {
-        done();
-      }
-    });
-
-    it('creates a client if there is none', async () => {
-      storeName = UUID.genV4().toString();
-      const db = new Dexie(storeName);
-      db.version(1).stores({
-        amplify: '',
-        clients: ', meta.primary_key',
-        keys: '',
-        prekeys: '',
-        sessions: '',
-      });
-      const engine = new IndexedDBEngine();
-      await engine.initWithDb(db);
-
-      const apiClient = new APIClient({
-        urls: APIClient.BACKEND.STAGING,
-      });
-
-      const context = {
-        clientId: 'aa9ecc1b-ed3a-49fc-987d-68d69ce59c0d',
-        userId: UUID.genV4().toString(),
-      };
-
-      const account = new Account(apiClient, () => Promise.resolve(engine));
-      await account.initServices(engine);
-      spyOn(account.service.client, 'register').and.callThrough();
-      account.service.client.synchronizeClients = () => Promise.resolve();
-      account.service.notification.backend.getLastNotification = () => Promise.resolve({id: 'notification-id'});
-      account.apiClient.context = {};
-      account.apiClient.client.api.postClient = () => Promise.resolve({id: context.clientId});
-      await account.initClient(context);
-
-      expect(account.service.client.register).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('loadAndValidateLocalClient', () => {
-    it('synchronizes the client ID', async () => {
-      const engine = new IndexedDBEngine();
-      const apiClient = new APIClient({
-        urls: APIClient.BACKEND.STAGING,
-      });
-      const clientId = UUID.genV4().toString().toString();
-      const account = new Account(apiClient, () => Promise.resolve(engine));
-      await account.initServices(engine);
-      spyOn(account.service.cryptography, 'initCryptobox').and.returnValue(Promise.resolve());
-      spyOn(account.service.client, 'getLocalClient').and.returnValue(Promise.resolve({id: clientId}));
-      spyOn(account.apiClient.client.api, 'getClient').and.returnValue(Promise.resolve({id: clientId}));
-      await account.apiClient.createContext('userId', 'clientType', 'clientId');
-
-      await account.loadAndValidateLocalClient();
-
-      expect(account.apiClient.context.clientId).toBe(clientId);
-    });
-  });
-
-  describe('registerClient', () => {
-    it('synchronizes the client ID', async () => {
-      const engine = new IndexedDBEngine();
-      const apiClient = new APIClient({
-        urls: APIClient.BACKEND.STAGING,
-      });
-      const clientId = UUID.genV4().toString().toString();
-      const account = new Account(apiClient, () => Promise.resolve(engine));
-      await account.initServices(engine);
-      spyOn(account.service.client, 'register').and.returnValue(Promise.resolve({id: clientId}));
-      spyOn(account.service.client, 'synchronizeClients').and.returnValue(Promise.resolve());
-      spyOn(account.service.notification, 'initializeNotificationStream').and.returnValue(Promise.resolve());
-      await account.apiClient.createContext('userId', 'clientType', 'clientId');
-
-      await account.registerClient();
-
-      expect(account.apiClient.context.clientId).toBe(clientId);
-    });
-  });
-});

package/src/main/Account.test.node.d.ts

@@ -1 +0,0 @@
-export {};