@protontech/drive-sdk 0.0.13 → 0.1.0
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.
- package/dist/cache/index.d.ts +1 -0
- package/dist/cache/index.js +3 -1
- package/dist/cache/index.js.map +1 -1
- package/dist/cache/memoryCache.d.ts +1 -1
- package/dist/cache/nullCache.d.ts +14 -0
- package/dist/cache/nullCache.js +37 -0
- package/dist/cache/nullCache.js.map +1 -0
- package/dist/config.d.ts +16 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/crypto/openPGPCrypto.js +2 -0
- package/dist/crypto/openPGPCrypto.js.map +1 -1
- package/dist/diagnostic/eventsGenerator.d.ts +14 -0
- package/dist/diagnostic/eventsGenerator.js +49 -0
- package/dist/diagnostic/eventsGenerator.js.map +1 -0
- package/dist/diagnostic/httpClient.d.ts +16 -0
- package/dist/diagnostic/httpClient.js +81 -0
- package/dist/diagnostic/httpClient.js.map +1 -0
- package/dist/diagnostic/index.d.ts +10 -0
- package/dist/diagnostic/index.js +35 -0
- package/dist/diagnostic/index.js.map +1 -0
- package/dist/diagnostic/integrityVerificationStream.d.ts +21 -0
- package/dist/diagnostic/integrityVerificationStream.js +56 -0
- package/dist/diagnostic/integrityVerificationStream.js.map +1 -0
- package/dist/diagnostic/interface.d.ts +102 -0
- package/dist/diagnostic/interface.js +3 -0
- package/dist/diagnostic/interface.js.map +1 -0
- package/dist/diagnostic/sdkDiagnostic.d.ts +22 -0
- package/dist/diagnostic/sdkDiagnostic.js +216 -0
- package/dist/diagnostic/sdkDiagnostic.js.map +1 -0
- package/dist/diagnostic/sdkDiagnosticFull.d.ts +18 -0
- package/dist/diagnostic/sdkDiagnosticFull.js +35 -0
- package/dist/diagnostic/sdkDiagnosticFull.js.map +1 -0
- package/dist/diagnostic/telemetry.d.ts +25 -0
- package/dist/diagnostic/telemetry.js +70 -0
- package/dist/diagnostic/telemetry.js.map +1 -0
- package/dist/diagnostic/zipGenerators.d.ts +9 -0
- package/dist/diagnostic/zipGenerators.js +64 -0
- package/dist/diagnostic/zipGenerators.js.map +1 -0
- package/dist/diagnostic/zipGenerators.test.js +144 -0
- package/dist/diagnostic/zipGenerators.test.js.map +1 -0
- package/dist/errors.d.ts +2 -1
- package/dist/errors.js +3 -1
- package/dist/errors.js.map +1 -1
- package/dist/interface/config.d.ts +26 -0
- package/dist/interface/config.js +3 -0
- package/dist/interface/config.js.map +1 -0
- package/dist/interface/download.d.ts +2 -2
- package/dist/interface/events.d.ts +60 -20
- package/dist/interface/events.js +11 -1
- package/dist/interface/events.js.map +1 -1
- package/dist/interface/httpClient.d.ts +0 -14
- package/dist/interface/index.d.ts +8 -4
- package/dist/interface/index.js +2 -1
- package/dist/interface/index.js.map +1 -1
- package/dist/interface/nodes.d.ts +9 -0
- package/dist/interface/nodes.js.map +1 -1
- package/dist/interface/sharing.d.ts +1 -0
- package/dist/interface/upload.d.ts +6 -0
- package/dist/internal/download/apiService.js +32 -31
- package/dist/internal/download/apiService.js.map +1 -1
- package/dist/internal/download/fileDownloader.d.ts +2 -2
- package/dist/internal/download/fileDownloader.js.map +1 -1
- package/dist/internal/events/apiService.d.ts +4 -6
- package/dist/internal/events/apiService.js +15 -22
- package/dist/internal/events/apiService.js.map +1 -1
- package/dist/internal/events/coreEventManager.d.ts +7 -10
- package/dist/internal/events/coreEventManager.js +19 -36
- package/dist/internal/events/coreEventManager.js.map +1 -1
- package/dist/internal/events/coreEventManager.test.js +87 -0
- package/dist/internal/events/coreEventManager.test.js.map +1 -0
- package/dist/internal/events/eventManager.d.ts +11 -36
- package/dist/internal/events/eventManager.js +59 -105
- package/dist/internal/events/eventManager.js.map +1 -1
- package/dist/internal/events/eventManager.test.js +167 -82
- package/dist/internal/events/eventManager.test.js.map +1 -1
- package/dist/internal/events/index.d.ts +13 -33
- package/dist/internal/events/index.js +56 -72
- package/dist/internal/events/index.js.map +1 -1
- package/dist/internal/events/interface.d.ts +59 -14
- package/dist/internal/events/interface.js +13 -3
- package/dist/internal/events/interface.js.map +1 -1
- package/dist/internal/events/volumeEventManager.d.ts +7 -17
- package/dist/internal/events/volumeEventManager.js +58 -45
- package/dist/internal/events/volumeEventManager.js.map +1 -1
- package/dist/internal/events/volumeEventManager.test.d.ts +1 -0
- package/dist/internal/events/volumeEventManager.test.js +203 -0
- package/dist/internal/events/volumeEventManager.test.js.map +1 -0
- package/dist/internal/nodes/cache.d.ts +10 -1
- package/dist/internal/nodes/cache.js +17 -0
- package/dist/internal/nodes/cache.js.map +1 -1
- package/dist/internal/nodes/cryptoService.d.ts +1 -1
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/events.d.ts +7 -83
- package/dist/internal/nodes/events.js +43 -217
- package/dist/internal/nodes/events.js.map +1 -1
- package/dist/internal/nodes/events.test.js +27 -277
- package/dist/internal/nodes/events.test.js.map +1 -1
- package/dist/internal/nodes/index.d.ts +3 -4
- package/dist/internal/nodes/index.js +5 -5
- package/dist/internal/nodes/index.js.map +1 -1
- package/dist/internal/nodes/nodesAccess.d.ts +15 -0
- package/dist/internal/nodes/nodesAccess.js +37 -0
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesAccess.test.js +131 -93
- package/dist/internal/nodes/nodesAccess.test.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.d.ts +1 -3
- package/dist/internal/nodes/nodesManagement.js +12 -26
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.test.js +35 -14
- package/dist/internal/nodes/nodesManagement.test.js.map +1 -1
- package/dist/internal/shares/cache.d.ts +2 -0
- package/dist/internal/shares/cache.js +2 -0
- package/dist/internal/shares/cache.js.map +1 -1
- package/dist/internal/shares/manager.d.ts +1 -0
- package/dist/internal/shares/manager.js +3 -0
- package/dist/internal/shares/manager.js.map +1 -1
- package/dist/internal/sharing/apiService.js +1 -0
- package/dist/internal/sharing/apiService.js.map +1 -1
- package/dist/internal/sharing/cryptoService.js +1 -0
- package/dist/internal/sharing/cryptoService.js.map +1 -1
- package/dist/internal/sharing/events.d.ts +23 -55
- package/dist/internal/sharing/events.js +46 -138
- package/dist/internal/sharing/events.js.map +1 -1
- package/dist/internal/sharing/events.test.js +77 -180
- package/dist/internal/sharing/events.test.js.map +1 -1
- package/dist/internal/sharing/index.d.ts +4 -5
- package/dist/internal/sharing/index.js +5 -5
- package/dist/internal/sharing/index.js.map +1 -1
- package/dist/internal/sharing/interface.d.ts +3 -0
- package/dist/internal/sharing/sharingManagement.d.ts +2 -3
- package/dist/internal/sharing/sharingManagement.js +7 -9
- package/dist/internal/sharing/sharingManagement.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.test.js +9 -39
- package/dist/internal/sharing/sharingManagement.test.js.map +1 -1
- package/dist/internal/upload/apiService.d.ts +2 -3
- package/dist/internal/upload/apiService.js +7 -4
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/index.d.ts +2 -2
- package/dist/internal/upload/index.js +3 -3
- package/dist/internal/upload/index.js.map +1 -1
- package/dist/internal/upload/interface.d.ts +2 -0
- package/dist/internal/upload/manager.d.ts +5 -5
- package/dist/internal/upload/manager.js +19 -50
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +68 -44
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/streamUploader.js +1 -2
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +1 -1
- package/dist/internal/upload/streamUploader.test.js.map +1 -1
- package/dist/protonDriveClient.d.ts +19 -162
- package/dist/protonDriveClient.js +26 -190
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.js +3 -2
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/package.json +3 -3
- package/src/cache/index.ts +1 -0
- package/src/cache/memoryCache.ts +1 -1
- package/src/cache/nullCache.ts +38 -0
- package/src/config.ts +17 -2
- package/src/crypto/openPGPCrypto.ts +2 -0
- package/src/diagnostic/eventsGenerator.ts +48 -0
- package/src/diagnostic/httpClient.ts +80 -0
- package/src/diagnostic/index.ts +38 -0
- package/src/diagnostic/integrityVerificationStream.ts +56 -0
- package/src/diagnostic/interface.ts +158 -0
- package/src/diagnostic/sdkDiagnostic.ts +238 -0
- package/src/diagnostic/sdkDiagnosticFull.ts +40 -0
- package/src/diagnostic/telemetry.ts +71 -0
- package/src/diagnostic/zipGenerators.test.ts +177 -0
- package/src/diagnostic/zipGenerators.ts +70 -0
- package/src/errors.ts +4 -1
- package/src/interface/config.ts +28 -0
- package/src/interface/download.ts +2 -2
- package/src/interface/events.ts +66 -21
- package/src/interface/httpClient.ts +0 -16
- package/src/interface/index.ts +8 -4
- package/src/interface/nodes.ts +21 -12
- package/src/interface/sharing.ts +1 -0
- package/src/interface/upload.ts +6 -0
- package/src/internal/download/apiService.ts +11 -8
- package/src/internal/download/fileDownloader.ts +2 -2
- package/src/internal/events/apiService.ts +25 -28
- package/src/internal/events/coreEventManager.test.ts +101 -0
- package/src/internal/events/coreEventManager.ts +20 -45
- package/src/internal/events/eventManager.test.ts +201 -88
- package/src/internal/events/eventManager.ts +69 -115
- package/src/internal/events/index.ts +54 -84
- package/src/internal/events/interface.ts +70 -15
- package/src/internal/events/volumeEventManager.test.ts +243 -0
- package/src/internal/events/volumeEventManager.ts +55 -53
- package/src/internal/nodes/cache.ts +20 -2
- package/src/internal/nodes/cryptoService.ts +1 -1
- package/src/internal/nodes/events.test.ts +29 -335
- package/src/internal/nodes/events.ts +45 -253
- package/src/internal/nodes/index.ts +6 -8
- package/src/internal/nodes/interface.ts +2 -2
- package/src/internal/nodes/nodesAccess.test.ts +132 -91
- package/src/internal/nodes/nodesAccess.ts +40 -1
- package/src/internal/nodes/nodesManagement.test.ts +39 -15
- package/src/internal/nodes/nodesManagement.ts +12 -30
- package/src/internal/shares/cache.ts +4 -2
- package/src/internal/shares/manager.ts +9 -5
- package/src/internal/sharing/apiService.ts +1 -0
- package/src/internal/sharing/cache.ts +1 -1
- package/src/internal/sharing/cryptoService.ts +1 -0
- package/src/internal/sharing/events.test.ts +89 -195
- package/src/internal/sharing/events.ts +42 -156
- package/src/internal/sharing/index.ts +6 -9
- package/src/internal/sharing/interface.ts +6 -2
- package/src/internal/sharing/sharingManagement.test.ts +10 -40
- package/src/internal/sharing/sharingManagement.ts +7 -11
- package/src/internal/upload/apiService.ts +5 -6
- package/src/internal/upload/index.ts +5 -5
- package/src/internal/upload/interface.ts +2 -0
- package/src/internal/upload/manager.test.ts +75 -45
- package/src/internal/upload/manager.ts +24 -54
- package/src/internal/upload/streamUploader.test.ts +0 -1
- package/src/internal/upload/streamUploader.ts +0 -2
- package/src/protonDriveClient.ts +75 -244
- package/src/protonDrivePhotosClient.ts +4 -3
- package/dist/internal/events/cache.d.ts +0 -28
- package/dist/internal/events/cache.js +0 -67
- package/dist/internal/events/cache.js.map +0 -1
- package/dist/internal/events/cache.test.js +0 -43
- package/dist/internal/events/cache.test.js.map +0 -1
- package/dist/internal/nodes/index.test.js +0 -114
- package/dist/internal/nodes/index.test.js.map +0 -1
- package/src/internal/events/cache.test.ts +0 -47
- package/src/internal/events/cache.ts +0 -80
- package/src/internal/nodes/index.test.ts +0 -137
- /package/dist/{internal/events/cache.test.d.ts → diagnostic/zipGenerators.test.d.ts} +0 -0
- /package/dist/internal/{nodes/index.test.d.ts → events/coreEventManager.test.d.ts} +0 -0
|
@@ -3,7 +3,8 @@ import { UploadTokens } from "./interface";
|
|
|
3
3
|
import { ThumbnailType } from "../../interface";
|
|
4
4
|
export declare class UploadAPIService {
|
|
5
5
|
private apiService;
|
|
6
|
-
|
|
6
|
+
private clientUid;
|
|
7
|
+
constructor(apiService: DriveAPIService, clientUid: string | undefined);
|
|
7
8
|
checkAvailableHashes(parentNodeUid: string, hashes: string[]): Promise<{
|
|
8
9
|
availalbleHashes: string[];
|
|
9
10
|
pendingHashes: {
|
|
@@ -17,7 +18,6 @@ export declare class UploadAPIService {
|
|
|
17
18
|
armoredEncryptedName: string;
|
|
18
19
|
hash: string;
|
|
19
20
|
mediaType: string;
|
|
20
|
-
clientUID?: string;
|
|
21
21
|
intendedUploadSize?: number;
|
|
22
22
|
armoredNodeKey: string;
|
|
23
23
|
armoredNodePassphrase: string;
|
|
@@ -31,7 +31,6 @@ export declare class UploadAPIService {
|
|
|
31
31
|
}>;
|
|
32
32
|
createDraftRevision(nodeUid: string, revision: {
|
|
33
33
|
currentRevisionUid: string;
|
|
34
|
-
clientUID?: string;
|
|
35
34
|
intendedUploadSize?: number;
|
|
36
35
|
}): Promise<{
|
|
37
36
|
nodeRevisionUid: string;
|
|
@@ -7,15 +7,18 @@ const apiService_1 = require("../apiService");
|
|
|
7
7
|
const uids_1 = require("../uids");
|
|
8
8
|
class UploadAPIService {
|
|
9
9
|
apiService;
|
|
10
|
-
|
|
10
|
+
clientUid;
|
|
11
|
+
constructor(apiService, clientUid) {
|
|
11
12
|
this.apiService = apiService;
|
|
13
|
+
this.clientUid = clientUid;
|
|
12
14
|
this.apiService = apiService;
|
|
15
|
+
this.clientUid = clientUid;
|
|
13
16
|
}
|
|
14
17
|
async checkAvailableHashes(parentNodeUid, hashes) {
|
|
15
18
|
const { volumeId, nodeId: parentNodeId } = (0, uids_1.splitNodeUid)(parentNodeUid);
|
|
16
19
|
const result = await this.apiService.post(`drive/v2/volumes/${volumeId}/links/${parentNodeId}/checkAvailableHashes`, {
|
|
17
20
|
Hashes: hashes,
|
|
18
|
-
ClientUID: null,
|
|
21
|
+
ClientUID: this.clientUid ? [this.clientUid] : null,
|
|
19
22
|
});
|
|
20
23
|
return {
|
|
21
24
|
availalbleHashes: result.AvailableHashes,
|
|
@@ -34,7 +37,7 @@ class UploadAPIService {
|
|
|
34
37
|
Name: node.armoredEncryptedName,
|
|
35
38
|
Hash: node.hash,
|
|
36
39
|
MIMEType: node.mediaType,
|
|
37
|
-
ClientUID:
|
|
40
|
+
ClientUID: this.clientUid || null,
|
|
38
41
|
IntendedUploadSize: node.intendedUploadSize || null,
|
|
39
42
|
NodeKey: node.armoredNodeKey,
|
|
40
43
|
NodePassphrase: node.armoredNodePassphrase,
|
|
@@ -53,7 +56,7 @@ class UploadAPIService {
|
|
|
53
56
|
const { revisionId: currentRevisionId } = (0, uids_1.splitNodeRevisionUid)(revision.currentRevisionUid);
|
|
54
57
|
const result = await this.apiService.post(`drive/v2/volumes/${volumeId}/files/${nodeId}/revisions`, {
|
|
55
58
|
CurrentRevisionID: currentRevisionId,
|
|
56
|
-
ClientUID:
|
|
59
|
+
ClientUID: this.clientUid || null,
|
|
57
60
|
IntendedUploadSize: revision.intendedUploadSize || null,
|
|
58
61
|
});
|
|
59
62
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,yCAAkF;AAClF,8CAAoF;AACpF,kCAA+F;AAwB/F,MAAa,gBAAgB;IACL;
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { ProtonDriveTelemetry, UploadMetadata } from "../../interface";
|
|
|
2
2
|
import { DriveAPIService } from "../apiService";
|
|
3
3
|
import { DriveCrypto } from "../../crypto";
|
|
4
4
|
import { FileUploader, FileRevisionUploader } from "./fileUploader";
|
|
5
|
-
import { NodesService,
|
|
5
|
+
import { NodesService, SharesService } from "./interface";
|
|
6
6
|
/**
|
|
7
7
|
* Provides facade for the upload module.
|
|
8
8
|
*
|
|
@@ -10,7 +10,7 @@ import { NodesService, NodesEvents, SharesService } from "./interface";
|
|
|
10
10
|
* metadata generation, content upload, API communication, encryption,
|
|
11
11
|
* and verifications.
|
|
12
12
|
*/
|
|
13
|
-
export declare function initUploadModule(telemetry: ProtonDriveTelemetry, apiService: DriveAPIService, driveCrypto: DriveCrypto, sharesService: SharesService, nodesService: NodesService,
|
|
13
|
+
export declare function initUploadModule(telemetry: ProtonDriveTelemetry, apiService: DriveAPIService, driveCrypto: DriveCrypto, sharesService: SharesService, nodesService: NodesService, clientUid?: string): {
|
|
14
14
|
getFileUploader: (parentFolderUid: string, name: string, metadata: UploadMetadata, signal?: AbortSignal) => Promise<FileUploader>;
|
|
15
15
|
getFileRevisionUploader: (nodeUid: string, metadata: UploadMetadata, signal?: AbortSignal) => Promise<FileRevisionUploader>;
|
|
16
16
|
};
|
|
@@ -14,11 +14,11 @@ const telemetry_1 = require("./telemetry");
|
|
|
14
14
|
* metadata generation, content upload, API communication, encryption,
|
|
15
15
|
* and verifications.
|
|
16
16
|
*/
|
|
17
|
-
function initUploadModule(telemetry, apiService, driveCrypto, sharesService, nodesService,
|
|
18
|
-
const api = new apiService_1.UploadAPIService(apiService);
|
|
17
|
+
function initUploadModule(telemetry, apiService, driveCrypto, sharesService, nodesService, clientUid) {
|
|
18
|
+
const api = new apiService_1.UploadAPIService(apiService, clientUid);
|
|
19
19
|
const cryptoService = new cryptoService_1.UploadCryptoService(driveCrypto, nodesService);
|
|
20
20
|
const uploadTelemetry = new telemetry_1.UploadTelemetry(telemetry, sharesService);
|
|
21
|
-
const manager = new manager_1.UploadManager(telemetry, api, cryptoService, nodesService,
|
|
21
|
+
const manager = new manager_1.UploadManager(telemetry, api, cryptoService, nodesService, clientUid);
|
|
22
22
|
const queue = new queue_1.UploadQueue();
|
|
23
23
|
/**
|
|
24
24
|
* Returns a FileUploader instance that can be used to upload a file to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/upload/index.ts"],"names":[],"mappings":";;AAkBA,4CAmFC;AAlGD,6CAAgD;AAChD,mDAAsD;AACtD,iDAAoE;AAEpE,uCAA0C;AAC1C,mCAAsC;AACtC,2CAA8C;AAE9C;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAC5B,SAA+B,EAC/B,UAA2B,EAC3B,WAAwB,EACxB,aAA4B,EAC5B,YAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/upload/index.ts"],"names":[],"mappings":";;AAkBA,4CAmFC;AAlGD,6CAAgD;AAChD,mDAAsD;AACtD,iDAAoE;AAEpE,uCAA0C;AAC1C,mCAAsC;AACtC,2CAA8C;AAE9C;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAC5B,SAA+B,EAC/B,UAA2B,EAC3B,WAAwB,EACxB,aAA4B,EAC5B,YAA0B,EAC1B,SAAkB;IAElB,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,mCAAmB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAEzE,MAAM,eAAe,GAAG,IAAI,2BAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,IAAI,uBAAa,CAAC,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IAE1F,MAAM,KAAK,GAAG,IAAI,mBAAW,EAAE,CAAC;IAEhC;;;;;;OAMG;IACH,KAAK,UAAU,eAAe,CAC1B,eAAuB,EACvB,IAAY,EACZ,QAAwB,EACxB,MAAoB;QAEpB,MAAM,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAEpC,MAAM,QAAQ,GAAG,GAAG,EAAE;YAClB,KAAK,CAAC,eAAe,EAAE,CAAC;QAC5B,CAAC,CAAA;QAED,OAAO,IAAI,2BAAY,CACnB,eAAe,EACf,GAAG,EACH,aAAa,EACb,OAAO,EACP,eAAe,EACf,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,MAAM,CACT,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACH,KAAK,UAAU,uBAAuB,CAClC,OAAe,EACf,QAAwB,EACxB,MAAoB;QAEpB,MAAM,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAEpC,MAAM,QAAQ,GAAG,GAAG,EAAE;YAClB,KAAK,CAAC,eAAe,EAAE,CAAC;QAC5B,CAAC,CAAA;QAED,OAAO,IAAI,mCAAoB,CAC3B,eAAe,EACf,GAAG,EACH,aAAa,EACb,OAAO,EACP,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,MAAM,CACT,CAAC;IAEN,CAAC;IAED,OAAO;QACH,eAAe;QACf,uBAAuB;KAC1B,CAAA;AACL,CAAC"}
|
|
@@ -94,6 +94,7 @@ export interface NodesService {
|
|
|
94
94
|
addressKey: PrivateKey;
|
|
95
95
|
addressKeyId: string;
|
|
96
96
|
}>;
|
|
97
|
+
notifyChildCreated(nodeUid: string): Promise<void>;
|
|
97
98
|
}
|
|
98
99
|
/**
|
|
99
100
|
* Interface describing the dependencies to the nodes module.
|
|
@@ -107,6 +108,7 @@ export interface NodesEvents {
|
|
|
107
108
|
}
|
|
108
109
|
export interface NodesServiceNode {
|
|
109
110
|
uid: string;
|
|
111
|
+
parentUid?: string;
|
|
110
112
|
activeRevision?: Result<Revision, Error>;
|
|
111
113
|
}
|
|
112
114
|
/**
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ProtonDriveTelemetry, UploadMetadata } from "../../interface";
|
|
2
2
|
import { UploadAPIService } from "./apiService";
|
|
3
3
|
import { UploadCryptoService } from "./cryptoService";
|
|
4
|
-
import { NodeRevisionDraft, NodesService
|
|
4
|
+
import { NodeRevisionDraft, NodesService } from "./interface";
|
|
5
5
|
/**
|
|
6
6
|
* UploadManager is responsible for creating and deleting draft nodes
|
|
7
7
|
* on the server. It handles the creation of draft nodes, including
|
|
@@ -11,21 +11,21 @@ export declare class UploadManager {
|
|
|
11
11
|
private apiService;
|
|
12
12
|
private cryptoService;
|
|
13
13
|
private nodesService;
|
|
14
|
-
private
|
|
14
|
+
private clientUid;
|
|
15
15
|
private logger;
|
|
16
|
-
constructor(telemetry: ProtonDriveTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, nodesService: NodesService,
|
|
16
|
+
constructor(telemetry: ProtonDriveTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, nodesService: NodesService, clientUid: string | undefined);
|
|
17
17
|
createDraftNode(parentFolderUid: string, name: string, metadata: UploadMetadata): Promise<NodeRevisionDraft>;
|
|
18
18
|
private createDraftOnAPI;
|
|
19
19
|
findAvailableName(parentFolderUid: string, name: string): Promise<string>;
|
|
20
20
|
deleteDraftNode(nodeUid: string): Promise<void>;
|
|
21
21
|
createDraftRevision(nodeUid: string, metadata: UploadMetadata): Promise<NodeRevisionDraft>;
|
|
22
22
|
deleteDraftRevision(nodeRevisionUid: string): Promise<void>;
|
|
23
|
-
commitDraft(nodeRevisionDraft: NodeRevisionDraft, manifest: Uint8Array,
|
|
23
|
+
commitDraft(nodeRevisionDraft: NodeRevisionDraft, manifest: Uint8Array, _metadata: UploadMetadata, extendedAttributes: {
|
|
24
24
|
modificationTime?: Date;
|
|
25
25
|
size?: number;
|
|
26
26
|
blockSizes?: number[];
|
|
27
27
|
digests?: {
|
|
28
28
|
sha1?: string;
|
|
29
29
|
};
|
|
30
|
-
}
|
|
30
|
+
}): Promise<void>;
|
|
31
31
|
}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.UploadManager = void 0;
|
|
4
4
|
const ttag_1 = require("ttag");
|
|
5
|
-
const interface_1 = require("../../interface");
|
|
6
5
|
const errors_1 = require("../../errors");
|
|
7
6
|
const nodes_1 = require("../nodes");
|
|
8
7
|
const uids_1 = require("../uids");
|
|
@@ -15,17 +14,18 @@ class UploadManager {
|
|
|
15
14
|
apiService;
|
|
16
15
|
cryptoService;
|
|
17
16
|
nodesService;
|
|
18
|
-
|
|
17
|
+
clientUid;
|
|
19
18
|
logger;
|
|
20
|
-
constructor(telemetry, apiService, cryptoService, nodesService,
|
|
19
|
+
constructor(telemetry, apiService, cryptoService, nodesService, clientUid) {
|
|
21
20
|
this.apiService = apiService;
|
|
22
21
|
this.cryptoService = cryptoService;
|
|
23
22
|
this.nodesService = nodesService;
|
|
24
|
-
this.
|
|
23
|
+
this.clientUid = clientUid;
|
|
25
24
|
this.logger = telemetry.getLogger('upload');
|
|
26
25
|
this.apiService = apiService;
|
|
27
26
|
this.cryptoService = cryptoService;
|
|
28
27
|
this.nodesService = nodesService;
|
|
28
|
+
this.clientUid = clientUid;
|
|
29
29
|
}
|
|
30
30
|
async createDraftNode(parentFolderUid, name, metadata) {
|
|
31
31
|
const parentKeys = await this.nodesService.getNodeKeys(parentFolderUid);
|
|
@@ -63,7 +63,6 @@ class UploadManager {
|
|
|
63
63
|
base64ContentKeyPacket: generatedNodeCrypto.contentKey.encrypted.base64ContentKeyPacket,
|
|
64
64
|
armoredContentKeyPacketSignature: generatedNodeCrypto.contentKey.encrypted.armoredContentKeyPacketSignature,
|
|
65
65
|
signatureEmail: generatedNodeCrypto.signatureAddress.email,
|
|
66
|
-
// FIXME: client UID
|
|
67
66
|
});
|
|
68
67
|
return result;
|
|
69
68
|
}
|
|
@@ -72,14 +71,19 @@ class UploadManager {
|
|
|
72
71
|
if (error.code === 2500 /* ErrorCode.ALREADY_EXISTS */) {
|
|
73
72
|
this.logger.info(`Node with given name already exists`);
|
|
74
73
|
const typedDetails = error.details;
|
|
74
|
+
// If the client doesn't specify the client UID, it should
|
|
75
|
+
// never be considered own draft.
|
|
76
|
+
const isOwnDraftConflict = (typedDetails?.ConflictDraftRevisionID &&
|
|
77
|
+
this.clientUid &&
|
|
78
|
+
typedDetails?.ConflictDraftClientUID === this.clientUid);
|
|
75
79
|
// If there is existing draft created by this client,
|
|
76
80
|
// automatically delete it and try to create a new one
|
|
77
81
|
// with the same name again.
|
|
78
|
-
if (typedDetails?.ConflictDraftRevisionID) {
|
|
82
|
+
if (typedDetails?.ConflictDraftRevisionID && (isOwnDraftConflict || metadata.overrideExistingDraftByOtherClient)) {
|
|
79
83
|
const existingDraftNodeUid = (0, uids_1.makeNodeUid)((0, uids_1.splitNodeUid)(parentFolderUid).volumeId, typedDetails.ConflictLinkID);
|
|
80
84
|
let deleteFailed = false;
|
|
81
85
|
try {
|
|
82
|
-
this.logger.warn(`Deleting existing draft node ${existingDraftNodeUid}`);
|
|
86
|
+
this.logger.warn(`Deleting existing draft node ${existingDraftNodeUid} by ${typedDetails.ConflictDraftClientUID}`);
|
|
83
87
|
await this.apiService.deleteDraft(existingDraftNodeUid);
|
|
84
88
|
}
|
|
85
89
|
catch (deleteDraftError) {
|
|
@@ -91,10 +95,13 @@ class UploadManager {
|
|
|
91
95
|
return this.createDraftOnAPI(parentFolderUid, parentHashKey, name, metadata, generatedNodeCrypto);
|
|
92
96
|
}
|
|
93
97
|
}
|
|
98
|
+
if (isOwnDraftConflict) {
|
|
99
|
+
this.logger.warn(`Existing draft conflict by another client ${typedDetails.ConflictDraftClientUID}`);
|
|
100
|
+
}
|
|
94
101
|
const existingNodeUid = typedDetails ? (0, uids_1.makeNodeUid)((0, uids_1.splitNodeUid)(parentFolderUid).volumeId, typedDetails.ConflictLinkID) : undefined;
|
|
95
102
|
// If there is existing node, return special error
|
|
96
103
|
// that includes the available name the client can use.
|
|
97
|
-
throw new errors_1.NodeAlreadyExistsValidationError(error.message, error.code, existingNodeUid);
|
|
104
|
+
throw new errors_1.NodeAlreadyExistsValidationError(error.message, error.code, existingNodeUid, !!typedDetails?.ConflictDraftRevisionID);
|
|
98
105
|
}
|
|
99
106
|
}
|
|
100
107
|
throw error;
|
|
@@ -169,51 +176,13 @@ class UploadManager {
|
|
|
169
176
|
this.logger.error('Failed to delete draft node revision', error);
|
|
170
177
|
}
|
|
171
178
|
}
|
|
172
|
-
async commitDraft(nodeRevisionDraft, manifest,
|
|
179
|
+
async commitDraft(nodeRevisionDraft, manifest, _metadata, extendedAttributes) {
|
|
173
180
|
const generatedExtendedAttributes = (0, nodes_1.generateFileExtendedAttributes)(extendedAttributes);
|
|
174
181
|
const nodeCommitCrypto = await this.cryptoService.commitFile(nodeRevisionDraft.nodeKeys, manifest, generatedExtendedAttributes);
|
|
175
182
|
await this.apiService.commitDraftRevision(nodeRevisionDraft.nodeRevisionUid, nodeCommitCrypto);
|
|
176
|
-
const
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
creationTime: new Date(),
|
|
180
|
-
storageSize: encryptedSize,
|
|
181
|
-
contentAuthor: (0, interface_1.resultOk)(nodeCommitCrypto.signatureEmail),
|
|
182
|
-
claimedSize: metadata.expectedSize,
|
|
183
|
-
claimedModificationTime: extendedAttributes.modificationTime,
|
|
184
|
-
claimedDigests: {
|
|
185
|
-
sha1: extendedAttributes.digests?.sha1,
|
|
186
|
-
},
|
|
187
|
-
});
|
|
188
|
-
if (nodeRevisionDraft.newNodeInfo) {
|
|
189
|
-
const node = {
|
|
190
|
-
// Internal metadata
|
|
191
|
-
hash: nodeRevisionDraft.newNodeInfo.hash,
|
|
192
|
-
encryptedName: nodeRevisionDraft.newNodeInfo.encryptedName,
|
|
193
|
-
// Basic node metadata
|
|
194
|
-
uid: nodeRevisionDraft.nodeUid,
|
|
195
|
-
parentUid: nodeRevisionDraft.newNodeInfo.parentUid,
|
|
196
|
-
type: interface_1.NodeType.File,
|
|
197
|
-
mediaType: metadata.mediaType,
|
|
198
|
-
creationTime: new Date(),
|
|
199
|
-
totalStorageSize: encryptedSize,
|
|
200
|
-
// Share node metadata
|
|
201
|
-
isShared: false,
|
|
202
|
-
directMemberRole: interface_1.MemberRole.Inherited,
|
|
203
|
-
// Decrypted metadata
|
|
204
|
-
isStale: false,
|
|
205
|
-
keyAuthor: (0, interface_1.resultOk)(nodeRevisionDraft.nodeKeys.signatureAddress.email),
|
|
206
|
-
nameAuthor: (0, interface_1.resultOk)(nodeRevisionDraft.nodeKeys.signatureAddress.email),
|
|
207
|
-
name: (0, interface_1.resultOk)(nodeRevisionDraft.newNodeInfo.name),
|
|
208
|
-
activeRevision,
|
|
209
|
-
};
|
|
210
|
-
await this.nodesEvents.nodeCreated(node);
|
|
211
|
-
}
|
|
212
|
-
else {
|
|
213
|
-
await this.nodesEvents.nodeUpdated({
|
|
214
|
-
uid: nodeRevisionDraft.nodeUid,
|
|
215
|
-
activeRevision,
|
|
216
|
-
});
|
|
183
|
+
const node = await this.nodesService.getNode(nodeRevisionDraft.nodeUid);
|
|
184
|
+
if (node.parentUid) {
|
|
185
|
+
await this.nodesService.notifyChildCreated(node.parentUid);
|
|
217
186
|
}
|
|
218
187
|
}
|
|
219
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const errors_1 = require("../../errors");
|
|
4
|
-
const interface_1 = require("../../interface");
|
|
5
4
|
const telemetry_1 = require("../../tests/telemetry");
|
|
6
5
|
const manager_1 = require("./manager");
|
|
7
6
|
describe("UploadManager", () => {
|
|
@@ -9,8 +8,8 @@ describe("UploadManager", () => {
|
|
|
9
8
|
let apiService;
|
|
10
9
|
let cryptoService;
|
|
11
10
|
let nodesService;
|
|
12
|
-
let nodesEvents;
|
|
13
11
|
let manager;
|
|
12
|
+
const clientUid = 'clientUid';
|
|
14
13
|
beforeEach(() => {
|
|
15
14
|
telemetry = (0, telemetry_1.getMockTelemetry)();
|
|
16
15
|
// @ts-expect-error No need to implement all methods for mocking
|
|
@@ -68,8 +67,11 @@ describe("UploadManager", () => {
|
|
|
68
67
|
armoredExtendedAttributes: "newNode:armoredExtendedAttributes",
|
|
69
68
|
}),
|
|
70
69
|
};
|
|
71
|
-
// @ts-expect-error No need to implement all methods for mocking
|
|
72
70
|
nodesService = {
|
|
71
|
+
getNode: jest.fn(async (nodeUid) => ({
|
|
72
|
+
uid: nodeUid,
|
|
73
|
+
parentUid: 'parentUid',
|
|
74
|
+
})),
|
|
73
75
|
getNodeKeys: jest.fn().mockResolvedValue({
|
|
74
76
|
hashKey: 'parentNode:hashKey',
|
|
75
77
|
key: 'parentNode:nodekey',
|
|
@@ -78,12 +80,9 @@ describe("UploadManager", () => {
|
|
|
78
80
|
email: "signatureEmail",
|
|
79
81
|
addressId: "addressId",
|
|
80
82
|
}),
|
|
83
|
+
notifyChildCreated: jest.fn(async (nodeUid) => { return; }),
|
|
81
84
|
};
|
|
82
|
-
|
|
83
|
-
nodeCreated: jest.fn(),
|
|
84
|
-
nodeUpdated: jest.fn(),
|
|
85
|
-
};
|
|
86
|
-
manager = new manager_1.UploadManager(telemetry, apiService, cryptoService, nodesService, nodesEvents);
|
|
85
|
+
manager = new manager_1.UploadManager(telemetry, apiService, cryptoService, nodesService, clientUid);
|
|
87
86
|
});
|
|
88
87
|
describe("createDraftNode", () => {
|
|
89
88
|
it("should fail to create node in non-folder parent", async () => {
|
|
@@ -134,7 +133,7 @@ describe("UploadManager", () => {
|
|
|
134
133
|
throw new errors_1.ValidationError("Draft already exists", 2500 /* ErrorCode.ALREADY_EXISTS */, {
|
|
135
134
|
ConflictLinkID: "existingLinkId",
|
|
136
135
|
ConflictDraftRevisionID: "existingDraftRevisionId",
|
|
137
|
-
ConflictDraftClientUID:
|
|
136
|
+
ConflictDraftClientUID: clientUid,
|
|
138
137
|
});
|
|
139
138
|
}
|
|
140
139
|
return {
|
|
@@ -143,7 +142,6 @@ describe("UploadManager", () => {
|
|
|
143
142
|
};
|
|
144
143
|
});
|
|
145
144
|
const result = await manager.createDraftNode("volumeId~parentUid", "name", {});
|
|
146
|
-
expect(apiService.deleteDraft).toHaveBeenCalledTimes(1);
|
|
147
145
|
expect(result).toEqual({
|
|
148
146
|
nodeUid: "newNode:nodeUid",
|
|
149
147
|
nodeRevisionUid: "newNode:nodeRevisionUid",
|
|
@@ -161,8 +159,63 @@ describe("UploadManager", () => {
|
|
|
161
159
|
hash: "newNode:hash",
|
|
162
160
|
},
|
|
163
161
|
});
|
|
162
|
+
expect(apiService.deleteDraft).toHaveBeenCalledTimes(1);
|
|
164
163
|
expect(apiService.deleteDraft).toHaveBeenCalledWith("volumeId~existingLinkId");
|
|
165
164
|
});
|
|
165
|
+
it("should not delete existing draft if client UID does not match", async () => {
|
|
166
|
+
let firstCall = true;
|
|
167
|
+
apiService.createDraft = jest.fn().mockImplementation(() => {
|
|
168
|
+
if (firstCall) {
|
|
169
|
+
firstCall = false;
|
|
170
|
+
throw new errors_1.ValidationError("Draft already exists", 2500 /* ErrorCode.ALREADY_EXISTS */, {
|
|
171
|
+
ConflictLinkID: "existingLinkId",
|
|
172
|
+
ConflictDraftRevisionID: "existingDraftRevisionId",
|
|
173
|
+
ConflictDraftClientUID: "anotherClientUid",
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
return {
|
|
177
|
+
nodeUid: "newNode:nodeUid",
|
|
178
|
+
nodeRevisionUid: "newNode:nodeRevisionUid",
|
|
179
|
+
};
|
|
180
|
+
});
|
|
181
|
+
const promise = manager.createDraftNode("volumeId~parentUid", "name", {});
|
|
182
|
+
try {
|
|
183
|
+
await promise;
|
|
184
|
+
}
|
|
185
|
+
catch (error) {
|
|
186
|
+
expect(error.message).toBe("Draft already exists");
|
|
187
|
+
expect(error.ongoingUploadByOtherClient).toBe(true);
|
|
188
|
+
}
|
|
189
|
+
expect(apiService.deleteDraft).not.toHaveBeenCalled();
|
|
190
|
+
});
|
|
191
|
+
it("should not delete existing draft if client UID is not set", async () => {
|
|
192
|
+
const clientUid = undefined;
|
|
193
|
+
manager = new manager_1.UploadManager(telemetry, apiService, cryptoService, nodesService, clientUid);
|
|
194
|
+
let firstCall = true;
|
|
195
|
+
apiService.createDraft = jest.fn().mockImplementation(() => {
|
|
196
|
+
if (firstCall) {
|
|
197
|
+
firstCall = false;
|
|
198
|
+
throw new errors_1.ValidationError("Draft already exists", 2500 /* ErrorCode.ALREADY_EXISTS */, {
|
|
199
|
+
ConflictLinkID: "existingLinkId",
|
|
200
|
+
ConflictDraftRevisionID: "existingDraftRevisionId",
|
|
201
|
+
ConflictDraftClientUID: clientUid,
|
|
202
|
+
});
|
|
203
|
+
}
|
|
204
|
+
return {
|
|
205
|
+
nodeUid: "newNode:nodeUid",
|
|
206
|
+
nodeRevisionUid: "newNode:nodeRevisionUid",
|
|
207
|
+
};
|
|
208
|
+
});
|
|
209
|
+
const promise = manager.createDraftNode("volumeId~parentUid", "name", {});
|
|
210
|
+
try {
|
|
211
|
+
await promise;
|
|
212
|
+
}
|
|
213
|
+
catch (error) {
|
|
214
|
+
expect(error.message).toBe("Draft already exists");
|
|
215
|
+
expect(error.ongoingUploadByOtherClient).toBe(true);
|
|
216
|
+
}
|
|
217
|
+
expect(apiService.deleteDraft).not.toHaveBeenCalled();
|
|
218
|
+
});
|
|
166
219
|
it("should handle error when deleting existing draft", async () => {
|
|
167
220
|
let firstCall = true;
|
|
168
221
|
apiService.createDraft = jest.fn().mockImplementation(() => {
|
|
@@ -171,7 +224,7 @@ describe("UploadManager", () => {
|
|
|
171
224
|
throw new errors_1.ValidationError("Draft already exists", 2500 /* ErrorCode.ALREADY_EXISTS */, {
|
|
172
225
|
ConflictLinkID: "existingLinkId",
|
|
173
226
|
ConflictDraftRevisionID: "existingDraftRevisionId",
|
|
174
|
-
ConflictDraftClientUID:
|
|
227
|
+
ConflictDraftClientUID: clientUid,
|
|
175
228
|
});
|
|
176
229
|
}
|
|
177
230
|
return {
|
|
@@ -254,27 +307,10 @@ describe("UploadManager", () => {
|
|
|
254
307
|
}
|
|
255
308
|
};
|
|
256
309
|
it("should commit revision draft", async () => {
|
|
257
|
-
await manager.commitDraft(nodeRevisionDraft, manifest, metadata, extendedAttributes
|
|
310
|
+
await manager.commitDraft(nodeRevisionDraft, manifest, metadata, extendedAttributes);
|
|
258
311
|
expect(cryptoService.commitFile).toHaveBeenCalledWith(nodeRevisionDraft.nodeKeys, manifest, expect.anything());
|
|
259
312
|
expect(apiService.commitDraftRevision).toHaveBeenCalledWith(nodeRevisionDraft.nodeRevisionUid, expect.anything());
|
|
260
|
-
expect(
|
|
261
|
-
uid: "newNode:nodeUid",
|
|
262
|
-
activeRevision: {
|
|
263
|
-
ok: true,
|
|
264
|
-
value: {
|
|
265
|
-
uid: "newNode:nodeRevisionUid",
|
|
266
|
-
state: interface_1.RevisionState.Active,
|
|
267
|
-
creationTime: expect.any(Date),
|
|
268
|
-
contentAuthor: { ok: true, value: "signatureEmail" },
|
|
269
|
-
storageSize: 1234567,
|
|
270
|
-
claimedSize: 123456,
|
|
271
|
-
claimedModificationTime: extendedAttributes.modificationTime,
|
|
272
|
-
claimedDigests: {
|
|
273
|
-
sha1: "sha1",
|
|
274
|
-
},
|
|
275
|
-
},
|
|
276
|
-
},
|
|
277
|
-
});
|
|
313
|
+
expect(nodesService.notifyChildCreated).toHaveBeenCalledWith("parentUid");
|
|
278
314
|
});
|
|
279
315
|
it("should commit node draft", async () => {
|
|
280
316
|
const nodeRevisionDraftWithNewNodeInfo = {
|
|
@@ -286,22 +322,10 @@ describe("UploadManager", () => {
|
|
|
286
322
|
hash: "newNode:hash",
|
|
287
323
|
}
|
|
288
324
|
};
|
|
289
|
-
await manager.commitDraft(nodeRevisionDraftWithNewNodeInfo, manifest, metadata, extendedAttributes
|
|
325
|
+
await manager.commitDraft(nodeRevisionDraftWithNewNodeInfo, manifest, metadata, extendedAttributes);
|
|
290
326
|
expect(cryptoService.commitFile).toHaveBeenCalledWith(nodeRevisionDraft.nodeKeys, manifest, expect.anything());
|
|
291
327
|
expect(apiService.commitDraftRevision).toHaveBeenCalledWith(nodeRevisionDraft.nodeRevisionUid, expect.anything());
|
|
292
|
-
expect(
|
|
293
|
-
uid: "newNode:nodeUid",
|
|
294
|
-
parentUid: "parentUid",
|
|
295
|
-
type: interface_1.NodeType.File,
|
|
296
|
-
totalStorageSize: 1234567,
|
|
297
|
-
activeRevision: {
|
|
298
|
-
ok: true,
|
|
299
|
-
value: expect.objectContaining({
|
|
300
|
-
uid: "newNode:nodeRevisionUid",
|
|
301
|
-
storageSize: 1234567,
|
|
302
|
-
}),
|
|
303
|
-
},
|
|
304
|
-
}));
|
|
328
|
+
expect(nodesService.notifyChildCreated).toHaveBeenCalledWith("parentUid");
|
|
305
329
|
});
|
|
306
330
|
});
|
|
307
331
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.test.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.test.ts"],"names":[],"mappings":";;AAAA,yCAA+C;AAC/C,+CAAgG;AAChG,qDAAyD;AAKzD,uCAA0C;AAE1C,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC3B,IAAI,SAA+B,CAAC;IACpC,IAAI,UAA4B,CAAC;IACjC,IAAI,aAAkC,CAAC;IACvC,IAAI,YAA0B,CAAC;IAC/B,IAAI,WAAwB,CAAC;IAE7B,IAAI,OAAsB,CAAC;IAE3B,UAAU,CAAC,GAAG,EAAE;QACZ,SAAS,GAAG,IAAA,4BAAgB,GAAE,CAAC;QAC/B,gEAAgE;QAChE,UAAU,GAAG;YACT,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBACrC,OAAO,EAAE,iBAAiB;gBAC1B,eAAe,EAAE,yBAAyB;aAC7C,CAAC;YACF,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE;YACtB,oBAAoB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBAC9C,gBAAgB,EAAE,CAAC,WAAW,CAAC;gBAC/B,aAAa,EAAE,EAAE;aACpB,CAAC;YACF,mBAAmB,EAAE,IAAI,CAAC,EAAE,EAAE;SACjC,CAAA;QACD,gEAAgE;QAChE,aAAa,GAAG;YACZ,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBAC5C,QAAQ,EAAE;oBACN,SAAS,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE;oBACjC,SAAS,EAAE;wBACP,UAAU,EAAE,oBAAoB;wBAChC,iBAAiB,EAAE,2BAA2B;wBAC9C,0BAA0B,EAAE,oCAAoC;qBACnE;iBACJ;gBACD,UAAU,EAAE;oBACR,SAAS,EAAE,EAAE,0BAA0B,EAAE,oCAAoC,EAAE;oBAC/E,SAAS,EAAE;wBACP,sBAAsB,EAAE,gCAAgC;wBACxD,gCAAgC,EAAE,0CAA0C;qBAC/E;iBACJ;gBACD,aAAa,EAAE;oBACX,aAAa,EAAE,uBAAuB;oBACtC,IAAI,EAAE,cAAc;iBACvB;gBACD,gBAAgB,EAAE;oBACd,KAAK,EAAE,gBAAgB;iBAC1B;aACJ,CAAC;YACF,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC;oBAC7C,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,WAAW;iBACpB,EAAE;oBACC,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,WAAW;iBACpB,EAAE;oBACC,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,WAAW;iBACpB,CAAC,CAAC;YACH,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBACpC,wBAAwB,EAAE,kCAAkC;gBAC5D,cAAc,EAAE,gBAAgB;gBAChC,yBAAyB,EAAE,mCAAmC;aACjE,CAAC;SACL,CAAA;QACD,gEAAgE;QAChE,YAAY,GAAG;YACX,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBACrC,OAAO,EAAE,oBAAoB;gBAC7B,GAAG,EAAE,oBAAoB;aAC5B,CAAC;YACF,mBAAmB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBAC7C,KAAK,EAAE,gBAAgB;gBACvB,SAAS,EAAE,WAAW;aACzB,CAAC;SACL,CAAA;QACD,WAAW,GAAG;YACV,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE;YACtB,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE;SACzB,CAAA;QAED,OAAO,GAAG,IAAI,uBAAa,CAAC,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IACjG,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC7D,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;YAE/E,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,EAAoB,CAAC,CAAC;YAClF,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,8CAA8C,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACtC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE;gBAC9D,SAAS,EAAE,YAAY;gBACvB,YAAY,EAAE,MAAM;aACL,CAAC,CAAC;YAErB,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACnB,OAAO,EAAE,iBAAiB;gBAC1B,eAAe,EAAE,yBAAyB;gBAC1C,QAAQ,EAAE;oBACN,GAAG,EAAE,aAAa;oBAClB,0BAA0B,EAAE,oCAAoC;oBAChE,gBAAgB,EAAE;wBACd,KAAK,EAAE,gBAAgB;qBAC1B;iBACJ;gBACD,WAAW,EAAE;oBACT,SAAS,EAAE,WAAW;oBACtB,IAAI,EAAE,MAAM;oBACZ,aAAa,EAAE,uBAAuB;oBACtC,IAAI,EAAE,cAAc;iBACvB;aACJ,CAAC,CAAC;YACH,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,WAAW,EAAE;gBAC7D,oBAAoB,EAAE,uBAAuB;gBAC7C,IAAI,EAAE,cAAc;gBACpB,SAAS,EAAE,YAAY;gBACvB,kBAAkB,EAAE,MAAM;gBAC1B,cAAc,EAAE,oBAAoB;gBACpC,qBAAqB,EAAE,2BAA2B;gBAClD,8BAA8B,EAAE,oCAAoC;gBACpE,sBAAsB,EAAE,gCAAgC;gBACxD,gCAAgC,EAAE,0CAA0C;gBAC5E,cAAc,EAAE,gBAAgB;aACnC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;YAC3D,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBACvD,IAAI,SAAS,EAAE,CAAC;oBACZ,SAAS,GAAG,KAAK,CAAC;oBAClB,MAAM,IAAI,wBAAe,CAAC,sBAAsB,uCAA4B;wBACxE,cAAc,EAAE,gBAAgB;wBAChC,uBAAuB,EAAE,yBAAyB;wBAClD,sBAAsB,EAAE,wBAAwB;qBACnD,CAAC,CAAC;gBACP,CAAC;gBACD,OAAO;oBACH,OAAO,EAAE,iBAAiB;oBAC1B,eAAe,EAAE,yBAAyB;iBAC7C,CAAC;YACN,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,MAAM,EAAE,EAAoB,CAAC,CAAC;YAEjG,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACnB,OAAO,EAAE,iBAAiB;gBAC1B,eAAe,EAAE,yBAAyB;gBAC1C,QAAQ,EAAE;oBACN,GAAG,EAAE,aAAa;oBAClB,0BAA0B,EAAE,oCAAoC;oBAChE,gBAAgB,EAAE;wBACd,KAAK,EAAE,gBAAgB;qBAC1B;iBACJ;gBACD,WAAW,EAAE;oBACT,SAAS,EAAE,oBAAoB;oBAC/B,IAAI,EAAE,MAAM;oBACZ,aAAa,EAAE,uBAAuB;oBACtC,IAAI,EAAE,cAAc;iBACvB;aACJ,CAAC,CAAC;YACH,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAC9D,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBACvD,IAAI,SAAS,EAAE,CAAC;oBACZ,SAAS,GAAG,KAAK,CAAC;oBAClB,MAAM,IAAI,wBAAe,CAAC,sBAAsB,uCAA4B;wBACxE,cAAc,EAAE,gBAAgB;wBAChC,uBAAuB,EAAE,yBAAyB;wBAClD,sBAAsB,EAAE,wBAAwB;qBACnD,CAAC,CAAC;gBACP,CAAC;gBACD,OAAO;oBACH,OAAO,EAAE,iBAAiB;oBAC1B,eAAe,EAAE,yBAAyB;iBAC7C,CAAC;YACN,CAAC,CAAC,CAAC;YACH,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBACvD,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,MAAM,EAAE,EAAoB,CAAC,CAAC;YAE3F,IAAI,CAAC;gBACD,MAAM,MAAM,CAAC;YACjB,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBAClB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;gBACnD,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YAClE,CAAC;YACD,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YACxC,UAAU,CAAC,oBAAoB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBAChE,OAAO;oBACH,gBAAgB,EAAE,CAAC,WAAW,CAAC;oBAC/B,aAAa,EAAE,EAAE;iBACpB,CAAA;YACL,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACpE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7B,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;QACvH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC5D,IAAI,SAAS,GAAG,KAAK,CAAC;YACtB,UAAU,CAAC,oBAAoB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBAChE,IAAI,CAAC,SAAS,EAAE,CAAC;oBACb,SAAS,GAAG,IAAI,CAAC;oBACjB,OAAO;wBACH,qCAAqC;wBACrC,gBAAgB,EAAE,EAAE;wBACpB,aAAa,EAAE,EAAE;qBACpB,CAAA;gBACL,CAAC;gBACD,OAAO;oBACH,gBAAgB,EAAE,CAAC,WAAW,CAAC;oBAC/B,aAAa,EAAE,EAAE;iBACpB,CAAA;YACL,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACpE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7B,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;QACvH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC1B,MAAM,iBAAiB,GAAG;YACtB,OAAO,EAAE,iBAAiB;YAC1B,eAAe,EAAE,yBAAyB;YAC1C,QAAQ,EAAE;gBACN,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBACpB,0BAA0B,EAAE,oCAAoC;gBAChE,gBAAgB,EAAE;oBACd,KAAK,EAAE,gBAAgB;oBACvB,SAAS,EAAE,WAAW;oBACtB,UAAU,EAAE,YAAY;iBACpB;aACX;SACJ,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG;YACb,SAAS,EAAE,YAAY;YACvB,YAAY,EAAE,MAAM;SACvB,CAAC;QACF,MAAM,kBAAkB,GAAG;YACvB,gBAAgB,EAAE,IAAI,IAAI,EAAE;YAC5B,OAAO,EAAE;gBACL,IAAI,EAAE,MAAM;aACf;SACJ,CAAC;QAEF,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;YAC1C,MAAM,OAAO,CAAC,WAAW,CACrB,iBAAwB,EACxB,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,OAAO,CACV,CAAC;YAEF,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/G,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClH,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC;gBACjD,GAAG,EAAE,iBAAiB;gBACtB,cAAc,EAAE;oBACZ,EAAE,EAAE,IAAI;oBACR,KAAK,EAAE;wBACH,GAAG,EAAE,yBAAyB;wBAC9B,KAAK,EAAE,yBAAa,CAAC,MAAM;wBAC3B,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;wBAC9B,aAAa,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE;wBACpD,WAAW,EAAE,OAAO;wBACpB,WAAW,EAAE,MAAM;wBACnB,uBAAuB,EAAE,kBAAkB,CAAC,gBAAgB;wBAC5D,cAAc,EAAE;4BACZ,IAAI,EAAE,MAAM;yBACf;qBACJ;iBACJ;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACtC,MAAM,gCAAgC,GAAG;gBACrC,GAAG,iBAAiB;gBACpB,WAAW,EAAE;oBACT,SAAS,EAAE,WAAW;oBACtB,IAAI,EAAE,cAAc;oBACpB,aAAa,EAAE,uBAAuB;oBACtC,IAAI,EAAE,cAAc;iBACvB;aACJ,CAAA;YACD,MAAM,OAAO,CAAC,WAAW,CACrB,gCAAuC,EACvC,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,OAAO,CACV,CAAC;YAEF,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/G,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClH,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBACzE,GAAG,EAAE,iBAAiB;gBACtB,SAAS,EAAE,WAAW;gBACtB,IAAI,EAAE,oBAAQ,CAAC,IAAI;gBACnB,gBAAgB,EAAE,OAAO;gBACzB,cAAc,EAAE;oBACZ,EAAE,EAAE,IAAI;oBACR,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC;wBAC3B,GAAG,EAAE,yBAAyB;wBAC9B,WAAW,EAAE,OAAO;qBACvB,CAAC;iBACL;aACJ,CAAC,CAAC,CAAC;QACR,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"manager.test.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -173,8 +173,7 @@ class StreamUploader {
|
|
|
173
173
|
blockSizes: uploadedBlocks.map(block => block.originalSize),
|
|
174
174
|
digests: this.digests.digests(),
|
|
175
175
|
};
|
|
176
|
-
|
|
177
|
-
await this.uploadManager.commitDraft(this.revisionDraft, this.manifest, this.metadata, extendedAttributes, encryptedSize);
|
|
176
|
+
await this.uploadManager.commitDraft(this.revisionDraft, this.manifest, this.metadata, extendedAttributes);
|
|
178
177
|
}
|
|
179
178
|
async encryptThumbnails(thumbnails) {
|
|
180
179
|
if (new Set(thumbnails.map(({ type }) => type)).size !== thumbnails.length) {
|