@wireapp/core 46.0.19 → 46.1.0-hotfix-1.0

package/lib/conversation/message/MessageBuilder.js

@@ -18,28 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createId = createId;
-exports.buildButtonActionMessage = buildButtonActionMessage;
-exports.buildButtonActionConfirmationMessage = buildButtonActionConfirmationMessage;
-exports.buildCompositeMessage = buildCompositeMessage;
-exports.buildConfirmationMessage = buildConfirmationMessage;
-exports.buildEditedTextMessage = buildEditedTextMessage;
-exports.buildFileDataMessage = buildFileDataMessage;
-exports.buildFileMetaDataMessage = buildFileMetaDataMessage;
-exports.buildFileAbortMessage = buildFileAbortMessage;
-exports.buildLastReadMessage = buildLastReadMessage;
-exports.buildDataTransferMessage = buildDataTransferMessage;
-exports.buildClearedMessage = buildClearedMessage;
-exports.buildImageMessage = buildImageMessage;
-exports.buildLocationMessage = buildLocationMessage;
-exports.buildPingMessage = buildPingMessage;
-exports.buildReactionMessage = buildReactionMessage;
-exports.buildSessionResetMessage = buildSessionResetMessage;
-exports.buildCallMessage = buildCallMessage;
-exports.buildDeleteMessage = buildDeleteMessage;
-exports.buildHideMessage = buildHideMessage;
-exports.buildTextMessage = buildTextMessage;
-exports.wrapInEphemeral = wrapInEphemeral;
+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 uuid_1 = require("uuid");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const AssetTransferState_1 = require("../AssetTransferState");
@@ -48,24 +27,28 @@ const MessageToProtoMapper_1 = require("../message/MessageToProtoMapper");
 function createId() {
     return (0, uuid_1.v4)();
 }
+exports.createId = createId;
 function buildButtonActionMessage(payloadBundle) {
     return protocol_messaging_1.GenericMessage.create({
         [GenericMessageType_1.GenericMessageType.BUTTON_ACTION]: protocol_messaging_1.ButtonAction.create(payloadBundle),
         messageId: createId(),
     });
 }
+exports.buildButtonActionMessage = buildButtonActionMessage;
 function buildButtonActionConfirmationMessage(payloadBundle) {
     return protocol_messaging_1.GenericMessage.create({
         [GenericMessageType_1.GenericMessageType.BUTTON_ACTION_CONFIRMATION]: protocol_messaging_1.ButtonActionConfirmation.create(payloadBundle),
         messageId: createId(),
     });
 }
+exports.buildButtonActionConfirmationMessage = buildButtonActionConfirmationMessage;
 function buildCompositeMessage(payload) {
     return protocol_messaging_1.GenericMessage.create({
         [GenericMessageType_1.GenericMessageType.COMPOSITE]: protocol_messaging_1.Composite.create(payload),
         messageId: createId(),
     });
 }
