@wireapp/core 31.0.0 → 31.1.1

package/package.json

@@ -3,12 +3,12 @@
     "./src/main/cryptography/AssetCryptography/crypto.node": "./src/main/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "workspace:^",
-    "@wireapp/commons": "workspace:^",
+    "@wireapp/api-client": "^20.5.0",
+    "@wireapp/commons": "^4.4.0",
     "@wireapp/core-crypto": "0.5.0",
     "@wireapp/cryptobox": "12.8.0",
-    "@wireapp/promise-queue": "workspace:^",
-    "@wireapp/store-engine-dexie": "workspace:^",
+    "@wireapp/promise-queue": "^1.2.0",
+    "@wireapp/store-engine-dexie": "^1.7.0",
     "axios": "^0.27.2",
     "bazinga64": "5.11.0",
     "hash.js": "1.1.7",
@@ -81,6 +81,6 @@
     "test": "jest",
     "watch": "tsc ---watch"
   },
-  "version": "31.0.0",
-  "gitHead": "a23001a062060cec72d2e3687e381c8ae6ca31a7"
+  "version": "31.1.1",
+  "gitHead": "b95b3e1af8e527cceaa3f770c9c2b06c019d0cb9"
 }

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

@@ -7,7 +7,7 @@ import { RemoteData } from '../content';
 import { CryptographyService } from '../../cryptography/';
 import { MLSService } from '../../mls';
 import { NotificationService } from '../../notification';
-import { ClearConversationMessage, HideMessage, OtrMessage } from '../message/OtrMessage';
+import { ClearConversationMessage, OtrMessage } from '../message/OtrMessage';
 import { XOR } from '@wireapp/commons/src/main/util/TypeUtil';
 import { AddUsersParams, MessageSendingOptions, MLSReturnType, SendMlsMessageParams, SendProteusMessageParams } from './ConversationService.types';
 export declare class ConversationService {
@@ -91,7 +91,6 @@ export declare class ConversationService {
      * @param {string} conversationDomain? - If given will send the message to the new qualified endpoint
      */
     fetchAllParticipantsClients(conversationId: string, conversationDomain?: string): Promise<UserClients | QualifiedUserClients>;
-    deleteMessageLocal(conversationId: string, messageIdToHide: string, sendAsProtobuf?: boolean, conversationDomain?: string): Promise<HideMessage>;
     /**
      * Create a group conversation.
      * @param  {string} name

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

@@ -342,33 +342,6 @@ class ConversationService {
         }));
         return qualifiedUserClients;
     }
-    async deleteMessageLocal(conversationId, messageIdToHide, sendAsProtobuf, conversationDomain) {
-        const messageId = MessageBuilder_1.MessageBuilder.createId();
-        const content = protocol_messaging_1.MessageHide.create({
-            conversationId,
-            messageId: messageIdToHide,
-        });
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.HIDDEN]: content,
-            messageId,
-        });
-        const { id: selfConversationId } = await this.getSelfConversationId();
-        await this.sendGenericMessage(this.apiClient.validatedClientId, selfConversationId, genericMessage, {
-            sendAsProtobuf,
-            conversationDomain,
-        });
-        return {
-            content,
-            conversation: conversationId,
-            from: this.apiClient.context.userId,
-            id: messageId,
-            messageTimer: this.messageTimer.getMessageTimer(conversationId),
-            source: conversation_2.PayloadBundleSource.LOCAL,
-            state: conversation_2.PayloadBundleState.OUTGOING_SENT,
-            timestamp: Date.now(),
-            type: conversation_2.PayloadBundleType.MESSAGE_HIDE,
-        };
-    }
     createProteusConversation(conversationData, otherUserIds) {
         let payload;
         if (typeof conversationData === 'string') {

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

@@ -59,6 +59,8 @@ function generateGenericMessage(payload, messageTimer) {
             return { genericMessage: generateTextGenericMessage(payload, messageTimer), content };
         case PayloadBundle_1.PayloadBundleType.MESSAGE_DELETE:
             return { genericMessage: generateDeleteMessage(payload), content };
+        case PayloadBundle_1.PayloadBundleType.MESSAGE_HIDE:
+            return { genericMessage: generateHideMessage(payload), content };
         /**
          * ToDo: Create Generic implementation for everything else
          */
@@ -248,6 +250,16 @@ function generateDeleteMessage(payload) {
         messageId: payload.id,
     });
 }
