@wireapp/core 18.0.0 → 19.0.0

package/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [19.0.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@18.0.0...@wireapp/core@19.0.0) (2021-12-08)
+
+
+### Features
+
+* **core:** Ability to cancel asset uploading ([#4198](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4198)) ([e111f46](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/e111f46d06bf2ec22f2002c9a2954cdf0c9e8d09))
+
+
+### BREAKING CHANGES
+
+* **core:** Uploading an asset now return a structure that allow cancelling the upload. Thus instances of `await account.service.asset.uploadAsset(...)` must be replaced by 
+```
+const {cancel, response} = await account.service.asset.uploadAsset(...);
+cancel() // This is how you cancel the upload
+await response// This will contain the uploaded asset once the upload is done
+```
+
+
+
+
+
 # [18.0.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.34.0...@wireapp/core@18.0.0) (2021-12-08)
 
 

package/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "15.11.1",
+    "@wireapp/api-client": "16.0.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": "18.0.0",
-  "gitHead": "2881ae7d03e14fda38627186f93079e028f4af17"
+  "version": "19.0.0",
+  "gitHead": "e4c585ccf983ca2eb954b3c381dc1fb093192b3a"
 }

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

@@ -1,11 +1,10 @@
+/// <reference types="node" />
 import type { APIClient } from '@wireapp/api-client';
 import type { AssetOptions } from '@wireapp/api-client/src/asset';
-import type { FileContent, ImageContent } from '../conversation/content/';
+import type { ProgressCallback, RequestCancelable } from '@wireapp/api-client/src/http';
 import type { EncryptedAssetUploaded } from '../cryptography/';
 export declare class AssetService {
     private readonly apiClient;
     constructor(apiClient: APIClient);
-    private postAsset;
-    uploadImageAsset(image: ImageContent, options?: AssetOptions): Promise<EncryptedAssetUploaded>;
-    uploadFileAsset(file: FileContent, options?: AssetOptions): Promise<EncryptedAssetUploaded>;
+    uploadAsset(plainText: Buffer | Uint8Array, options?: AssetOptions, progressCallback?: ProgressCallback): Promise<RequestCancelable<EncryptedAssetUploaded>>;
 }

package/src/main/conversation/AssetService.js

@@ -24,27 +24,23 @@ class AssetService {
     constructor(apiClient) {
         this.apiClient = apiClient;
     }
-    async postAsset(plainText, options, progressCallback) {
+    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 = await this.apiClient.asset.api.postAsset(new Uint8Array(cipherText), options, progressCallback);
-        const { key, token } = await request.response;
-        return {
-            cipherText,
-            key,
-            keyBytes,
-            sha256,
-            token,
-        };
-    }
-    uploadImageAsset(image, options) {
-        return this.postAsset(image.data, options);
-    }
-    uploadFileAsset(file, options) {
-        return this.postAsset(file.data, options);
+        const request = this.apiClient.asset.api.postAsset(new Uint8Array(cipherText), options, progressCallback);
+        return Object.assign(Object.assign({}, request), { response: request.response.then(response => {
+                const { key, token } = response;
+                return {
+                    cipherText,
+                    key,
+                    keyBytes,
+                    sha256,
+                    token,
+                };
+            }) });
     }
 }
 exports.AssetService = AssetService;

package/src/main/linkPreview/LinkPreviewService.js

@@ -40,7 +40,7 @@ class LinkPreviewService {
             return preview;
         }
         const uploadedLinkPreview = preview;
-        const asset = await this.assetService.uploadImageAsset(linkPreview.image);
+        const asset = await (await this.assetService.uploadAsset(linkPreview.image.data)).response;
         uploadedLinkPreview.imageUploaded = {
             asset,
             image,