@wireapp/core 46.36.0 → 46.37.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,33 +2,13 @@ import { AssetOptions, AssetResponse } from '@wireapp/api-client/lib/asset';
|
|
|
2
2
|
import { ProgressCallback, RequestCancelable } from '@wireapp/api-client/lib/http';
|
|
3
3
|
import { APIClient } from '@wireapp/api-client';
|
|
4
4
|
import { EncryptedAsset, EncryptedAssetUploaded } from '../../cryptography';
|
|
5
|
-
|
|
5
|
+
export { ProgressCallback };
|
|
6
|
+
export type AssetUrlData = {
|
|
6
7
|
assetKey: string;
|
|
7
8
|
assetToken: string;
|
|
8
9
|
assetDomain: string;
|
|
9
10
|
forceCaching: boolean;
|
|
10
|
-
|
|
11
|
-
}
|
|
12
|
-
interface AssetDataV3 {
|
|
13
|
-
assetKey: string;
|
|
14
|
-
assetToken: string;
|
|
15
|
-
forceCaching: boolean;
|
|
16
|
-
version: 3;
|
|
17
|
-
}
|
|
18
|
-
interface AssetDataV2 {
|
|
19
|
-
assetId: string;
|
|
20
|
-
conversationId: string;
|
|
21
|
-
forceCaching: boolean;
|
|
22
|
-
version: 2;
|
|
23
|
-
}
|
|
24
|
-
interface AssetDataV1 {
|
|
25
|
-
assetId: string;
|
|
26
|
-
conversationId: string;
|
|
27
|
-
forceCaching: boolean;
|
|
28
|
-
version: 1;
|
|
29
|
-
}
|
|
30
|
-
export { ProgressCallback };
|
|
31
|
-
export type AssetUrlData = AssetDataV1 | AssetDataV2 | AssetDataV3 | AssetDataV4;
|
|
11
|
+
};
|
|
32
12
|
export declare class AssetService {
|
|
33
13
|
private readonly apiClient;
|
|
34
14
|
constructor(apiClient: APIClient);
|
|
@@ -40,10 +20,7 @@ export declare class AssetService {
|
|
|
40
20
|
* @param progressCallback?
|
|
41
21
|
* @return Resolves when the asset has been uploaded
|
|
42
22
|
*/
|
|
43
|
-
downloadRawAsset(assetData: AssetUrlData, progressCallback?: ProgressCallback):
|
|
44
|
-
cancel: () => void;
|
|
45
|
-
response: Promise<AssetResponse>;
|
|
46
|
-
};
|
|
23
|
+
downloadRawAsset(assetData: AssetUrlData, progressCallback?: ProgressCallback): RequestCancelable<AssetResponse>;
|
|
47
24
|
/**
|
|
48
25
|
* Uploads a raw asset to the backend without encrypting it
|
|
49
26
|
*
|
|
@@ -52,7 +29,12 @@ export declare class AssetService {
|
|
|
52
29
|
* @param progressCallback?
|
|
53
30
|
* @return cancellable request that resolves with the uploaded image
|
|
54
31
|
*/
|
|
55
|
-
uploadRawAsset(asset: Buffer | Uint8Array, options?: AssetOptions, progressCallback?: ProgressCallback): RequestCancelable<
|
|
32
|
+
uploadRawAsset(asset: Buffer | Uint8Array, options?: AssetOptions, progressCallback?: ProgressCallback): RequestCancelable<{
|
|
33
|
+
key: string;
|
|
34
|
+
token: string;
|
|
35
|
+
expires: string;
|
|
36
|
+
domain?: string | undefined;
|
|
37
|
+
}>;
|
|
56
38
|
/**
|
|
57
39
|
* Will encrypt and upload an asset to the backend
|
|
58
40
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetService.d.ts","sourceRoot":"","sources":["../../../src/conversation/AssetService/AssetService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;AAEjF,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,cAAc,EAAE,sBAAsB,EAAC,MAAM,oBAAoB,CAAC;AAG1E,
|
|
1
|
+
{"version":3,"file":"AssetService.d.ts","sourceRoot":"","sources":["../../../src/conversation/AssetService/AssetService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;AAEjF,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,cAAc,EAAE,sBAAsB,EAAC,MAAM,oBAAoB,CAAC;AAG1E,OAAO,EAAC,gBAAgB,EAAC,CAAC;AAC1B,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAEjD;;;;;;;OAOG;IACI,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,gBAAgB,CAAC,EAAE,gBAAgB;IAUpF;;;;;;;OAOG;IACI,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,OAAO,CAAC,EAAE,YAAY,EAAE,gBAAgB,CAAC,EAAE,gBAAgB;;;;;;IAI7G;;;;;;;OAOG;IACU,WAAW,CACtB,SAAS,EAAE,MAAM,GAAG,UAAU,EAC9B,OAAO,CAAC,EAAE,YAAY,EACtB,gBAAgB,CAAC,EAAE,gBAAgB,GAClC,OAAO,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;IAyB9C,YAAY,CAAC,KAAK,EAAE,cAAc;IAIzC;;;;;;OAMG;IACI,aAAa,CAClB,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,UAAU,EAClB,gBAAgB,CAAC,EAAE,gBAAgB,GAClC;QAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;QAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAAC;CAgB1D"}
|
|
@@ -34,17 +34,7 @@ class AssetService {
|
|
|
34
34
|
* @return Resolves when the asset has been uploaded
|
|
35
35
|
*/
|
|
36
36
|
downloadRawAsset(assetData, progressCallback) {
|
|
37
|
-
|
|
38
|
-
switch (assetData.version) {
|
|
39
|
-
case 1:
|
|
40
|
-
return this.apiClient.api.asset.getAssetV1(assetData.assetId, assetData.conversationId, forceCaching, progressCallback);
|
|
41
|
-
case 2:
|
|
42
|
-
return this.apiClient.api.asset.getAssetV2(assetData.assetId, assetData.conversationId, forceCaching, progressCallback);
|
|
43
|
-
case 3:
|
|
44
|
-
return this.apiClient.api.asset.getAssetV3(assetData.assetKey, assetData.assetToken, forceCaching, progressCallback);
|
|
45
|
-
case 4:
|
|
46
|
-
return this.apiClient.api.asset.getAssetV4(assetData.assetKey, assetData.assetDomain, assetData.assetToken, forceCaching, progressCallback);
|
|
47
|
-
}
|
|
37
|
+
return this.apiClient.api.asset.getAsset(assetData.assetKey, assetData.assetDomain, assetData.assetToken, assetData.forceCaching, progressCallback);
|
|
48
38
|
}
|
|
49
39
|
/**
|
|
50
40
|
* Uploads a raw asset to the backend without encrypting it
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@wireapp/api-client": "^27.
|
|
14
|
+
"@wireapp/api-client": "^27.76.1",
|
|
15
15
|
"@wireapp/commons": "^5.4.5",
|
|
16
16
|
"@wireapp/core-crypto": "9.0.1",
|
|
17
17
|
"@wireapp/cryptobox": "12.8.0",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"@wireapp/protocol-messaging": "1.53.0",
|
|
21
21
|
"@wireapp/store-engine": "^5.1.12",
|
|
22
22
|
"axios": "1.12.2",
|
|
23
|
-
"bazinga64": "^6.5.
|
|
23
|
+
"bazinga64": "^6.5.3",
|
|
24
24
|
"deepmerge-ts": "6.0.0",
|
|
25
25
|
"hash.js": "1.1.7",
|
|
26
26
|
"http-status-codes": "2.3.0",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@types/tough-cookie": "4.0.5",
|
|
40
40
|
"@types/uuid": "9.0.8",
|
|
41
41
|
"commander": "14.0.1",
|
|
42
|
-
"cross-env": "10.
|
|
42
|
+
"cross-env": "10.1.0",
|
|
43
43
|
"dotenv-defaults": "5.0.2",
|
|
44
44
|
"fake-indexeddb": "^5.0.2",
|
|
45
45
|
"jest": "^29.2.1",
|
|
@@ -61,6 +61,6 @@
|
|
|
61
61
|
"test:coverage": "jest --coverage",
|
|
62
62
|
"watch": "tsc --watch"
|
|
63
63
|
},
|
|
64
|
-
"version": "46.
|
|
65
|
-
"gitHead": "
|
|
64
|
+
"version": "46.37.1",
|
|
65
|
+
"gitHead": "9088400e5401ca1246dd4fc981663135276805c3"
|
|
66
66
|
}
|