+function generateHideMessage(payload) {
+    const content = protocol_messaging_1.MessageHide.create({
+        messageId: payload.content.messageId,
+        conversationId: payload.content.conversationId,
+    });
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.HIDDEN]: content,
+        messageId: payload.id,
+    });
+}
 function generateTextGenericMessage(payloadBundle, messageTimer) {
     const genericMessage = protocol_messaging_1.GenericMessage.create({
         messageId: payloadBundle.id,

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

@@ -3,16 +3,20 @@ import { AbortReason } from '..';
 import { EncryptedAssetUploaded } from '../../cryptography';
 import { ButtonActionConfirmationContent, ButtonActionContent, CallingContent, FileContent, FileMetaDataContent, ImageContent, KnockContent, LegalHoldStatus, LocationContent, ReactionContent } from '../content';
 import { CompositeContentBuilder } from './CompositeContentBuilder';
-import { ButtonActionConfirmationMessage, ButtonActionMessage, CallMessage, ConfirmationMessage, DeleteMessage, FileAssetAbortMessage, FileAssetMessage, FileAssetMetaDataMessage, ImageAssetMessageOutgoing, LocationMessage, PingMessage, ReactionMessage, ResetSessionMessage } from './OtrMessage';
+import { ButtonActionConfirmationMessage, ButtonActionMessage, CallMessage, ConfirmationMessage, DeleteMessage, FileAssetAbortMessage, FileAssetMessage, FileAssetMetaDataMessage, HideMessage, ImageAssetMessageOutgoing, LocationMessage, PingMessage, ReactionMessage, ResetSessionMessage } from './OtrMessage';
 import { TextContentBuilder } from './TextContentBuilder';
 interface BaseOptions {
     conversationId: string;
     from: string;
     messageId?: string;
 }
-interface CreateDeleteOption extends BaseOptions {
+interface CreateMessageDeleteOption extends BaseOptions {
     messageIdToDelete: string;
 }
+interface CreateMessageHideOption extends BaseOptions {
+    messageIdToDelete: string;
+    targetConversation: string;
+}
 interface CreateImageOptions extends BaseOptions {
     expectsReadConfirmation?: boolean;
     asset: EncryptedAssetUploaded;
@@ -72,7 +76,8 @@ interface CreateActionMessageOptions extends BaseOptions {
 export declare class MessageBuilder {
     static createEditedText(payload: CreateEditedTextOptions): TextContentBuilder;
     static createFileData(payload: CreateFileOptions): FileAssetMessage;
-    static createDelete(payload: CreateDeleteOption): DeleteMessage;
+    static createMessageDelete(payload: CreateMessageDeleteOption): DeleteMessage;
+    static createMessageHide(payload: CreateMessageHideOption): HideMessage;
     static createFileMetadata(payload: CreateFileMetadataOptions): FileAssetMetaDataMessage;
     static createFileAbort(payload: CreateFileAbortOptions): FileAssetAbortMessage;
     static createImage(payload: CreateImageOptions): ImageAssetMessageOutgoing;

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

@@ -53,9 +53,12 @@ class MessageBuilder {
                 legalHoldStatus,
             }, id: originalMessageId, type: __1.PayloadBundleType.ASSET });
     }
-    static createDelete(payload) {
+    static createMessageDelete(payload) {
         return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: { messageId: payload.messageIdToDelete }, type: __1.PayloadBundleType.MESSAGE_DELETE });
     }
+    static createMessageHide(payload) {
+        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: { messageId: payload.messageIdToDelete, conversationId: payload.targetConversation }, type: __1.PayloadBundleType.MESSAGE_HIDE });
+    }
     static createFileMetadata(payload) {
         const { expectsReadConfirmation, legalHoldStatus, metaData } = payload;
         return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: {

package/src/main/util/mapQualifiedUserClientIdsToFullyQualifiedClientIds.d.ts

@@ -0,0 +1,8 @@
+import { QualifiedUserClientMap } from '@wireapp/api-client/src/client';
+declare type UserId = string;
+declare type ClientId = string;
+declare type Domain = string;
+export declare type ClientIdStringType = `${UserId}:${ClientId}@${Domain}`;
+export declare const constructFullyQualifiedClientId: (userId: UserId, clientId: ClientId, domain: Domain) => ClientIdStringType;
+export declare const mapQualifiedUserClientIdsToFullyQualifiedClientIds: (qualifiedUserMap: QualifiedUserClientMap) => Uint8Array[];
+export {};

package/src/main/util/mapQualifiedUserClientIdsToFullyQualifiedClientIds.js

@@ -0,0 +1,32 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 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/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapQualifiedUserClientIdsToFullyQualifiedClientIds = exports.constructFullyQualifiedClientId = void 0;
+const constructFullyQualifiedClientId = (userId, clientId, domain) => `${userId}:${clientId}@${domain}`;
+exports.constructFullyQualifiedClientId = constructFullyQualifiedClientId;
+const mapQualifiedUserClientIdsToFullyQualifiedClientIds = (qualifiedUserMap) => {
+    const encoder = new TextEncoder();
+    return Object.entries(qualifiedUserMap).flatMap(([domain, users]) => {
+        const clients = Object.entries(users);
+        return clients.flatMap(([userId, clients]) => clients.map(client => encoder.encode((0, exports.constructFullyQualifiedClientId)(userId, client.id, domain))));
+    });
+};
+exports.mapQualifiedUserClientIdsToFullyQualifiedClientIds = mapQualifiedUserClientIdsToFullyQualifiedClientIds;
+//# sourceMappingURL=mapQualifiedUserClientIdsToFullyQualifiedClientIds.js.map