@wireapp/core 24.0.2 → 24.1.1

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+
+
+
+
 ## [24.0.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@24.0.1...@wireapp/core@24.0.2) (2022-02-24)
 
 **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.0.2",
+    "@wireapp/api-client": "18.2.0",
     "@wireapp/cryptobox": "12.7.1",
     "bazinga64": "5.10.0",
     "hash.js": "1.1.7",
@@ -69,6 +69,6 @@
     "test:project": "yarn dist && yarn test",
     "test:node": "nyc jasmine --config=jasmine.json"
   },
-  "version": "24.0.2",
-  "gitHead": "258a287ce9d451ad93cdb5b4279876106dbd919c"
+  "version": "24.1.1",
+  "gitHead": "34c3008f9086e61fa837715618c8c18178b2e5a7"
 }

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;