@wireapp/core 20.1.0 → 20.2.0

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [20.2.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.1.3...@wireapp/core@20.2.0) (2021-12-16)
+
+
+### Features
+
+* **core:** Add a method to upload an unencrypted asset ([#4203](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4203)) ([7bbef28](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/7bbef28b49b877312512dc59c31d2249f876fa67))
+
+
+
+
+
+## [20.1.3](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.1.2...@wireapp/core@20.1.3) (2021-12-16)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [20.1.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.1.1...@wireapp/core@20.1.2) (2021-12-15)
+
+
+### Bug Fixes
+
+* **core:** Await for mismatch handling before considering a message sent ([925ecbb](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/925ecbb9f9a8e5f0f123d29615a794d7c58f2f10))
+
+
+
+
+
+## [20.1.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.1.0...@wireapp/core@20.1.1) (2021-12-14)
+
+
+### Bug Fixes
+
+* **core:** Call message send success callback after mismatch handling ([ada3fd1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/ada3fd1378a7c5fecddd03db9547a89f90a7a174))
+
+
+
+
+
 # [20.1.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.0.2...@wireapp/core@20.1.0) (2021-12-14)
 
 

package/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "16.1.0",
+    "@wireapp/api-client": "16.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": "20.1.0",
-  "gitHead": "c8c5272251a8bba3dc22087a7958451e9e7cfa6f"
+  "version": "20.2.0",
+  "gitHead": "5ff57f8efd8713ae9767f12c103ea918acbbaa3b"
 }

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

@@ -6,5 +6,22 @@ import type { EncryptedAssetUploaded } from '../cryptography/';
 export declare class AssetService {
     private readonly apiClient;
     constructor(apiClient: APIClient);
+    /**
+     * Uploads a raw asset to the backend without encrypting it
+     *
+     * @param plainText The raw content of the asset to upload
+     * @param options?
+     * @param progressCallback?
+     * @return cancellable request that resolves with the uploaded image
+     */
+    uploadRawAsset(asset: Buffer | Uint8Array, options?: AssetOptions, progressCallback?: ProgressCallback): RequestCancelable<import("@wireapp/api-client/src/asset").AssetUploadData>;
+    /**
+     * Will encrypt and upload an asset to the backend
+     *
+     * @param plainText The raw content of the asset to upload
+     * @param options?
+     * @param progressCallback?
+     * @return cancellable request that resolves with the uploaded image and decryption keys
+     */
     uploadAsset(plainText: Buffer | Uint8Array, options?: AssetOptions, progressCallback?: ProgressCallback): Promise<RequestCancelable<EncryptedAssetUploaded>>;
 }

package/src/main/conversation/AssetService.js

@@ -24,13 +24,32 @@ class AssetService {
     constructor(apiClient) {
         this.apiClient = apiClient;
     }
+    /**
+     * Uploads a raw asset to the backend without encrypting it
+     *
+     * @param plainText The raw content of the asset to upload
+     * @param options?
+     * @param progressCallback?
+     * @return cancellable request that resolves with the uploaded image
+     */
+    uploadRawAsset(asset, options, progressCallback) {
+        return this.apiClient.asset.api.postAsset(new Uint8Array(asset), options, progressCallback);
+    }
+    /**
+     * Will encrypt and upload an asset to the backend
+     *
+     * @param plainText The raw content of the asset to upload
+     * @param options?
+     * @param progressCallback?
+     * @return cancellable request that resolves with the uploaded image and decryption keys
+     */
     async uploadAsset(plainText, options, progressCallback) {
         const { cipherText, keyBytes, sha256 } = await (0, AssetCryptography_1.encryptAsset)({
             plainText,
             algorithm: options === null || options === void 0 ? void 0 : options.algorithm,
             hash: options === null || options === void 0 ? void 0 : options.hash,
         });
-        const request = this.apiClient.asset.api.postAsset(new Uint8Array(cipherText), options, progressCallback);
+        const request = this.uploadRawAsset(cipherText, options, progressCallback);
         return Object.assign(Object.assign({}, request), { response: request.response.then(response => {
                 const { key, token } = response;
                 return {

package/src/main/conversation/ConversationService.js

@@ -686,11 +686,11 @@ class ConversationService {
             onClientMismatch: callbacks === null || callbacks === void 0 ? void 0 : callbacks.onClientMismatch,
         });
         if (!response.errored) {
-            (_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _b === void 0 ? void 0 : _b.call(callbacks, genericMessage, response.time);
             if (!this.isClearFromMismatch(response)) {
                 // We warn the consumer that there is a mismatch that did not prevent message sending
-                (_c = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onClientMismatch) === null || _c === void 0 ? void 0 : _c.call(callbacks, response, true);
+                await ((_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onClientMismatch) === null || _b === void 0 ? void 0 : _b.call(callbacks, response, true));
             }
+            (_c = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _c === void 0 ? void 0 : _c.call(callbacks, genericMessage, response.time);
         }
         return Object.assign(Object.assign({}, payloadBundle), { content: processedContent || payloadBundle.content, messageTimer: ((_d = genericMessage.ephemeral) === null || _d === void 0 ? void 0 : _d.expireAfterMillis) || 0, state: response.errored ? conversation_2.PayloadBundleState.CANCELLED : conversation_2.PayloadBundleState.OUTGOING_SENT });
     }