@wireapp/core 24.0.3 → 24.2.0

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [24.2.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@24.1.1...@wireapp/core@24.2.0) (2022-03-07)
+
+
+### Bug Fixes
+
+* **core:** Do not use qualified session ids in non-federated env ([#4237](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4237)) ([ad9e6d0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/ad9e6d0e903c42674aa7f60038463e3c1dfeb5e4))
+
+
+### Features
+
+* **api-client:** Send federated broadcast messages ([#4235](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4235)) ([4e437a5](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/4e437a5c60a0c801d2ce10d802f100d7ac9c6f6b))
+
+
+
+
+
+## [24.1.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@24.1.0...@wireapp/core@24.1.1) (2022-03-01)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+# [24.1.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@24.0.3...@wireapp/core@24.1.0) (2022-02-28)
+
+
+### Features
+
+* **core:** Allow sending broadcast message to federated env ([#4234](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4234)) ([ee66d4d](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/ee66d4d269d0af9fdd72d9a20fdfa4cab884cf8d))
+
+
+
+
+
 ## [24.0.3](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@24.0.2...@wireapp/core@24.0.3) (2022-02-25)
 
 **Note:** Version bump only for package @wireapp/core

package/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "18.1.0",
+    "@wireapp/api-client": "18.3.0",
     "@wireapp/cryptobox": "12.7.1",
     "bazinga64": "5.10.0",
     "hash.js": "1.1.7",
@@ -20,14 +20,14 @@
     "@types/jasmine": "3.8.2",
     "@types/karma": "6.3.1",
     "@wireapp/commons": "4.2.13",
-    "@wireapp/store-engine-dexie": "1.6.8",
+    "@wireapp/store-engine-dexie": "1.6.9",
     "commander": "8.0.0",
     "cross-env": "7.0.3",
     "dotenv-defaults": "2.0.2",
     "faker": "5.5.3",
     "istanbul": "1.1.0-alpha.1",
     "jasmine": "3.8.0",
-    "karma": "6.3.14",
+    "karma": "6.3.16",
     "karma-chrome-launcher": "3.1.0",
     "karma-jasmine": "4.0.1",
     "karma-jasmine-diff-reporter": "2.0.1",
@@ -69,6 +69,6 @@
     "test:project": "yarn dist && yarn test",
     "test:node": "nyc jasmine --config=jasmine.json"
   },
-  "version": "24.0.3",
-  "gitHead": "4dee80062725efdc91bb0102eb768e5f431db04b"
+  "version": "24.2.0",
+  "gitHead": "e0b2ffc4997ecf5bc50148635b639c055fa863c7"
 }

package/src/main/Account.js

@@ -149,15 +149,20 @@ class Account extends events_1.EventEmitter {
         return context;
     }
     async initServices(storeEngine) {
-        const config = { useQualifiedIds: this.apiClient.backendFeatures.federationEndpoints };
         const accountService = new account_1.AccountService(this.apiClient);
         const assetService = new conversation_1.AssetService(this.apiClient);
-        const cryptographyService = new cryptography_1.CryptographyService(this.apiClient, storeEngine, config);
+        const cryptographyService = new cryptography_1.CryptographyService(this.apiClient, storeEngine, {
+            // We want to encrypt with fully qualified session ids, only if the backend is federated with other backends
+            useQualifiedIds: this.backendFeatures.isFederated,
+        });
         const clientService = new client_2.ClientService(this.apiClient, storeEngine, cryptographyService);
         const connectionService = new connection_1.ConnectionService(this.apiClient);
         const giphyService = new giphy_1.GiphyService(this.apiClient);
         const linkPreviewService = new linkPreview_1.LinkPreviewService(assetService);
-        const conversationService = new conversation_1.ConversationService(this.apiClient, cryptographyService, config);
+        const conversationService = new conversation_1.ConversationService(this.apiClient, cryptographyService, {
+            // We can use qualified ids to send messages as long as the backend supports federated endpoints
+            useQualifiedIds: this.backendFeatures.federationEndpoints,
+        });
         const notificationService = new notification_1.NotificationService(this.apiClient, cryptographyService, storeEngine);
         const selfService = new self_1.SelfService(this.apiClient);
         const teamService = new team_1.TeamService(this.apiClient);

package/src/main/broadcast/BroadcastService.d.ts

@@ -1,5 +1,5 @@
 import type { APIClient } from '@wireapp/api-client';
-import { ClientMismatch, UserClients } from '@wireapp/api-client/src/conversation';
+import { ClientMismatch, MessageSendingStatus, QualifiedUserClients, UserClients } from '@wireapp/api-client/src/conversation';
 import type { UserPreKeyBundleMap } from '@wireapp/api-client/src/user/';
 import { GenericMessage } from '@wireapp/protocol-messaging';
 import type { CryptographyService } from '../cryptography/';
@@ -16,5 +16,9 @@ export declare class BroadcastService {
      * @param onlyDirectConnections=false Will generate a bundle only for directly connected users (users the self user has conversation with). Allows avoiding broadcasting messages to too many people
      */
     getPreKeyBundlesFromTeam(teamId: string, skipOwnClients?: boolean, onlyDirectConnections?: boolean): Promise<UserPreKeyBundleMap>;
-    broadcastGenericMessage(genericMessage: GenericMessage, recipients: UserPreKeyBundleMap | UserClients, sendAsProtobuf?: boolean, onClientMismatch?: (mismatch: ClientMismatch) => void | boolean | Promise<boolean>): Promise<ClientMismatch>;
+    broadcastGenericMessage(genericMessage: GenericMessage, recipients: UserPreKeyBundleMap | UserClients | QualifiedUserClients, sendAsProtobuf?: boolean, onClientMismatch?: (mismatch: ClientMismatch | MessageSendingStatus) => void | boolean | Promise<boolean>): Promise<(MessageSendingStatus & {
+        errored?: boolean | undefined;
+    }) | (ClientMismatch & {
+        errored?: boolean | undefined;
+    })>;
 }

package/src/main/broadcast/BroadcastService.js

@@ -21,6 +21,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BroadcastService = void 0;
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const MessageService_1 = require("../conversation/message/MessageService");
+const UserClientsUtil_1 = require("../conversation/message/UserClientsUtil");
+const util_1 = require("../util");
 class BroadcastService {
     constructor(apiClient, cryptographyService) {
         this.apiClient = apiClient;
@@ -56,11 +58,16 @@ class BroadcastService {
     }
     async broadcastGenericMessage(genericMessage, recipients, sendAsProtobuf, onClientMismatch) {
         const plainTextArray = protocol_messaging_1.GenericMessage.encode(genericMessage).finish();
-        return this.messageService.sendMessage(this.apiClient.validatedClientId, recipients, plainTextArray, {
-            sendAsProtobuf,
-            reportMissing: Object.keys(recipients),
-            onClientMismatch,
-        });
+        return (0, util_1.isQualifiedUserClients)(recipients)
+            ? this.messageService.sendFederatedMessage(this.apiClient.validatedClientId, recipients, plainTextArray, {
+                reportMissing: (0, UserClientsUtil_1.flattenQualifiedUserClients)(recipients).map(({ userId }) => userId),
+                onClientMismatch,
+            })
+            : this.messageService.sendMessage(this.apiClient.validatedClientId, recipients, plainTextArray, {
+                sendAsProtobuf,
+                reportMissing: Object.keys(recipients),
+                onClientMismatch,
+            });
     }
 }
 exports.BroadcastService = BroadcastService;

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

@@ -162,8 +162,7 @@ class MessageService {
             protoMessage.ignoreAll = true;
         }
         if (!options.conversationId) {
-            //TODO implement federated broadcast sending
-            throw new Error('Unimplemented federated broadcast');
+            return this.apiClient.api.broadcast.postBroadcastFederatedMessage(sendingClientId, protoMessage);
         }
         const { id, domain } = options.conversationId;
         return this.apiClient.api.conversation.postOTRMessageV2(id, domain, protoMessage);