+exports.buildCompositeMessage = buildCompositeMessage;
 function buildConfirmationMessage(payloadBundle) {
     const content = protocol_messaging_1.Confirmation.create(payloadBundle);
     return protocol_messaging_1.GenericMessage.create({
@@ -73,6 +56,7 @@ function buildConfirmationMessage(payloadBundle) {
         messageId: createId(),
     });
 }
+exports.buildConfirmationMessage = buildConfirmationMessage;
 function buildEditedTextMessage(payloadBundle, messageId = createId()) {
     const editedMessage = protocol_messaging_1.MessageEdit.create({
         replacingMessageId: payloadBundle.originalMessageId,
@@ -83,6 +67,7 @@ function buildEditedTextMessage(payloadBundle, messageId = createId()) {
         messageId,
     });
 }
+exports.buildEditedTextMessage = buildEditedTextMessage;
 function buildFileDataMessage(payloadBundle, messageId = createId()) {
     const { asset, expectsReadConfirmation, legalHoldStatus } = payloadBundle;
     const remoteData = protocol_messaging_1.Asset.RemoteData.create({
@@ -104,6 +89,7 @@ function buildFileDataMessage(payloadBundle, messageId = createId()) {
     });
     return genericMessage;
 }
+exports.buildFileDataMessage = buildFileDataMessage;
 function buildFileMetaDataMessage(payloadBundle, messageId = createId()) {
     const { expectsReadConfirmation, legalHoldStatus, metaData } = payloadBundle;
     const original = protocol_messaging_1.Asset.Original.create({
@@ -125,6 +111,7 @@ function buildFileMetaDataMessage(payloadBundle, messageId = createId()) {
     });
     return genericMessage;
 }
+exports.buildFileMetaDataMessage = buildFileMetaDataMessage;
 function buildFileAbortMessage(payloadBundle, messageId = createId()) {
     const { expectsReadConfirmation, legalHoldStatus, reason } = payloadBundle;
     const assetMessage = protocol_messaging_1.Asset.create({
@@ -139,6 +126,7 @@ function buildFileAbortMessage(payloadBundle, messageId = createId()) {
     });
     return genericMessage;
 }
+exports.buildFileAbortMessage = buildFileAbortMessage;
 function buildLastReadMessage(conversationId, lastReadTimestamp) {
     const lastRead = new protocol_messaging_1.LastRead({
         conversationId: conversationId.id,
@@ -150,6 +138,7 @@ function buildLastReadMessage(conversationId, lastReadTimestamp) {
         messageId: createId(),
     });
 }
+exports.buildLastReadMessage = buildLastReadMessage;
 function buildDataTransferMessage(identifier) {
     const dataTransfer = new protocol_messaging_1.DataTransfer({
         trackingIdentifier: {
@@ -161,6 +150,7 @@ function buildDataTransferMessage(identifier) {
         messageId: createId(),
     });
 }
+exports.buildDataTransferMessage = buildDataTransferMessage;
 function buildClearedMessage(conversationId, timestamp = Date.now()) {
     const clearedMessage = protocol_messaging_1.Cleared.create({
         clearedTimestamp: timestamp,
@@ -171,6 +161,7 @@ function buildClearedMessage(conversationId, timestamp = Date.now()) {
         messageId: createId(),
     });
 }
+exports.buildClearedMessage = buildClearedMessage;
 function buildImageMessage(payloadBundle, messageId = createId()) {
     const imageAsset = buildAsset(payloadBundle);
     const genericMessage = protocol_messaging_1.GenericMessage.create({
@@ -179,6 +170,7 @@ function buildImageMessage(payloadBundle, messageId = createId()) {
     });
     return genericMessage;
 }
+exports.buildImageMessage = buildImageMessage;
 function buildLocationMessage(payloadBundle) {
     const { expectsReadConfirmation, latitude, legalHoldStatus, longitude, name, zoom } = payloadBundle;
     const locationMessage = protocol_messaging_1.Location.create({
@@ -195,6 +187,7 @@ function buildLocationMessage(payloadBundle) {
     });
     return genericMessage;
 }
+exports.buildLocationMessage = buildLocationMessage;
 function buildPingMessage(payloadBundle) {
     const content = protocol_messaging_1.Knock.create(payloadBundle);
     const genericMessage = protocol_messaging_1.GenericMessage.create({
@@ -203,6 +196,7 @@ function buildPingMessage(payloadBundle) {
     });
     return genericMessage;
 }
+exports.buildPingMessage = buildPingMessage;
 function buildReactionMessage(payloadBundle) {
     const { legalHoldStatus, originalMessageId, type } = payloadBundle;
     const reaction = protocol_messaging_1.Reaction.create({
@@ -216,12 +210,14 @@ function buildReactionMessage(payloadBundle) {
     });
     return genericMessage;
 }
+exports.buildReactionMessage = buildReactionMessage;
 function buildSessionResetMessage() {
     return protocol_messaging_1.GenericMessage.create({
         [GenericMessageType_1.GenericMessageType.CLIENT_ACTION]: protocol_messaging_1.ClientAction.RESET_SESSION,
         messageId: createId(),
     });
 }
+exports.buildSessionResetMessage = buildSessionResetMessage;
 function buildCallMessage(payload) {
     const callMessage = protocol_messaging_1.Calling.create(payload);
     return protocol_messaging_1.GenericMessage.create({
@@ -229,6 +225,7 @@ function buildCallMessage(payload) {
         messageId: createId(),
     });
 }
+exports.buildCallMessage = buildCallMessage;
 function buildDeleteMessage(payload) {
     const content = protocol_messaging_1.MessageDelete.create(payload);
     return protocol_messaging_1.GenericMessage.create({
@@ -236,6 +233,7 @@ function buildDeleteMessage(payload) {
         messageId: createId(),
     });
 }
+exports.buildDeleteMessage = buildDeleteMessage;
 function buildHideMessage(payload) {
     const content = protocol_messaging_1.MessageHide.create(payload);
     return protocol_messaging_1.GenericMessage.create({
@@ -243,6 +241,7 @@ function buildHideMessage(payload) {
         messageId: createId(),
     });
 }
+exports.buildHideMessage = buildHideMessage;
 function buildTextMessage(payloadBundle, messageId = createId()) {
     const genericMessage = protocol_messaging_1.GenericMessage.create({
         messageId,
@@ -250,6 +249,7 @@ function buildTextMessage(payloadBundle, messageId = createId()) {
     });
     return genericMessage;
 }
+exports.buildTextMessage = buildTextMessage;
 function buildAsset(payloadBundle) {
     const { asset, expectsReadConfirmation, image, legalHoldStatus } = payloadBundle;
     const imageMetadata = protocol_messaging_1.Asset.ImageMetaData.create({
@@ -289,3 +289,4 @@ function wrapInEphemeral(originalGenericMessage, expireAfterMillis) {
     });
     return genericMessage;
 }
+exports.wrapInEphemeral = wrapInEphemeral;

package/lib/conversation/message/MessageService.js

@@ -30,8 +30,6 @@ const long_1 = __importDefault(require("long"));
 const UserClientsUtil_1 = require("./UserClientsUtil");
 const util_1 = require("../../util");
 class MessageService {
-    apiClient;
-    proteusService;
     constructor(apiClient, proteusService) {
         this.apiClient = apiClient;
         this.proteusService = proteusService;
@@ -52,7 +50,7 @@ class MessageService {
         const encryptionResults = await this.proteusService.encrypt(plainText, recipients);
         const send = async ({ payloads, unknowns, failed }) => {
             const result = await this.sendOtrMessage(sendingClientId, payloads, options);
-            const extras = { failed, deleted: unknowns ?? {} };
+            const extras = { failed, deleted: unknowns !== null && unknowns !== void 0 ? unknowns : {} };
             return (0, deepmerge_ts_1.deepmerge)(result, extras);
         };
         try {
@@ -65,7 +63,7 @@ class MessageService {
             const mismatch = error.response.data;
             const shouldStopSending = options.onClientMismatch && (await options.onClientMismatch(mismatch)) === false;
             if (shouldStopSending) {
-                return { ...mismatch, canceled: true };
+                return Object.assign(Object.assign({}, mismatch), { canceled: true });
             }
             const reEncryptedPayload = await this.reencryptAfterMismatch(mismatch, encryptionResults, plainText);
             return send(reEncryptedPayload);
@@ -119,7 +117,8 @@ class MessageService {
         return this.apiClient.api.conversation.postOTRMessage(id, domain, protoMessage);
     }
     isClientMismatchError(error) {
-        return error.response?.status === http_status_codes_1.StatusCodes.PRECONDITION_FAILED;
+        var _a;
+        return ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === http_status_codes_1.StatusCodes.PRECONDITION_FAILED;
     }
     /**
      * Will re-encrypt a message when there were some missing clients in the initial send (typically when the server replies with a client mismatch error)

package/lib/conversation/message/MessageService.test.js

@@ -45,7 +45,7 @@ const user2 = {
 function generateQualifiedRecipients(users) {
     const payload = {};
     users.forEach(({ id, domain, clients }) => {
-        payload[domain] ||= {};
+        payload[domain] || (payload[domain] = {});
         payload[domain][id] = clients;
     });
     return payload;
@@ -104,7 +104,7 @@ describe('MessageService', () => {
                 conversationId: { id: 'convid', domain: 'domain' },
             });
             expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalled();
-            expect(result).toEqual({ ...baseMessageSendingStatus, failed: undefined });
+            expect(result).toEqual(Object.assign(Object.assign({}, baseMessageSendingStatus), { failed: undefined }));
         });
         it('should send regular to conversation', async () => {
             const [messageService, { apiClient }] = await buildMessageService();
@@ -137,10 +137,7 @@ describe('MessageService', () => {
             it('handles client mismatch when no other clients from that domain are known', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 let spyCounter = 0;
-                const clientMismatch = {
-                    ...baseClientMismatch,
-                    missing: { [user1.domain]: { [user1.id]: ['client'] } },
-                };
+                const clientMismatch = Object.assign(Object.assign({}, baseClientMismatch), { missing: { [user1.domain]: { [user1.id]: ['client'] } } });
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     spyCounter++;
                     if (spyCounter === 1) {
@@ -166,11 +163,7 @@ describe('MessageService', () => {
             it('handles client mismatch internally if no onClientMismatch is given', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 let spyCounter = 0;
-                const clientMismatch = {
-                    ...baseClientMismatch,
-                    deleted: { [user1.domain]: { [user1.id]: [user1.clients[0]] } },
-                    missing: { [user2.domain]: { [user2.id]: ['client22'] } },
-                };
+                const clientMismatch = Object.assign(Object.assign({}, baseClientMismatch), { deleted: { [user1.domain]: { [user1.id]: [user1.clients[0]] } }, missing: { [user2.domain]: { [user2.id]: ['client22'] } } });
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     spyCounter++;
                     if (spyCounter === 1) {
@@ -196,7 +189,7 @@ describe('MessageService', () => {
             it('continues message sending if onClientMismatch returns true', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 const onClientMismatch = jest.fn().mockReturnValue(Promise.resolve(true));
-                const clientMismatch = { ...baseClientMismatch, missing: { [user2.domain]: { [user2.id]: ['client22'] } } };
+                const clientMismatch = Object.assign(Object.assign({}, baseClientMismatch), { missing: { [user2.domain]: { [user2.id]: ['client22'] } } });
                 let spyCounter = 0;
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     spyCounter++;
@@ -225,7 +218,7 @@ describe('MessageService', () => {
             it('stops message sending if onClientMismatch returns false', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 const onClientMismatch = jest.fn().mockReturnValue(Promise.resolve(false));
-                const clientMismatch = { ...baseMessageSendingStatus, missing: { [user2.id]: ['client22'] } };
+                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { missing: { [user2.id]: ['client22'] } });
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     const error = new Error();
                     error.response = {
@@ -251,11 +244,7 @@ describe('MessageService', () => {
             it('handles client mismatch internally if no onClientMismatch is given', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 let spyCounter = 0;
-                const clientMismatch = {
-                    ...baseMessageSendingStatus,
-                    deleted: { [user1.domain]: { [user1.id]: [user1.clients[0]] } },
-                    missing: { '2.wire.test': { [user2.id]: ['client22'] } },
-                };
+                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { deleted: { [user1.domain]: { [user1.id]: [user1.clients[0]] } }, missing: { '2.wire.test': { [user2.id]: ['client22'] } } });
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     spyCounter++;
                     if (spyCounter === 1) {
@@ -281,7 +270,7 @@ describe('MessageService', () => {
             it('continues message sending if onClientMismatch returns true', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 const onClientMismatch = jest.fn().mockReturnValue(true);
-                const clientMismatch = { ...baseMessageSendingStatus, missing: { '2.wire.test': { [user2.id]: ['client22'] } } };
+                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { missing: { '2.wire.test': { [user2.id]: ['client22'] } } });
                 let spyCounter = 0;
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     spyCounter++;
@@ -331,7 +320,7 @@ describe('MessageService', () => {
             it('stops message sending if onClientMismatch returns false', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 const onClientMismatch = jest.fn().mockReturnValue(false);
-                const clientMismatch = { ...baseMessageSendingStatus, missing: { '2.wire.test': { [user2.id]: ['client22'] } } };
+                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { missing: { '2.wire.test': { [user2.id]: ['client22'] } } });
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     const error = new Error();
                     error.response = {

package/lib/conversation/message/MessageToProtoMapper.js

@@ -80,10 +80,10 @@ class MessageToProtoMapper {
             expectsReadConfirmation,
             legalHoldStatus,
         });
-        if (linkPreviews?.length) {
+        if (linkPreviews === null || linkPreviews === void 0 ? void 0 : linkPreviews.length) {
             textMessage.linkPreview = MessageToProtoMapper.mapLinkPreviews(linkPreviews);
         }
-        if (mentions?.length) {
+        if (mentions === null || mentions === void 0 ? void 0 : mentions.length) {
             textMessage.mentions = mentions.map(mention => protocol_messaging_1.Mention.create(mention));
         }
         if (quote) {

package/lib/conversation/message/RecipientsHelper.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recipientsToBase64 = recipientsToBase64;
+exports.recipientsToBase64 = void 0;
 const bazinga64_1 = require("bazinga64");
 function recipientsToBase64(recipients) {
     return Object.fromEntries(Object.entries(recipients).map(([userId, otrClientMap]) => {
@@ -28,3 +28,4 @@ function recipientsToBase64(recipients) {
         return [userId, otrClientMapWithBase64];
     }));
 }
+exports.recipientsToBase64 = recipientsToBase64;

package/lib/conversation/message/TextContentBuilder.js

@@ -21,7 +21,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TextContentBuilder = void 0;
 const content_1 = require("../content");
 class TextContentBuilder {
-    content;
     constructor(textContent) {
         this.content = textContent;
     }
@@ -29,13 +28,13 @@ class TextContentBuilder {
         return this.content;
     }
     withLinkPreviews(linkPreviews) {
-        if (linkPreviews?.length) {
+        if (linkPreviews === null || linkPreviews === void 0 ? void 0 : linkPreviews.length) {
             this.content.linkPreviews = linkPreviews;
         }
         return this;
     }
     withMentions(mentions) {
-        if (mentions?.length) {
+        if (mentions === null || mentions === void 0 ? void 0 : mentions.length) {
             this.content.mentions = mentions;
         }
         return this;

package/lib/conversation/message/UserClientsUtil.js

@@ -18,8 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flattenUserMap = flattenUserMap;
-exports.nestUsersList = nestUsersList;
+exports.nestUsersList = exports.flattenUserMap = void 0;
 /**
  * Will flatten a container of domain=>users=>anything infos to an array
  *
@@ -31,6 +30,7 @@ function flattenUserMap(userMap) {
         return [...ids, ...Object.entries(userClients).map(([id, data]) => ({ data, userId: { domain, id } }))];
     }, []);
 }
+exports.flattenUserMap = flattenUserMap;
 /**
  * Will convert a list of qualified users to a UserMap
  * @param users the list of users to convert
@@ -44,3 +44,4 @@ function nestUsersList(users) {
         return users;
     }, {});
 }
+exports.nestUsersList = nestUsersList;

package/lib/conversation/message/messageSender.js

@@ -18,25 +18,26 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendMessage = sendMessage;
-exports.getQueueLength = getQueueLength;
-exports.isSendingMessage = isSendingMessage;
-exports.resumeMessageSending = resumeMessageSending;
-exports.pauseMessageSending = pauseMessageSending;
+exports.pauseMessageSending = exports.resumeMessageSending = exports.isSendingMessage = exports.getQueueLength = exports.sendMessage = void 0;
 const promise_queue_1 = require("@wireapp/promise-queue");
 const sendingQueue = new promise_queue_1.PromiseQueue({ name: 'message-sender', paused: true });
 function sendMessage(sendingFunction) {
     return sendingQueue.push(sendingFunction);
 }
+exports.sendMessage = sendMessage;
 function getQueueLength() {
     return sendingQueue.getLength();
 }
+exports.getQueueLength = getQueueLength;
 function isSendingMessage() {
     return sendingQueue.hasRunningTasks();
 }
+exports.isSendingMessage = isSendingMessage;
 function resumeMessageSending() {
     sendingQueue.pause(false);
 }
+exports.resumeMessageSending = resumeMessageSending;
 function pauseMessageSending() {
     sendingQueue.pause(true);
 }
+exports.pauseMessageSending = pauseMessageSending;

package/lib/cryptography/AssetCryptography/AssetCryptography.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssetCryptography.d.ts","sourceRoot":"","sources":["../../../src/cryptography/AssetCryptography/AssetCryptography.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAG5D,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAYhD,UAAU,cAAe,SAAQ,aAAa;IAC5C,SAAS,EAAE,UAAU,CAAC;CACvB;AAED,eAAO,MAAM,YAAY,uDAItB,cAAc,KAAG,OAAO,CAAC,UAAU,CAQrC,CAAC;AAEF,eAAO,MAAM,YAAY,6BAAkD,cAAc,KAAG,OAAO,CAAC,cAAc,CAiBjH,CAAC"}
+{"version":3,"file":"AssetCryptography.d.ts","sourceRoot":"","sources":["../../../src/cryptography/AssetCryptography/AssetCryptography.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAG5D,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAYhD,UAAU,cAAe,SAAQ,aAAa;IAC5C,SAAS,EAAE,UAAU,CAAC;CACvB;AAED,eAAO,MAAM,YAAY,uDAItB,cAAc,KAAG,QAAQ,UAAU,CAQrC,CAAC;AAEF,eAAO,MAAM,YAAY,6BAAkD,cAAc,KAAG,QAAQ,cAAc,CAiBjH,CAAC"}

package/lib/cryptography/GenericMessageMapper.js

@@ -25,10 +25,6 @@ exports.GenericMessageMapper = void 0;
 const logdown_1 = __importDefault(require("logdown"));
 const conversation_1 = require("../conversation");
 class GenericMessageMapper {
-    static logger = (0, logdown_1.default)('@wireapp/core/GenericMessageMapper', {
-        logger: console,
-        markdown: false,
-    });
     // 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) {
@@ -48,10 +44,10 @@ class GenericMessageMapper {
             case conversation_1.GenericMessageType.TEXT: {
                 const { content: text, expectsReadConfirmation, legalHoldStatus, linkPreview: linkPreviews, mentions, quote, } = genericMessage[conversation_1.GenericMessageType.TEXT];
                 const content = { expectsReadConfirmation, legalHoldStatus, text };
-                if (linkPreviews?.length) {
+                if (linkPreviews === null || linkPreviews === void 0 ? void 0 : linkPreviews.length) {
                     content.linkPreviews = linkPreviews;
                 }
-                if (mentions?.length) {
+                if (mentions === null || mentions === void 0 ? void 0 : mentions.length) {
                     content.mentions = mentions;
                 }
                 if (quote) {
@@ -60,51 +56,27 @@ class GenericMessageMapper {
                 if (typeof legalHoldStatus !== 'undefined') {
                     content.legalHoldStatus = legalHoldStatus;
                 }
-                return {
-                    ...baseMessage,
-                    content,
-                    type: conversation_1.PayloadBundleType.TEXT,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content, type: conversation_1.PayloadBundleType.TEXT });
             }
             case conversation_1.GenericMessageType.BUTTON_ACTION: {
-                return {
-                    ...baseMessage,
-                    content: genericMessage.buttonAction,
-                    type: conversation_1.PayloadBundleType.BUTTON_ACTION,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content: genericMessage.buttonAction, type: conversation_1.PayloadBundleType.BUTTON_ACTION });
             }
             case conversation_1.GenericMessageType.CALLING: {
-                return {
-                    ...baseMessage,
-                    content: genericMessage.calling.content,
-                    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 {
-                    ...baseMessage,
-                    content,
-                    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 {
-                    ...baseMessage,
-                    content,
-                    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 {
-                    ...baseMessage,
-                    content,
-                    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];
@@ -114,20 +86,16 @@ class GenericMessageMapper {
                     originalMessageId: replacingMessageId,
                     text: editedText,
                 };
-                if (editedLinkPreviews?.length) {
+                if (editedLinkPreviews === null || editedLinkPreviews === void 0 ? void 0 : editedLinkPreviews.length) {
                     content.linkPreviews = editedLinkPreviews;
                 }
-                if (editedMentions?.length) {
+                if (editedMentions === null || editedMentions === void 0 ? void 0 : editedMentions.length) {
                     content.mentions = editedMentions;
                 }
                 if (editedQuote) {
                     content.quote = editedQuote;
                 }
-                return {
-                    ...baseMessage,
-                    content,
-                    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];
@@ -135,20 +103,12 @@ class GenericMessageMapper {
                     conversationId,
                     messageId,
                 };
-                return {
-                    ...baseMessage,
-                    content,
-                    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 {
-                    ...baseMessage,
-                    content,
-                    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];
@@ -160,15 +120,11 @@ class GenericMessageMapper {
                     name,
                     zoom,
                 };
-                return {
-                    ...baseMessage,
-                    content,
-                    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];
-                const isImage = !!uploaded?.assetId && !!original?.image;
+                const isImage = !!(uploaded === null || uploaded === void 0 ? void 0 : uploaded.assetId) && !!(original === null || original === void 0 ? void 0 : original.image);
                 const content = {
                     abortReason: notUploaded,
                     expectsReadConfirmation,
@@ -178,11 +134,7 @@ class GenericMessageMapper {
                     status,
                     uploaded,
                 };
-                return {
-                    ...baseMessage,
-                    content,
-                    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];
@@ -191,21 +143,17 @@ class GenericMessageMapper {
                     originalMessageId: messageId,
                     type: emoji,
                 };
-                return {
-                    ...baseMessage,
-                    content,
-                    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 {
-                    ...baseMessage,
-                    content: genericMessage.content,
-                    type: conversation_1.PayloadBundleType.UNKNOWN,
-                };
+                return Object.assign(Object.assign({}, baseMessage), { content: genericMessage.content, type: conversation_1.PayloadBundleType.UNKNOWN });
             }
         }
     }
 }
 exports.GenericMessageMapper = GenericMessageMapper;
+GenericMessageMapper.logger = (0, logdown_1.default)('@wireapp/core/GenericMessageMapper', {
+    logger: console,
+    markdown: false,
+});

package/lib/cryptography/MessageHashService.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { AssetContent, LocationContent, TextContent } from '../conversation/content';
 export type AvailableMessageContent = AssetContent | LocationContent | TextContent;
 export declare class MessageHashService {

package/lib/cryptography/MessageHashService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageHashService.d.ts","sourceRoot":"","sources":["../../src/cryptography/MessageHashService.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,YAAY,EAAoC,eAAe,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAErH,MAAM,MAAM,uBAAuB,GAAG,YAAY,GAAG,eAAe,GAAG,WAAW,CAAC;AAEnF,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0B;IACzD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAEvB,cAAc,EAAE,uBAAuB,EAAE,SAAS,GAAE,MAAmB;IAMnF,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,QAAQ;IAiBhB,OAAO,IAAI,MAAM;CAIlB"}
+{"version":3,"file":"MessageHashService.d.ts","sourceRoot":"","sources":["../../src/cryptography/MessageHashService.ts"],"names":[],"mappings":";AAsBA,OAAO,EAAC,YAAY,EAAoC,eAAe,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAErH,MAAM,MAAM,uBAAuB,GAAG,YAAY,GAAG,eAAe,GAAG,WAAW,CAAC;AAEnF,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0B;IACzD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAEvB,cAAc,EAAE,uBAAuB,EAAE,SAAS,GAAE,MAAmB;IAMnF,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,QAAQ;IAiBhB,OAAO,IAAI,MAAM;CAIlB"}

package/lib/cryptography/MessageHashService.js

@@ -49,8 +49,6 @@ const hash = __importStar(require("hash.js"));
 const long_1 = __importDefault(require("long"));
 const content_1 = require("../conversation/content");
 class MessageHashService {
-    messageContent;
-    timestamp;
     constructor(messageContent, timestamp = Date.now()) {
         this.messageContent = messageContent;
         const unixTimestamp = new Date(timestamp).getTime();

package/lib/errors/DecryptionError.js

@@ -20,8 +20,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DecryptionError = void 0;
 class DecryptionError extends Error {
-    message;
-    code;
     constructor(message, code) {
         super(message);
         this.message = message;