@protontech/drive-sdk 0.9.9 → 0.11.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/crypto/driveCrypto.d.ts +19 -16
- package/dist/crypto/driveCrypto.js +23 -1
- package/dist/crypto/driveCrypto.js.map +1 -1
- package/dist/crypto/driveCrypto.test.js +2 -1
- package/dist/crypto/driveCrypto.test.js.map +1 -1
- package/dist/crypto/hmac.d.ts +3 -3
- package/dist/crypto/hmac.js.map +1 -1
- package/dist/crypto/interface.d.ts +45 -25
- package/dist/crypto/interface.js.map +1 -1
- package/dist/crypto/openPGPCrypto.d.ts +37 -37
- package/dist/crypto/openPGPCrypto.js.map +1 -1
- package/dist/crypto/utils.d.ts +1 -1
- package/dist/diagnostic/telemetry.js +3 -0
- package/dist/diagnostic/telemetry.js.map +1 -1
- package/dist/interface/index.d.ts +4 -3
- package/dist/interface/index.js +3 -1
- package/dist/interface/index.js.map +1 -1
- package/dist/interface/nodes.d.ts +8 -0
- package/dist/interface/photos.d.ts +31 -2
- package/dist/interface/photos.js +14 -0
- package/dist/interface/photos.js.map +1 -1
- package/dist/interface/sharing.d.ts +2 -0
- package/dist/interface/telemetry.d.ts +13 -1
- package/dist/interface/telemetry.js.map +1 -1
- package/dist/interface/thumbnail.d.ts +2 -2
- package/dist/internal/apiService/apiService.d.ts +1 -1
- package/dist/internal/apiService/apiService.js +27 -14
- package/dist/internal/apiService/apiService.js.map +1 -1
- package/dist/internal/apiService/apiService.test.js +33 -5
- package/dist/internal/apiService/apiService.test.js.map +1 -1
- package/dist/internal/apiService/driveTypes.d.ts +2942 -3187
- package/dist/internal/apiService/errors.test.js +17 -7
- package/dist/internal/apiService/errors.test.js.map +1 -1
- package/dist/internal/devices/manager.d.ts +1 -0
- package/dist/internal/devices/manager.js +11 -0
- package/dist/internal/devices/manager.js.map +1 -1
- package/dist/internal/download/apiService.d.ts +1 -1
- package/dist/internal/download/cryptoService.d.ts +4 -4
- package/dist/internal/download/cryptoService.js.map +1 -1
- package/dist/internal/download/fileDownloader.js.map +1 -1
- package/dist/internal/download/fileDownloader.test.js.map +1 -1
- package/dist/internal/download/thumbnailDownloader.js.map +1 -1
- package/dist/internal/nodes/apiService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.d.ts +4 -4
- package/dist/internal/nodes/cryptoService.js +5 -3
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.test.js.map +1 -1
- package/dist/internal/nodes/interface.d.ts +1 -1
- package/dist/internal/nodes/nodesAccess.js +1 -1
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.js +0 -1
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/photos/addToAlbum.d.ts +42 -0
- package/dist/internal/photos/addToAlbum.js +178 -0
- package/dist/internal/photos/addToAlbum.js.map +1 -0
- package/dist/internal/photos/addToAlbum.test.js +409 -0
- package/dist/internal/photos/addToAlbum.test.js.map +1 -0
- package/dist/internal/photos/albumsCrypto.d.ts +20 -3
- package/dist/internal/photos/albumsCrypto.js +27 -0
- package/dist/internal/photos/albumsCrypto.js.map +1 -1
- package/dist/internal/photos/{albums.d.ts → albumsManager.d.ts} +6 -4
- package/dist/internal/photos/{albums.js → albumsManager.js} +17 -5
- package/dist/internal/photos/albumsManager.js.map +1 -0
- package/dist/internal/photos/albumsManager.test.d.ts +1 -0
- package/dist/internal/photos/{albums.test.js → albumsManager.test.js} +4 -3
- package/dist/internal/photos/albumsManager.test.js.map +1 -0
- package/dist/internal/photos/apiService.d.ts +22 -2
- package/dist/internal/photos/apiService.js +136 -5
- package/dist/internal/photos/apiService.js.map +1 -1
- package/dist/internal/photos/apiService.test.d.ts +1 -0
- package/dist/internal/photos/apiService.test.js +199 -0
- package/dist/internal/photos/apiService.test.js.map +1 -0
- package/dist/internal/photos/errors.d.ts +4 -0
- package/dist/internal/photos/errors.js +17 -0
- package/dist/internal/photos/errors.js.map +1 -0
- package/dist/internal/photos/index.d.ts +5 -3
- package/dist/internal/photos/index.js +5 -2
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +6 -15
- package/dist/internal/photos/interface.js +0 -14
- package/dist/internal/photos/interface.js.map +1 -1
- package/dist/internal/photos/nodes.js +33 -3
- package/dist/internal/photos/nodes.js.map +1 -1
- package/dist/internal/photos/nodes.test.js +25 -5
- package/dist/internal/photos/nodes.test.js.map +1 -1
- package/dist/internal/photos/photosManager.d.ts +22 -0
- package/dist/internal/photos/photosManager.js +101 -0
- package/dist/internal/photos/photosManager.js.map +1 -0
- package/dist/internal/photos/photosManager.test.d.ts +1 -0
- package/dist/internal/photos/photosManager.test.js +222 -0
- package/dist/internal/photos/photosManager.test.js.map +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.d.ts +57 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js +113 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js.map +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.test.d.ts +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.test.js +289 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.test.js.map +1 -0
- package/dist/internal/photos/upload.d.ts +2 -2
- package/dist/internal/photos/upload.js +1 -1
- package/dist/internal/photos/upload.js.map +1 -1
- package/dist/internal/shares/apiService.js +1 -0
- package/dist/internal/shares/apiService.js.map +1 -1
- package/dist/internal/shares/interface.d.ts +1 -0
- package/dist/internal/sharing/apiService.d.ts +8 -1
- package/dist/internal/sharing/apiService.js +23 -1
- package/dist/internal/sharing/apiService.js.map +1 -1
- package/dist/internal/sharing/cryptoService.js +8 -4
- package/dist/internal/sharing/cryptoService.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.d.ts +1 -0
- package/dist/internal/sharing/sharingManagement.js +15 -2
- package/dist/internal/sharing/sharingManagement.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.test.js +30 -5
- package/dist/internal/sharing/sharingManagement.test.js.map +1 -1
- package/dist/internal/sharingPublic/nodes.d.ts +2 -2
- package/dist/internal/sharingPublic/nodes.js.map +1 -1
- package/dist/internal/upload/apiService.d.ts +3 -7
- package/dist/internal/upload/apiService.js +0 -4
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/blockVerifier.d.ts +2 -2
- package/dist/internal/upload/blockVerifier.js.map +1 -1
- package/dist/internal/upload/chunkStreamReader.d.ts +2 -2
- package/dist/internal/upload/chunkStreamReader.js.map +1 -1
- package/dist/internal/upload/chunkStreamReader.test.js.map +1 -1
- package/dist/internal/upload/cryptoService.d.ts +7 -7
- package/dist/internal/upload/cryptoService.js +4 -4
- package/dist/internal/upload/cryptoService.js.map +1 -1
- package/dist/internal/upload/interface.d.ts +6 -6
- package/dist/internal/upload/manager.d.ts +1 -1
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/streamUploader.d.ts +1 -1
- package/dist/internal/upload/streamUploader.js +12 -13
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +28 -4
- package/dist/internal/upload/streamUploader.test.js.map +1 -1
- package/dist/internal/utils.d.ts +1 -1
- package/dist/protonDriveClient.d.ts +8 -0
- package/dist/protonDriveClient.js +12 -1
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +35 -3
- package/dist/protonDrivePhotosClient.js +42 -2
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/protonDrivePublicLinkClient.js +1 -1
- package/dist/protonDrivePublicLinkClient.js.map +1 -1
- package/dist/transformers.js +2 -0
- package/dist/transformers.js.map +1 -1
- package/package.json +4 -4
- package/src/crypto/driveCrypto.test.ts +2 -1
- package/src/crypto/driveCrypto.ts +50 -16
- package/src/crypto/hmac.ts +4 -4
- package/src/crypto/interface.ts +58 -27
- package/src/crypto/openPGPCrypto.ts +26 -26
- package/src/diagnostic/telemetry.ts +3 -0
- package/src/interface/index.ts +11 -2
- package/src/interface/nodes.ts +1 -0
- package/src/interface/photos.ts +33 -2
- package/src/interface/sharing.ts +2 -0
- package/src/interface/telemetry.ts +15 -1
- package/src/interface/thumbnail.ts +2 -2
- package/src/internal/apiService/apiService.test.ts +38 -6
- package/src/internal/apiService/apiService.ts +39 -14
- package/src/internal/apiService/driveTypes.ts +2942 -3187
- package/src/internal/devices/manager.ts +14 -0
- package/src/internal/download/apiService.ts +1 -1
- package/src/internal/download/cryptoService.ts +4 -4
- package/src/internal/download/fileDownloader.test.ts +4 -4
- package/src/internal/download/fileDownloader.ts +6 -6
- package/src/internal/download/thumbnailDownloader.ts +4 -4
- package/src/internal/nodes/apiService.ts +2 -2
- package/src/internal/nodes/cryptoService.test.ts +2 -2
- package/src/internal/nodes/cryptoService.ts +11 -8
- package/src/internal/nodes/interface.ts +1 -1
- package/src/internal/nodes/nodesAccess.ts +1 -1
- package/src/internal/nodes/nodesManagement.ts +0 -1
- package/src/internal/photos/addToAlbum.test.ts +515 -0
- package/src/internal/photos/addToAlbum.ts +234 -0
- package/src/internal/photos/albumsCrypto.ts +54 -3
- package/src/internal/photos/{albums.test.ts → albumsManager.test.ts} +22 -25
- package/src/internal/photos/{albums.ts → albumsManager.ts} +32 -3
- package/src/internal/photos/apiService.test.ts +233 -0
- package/src/internal/photos/apiService.ts +228 -26
- package/src/internal/photos/errors.ts +11 -0
- package/src/internal/photos/index.ts +6 -3
- package/src/internal/photos/interface.ts +8 -18
- package/src/internal/photos/nodes.test.ts +27 -6
- package/src/internal/photos/nodes.ts +35 -3
- package/src/internal/photos/photosManager.test.ts +266 -0
- package/src/internal/photos/photosManager.ts +144 -0
- package/src/internal/photos/photosTransferPayloadBuilder.test.ts +380 -0
- package/src/internal/photos/photosTransferPayloadBuilder.ts +203 -0
- package/src/internal/photos/upload.ts +8 -3
- package/src/internal/shares/apiService.ts +1 -0
- package/src/internal/shares/interface.ts +1 -0
- package/src/internal/sharing/apiService.ts +49 -5
- package/src/internal/sharing/cryptoService.ts +10 -4
- package/src/internal/sharing/sharingManagement.test.ts +33 -5
- package/src/internal/sharing/sharingManagement.ts +28 -6
- package/src/internal/sharingPublic/nodes.ts +1 -1
- package/src/internal/upload/apiService.ts +10 -12
- package/src/internal/upload/blockVerifier.ts +3 -3
- package/src/internal/upload/chunkStreamReader.test.ts +7 -7
- package/src/internal/upload/chunkStreamReader.ts +3 -3
- package/src/internal/upload/cryptoService.ts +11 -12
- package/src/internal/upload/interface.ts +6 -6
- package/src/internal/upload/manager.ts +2 -2
- package/src/internal/upload/streamUploader.test.ts +33 -4
- package/src/internal/upload/streamUploader.ts +13 -13
- package/src/protonDriveClient.ts +16 -4
- package/src/protonDrivePhotosClient.ts +73 -17
- package/src/protonDrivePublicLinkClient.ts +1 -1
- package/src/transformers.ts +2 -0
- package/dist/internal/photos/albums.js.map +0 -1
- package/dist/internal/photos/albums.test.js.map +0 -1
- /package/dist/internal/photos/{albums.test.d.ts → addToAlbum.test.d.ts} +0 -0
|
@@ -10,7 +10,7 @@ export declare class BlockVerifier {
|
|
|
10
10
|
private contentKeyPacketSessionKey?;
|
|
11
11
|
constructor(apiService: UploadAPIService, cryptoService: UploadCryptoService, nodeKey: PrivateKey, draftNodeRevisionUid: string);
|
|
12
12
|
loadVerificationData(): Promise<void>;
|
|
13
|
-
verifyBlock(encryptedBlock: Uint8Array): Promise<{
|
|
14
|
-
verificationToken: Uint8Array
|
|
13
|
+
verifyBlock(encryptedBlock: Uint8Array<ArrayBuffer>): Promise<{
|
|
14
|
+
verificationToken: Uint8Array<ArrayBuffer>;
|
|
15
15
|
}>;
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blockVerifier.js","sourceRoot":"","sources":["../../../src/internal/upload/blockVerifier.ts"],"names":[],"mappings":";;;AAIA,MAAa,aAAa;IAKV;IACA;IACA;IACA;IAPJ,gBAAgB,
|
|
1
|
+
{"version":3,"file":"blockVerifier.js","sourceRoot":"","sources":["../../../src/internal/upload/blockVerifier.ts"],"names":[],"mappings":";;;AAIA,MAAa,aAAa;IAKV;IACA;IACA;IACA;IAPJ,gBAAgB,CAA2B;IAC3C,0BAA0B,CAAc;IAEhD,YACY,UAA4B,EAC5B,aAAkC,EAClC,OAAmB,EACnB,oBAA4B;QAH5B,eAAU,GAAV,UAAU,CAAkB;QAC5B,kBAAa,GAAb,aAAa,CAAqB;QAClC,YAAO,GAAP,OAAO,CAAY;QACnB,yBAAoB,GAApB,oBAAoB,CAAQ;QAEpC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,oBAAoB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACpF,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAChD,IAAI,CAAC,0BAA0B,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,6BAA6B,CACpF,IAAI,CAAC,OAAO,EACZ,MAAM,CAAC,sBAAsB,CAChC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,cAAuC;QAGrD,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CACjC,IAAI,CAAC,0BAA0B,EAC/B,IAAI,CAAC,gBAAgB,EACrB,cAAc,CACjB,CAAC;IACN,CAAC;CACJ;AArCD,sCAqCC"}
|
|
@@ -8,6 +8,6 @@
|
|
|
8
8
|
export declare class ChunkStreamReader {
|
|
9
9
|
private reader;
|
|
10
10
|
private chunkSize;
|
|
11
|
-
constructor(stream: ReadableStream<Uint8Array
|
|
12
|
-
iterateChunks(): AsyncGenerator<Uint8Array
|
|
11
|
+
constructor(stream: ReadableStream<Uint8Array<ArrayBuffer>>, chunkSize: number);
|
|
12
|
+
iterateChunks(): AsyncGenerator<Uint8Array<ArrayBuffer>>;
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunkStreamReader.js","sourceRoot":"","sources":["../../../src/internal/upload/chunkStreamReader.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,MAAa,iBAAiB;IAClB,MAAM,
|
|
1
|
+
{"version":3,"file":"chunkStreamReader.js","sourceRoot":"","sources":["../../../src/internal/upload/chunkStreamReader.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,MAAa,iBAAiB;IAClB,MAAM,CAAuD;IAE7D,SAAS,CAAS;IAE1B,YAAY,MAA+C,EAAE,SAAiB;QAC1E,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,CAAC,aAAa;QAChB,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE9C,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjD,IAAI,IAAI,EAAE,CAAC;gBACP,MAAM;YACV,CAAC;YAED,IAAI,cAAc,GAAG,KAAK,CAAC;YAC3B,OAAO,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,QAAQ,GAAG,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;oBACpD,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;oBACrC,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC;oBAClC,MAAM;gBACV,CAAC;gBAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;gBACxD,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,qBAAqB,CAAC,EAAE,QAAQ,CAAC,CAAC;gBACrE,MAAM,MAAM,CAAC;gBAEb,QAAQ,GAAG,CAAC,CAAC;gBACb,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACjE,CAAC;QACL,CAAC;QAED,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;YACf,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;CACJ;AAzCD,8CAyCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunkStreamReader.test.js","sourceRoot":"","sources":["../../../src/internal/upload/chunkStreamReader.test.ts"],"names":[],"mappings":";;AAAA,2DAAwD;AAExD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,IAAI,
|
|
1
|
+
{"version":3,"file":"chunkStreamReader.test.js","sourceRoot":"","sources":["../../../src/internal/upload/chunkStreamReader.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export declare class UploadCryptoService {
|
|
|
7
7
|
constructor(driveCrypto: DriveCrypto, nodesService: NodesService);
|
|
8
8
|
generateFileCrypto(parentUid: string, parentKeys: {
|
|
9
9
|
key: PrivateKey;
|
|
10
|
-
hashKey: Uint8Array
|
|
10
|
+
hashKey: Uint8Array<ArrayBuffer>;
|
|
11
11
|
}, name: string): Promise<NodeCrypto>;
|
|
12
12
|
getSigningKeysForExistingNode(uids: {
|
|
13
13
|
nodeUid: string;
|
|
@@ -15,16 +15,16 @@ export declare class UploadCryptoService {
|
|
|
15
15
|
}): Promise<NodeCryptoSigningKeys>;
|
|
16
16
|
private getSigningKeys;
|
|
17
17
|
encryptThumbnail(nodeRevisionDraftKeys: NodeRevisionDraftKeys, thumbnail: Thumbnail): Promise<EncryptedThumbnail>;
|
|
18
|
-
encryptBlock(verifyBlock: (encryptedBlock: Uint8Array) => Promise<{
|
|
19
|
-
verificationToken: Uint8Array
|
|
20
|
-
}>, nodeRevisionDraftKeys: NodeRevisionDraftKeys, block: Uint8Array
|
|
21
|
-
commitFile(nodeRevisionDraftKeys: NodeRevisionDraftKeys, manifest: Uint8Array
|
|
18
|
+
encryptBlock(verifyBlock: (encryptedBlock: Uint8Array<ArrayBuffer>) => Promise<{
|
|
19
|
+
verificationToken: Uint8Array<ArrayBuffer>;
|
|
20
|
+
}>, nodeRevisionDraftKeys: NodeRevisionDraftKeys, block: Uint8Array<ArrayBuffer>, index: number): Promise<EncryptedBlock>;
|
|
21
|
+
commitFile(nodeRevisionDraftKeys: NodeRevisionDraftKeys, manifest: Uint8Array<ArrayBuffer>, extendedAttributes?: string): Promise<{
|
|
22
22
|
armoredManifestSignature: string;
|
|
23
23
|
signatureEmail: string | AnonymousUser;
|
|
24
24
|
armoredExtendedAttributes?: string;
|
|
25
25
|
}>;
|
|
26
26
|
getContentKeyPacketSessionKey(nodeKey: PrivateKey, base64ContentKeyPacket: string): Promise<SessionKey>;
|
|
27
|
-
verifyBlock(contentKeyPacketSessionKey: SessionKey, verificationCode: Uint8Array
|
|
28
|
-
verificationToken: Uint8Array
|
|
27
|
+
verifyBlock(contentKeyPacketSessionKey: SessionKey, verificationCode: Uint8Array<ArrayBuffer>, encryptedData: Uint8Array<ArrayBuffer>): Promise<{
|
|
28
|
+
verificationToken: Uint8Array<ArrayBuffer>;
|
|
29
29
|
}>;
|
|
30
30
|
}
|
|
@@ -68,18 +68,18 @@ class UploadCryptoService {
|
|
|
68
68
|
}
|
|
69
69
|
async encryptThumbnail(nodeRevisionDraftKeys, thumbnail) {
|
|
70
70
|
const { encryptedData } = await this.driveCrypto.encryptThumbnailBlock(thumbnail.thumbnail, nodeRevisionDraftKeys.contentKeyPacketSessionKey, nodeRevisionDraftKeys.signingKeys.contentSigningKey);
|
|
71
|
-
const
|
|
71
|
+
const digestPromise = crypto.subtle.digest('SHA-256', encryptedData);
|
|
72
72
|
return {
|
|
73
73
|
type: thumbnail.type,
|
|
74
74
|
encryptedData: encryptedData,
|
|
75
75
|
originalSize: thumbnail.thumbnail.length,
|
|
76
76
|
encryptedSize: encryptedData.length,
|
|
77
|
-
|
|
77
|
+
hashPromise: digestPromise.then((digest) => new Uint8Array(digest)),
|
|
78
78
|
};
|
|
79
79
|
}
|
|
80
80
|
async encryptBlock(verifyBlock, nodeRevisionDraftKeys, block, index) {
|
|
81
81
|
const { encryptedData, armoredSignature } = await this.driveCrypto.encryptBlock(block, nodeRevisionDraftKeys.key, nodeRevisionDraftKeys.contentKeyPacketSessionKey, nodeRevisionDraftKeys.signingKeys.contentSigningKey);
|
|
82
|
-
const
|
|
82
|
+
const digestPromise = crypto.subtle.digest('SHA-256', encryptedData);
|
|
83
83
|
const { verificationToken } = await verifyBlock(encryptedData);
|
|
84
84
|
return {
|
|
85
85
|
index,
|
|
@@ -88,7 +88,7 @@ class UploadCryptoService {
|
|
|
88
88
|
verificationToken,
|
|
89
89
|
originalSize: block.length,
|
|
90
90
|
encryptedSize: encryptedData.length,
|
|
91
|
-
|
|
91
|
+
hashPromise: digestPromise.then((digest) => new Uint8Array(digest)),
|
|
92
92
|
};
|
|
93
93
|
}
|
|
94
94
|
async commitFile(nodeRevisionDraftKeys, manifest, extendedAttributes) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/upload/cryptoService.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAGzB,yCAA8C;AAW9C,MAAa,mBAAmB;IAEd;IACA;IAFd,YACc,WAAwB,EACxB,YAA0B;QAD1B,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAc;QAEpC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,kBAAkB,CACpB,SAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/upload/cryptoService.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export type NodeRevisionDraft = {
|
|
|
6
6
|
nodeRevisionUid: string;
|
|
7
7
|
nodeKeys: NodeRevisionDraftKeys;
|
|
8
8
|
parentNodeKeys?: {
|
|
9
|
-
hashKey: Uint8Array
|
|
9
|
+
hashKey: Uint8Array<ArrayBuffer>;
|
|
10
10
|
};
|
|
11
11
|
newNodeInfo?: {
|
|
12
12
|
parentUid: string;
|
|
@@ -57,17 +57,17 @@ export type NodeCryptoSigningKeys = {
|
|
|
57
57
|
export type EncryptedBlockMetadata = {
|
|
58
58
|
encryptedSize: number;
|
|
59
59
|
originalSize: number;
|
|
60
|
-
|
|
60
|
+
hashPromise: Promise<Uint8Array<ArrayBuffer>>;
|
|
61
61
|
};
|
|
62
62
|
export type EncryptedBlock = EncryptedBlockMetadata & {
|
|
63
63
|
index: number;
|
|
64
|
-
encryptedData: Uint8Array
|
|
64
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
65
65
|
armoredSignature: string;
|
|
66
|
-
verificationToken: Uint8Array
|
|
66
|
+
verificationToken: Uint8Array<ArrayBuffer>;
|
|
67
67
|
};
|
|
68
68
|
export type EncryptedThumbnail = EncryptedBlockMetadata & {
|
|
69
69
|
type: ThumbnailType;
|
|
70
|
-
encryptedData: Uint8Array
|
|
70
|
+
encryptedData: Uint8Array<ArrayBuffer>;
|
|
71
71
|
};
|
|
72
72
|
export type UploadTokens = {
|
|
73
73
|
blockTokens: {
|
|
@@ -90,7 +90,7 @@ export interface NodesService {
|
|
|
90
90
|
key: PrivateKey;
|
|
91
91
|
passphraseSessionKey: SessionKey;
|
|
92
92
|
contentKeyPacketSessionKey?: SessionKey;
|
|
93
|
-
hashKey?: Uint8Array
|
|
93
|
+
hashKey?: Uint8Array<ArrayBuffer>;
|
|
94
94
|
}>;
|
|
95
95
|
getNodeSigningKeys(uids: {
|
|
96
96
|
nodeUid: string;
|
|
@@ -19,7 +19,7 @@ export declare class UploadManager {
|
|
|
19
19
|
deleteDraftNode(nodeUid: string): Promise<void>;
|
|
20
20
|
createDraftRevision(nodeUid: string, metadata: UploadMetadata): Promise<NodeRevisionDraft>;
|
|
21
21
|
deleteDraftRevision(nodeRevisionUid: string): Promise<void>;
|
|
22
|
-
commitDraft(nodeRevisionDraft: NodeRevisionDraft, manifest: Uint8Array
|
|
22
|
+
commitDraft(nodeRevisionDraft: NodeRevisionDraft, manifest: Uint8Array<ArrayBuffer>, extendedAttributes: {
|
|
23
23
|
modificationTime?: Date;
|
|
24
24
|
size: number;
|
|
25
25
|
blockSizes: number[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAGzB,yCAAsF;AAEtF,oCAA0D;AAI1D,kCAAoD;AAEpD;;;;GAIG;AACH,MAAa,aAAa;IAKR;IACA;IACA;IACA;IAPJ,MAAM,CAAS;IAEzB,YACI,SAA+B,EACrB,UAA4B,EAC5B,aAAkC,EAClC,YAA0B,EAC1B,SAA6B;QAH7B,eAAU,GAAV,UAAU,CAAkB;QAC5B,kBAAa,GAAb,aAAa,CAAqB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,cAAS,GAAT,SAAS,CAAoB;QAEvC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,eAAuB,EAAE,IAAY,EAAE,QAAwB;QACjF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACxE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,wBAAe,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,8CAA8C,CAAC,CAAC;QAC1F,CAAC;QAED,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnE,eAAe,EACf,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,EACpD,IAAI,CACP,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAC5D,eAAe,EACf,UAAU,CAAC,OAAO,EAClB,IAAI,EACJ,QAAQ,EACR,mBAAmB,CACtB,CAAC;QAEF,OAAO;YACH,OAAO;YACP,eAAe;YACf,QAAQ,EAAE;gBACN,GAAG,EAAE,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG;gBAC/C,0BAA0B,EAAE,mBAAmB,CAAC,UAAU,CAAC,SAAS,CAAC,0BAA0B;gBAC/F,WAAW,EAAE,mBAAmB,CAAC,WAAW;aAC/C;YACD,cAAc,EAAE;gBACZ,OAAO,EAAE,UAAU,CAAC,OAAO;aAC9B;YACD,WAAW,EAAE;gBACT,SAAS,EAAE,eAAe;gBAC1B,IAAI;gBACJ,aAAa,EAAE,mBAAmB,CAAC,aAAa,CAAC,aAAa;gBAC9D,IAAI,EAAE,mBAAmB,CAAC,aAAa,CAAC,IAAI;aAC/C;SACJ,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC1B,eAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/internal/upload/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,7 +76,7 @@ export declare class StreamUploader {
|
|
|
76
76
|
private get uploadedBlockCount();
|
|
77
77
|
private get uploadedOriginalFileSize();
|
|
78
78
|
protected get uploadedBlockSizes(): number[];
|
|
79
|
-
protected
|
|
79
|
+
protected getManifest(): Promise<Uint8Array<ArrayBuffer>>;
|
|
80
80
|
private abortUpload;
|
|
81
81
|
private get isUploadAborted();
|
|
82
82
|
}
|
|
@@ -97,7 +97,9 @@ class StreamUploader {
|
|
|
97
97
|
this.logger.info(`Starting upload`);
|
|
98
98
|
await this.encryptAndUploadBlocks(stream, thumbnails, (uploadedBytes) => {
|
|
99
99
|
fileProgress += uploadedBytes;
|
|
100
|
-
|
|
100
|
+
if (!failure) {
|
|
101
|
+
onProgress?.(fileProgress);
|
|
102
|
+
}
|
|
101
103
|
});
|
|
102
104
|
this.logger.debug(`All blocks uploaded, committing`);
|
|
103
105
|
await this.commitFile(thumbnails);
|
|
@@ -182,7 +184,7 @@ class StreamUploader {
|
|
|
182
184
|
blockSizes: this.uploadedBlockSizes,
|
|
183
185
|
digests,
|
|
184
186
|
};
|
|
185
|
-
await this.uploadManager.commitDraft(this.revisionDraft, this.
|
|
187
|
+
await this.uploadManager.commitDraft(this.revisionDraft, await this.getManifest(), extendedAttributes, this.metadata.additionalMetadata);
|
|
186
188
|
}
|
|
187
189
|
async encryptThumbnails(thumbnails) {
|
|
188
190
|
if (new Set(thumbnails.map(({ type }) => type)).size !== thumbnails.length) {
|
|
@@ -252,15 +254,11 @@ class StreamUploader {
|
|
|
252
254
|
const uploadTokens = await this.apiService.requestBlockUpload(this.revisionDraft.nodeRevisionUid, this.revisionDraft.nodeKeys.signingKeys.addressId, {
|
|
253
255
|
contentBlocks: Array.from(this.encryptedBlocks.values().map((block) => ({
|
|
254
256
|
index: block.index,
|
|
255
|
-
encryptedSize: block.encryptedSize,
|
|
256
|
-
hash: block.hash,
|
|
257
257
|
armoredSignature: block.armoredSignature,
|
|
258
258
|
verificationToken: block.verificationToken,
|
|
259
259
|
}))),
|
|
260
260
|
thumbnails: Array.from(this.encryptedThumbnails.values().map((block) => ({
|
|
261
261
|
type: block.type,
|
|
262
|
-
encryptedSize: block.encryptedSize,
|
|
263
|
-
hash: block.hash,
|
|
264
262
|
}))),
|
|
265
263
|
});
|
|
266
264
|
// If the upload was aborted while requesting next upload tokens,
|
|
@@ -317,7 +315,7 @@ class StreamUploader {
|
|
|
317
315
|
}, this.abortController.signal);
|
|
318
316
|
this.uploadedThumbnails.push({
|
|
319
317
|
type: encryptedThumbnail.type,
|
|
320
|
-
|
|
318
|
+
hashPromise: encryptedThumbnail.hashPromise,
|
|
321
319
|
encryptedSize: encryptedThumbnail.encryptedSize,
|
|
322
320
|
originalSize: encryptedThumbnail.originalSize,
|
|
323
321
|
});
|
|
@@ -358,6 +356,9 @@ class StreamUploader {
|
|
|
358
356
|
let blockProgress = 0;
|
|
359
357
|
let attempt = 0;
|
|
360
358
|
while (true) {
|
|
359
|
+
if (this.isUploadAborted) {
|
|
360
|
+
throw this.error || new errors_1.AbortError();
|
|
361
|
+
}
|
|
361
362
|
attempt++;
|
|
362
363
|
try {
|
|
363
364
|
logger.debug(`Uploading`);
|
|
@@ -367,7 +368,7 @@ class StreamUploader {
|
|
|
367
368
|
}, this.abortController.signal);
|
|
368
369
|
this.uploadedBlocks.push({
|
|
369
370
|
index: encryptedBlock.index,
|
|
370
|
-
|
|
371
|
+
hashPromise: encryptedBlock.hashPromise,
|
|
371
372
|
encryptedSize: encryptedBlock.encryptedSize,
|
|
372
373
|
originalSize: encryptedBlock.originalSize,
|
|
373
374
|
});
|
|
@@ -395,8 +396,6 @@ class StreamUploader {
|
|
|
395
396
|
contentBlocks: [
|
|
396
397
|
{
|
|
397
398
|
index: encryptedBlock.index,
|
|
398
|
-
encryptedSize: encryptedBlock.encryptedSize,
|
|
399
|
-
hash: encryptedBlock.hash,
|
|
400
399
|
armoredSignature: encryptedBlock.armoredSignature,
|
|
401
400
|
verificationToken: encryptedBlock.verificationToken,
|
|
402
401
|
},
|
|
@@ -508,12 +507,12 @@ class StreamUploader {
|
|
|
508
507
|
uploadedBlocks.sort((a, b) => a.index - b.index);
|
|
509
508
|
return uploadedBlocks.map((block) => block.originalSize);
|
|
510
509
|
}
|
|
511
|
-
|
|
510
|
+
async getManifest() {
|
|
512
511
|
this.uploadedThumbnails.sort((a, b) => a.type - b.type);
|
|
513
512
|
this.uploadedBlocks.sort((a, b) => a.index - b.index);
|
|
514
513
|
const hashes = [
|
|
515
|
-
...this.uploadedThumbnails.map(({
|
|
516
|
-
...this.uploadedBlocks.map(({
|
|
514
|
+
...(await Promise.all(this.uploadedThumbnails.map(({ hashPromise }) => hashPromise))),
|
|
515
|
+
...(await Promise.all(this.uploadedBlocks.map(({ hashPromise }) => hashPromise))),
|
|
517
516
|
];
|
|
518
517
|
return (0, utils_1.mergeUint8Arrays)(hashes);
|
|
519
518
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/streamUploader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"streamUploader.js","sourceRoot":"","sources":["../../../src/internal/upload/streamUploader.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ async function mockEncryptBlock(verifyBlock, _, block, index) {
|
|
|
16
16
|
verificationToken: 'verificationToken',
|
|
17
17
|
originalSize: block.length,
|
|
18
18
|
encryptedSize: block.length + BLOCK_ENCRYPTION_OVERHEAD,
|
|
19
|
-
|
|
19
|
+
hashPromise: Promise.resolve('blockHash'),
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
function mockUploadBlock(_, __, encryptedBlock, onProgress) {
|
|
@@ -67,7 +67,7 @@ describe('StreamUploader', () => {
|
|
|
67
67
|
encryptedData: thumbnail.thumbnail,
|
|
68
68
|
originalSize: thumbnail.thumbnail.length,
|
|
69
69
|
encryptedSize: thumbnail.thumbnail + 1000,
|
|
70
|
-
|
|
70
|
+
hashPromise: Promise.resolve('thumbnailHash'),
|
|
71
71
|
})),
|
|
72
72
|
encryptBlock: jest.fn().mockImplementation(mockEncryptBlock),
|
|
73
73
|
};
|
|
@@ -316,6 +316,32 @@ describe('StreamUploader', () => {
|
|
|
316
316
|
expect(logger.warn).toHaveBeenCalledWith('block 1:token/block:1: Upload timeout, retrying');
|
|
317
317
|
expect(uploader.maxUploadingBlocks).toEqual(1);
|
|
318
318
|
});
|
|
319
|
+
it('should not call onProgress after upload has failed', async () => {
|
|
320
|
+
let firstBlockPromise;
|
|
321
|
+
// Block 1 delays before reporting progress; block 2 fails immediately.
|
|
322
|
+
// This simulates block 1's progress callback firing after we've already
|
|
323
|
+
// entered the catch block.
|
|
324
|
+
apiService.uploadBlock = jest.fn().mockImplementation(async function (bareUrl, token, block, onProgress) {
|
|
325
|
+
if (token === 'token/block:1') {
|
|
326
|
+
firstBlockPromise = new Promise((resolve) => setTimeout(resolve, 100));
|
|
327
|
+
await firstBlockPromise;
|
|
328
|
+
return mockUploadBlock(bareUrl, token, block, onProgress);
|
|
329
|
+
}
|
|
330
|
+
if (token === 'token/block:2') {
|
|
331
|
+
throw new Error('Failed to upload block');
|
|
332
|
+
}
|
|
333
|
+
return mockUploadBlock(bareUrl, token, block, onProgress);
|
|
334
|
+
});
|
|
335
|
+
const startPromise = uploader.start(stream, thumbnails, onProgress);
|
|
336
|
+
await expect(startPromise).rejects.toThrow('Failed to upload block');
|
|
337
|
+
expect(firstBlockPromise).toBeDefined();
|
|
338
|
+
await firstBlockPromise;
|
|
339
|
+
// Mocked file has 3 blocks - 2x 4 MB blocks and 1x 2 MB block
|
|
340
|
+
// First block is delayed - should not be reported.
|
|
341
|
+
// Second block is failed - should not be reported.
|
|
342
|
+
// Third block is successfull before second block is failed - should be reported.
|
|
343
|
+
await verifyOnProgress([thumbnailSize, 2 * 1024 * 1024]);
|
|
344
|
+
});
|
|
319
345
|
it('limitUploadCapacity should wait for the previous blocks to finish', async () => {
|
|
320
346
|
const error = new Error('TimeoutError');
|
|
321
347
|
error.name = 'TimeoutError';
|
|
@@ -372,8 +398,6 @@ describe('StreamUploader', () => {
|
|
|
372
398
|
contentBlocks: [
|
|
373
399
|
{
|
|
374
400
|
index: 2,
|
|
375
|
-
encryptedSize: 4 * 1024 * 1024 + 10000,
|
|
376
|
-
hash: 'blockHash',
|
|
377
401
|
armoredSignature: 'signature',
|
|
378
402
|
verificationToken: 'verificationToken',
|
|
379
403
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamUploader.test.js","sourceRoot":"","sources":["../../../src/internal/upload/streamUploader.test.ts"],"names":[],"mappings":";;AAAA,+CAAmF;AACnF,yCAA8C;AAC9C,+CAAmD;AACnD,8CAA4D;AAC5D,qDAAmE;AAInE,6CAAgD;AAKhD,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAExC,KAAK,UAAU,gBAAgB,CAC3B,WAAiD,EACjD,CAAM,EACN,KAAiB,EACjB,KAAa;IAEb,MAAM,WAAW,CAAC,KAAK,CAAC,CAAC;IACzB,OAAO;QACH,KAAK;QACL,aAAa,EAAE,KAAK;QACpB,gBAAgB,EAAE,WAAW;QAC7B,iBAAiB,EAAE,mBAAmB;QACtC,YAAY,EAAE,KAAK,CAAC,MAAM;QAC1B,aAAa,EAAE,KAAK,CAAC,MAAM,GAAG,yBAAyB;QACvD,IAAI,EAAE,WAAW;KACpB,CAAC;AACN,CAAC;AAED,SAAS,eAAe,CACpB,CAAS,EACT,EAAU,EACV,cAA0B,EAC1B,UAA2C;IAE3C,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC;AAED,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,IAAI,MAAc,CAAC;IACnB,IAAI,SAA0B,CAAC;IAC/B,IAAI,UAAyC,CAAC;IAC9C,IAAI,aAAkC,CAAC;IACvC,IAAI,aAA4B,CAAC;IACjC,IAAI,aAA4B,CAAC;IACjC,IAAI,aAAgC,CAAC;IACrC,IAAI,QAAwB,CAAC;IAC7B,IAAI,UAA4B,CAAC;IACjC,IAAI,QAA6B,CAAC;IAClC,IAAI,eAAgC,CAAC;IAErC,IAAI,QAAwB,CAAC;IAE7B,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,GAAG,IAAA,sBAAa,GAAE,CAAC;QAEzB,gEAAgE;QAChE,SAAS,GAAG;YACR,oBAAoB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC;YACvD,yBAAyB,EAAE,IAAI,CAAC,EAAE,EAAE;YACpC,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;YACvB,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;SAC5B,CAAC;QAEF,gEAAgE;QAChE,UAAU,GAAG;YACT,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;gBACjE,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAwB,EAAE,EAAE,CAAC,CAAC;oBACjE,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,OAAO,EAAE,iBAAiB,KAAK,CAAC,KAAK,EAAE;oBACvC,KAAK,EAAE,eAAe,KAAK,CAAC,KAAK,EAAE;iBACtC,CAAC,CAAC;gBACH,eAAe,EAAE,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAA2B,EAAE,EAAE,CAAC,CAAC;oBAC7E,IAAI,EAAE,SAAS,CAAC,IAAI;oBACpB,OAAO,EAAE,qBAAqB,SAAS,CAAC,IAAI,EAAE;oBAC9C,KAAK,EAAE,mBAAmB,SAAS,CAAC,IAAI,EAAE;iBAC7C,CAAC,CAAC;aACN,CAAC,CAAC;YACH,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,eAAe,CAAC;SAC7D,CAAC;QAEF,gEAAgE;QAChE,aAAa,GAAG;YACZ,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;gBACpE,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,aAAa,EAAE,SAAS,CAAC,SAAS;gBAClC,YAAY,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM;gBACxC,aAAa,EAAE,SAAS,CAAC,SAAS,GAAG,IAAI;gBACzC,IAAI,EAAE,eAAe;aACxB,CAAC,CAAC;YACH,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;SAC/D,CAAC;QAEF,gEAAgE;QAChE,aAAa,GAAG;YACZ,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;SACtD,CAAC;QAEF,gEAAgE;QAChE,aAAa,GAAG;YACZ,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;SACtD,CAAC;QAEF,aAAa,GAAG;YACZ,eAAe,EAAE,aAAa;YAC9B,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE;gBACN,WAAW,EAAE;oBACT,SAAS,EAAE,WAAW;iBACzB;aACJ;SACiB,CAAC;QAEvB,QAAQ,GAAG;YACP,yBAAyB;YACzB,YAAY,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;SACf,CAAC;QAEpB,UAAU,GAAG,IAAI,6BAAgB,EAAE,CAAC;QACpC,QAAQ,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACrB,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAExC,QAAQ,GAAG,IAAI,+BAAc,CACzB,SAAS,EACT,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,eAAe,CAClB,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACnB,IAAI,UAAuB,CAAC;QAC5B,IAAI,aAAqB,CAAC;QAE1B,IAAI,UAA2C,CAAC;QAChD,IAAI,MAAkC,CAAC;QAEvC,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;YAC7B,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAEpE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACnB,eAAe,EAAE,aAAa;gBAC9B,OAAO,EAAE,SAAS;aACrB,CAAC,CAAC;YAEH,MAAM,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,GAAG,gCAAe,CAAC,CAAC;YAClF,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAClD,aAAa,EACb,MAAM,CAAC,QAAQ,EAAE,EACjB;gBACI,IAAI,EAAE,QAAQ,CAAC,YAAY;gBAC3B,UAAU,EAAE,QAAQ,CAAC,YAAY;oBAC7B,CAAC,CAAC;wBACI,GAAG,KAAK,CAAC,sBAAsB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,gCAAe,CAAC;wBAC1D,QAAQ,CAAC,YAAY,GAAG,gCAAe;qBAC1C;oBACH,CAAC,CAAC,EAAE;gBACR,gBAAgB,EAAE,SAAS;gBAC3B,OAAO,EAAE;oBACL,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE;iBAC1B;aACJ,EACD,QAAQ,CAAC,kBAAkB,CAC9B,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,oBAAoB,CAAC,aAAa,EAAE,QAAQ,CAAC,YAAY,GAAG,aAAa,CAAC,CAAC;YAC5G,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YACtD,MAAM,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,KAAK,EACvB,KAAa,EACb,aAAiC,EACjC,YAAY,GAAG,QAAQ,CAAC,YAAY,EACtC,EAAE;YACA,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAC/D,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAE7C,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YACxD,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAC/C,aAAa,EACb,IAAI,KAAK,CAAC,KAAK,CAAC,EAChB,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,aAAa,EAC/D,YAAY,CACf,CAAC;YACF,MAAM,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC,CAAC;QAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,aAAuB,EAAE,EAAE;YACvD,MAAM,CAAC,UAAU,CAAC,CAAC,qBAAqB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC/D,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,YAAY,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;YACpE,CAAC;QACL,CAAC,CAAC;QAEF,UAAU,CAAC,GAAG,EAAE;YACZ,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;YACvB,UAAU,GAAG;gBACT;oBACI,IAAI,EAAE,yBAAa,CAAC,KAAK;oBACzB,SAAS,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC;iBAClC;aACJ,CAAC;YACF,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC3F,MAAM,GAAG,IAAI,cAAc,CAAC;gBACxB,KAAK,CAAC,UAAU;oBACZ,MAAM,SAAS,GAAG,IAAI,CAAC;oBACvB,MAAM,UAAU,GAAG,QAAQ,CAAC,YAAY,GAAG,SAAS,CAAC;oBACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;wBACnC,UAAU,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;oBAClD,CAAC;oBACD,UAAU,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YACxC,MAAM,aAAa,EAAE,CAAC;YACtB,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,yBAAyB;YAClF,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW;YACvE,MAAM,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YACnE,MAAM,gBAAgB,CAAC,CAAC,aAAa,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACrE,QAAQ,GAAG;gBACP,YAAY,EAAE,CAAC;aACA,CAAC;YACpB,MAAM,GAAG,IAAI,cAAc,CAAC;gBACxB,KAAK,CAAC,UAAU;oBACZ,UAAU,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;aACJ,CAAC,CAAC;YACH,UAAU,GAAG,EAAE,CAAC;YAChB,aAAa,GAAG,CAAC,CAAC;YAClB,QAAQ,GAAG,IAAI,+BAAc,CACzB,SAAS,EACT,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,eAAe,CAClB,CAAC;YAEF,MAAM,aAAa,EAAE,CAAC;YACtB,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YAClE,QAAQ,GAAG;gBACP,YAAY,EAAE,CAAC;aACA,CAAC;YACpB,MAAM,GAAG,IAAI,cAAc,CAAC;gBACxB,KAAK,CAAC,UAAU;oBACZ,UAAU,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;aACJ,CAAC,CAAC;YACH,QAAQ,GAAG,IAAI,+BAAc,CACzB,SAAS,EACT,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,eAAe,CAClB,CAAC;YAEF,MAAM,aAAa,EAAE,CAAC;YACtB,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,gBAAgB,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAC9D,aAAa,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK;gBAC/D,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;YAEH,MAAM,aAAa,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;YACtD,MAAM,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YACzD,aAAa,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK;gBAC3D,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YAEH,8DAA8D;YAC9D,uDAAuD;YACvD,MAAM,aAAa,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC;YAClD,wCAAwC;YACxC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YACtE,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,aAAa,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,WAAW,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK;gBACrG,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;oBACd,KAAK,EAAE,CAAC;oBACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBAC/C,CAAC;gBACD,OAAO,gBAAgB,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;YAEH,MAAM,aAAa,EAAE,CAAC;YACtB,mDAAmD;YACnD,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC5D,MAAM,gBAAgB,CAAC,CAAC,aAAa,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC1D,UAAU,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK;gBAC9D,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;YAEH,MAAM,aAAa,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC5D,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,WAAW,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU;gBACnG,IAAI,KAAK,KAAK,mBAAmB,EAAE,CAAC;oBAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAClD,CAAC;gBACD,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;YAEH,0CAA0C;YAC1C,MAAM,aAAa,CAAC,4BAA4B,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;YACzE,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,WAAW,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU;gBACnG,IAAI,KAAK,KAAK,mBAAmB,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;oBAC/C,KAAK,EAAE,CAAC;oBACR,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAClD,CAAC;gBACD,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;YAEH,MAAM,aAAa,EAAE,CAAC;YACtB,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC/D,mCAAmC;YACnC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YACxD,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,WAAW,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU;gBACnG,IAAI,KAAK,KAAK,eAAe,EAAE,CAAC;oBAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBAC9C,CAAC;gBACD,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;YAEH,gEAAgE;YAChE,MAAM,aAAa,CAAC,wBAAwB,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACrE,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,WAAW,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU;gBACnG,IAAI,KAAK,KAAK,eAAe,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;oBAC3C,KAAK,EAAE,CAAC;oBACR,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBAC9C,CAAC;gBACD,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;YAEH,MAAM,aAAa,EAAE,CAAC;YACtB,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC/D,mCAAmC;YACnC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YACxD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;YACxC,KAAK,CAAC,IAAI,GAAG,cAAc,CAAC;YAE5B,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,WAAW,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU;gBACnG,IAAI,KAAK,KAAK,eAAe,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;oBAC3C,KAAK,EAAE,CAAC;oBACR,MAAM,KAAK,CAAC;gBAChB,CAAC;gBACD,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;YAEH,MAAM,CAAE,QAAgB,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,aAAa,EAAE,CAAC;YACtB,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC/D,2CAA2C;YAC3C,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,oBAAoB,CACpC,4EAA4E,CAC/E,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,iDAAiD,CAAC,CAAC;YAC5F,MAAM,CAAE,QAAgB,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YAC/E,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;YACxC,KAAK,CAAC,IAAI,GAAG,cAAc,CAAC;YAE5B,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,IAAI,cAAwC,CAAC;YAC7C,IAAI,kBAAkB,GAAG,IAAI,CAAC;YAE9B,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,WAAW,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU;gBACnG,IAAI,KAAK,KAAK,eAAe,EAAE,CAAC;oBAC5B,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;oBACnC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;wBAChC,cAAc,GAAG,OAAO,CAAC;oBAC7B,CAAC,CAAC,CAAC;oBACH,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;oBACjC,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;gBAC9D,CAAC;gBACD,IAAI,KAAK,KAAK,eAAe,EAAE,CAAC;oBAC5B,IAAI,kBAAkB,EAAE,CAAC;wBACrB,kBAAkB,GAAG,KAAK,CAAC;wBAC3B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;wBAC9B,wEAAwE;wBACxE,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;wBAC1C,MAAM,KAAK,CAAC;oBAChB,CAAC;oBACD,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;oBAC5B,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;gBAC9D,CAAC;gBACD,0CAA0C;gBAC1C,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;YAEH,MAAM,aAAa,EAAE,CAAC;YAEtB,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;gBACzB,qBAAqB;gBACrB,gBAAgB;gBAChB,mBAAmB;gBACnB,cAAc;aACjB,CAAC,CAAC;YAEH,+CAA+C;YAC/C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,oBAAoB,CACpC,4EAA4E,CAC/E,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,iDAAiD,CAAC,CAAC;QAChG,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAC9D,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,WAAW,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU;gBACnG,IAAI,KAAK,KAAK,eAAe,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;oBAC3C,KAAK,EAAE,CAAC;oBACR,MAAM,IAAI,yBAAY,CAAC,eAAe,oCAA0B,CAAC;gBACrE,CAAC;gBACD,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;YAEH,MAAM,aAAa,EAAE,CAAC;YACtB,gCAAgC;YAChC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CACtD,aAAa,CAAC,eAAe,EAC7B,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAC5C;gBACI,aAAa,EAAE;oBACX;wBACI,KAAK,EAAE,CAAC;wBACR,aAAa,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK;wBACtC,IAAI,EAAE,WAAW;wBACjB,gBAAgB,EAAE,WAAW;wBAC7B,iBAAiB,EAAE,mBAAmB;qBACzC;iBACJ;aACJ,CACJ,CAAC;YACF,mCAAmC;YACnC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;YAC7B,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;gBACpD,aAAa,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,uBAAc,CAAC,0BAA0B,CAAC,CAAC,CAAC;gBACxG,MAAM,aAAa,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;gBACnD,MAAM,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;gBACtE,aAAa,CAAC,WAAW,GAAG,IAAI;qBAC3B,EAAE,EAAE;qBACJ,qBAAqB,CAAC,IAAI,uBAAc,CAAC,0BAA0B,CAAC,CAAC;qBACrE,iBAAiB,CAAC;oBACf,iBAAiB,EAAE,IAAI,UAAU,EAAE;iBACtC,CAAC,CAAC;gBACP,MAAM,aAAa,EAAE,CAAC;gBACtB,MAAM,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC3E,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;gBACjE,QAAQ,GAAG,IAAI,+BAAc,CACzB,SAAS,EACT,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb;oBACI,2CAA2C;oBAC3C,YAAY,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI;iBACrB,EACnB,QAAQ,EACR,UAAU,EACV,eAAe,CAClB,CAAC;gBAEF,MAAM,aAAa,CACf,kCAAkC,EAClC,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,EACvB,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CACzB,CAAC;YACN,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;gBAC/D,aAAa,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;oBACtF,KAAK;oBACL,aAAa,EAAE,KAAK;oBACpB,gBAAgB,EAAE,WAAW;oBAC7B,iBAAiB,EAAE,mBAAmB;oBACtC,YAAY,EAAE,CAAC,EAAE,2CAA2C;oBAC5D,aAAa,EAAE,KAAK,CAAC,MAAM,GAAG,KAAK;oBACnC,IAAI,EAAE,WAAW;iBACpB,CAAC,CAAC,CAAC;gBAEJ,MAAM,aAAa,CAAC,kCAAkC,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;YACrF,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;gBACvD,QAAQ,CAAC,YAAY,GAAG,0CAA0C,CAAC;gBAEnE,QAAQ,GAAG,IAAI,+BAAc,CACzB,SAAS,EACT,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,eAAe,CAClB,CAAC;gBAEF,MAAM,aAAa,EAAE,CAAC;YAC1B,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;gBAC1D,QAAQ,CAAC,YAAY,GAAG,qCAAqC,CAAC;gBAE9D,QAAQ,GAAG,IAAI,+BAAc,CACzB,SAAS,EACT,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,eAAe,CAClB,CAAC;gBAEF,MAAM,aAAa,CAAC,wCAAwC,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;YAC3F,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACnB,MAAM,UAAU,GAAgB,EAAE,CAAC;QACnC,IAAI,MAAkC,CAAC;QACvC,IAAI,gBAA6D,CAAC;QAElE,UAAU,CAAC,GAAG,EAAE;YACZ,MAAM,GAAG,IAAI,cAAc,CAAC;gBACxB,KAAK,CAAC,UAAU;oBACZ,gBAAgB,GAAG,UAAU,CAAC;gBAClC,CAAC;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YACnD,eAAe,CAAC,KAAK,EAAE,CAAC;YACxB,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YACnD,gBAAgB,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,gCAAe,CAAC,CAAC,CAAC;YAC1D,gBAAgB,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,gCAAe,CAAC,CAAC,CAAC;YAC1D,gBAAgB,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,gCAAe,CAAC,CAAC,CAAC;YAC1D,eAAe,CAAC,KAAK,EAAE,CAAC;YACxB,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YAC/C,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK;gBACvD,eAAe,CAAC,KAAK,EAAE,CAAC;YAC5B,CAAC,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YACnD,gBAAgB,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,gCAAe,CAAC,CAAC,CAAC;YAE1D,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"streamUploader.test.js","sourceRoot":"","sources":["../../../src/internal/upload/streamUploader.test.ts"],"names":[],"mappings":"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"}
|
package/dist/internal/utils.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function mergeUint8Arrays(arrays: Uint8Array[]): Uint8Array
|
|
1
|
+
export declare function mergeUint8Arrays(arrays: Uint8Array[]): Uint8Array<ArrayBuffer>;
|
|
@@ -508,6 +508,14 @@ export declare class ProtonDriveClient {
|
|
|
508
508
|
* @returns An async generator of devices.
|
|
509
509
|
*/
|
|
510
510
|
iterateDevices(signal?: AbortSignal): AsyncGenerator<Device>;
|
|
511
|
+
/**
|
|
512
|
+
* Get the device entity by its UID.
|
|
513
|
+
*
|
|
514
|
+
* @param deviceOrUid - Device entity or its UID string.
|
|
515
|
+
* @returns The device entity.
|
|
516
|
+
* @throws {@link ValidationError} If the device is not found.
|
|
517
|
+
*/
|
|
518
|
+
getDevice(deviceOrUid: DeviceOrUid): Promise<Device>;
|
|
511
519
|
/**
|
|
512
520
|
* Creates a new device.
|
|
513
521
|
*
|