@protontech/drive-sdk 0.10.0 → 0.11.0

package/dist/internal/photos/photosTransferPayloadBuilder.test.js

@@ -0,0 +1,289 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const errors_1 = require("../../errors");
+const interface_1 = require("../../interface");
+const photosTransferPayloadBuilder_1 = require("./photosTransferPayloadBuilder");
+/**
+ * Helper to create a mock photo node with minimal required properties.
+ */
+function createMockPhotoNode(uid, overrides = {}) {
+    return {
+        uid,
+        parentUid: 'volume1~parent',
+        hash: 'hash',
+        name: (0, interface_1.resultOk)('photo.jpg'),
+        photo: {
+            captureTime: new Date(),
+            mainPhotoNodeUid: undefined,
+            relatedPhotoNodeUids: [],
+            tags: [],
+            albums: [],
+        },
+        activeRevision: {
+            ok: true,
+            value: {
+                uid: 'rev1',
+                state: 'active',
+                creationTime: new Date(),
+                storageSize: 100,
+                signatureEmail: 'test@example.com',
+                claimedModificationTime: new Date(),
+                claimedSize: 100,
+                claimedDigests: { sha1: 'sha1hash' },
+                claimedBlockSizes: [100],
+            },
+        },
+        keyAuthor: { ok: true, value: 'test@example.com' },
+        ...overrides,
+    };
+}
+describe('PhotoTransferPayloadBuilder', () => {
+    let cryptoService;
+    let nodesService;
+    let targetKeys;
+    let signingKeys;
+    let builder;
+    beforeEach(() => {
+        targetKeys = {
+            key: 'targetKey',
+            hashKey: new Uint8Array([1, 2, 3]),
+        };
+        signingKeys = {
+            type: 'userAddress',
+            email: 'test@example.com',
+            addressId: 'addressId',
+            key: 'signingKey',
+        };
+        // @ts-expect-error Mocking for testing purposes
+        cryptoService = {
+            encryptPhotoForAlbum: jest.fn(),
+        };
+        // @ts-expect-error Mocking for testing purposes
+        nodesService = {
+            iterateNodes: jest.fn(),
+            getNodePrivateAndSessionKeys: jest.fn(),
+        };
+        builder = new photosTransferPayloadBuilder_1.PhotoTransferPayloadBuilder(cryptoService, nodesService);
+    });
+    describe('preparePhotoPayloads', () => {
+        beforeEach(() => {
+            nodesService.iterateNodes.mockImplementation(async function* (uids) {
+                for (const uid of uids) {
+                    if (uid === 'volume1~missing') {
+                        yield { missingUid: uid };
+                        continue;
+                    }
+                    const photoNode = createMockPhotoNode(uid);
+                    // Handle uids in the form 'volumeId~mainPhoto-related:N' where N is the number of related photos
+                    const relatedMatch = /^(.+)~(.+)-related:(\d+)$/.exec(uid);
+                    if (relatedMatch) {
+                        const [, volumeId, , countStr] = relatedMatch;
+                        const count = parseInt(countStr, 10);
+                        photoNode.photo.relatedPhotoNodeUids = Array.from({ length: count }, (_, idx) => `${volumeId}~related${idx + 1}`);
+                    }
+                    yield photoNode;
+                }
+            });
+            nodesService.getNodePrivateAndSessionKeys.mockResolvedValue({
+                key: 'nodeKey',
+                nameSessionKey: 'sessionKey',
+                passphrase: 'passphrase',
+                passphraseSessionKey: 'passphraseSessionKey',
+            });
+            cryptoService.encryptPhotoForAlbum.mockResolvedValue({
+                contentHash: 'contentHash',
+                hash: 'nameHash',
+                encryptedName: 'encryptedName',
+                nameSignatureEmail: 'test@example.com',
+                armoredNodePassphrase: 'passphrase',
+                armoredNodePassphraseSignature: 'signature',
+                signatureEmail: 'test@example.com',
+            });
+        });
+        it('should return payloads and empty errors for a single photo without related photos', async () => {
+            const items = [{ photoNodeUid: 'volume1~photo1' }];
+            const result = await builder.preparePhotoPayloads(items, 'volume1~root', targetKeys, signingKeys);
+            expect(result).toMatchObject({
+                payloads: [{
+                        nodeUid: 'volume1~photo1',
+                        contentHash: 'contentHash',
+                        nameHash: 'nameHash',
+                        encryptedName: 'encryptedName',
+                        nameSignatureEmail: 'test@example.com',
+                        nodePassphrase: 'passphrase',
+                        relatedPhotos: [],
+                    }],
+                errors: new Map(),
+            });
+            expect(nodesService.iterateNodes).toHaveBeenCalledWith(['volume1~photo1'], undefined);
+            expect(nodesService.getNodePrivateAndSessionKeys).toHaveBeenCalledWith('volume1~photo1');
+            expect(cryptoService.encryptPhotoForAlbum).toHaveBeenCalledTimes(1);
+        });
+        it('should include related photos in payload when photo has relatedPhotoNodeUids', async () => {
+            const items = [{ photoNodeUid: 'volume1~mainPhoto-related:3' }];
+            const result = await builder.preparePhotoPayloads(items, 'volume1~root', targetKeys, signingKeys);
+            expect(result).toMatchObject({
+                payloads: [{
+                        nodeUid: 'volume1~mainPhoto-related:3',
+                        contentHash: 'contentHash',
+                        nameHash: 'nameHash',
+                        encryptedName: 'encryptedName',
+                        nameSignatureEmail: 'test@example.com',
+                        nodePassphrase: 'passphrase',
+                        relatedPhotos: [{
+                                nodeUid: 'volume1~related1',
+                                contentHash: 'contentHash',
+                                nameHash: 'nameHash',
+                                encryptedName: 'encryptedName',
+                                nameSignatureEmail: 'test@example.com',
+                                nodePassphrase: 'passphrase',
+                            }, {
+                                nodeUid: 'volume1~related2',
+                                contentHash: 'contentHash',
+                                nameHash: 'nameHash',
+                                encryptedName: 'encryptedName',
+                                nameSignatureEmail: 'test@example.com',
+                                nodePassphrase: 'passphrase',
+                            }, {
+                                nodeUid: 'volume1~related3',
+                                contentHash: 'contentHash',
+                                nameHash: 'nameHash',
+                                encryptedName: 'encryptedName',
+                                nameSignatureEmail: 'test@example.com',
+                                nodePassphrase: 'passphrase',
+                            }],
+                    }],
+                errors: new Map(),
+            });
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(2);
+            expect(nodesService.iterateNodes).toHaveBeenNthCalledWith(1, ['volume1~mainPhoto-related:3'], undefined);
+            expect(nodesService.iterateNodes).toHaveBeenNthCalledWith(2, ['volume1~related1', 'volume1~related2', 'volume1~related3'], undefined);
+            expect(cryptoService.encryptPhotoForAlbum).toHaveBeenCalledTimes(4);
+        });
+        it('should merge additionalRelatedPhotoNodeUids with photo relatedPhotoNodeUids', async () => {
+            const items = [
+                {
+                    photoNodeUid: 'volume1~photo1',
+                    additionalRelatedPhotoNodeUids: ['volume1~extraRelated1'],
+                },
+            ];
+            const result = await builder.preparePhotoPayloads(items, 'volume1~root', targetKeys, signingKeys);
+            expect(result).toMatchObject({
+                payloads: [{
+                        nodeUid: 'volume1~photo1',
+                        contentHash: 'contentHash',
+                        nameHash: 'nameHash',
+                        encryptedName: 'encryptedName',
+                        nameSignatureEmail: 'test@example.com',
+                        nodePassphrase: 'passphrase',
+                        relatedPhotos: [{
+                                nodeUid: 'volume1~extraRelated1',
+                                contentHash: 'contentHash',
+                                nameHash: 'nameHash',
+                                encryptedName: 'encryptedName',
+                                nameSignatureEmail: 'test@example.com',
+                                nodePassphrase: 'passphrase',
+                            }],
+                    }],
+                errors: new Map(),
+            });
+        });
+        it('should put missing node UIDs in errors with ValidationError', async () => {
+            const items = [
+                { photoNodeUid: 'volume1~photo1' },
+                { photoNodeUid: 'volume1~missing' },
+            ];
+            const result = await builder.preparePhotoPayloads(items, 'volume1~root', targetKeys, signingKeys);
+            expect(result).toMatchObject({
+                payloads: [{
+                        nodeUid: 'volume1~photo1',
+                        contentHash: 'contentHash',
+                        nameHash: 'nameHash',
+                        encryptedName: 'encryptedName',
+                        nameSignatureEmail: 'test@example.com',
+                        nodePassphrase: 'passphrase',
+                        relatedPhotos: [],
+                    }],
+                errors: new Map([['volume1~missing', new errors_1.ValidationError('Photo not found')]]),
+            });
+        });
+        it('should throw when targetKeys.hashKey is missing', async () => {
+            const items = [{ photoNodeUid: 'volume1~photo1' }];
+            const keysWithoutHashKey = { ...targetKeys, hashKey: undefined };
+            await expect(builder.preparePhotoPayloads(items, 'volume1~root', keysWithoutHashKey, signingKeys)).rejects.toThrow('Target hash key is required to build photo payloads');
+            expect(nodesService.iterateNodes).not.toHaveBeenCalled();
+        });
+        it('should put error in errors map when encryptPhotoForAlbum fails', async () => {
+            const items = [{ photoNodeUid: 'volume1~photo1' }];
+            const cryptoError = new Error('Crypto operation failed');
+            cryptoService.encryptPhotoForAlbum.mockRejectedValue(cryptoError);
+            const result = await builder.preparePhotoPayloads(items, 'volume1~root', targetKeys, signingKeys);
+            expect(result).toMatchObject({
+                payloads: [],
+                errors: new Map([['volume1~photo1', cryptoError]]),
+            });
+        });
+        it('should put error in errors map when getNodePrivateAndSessionKeys fails', async () => {
+            const items = [{ photoNodeUid: 'volume1~photo1' }];
+            const keysError = new Error('Failed to get keys');
+            nodesService.getNodePrivateAndSessionKeys.mockRejectedValue(keysError);
+            const result = await builder.preparePhotoPayloads(items, 'volume1~root', targetKeys, signingKeys);
+            expect(result).toMatchObject({
+                payloads: [],
+                errors: new Map([['volume1~photo1', keysError]]),
+            });
+        });
+        it('should put error in errors map when photo has no content hash', async () => {
+            const items = [{ photoNodeUid: 'volume1~photo1' }];
+            nodesService.iterateNodes.mockImplementation(async function* (uids) {
+                const node = createMockPhotoNode(uids[0]);
+                node.activeRevision = { ok: true, value: { ...node.activeRevision.value, claimedDigests: {} } };
+                yield node;
+            });
+            const result = await builder.preparePhotoPayloads(items, 'volume1~root', targetKeys, signingKeys);
+            expect(result).toMatchObject({
+                payloads: [],
+                errors: new Map([['volume1~photo1', new Error('Cannot build photo payload without a content hash')]]),
+            });
+        });
+        it('should include signatureEmail and nodePassphraseSignature only for anonymous key author', async () => {
+            const items = [{ photoNodeUid: 'volume1~anonymous' }, { photoNodeUid: 'volume1~signed' }];
+            nodesService.iterateNodes.mockImplementation(async function* (uids) {
+                for (const uid of uids) {
+                    const node = createMockPhotoNode(uid);
+                    if (uid === 'volume1~anonymous') {
+                        node.keyAuthor = { ok: true, value: null };
+                    }
+                    else {
+                        node.keyAuthor = { ok: true, value: 'test@example.com' };
+                    }
+                    yield node;
+                }
+            });
+            const result = await builder.preparePhotoPayloads(items, 'volume1~root', targetKeys, signingKeys);
+            expect(result).toMatchObject({
+                payloads: [{
+                        nodeUid: 'volume1~anonymous',
+                        contentHash: 'contentHash',
+                        nameHash: 'nameHash',
+                        encryptedName: 'encryptedName',
+                        nameSignatureEmail: 'test@example.com',
+                        nodePassphrase: 'passphrase',
+                        signatureEmail: 'test@example.com',
+                        nodePassphraseSignature: 'signature',
+                        relatedPhotos: [],
+                    }, {
+                        nodeUid: 'volume1~signed',
+                        contentHash: 'contentHash',
+                        nameHash: 'nameHash',
+                        encryptedName: 'encryptedName',
+                        nameSignatureEmail: 'test@example.com',
+                        nodePassphrase: 'passphrase',
+                        relatedPhotos: [],
+                    }],
+                errors: new Map(),
+            });
+        });
+    });
+});
+//# sourceMappingURL=photosTransferPayloadBuilder.test.js.map

package/dist/internal/photos/photosTransferPayloadBuilder.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"photosTransferPayloadBuilder.test.js","sourceRoot":"","sources":["../../../src/internal/photos/photosTransferPayloadBuilder.test.ts"],"names":[],"mappings":"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"}

package/dist/internal/photos/upload.js

@@ -46,7 +46,7 @@ class PhotoStreamUploader extends streamUploader_1.StreamUploader {
             blockSizes: this.uploadedBlockSizes,
             digests,
         };
-        await this.photoUploadManager.commitDraftPhoto(this.revisionDraft, this.manifest, extendedAttributes, this.photoMetadata);
+        await this.photoUploadManager.commitDraftPhoto(this.revisionDraft, await this.getManifest(), extendedAttributes, this.photoMetadata);
     }
 }
 exports.PhotoStreamUploader = PhotoStreamUploader;

package/dist/internal/photos/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/internal/photos/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/internal/photos/upload.ts"],"names":[],"mappings":";;;AAGA,oCAA0D;AAC1D,kCAA+C;AAC/C,qDAAwD;AAGxD,2DAA8D;AAC9D,yDAAsD;AAEtD,+CAAkD;AAClD,6DAA0D;AAiB1D,MAAa,iBAAkB,SAAQ,2BAAY;IACvC,eAAe,CAAwB;IACvC,YAAY,CAAqB;IACjC,aAAa,CAAsB;IAE3C,YACI,SAA0B,EAC1B,UAAiC,EACjC,aAAkC,EAClC,OAA2B,EAC3B,eAAuB,EACvB,IAAY,EACZ,QAA6B,EAC7B,QAAoB,EACpB,MAAoB;QAEpB,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACxG,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAC5B,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC;IAClC,CAAC;IAES,KAAK,CAAC,iBAAiB,CAC7B,aAA4B,EAC5B,aAAgC,EAChC,QAA6C;QAE7C,OAAO,IAAI,mBAAmB,CAC1B,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,YAAY,EACjB,aAAa,EACb,aAAa,EACb,IAAI,CAAC,aAAa,EAClB,QAAQ,EACR,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,CACd,CAAC;IACN,CAAC;CACJ;AAxCD,8CAwCC;AAED,MAAa,mBAAoB,SAAQ,+BAAc;IAC3C,kBAAkB,CAAqB;IACvC,aAAa,CAAsB;IAE3C,YACI,SAA0B,EAC1B,UAAiC,EACjC,aAAkC,EAClC,aAAiC,EACjC,aAA4B,EAC5B,aAAgC,EAChC,QAA6B,EAC7B,QAA6C,EAC7C,UAA4B,EAC5B,MAAoB;QAEpB,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;gBAClC,eAAe,CAAC,KAAK,EAAE,CAAC;YAC5B,CAAC,CAAC,CAAC;QACP,CAAC;QAED,KAAK,CACD,SAAS,EACT,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,eAAe,CAClB,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,aAAa,CAAC;QACxC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,UAAuB;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACvC,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE1C,MAAM,kBAAkB,GAAG;YACvB,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,gBAAgB;YAChD,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;YAChC,UAAU,EAAE,IAAI,CAAC,kBAAkB;YACnC,OAAO;SACV,CAAC;QAEF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAC1C,IAAI,CAAC,aAAa,EAClB,MAAM,IAAI,CAAC,WAAW,EAAE,EACxB,kBAAkB,EAClB,IAAI,CAAC,aAAa,CACrB,CAAC;IACN,CAAC;CACJ;AAzDD,kDAyDC;AAED,MAAa,kBAAmB,SAAQ,uBAAa;IACzC,eAAe,CAAwB;IACvC,kBAAkB,CAA2B;IAErD,YACI,SAA+B,EAC/B,UAAiC,EACjC,aAAuC,EACvC,YAA0B,EAC1B,SAA6B;QAE7B,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC;QAClC,IAAI,CAAC,kBAAkB,GAAG,aAAa,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,iBAAoC,EACpC,QAAiC,EACjC,kBAOC,EACD,cAAmC;QAEnC,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACtE,CAAC;QAED,4FAA4F;QAC5F,MAAM,2BAA2B,GAAG,IAAA,sCAA8B,EAAC,kBAAkB,EAAE,cAAc,CAAC,kBAAkB,CAAC,CAAC;QAC1H,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CACxD,iBAAiB,CAAC,QAAQ,EAC1B,QAAQ,EACR,2BAA2B,CAC9B,CAAC;QAEF,MAAM,IAAI,GAAG,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC;QAC7C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACvH,MAAM,KAAK,GAAG;YACV,WAAW;YACX,WAAW,EAAE,cAAc,CAAC,WAAW,IAAI,kBAAkB,CAAC,gBAAgB;YAC9E,eAAe,EAAE,cAAc,CAAC,eAAe;YAC/C,IAAI,EAAE,cAAc,CAAC,IAAI;SAC5B,CAAA;QACD,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,eAAe,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACxG,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IACrD,CAAC;CACJ;AApDD,gDAoDC;AAED,MAAa,wBAAyB,SAAQ,mCAAmB;IAC7D,YACI,WAAwB,EACxB,YAA0B;QAE1B,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAY,EAAE,aAAsC;QAC1E,OAAO,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACpE,CAAC;CACJ;AAXD,4DAWC;AAED,MAAa,qBAAsB,SAAQ,6BAAgB;IACvD,YAAY,UAA2B,EAAE,SAA6B;QAClE,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,oBAA4B,EAC5B,OAIC,EACD,KAMC;QAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,2BAAoB,EAAC,oBAAoB,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAIvB,oBAAoB,QAAQ,UAAU,MAAM,cAAc,UAAU,EAAE,EAAE;YACtE,iBAAiB,EAAE,OAAO,CAAC,wBAAwB;YACnD,gBAAgB,EAAE,OAAO,CAAC,cAAc;YACxC,KAAK,EAAE,OAAO,CAAC,yBAAyB,IAAI,IAAI;YAChD,KAAK,EAAE;gBACH,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpF,eAAe,EAAE,KAAK,CAAC,eAAe,IAAI,IAAI;gBAC9C,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE;gBACtB,IAAI,EAAE,IAAI,EAAE,8BAA8B;aAC7C;SACJ,CAAC,CAAC;IACP,CAAC;CACJ;AAtCD,sDAsCC"}

package/dist/internal/upload/apiService.d.ts

@@ -34,15 +34,11 @@ export declare class UploadAPIService {
     requestBlockUpload(draftNodeRevisionUid: string, addressId: string | AnonymousUser, blocks: {
         contentBlocks: {
             index: number;
-            hash: Uint8Array<ArrayBuffer>;
-            encryptedSize: number;
             armoredSignature: string;
             verificationToken: Uint8Array<ArrayBuffer>;
         }[];
         thumbnails?: {
             type: ThumbnailType;
-            hash: Uint8Array<ArrayBuffer>;
-            encryptedSize: number;
         }[];
     }): Promise<UploadTokens>;
     commitDraftRevision(draftNodeRevisionUid: string, options: {

package/dist/internal/upload/apiService.js

@@ -73,16 +73,12 @@ class UploadAPIService {
             RevisionID: revisionId,
             BlockList: blocks.contentBlocks.map((block) => ({
                 Index: block.index,
-                Hash: (0, crypto_1.uint8ArrayToBase64String)(block.hash),
                 EncSignature: block.armoredSignature,
-                Size: block.encryptedSize,
                 Verifier: {
                     Token: (0, crypto_1.uint8ArrayToBase64String)(block.verificationToken),
                 },
             })),
             ThumbnailList: (blocks.thumbnails || []).map((block) => ({
-                Hash: (0, crypto_1.uint8ArrayToBase64String)(block.hash),
-                Size: block.encryptedSize,
                 Type: block.type,
             })),
         });

package/dist/internal/upload/apiService.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,yCAAkF;AAElF,8CAAoF;AACpF,kCAA+F;AAiD/F,MAAa,gBAAgB;IAEX;IACA;IAFd,YACc,UAA2B,EAC3B,SAA6B;QAD7B,eAAU,GAAV,UAAU,CAAiB;QAC3B,cAAS,GAAT,SAAS,CAAoB;QAEvC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,WAAW,CACb,aAAqB,EACrB,IAWC;QAKD,6DAA6D;QAC7D,oEAAoE;QACpE,sEAAsE;QACtE,gEAAgE;QAChE,qDAAqD;QACrD,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,QAAQ;QACnC,MAAM,kBAAkB,GACpB,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,kBAAkB,GAAG,SAAS;YAC1D,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC,GAAG,SAAS;YAC7D,CAAC,CAAC,IAAI,CAAC;QAEf,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,mBAAY,EAAC,aAAa,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACrC,oBAAoB,QAAQ,QAAQ,EACpC;YACI,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,IAAI,CAAC,oBAAoB;YAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI;YACjC,kBAAkB,EAAE,kBAAkB;YACtC,OAAO,EAAE,IAAI,CAAC,cAAc;YAC5B,cAAc,EAAE,IAAI,CAAC,qBAAqB;YAC1C,uBAAuB,EAAE,IAAI,CAAC,8BAA8B;YAC5D,gBAAgB,EAAE,IAAI,CAAC,sBAAsB;YAC7C,yBAAyB,EAAE,IAAI,CAAC,gCAAgC;YAChE,gBAAgB,EAAE,IAAI,CAAC,cAAc;SACxC,CACJ,CAAC;QAEF,OAAO;YACH,OAAO,EAAE,IAAA,kBAAW,EAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9C,eAAe,EAAE,IAAA,0BAAmB,EAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;SACzF,CAAC;IACN,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,OAAe,EACf,QAGC;QAID,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,IAAA,2BAAoB,EAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAE5F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACrC,oBAAoB,QAAQ,UAAU,MAAM,YAAY,EACxD;YACI,iBAAiB,EAAE,iBAAiB;YACpC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI;YACjC,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB,IAAI,IAAI;SAC1D,CACJ,CAAC;QAEF,OAAO;YACH,eAAe,EAAE,IAAA,0BAAmB,EAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;SAC7E,CAAC;IACN,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,oBAA4B;QAIlD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,2BAAoB,EAAC,oBAAoB,CAAC,CAAC;QACpF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CACpC,oBAAoB,QAAQ,UAAU,MAAM,cAAc,UAAU,eAAe,CACtF,CAAC;QAEF,OAAO;YACH,gBAAgB,EAAE,IAAA,iCAAwB,EAAC,MAAM,CAAC,gBAAgB,CAAC;YACnE,sBAAsB,EAAE,MAAM,CAAC,gBAAgB;SAClD,CAAC;IACN,CAAC;IAED,KAAK,CAAC,kBAAkB,CACpB,oBAA4B,EAC5B,SAAiC,EACjC,MASC;QAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,2BAAoB,EAAC,oBAAoB,CAAC,CAAC;QACpF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAUvC,cAAc,EAAE;YACd,SAAS,EAAE,SAAS;YACpB,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC5C,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,YAAY,EAAE,KAAK,CAAC,gBAAgB;gBACpC,QAAQ,EAAE;oBACN,KAAK,EAAE,IAAA,iCAAwB,EAAC,KAAK,CAAC,iBAAiB,CAAC;iBAC3D;aACJ,CAAC,CAAC;YACH,aAAa,EAAE,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACrD,IAAI,EAAE,KAAK,CAAC,IAAI;aACnB,CAAC,CAAC;SACN,CAAC,CAAC;QAEH,OAAO;YACH,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC3C,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC,CAAC;YACH,eAAe,EAAE,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1D,+EAA+E;gBAC/E,IAAI,EAAE,IAAI,CAAC,aAA8B;gBACzC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC,CAAC;SACN,CAAC;IACN,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,oBAA4B,EAC5B,OAIC;QAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,2BAAoB,EAAC,oBAAoB,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAIvB,oBAAoB,QAAQ,UAAU,MAAM,cAAc,UAAU,EAAE,EAAE;YACtE,iBAAiB,EAAE,OAAO,CAAC,wBAAwB;YACnD,gBAAgB,EAAE,OAAO,CAAC,cAAc;YACxC,KAAK,EAAE,OAAO,CAAC,yBAAyB,IAAI,IAAI;YAChD,KAAK,EAAE,IAAI,EAAE,4CAA4C;SAC5D,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,YAAoB;QAClC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAA,mBAAY,EAAC,YAAY,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACvC,oBAAoB,QAAQ,kBAAkB,EAC9C;YACI,OAAO,EAAE,CAAC,MAAM,CAAC;SACpB,CACJ,CAAC;QAEF,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;YAClB,MAAM,IAAI,yBAAY,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,iBAAiB,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,oBAA4B;QAClD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,2BAAoB,EAAC,oBAAoB,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,qBAAqB,QAAQ,UAAU,MAAM,cAAc,UAAU,EAAE,CAAC,CAAC;IAC1G,CAAC;IAED,KAAK,CAAC,WAAW,CACb,GAAW,EACX,KAAa,EACb,KAA8B,EAC9B,UAA4C,EAC5C,MAAoB;QAEpB,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAChC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAEpD,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,eAAuB;QAC5C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,2BAAoB,EAAC,eAAe,CAAC,CAAC;QAC/E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACrC,oBAAoB,QAAQ,QAAQ,EACpC;YACI,OAAO,EAAE,CAAC,MAAM,CAAC;SACpB,CACJ,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7B,OAAO,CACH,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,eAAe;YACxC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,KAAK,UAAU,CACvD,CAAC;IACN,CAAC;CACJ;AAzOD,4CAyOC"}

package/dist/internal/upload/cryptoService.js

@@ -68,18 +68,18 @@ class UploadCryptoService {
     }
     async encryptThumbnail(nodeRevisionDraftKeys, thumbnail) {
         const { encryptedData } = await this.driveCrypto.encryptThumbnailBlock(thumbnail.thumbnail, nodeRevisionDraftKeys.contentKeyPacketSessionKey, nodeRevisionDraftKeys.signingKeys.contentSigningKey);
-        const digest = await crypto.subtle.digest('SHA-256', encryptedData);
+        const digestPromise = crypto.subtle.digest('SHA-256', encryptedData);
         return {
             type: thumbnail.type,
             encryptedData: encryptedData,
             originalSize: thumbnail.thumbnail.length,
             encryptedSize: encryptedData.length,
-            hash: new Uint8Array(digest),
+            hashPromise: digestPromise.then((digest) => new Uint8Array(digest)),
         };
     }
     async encryptBlock(verifyBlock, nodeRevisionDraftKeys, block, index) {
         const { encryptedData, armoredSignature } = await this.driveCrypto.encryptBlock(block, nodeRevisionDraftKeys.key, nodeRevisionDraftKeys.contentKeyPacketSessionKey, nodeRevisionDraftKeys.signingKeys.contentSigningKey);
-        const digest = await crypto.subtle.digest('SHA-256', encryptedData);
+        const digestPromise = crypto.subtle.digest('SHA-256', encryptedData);
         const { verificationToken } = await verifyBlock(encryptedData);
         return {
             index,
@@ -88,7 +88,7 @@ class UploadCryptoService {
             verificationToken,
             originalSize: block.length,
             encryptedSize: encryptedData.length,
-            hash: new Uint8Array(digest),
+            hashPromise: digestPromise.then((digest) => new Uint8Array(digest)),
         };
     }
     async commitFile(nodeRevisionDraftKeys, manifest, extendedAttributes) {

package/dist/internal/upload/cryptoService.js.map

@@ -1 +1 @@
-{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/upload/cryptoService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/upload/cryptoService.ts"],"names":[],"mappings":"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"}

package/dist/internal/upload/interface.d.ts

@@ -57,7 +57,7 @@ export type NodeCryptoSigningKeys = {
 export type EncryptedBlockMetadata = {
     encryptedSize: number;
     originalSize: number;
-    hash: Uint8Array<ArrayBuffer>;
+    hashPromise: Promise<Uint8Array<ArrayBuffer>>;
 };
 export type EncryptedBlock = EncryptedBlockMetadata & {
     index: number;

package/dist/internal/upload/streamUploader.d.ts

@@ -76,7 +76,7 @@ export declare class StreamUploader {
     private get uploadedBlockCount();
     private get uploadedOriginalFileSize();
     protected get uploadedBlockSizes(): number[];
-    protected get manifest(): Uint8Array<ArrayBuffer>;
+    protected getManifest(): Promise<Uint8Array<ArrayBuffer>>;
     private abortUpload;
     private get isUploadAborted();
 }

package/dist/internal/upload/streamUploader.js

@@ -97,7 +97,9 @@ class StreamUploader {
             this.logger.info(`Starting upload`);
             await this.encryptAndUploadBlocks(stream, thumbnails, (uploadedBytes) => {
                 fileProgress += uploadedBytes;
-                onProgress?.(fileProgress);
+                if (!failure) {
+                    onProgress?.(fileProgress);
+                }
             });
             this.logger.debug(`All blocks uploaded, committing`);
             await this.commitFile(thumbnails);
@@ -182,7 +184,7 @@ class StreamUploader {
             blockSizes: this.uploadedBlockSizes,
             digests,
         };
-        await this.uploadManager.commitDraft(this.revisionDraft, this.manifest, extendedAttributes, this.metadata.additionalMetadata);
+        await this.uploadManager.commitDraft(this.revisionDraft, await this.getManifest(), extendedAttributes, this.metadata.additionalMetadata);
     }
     async encryptThumbnails(thumbnails) {
         if (new Set(thumbnails.map(({ type }) => type)).size !== thumbnails.length) {
@@ -252,15 +254,11 @@ class StreamUploader {
         const uploadTokens = await this.apiService.requestBlockUpload(this.revisionDraft.nodeRevisionUid, this.revisionDraft.nodeKeys.signingKeys.addressId, {
             contentBlocks: Array.from(this.encryptedBlocks.values().map((block) => ({
                 index: block.index,
-                encryptedSize: block.encryptedSize,
-                hash: block.hash,
                 armoredSignature: block.armoredSignature,
                 verificationToken: block.verificationToken,
             }))),
             thumbnails: Array.from(this.encryptedThumbnails.values().map((block) => ({
                 type: block.type,
-                encryptedSize: block.encryptedSize,
-                hash: block.hash,
             }))),
         });
         // If the upload was aborted while requesting next upload tokens,
@@ -317,7 +315,7 @@ class StreamUploader {
                 }, this.abortController.signal);
                 this.uploadedThumbnails.push({
                     type: encryptedThumbnail.type,
-                    hash: encryptedThumbnail.hash,
+                    hashPromise: encryptedThumbnail.hashPromise,
                     encryptedSize: encryptedThumbnail.encryptedSize,
                     originalSize: encryptedThumbnail.originalSize,
                 });
@@ -358,6 +356,9 @@ class StreamUploader {
         let blockProgress = 0;
         let attempt = 0;
         while (true) {
+            if (this.isUploadAborted) {
+                throw this.error || new errors_1.AbortError();
+            }
             attempt++;
             try {
                 logger.debug(`Uploading`);
@@ -367,7 +368,7 @@ class StreamUploader {
                 }, this.abortController.signal);
                 this.uploadedBlocks.push({
                     index: encryptedBlock.index,
-                    hash: encryptedBlock.hash,
+                    hashPromise: encryptedBlock.hashPromise,
                     encryptedSize: encryptedBlock.encryptedSize,
                     originalSize: encryptedBlock.originalSize,
                 });
@@ -395,8 +396,6 @@ class StreamUploader {
                         contentBlocks: [
                             {
                                 index: encryptedBlock.index,
-                                encryptedSize: encryptedBlock.encryptedSize,
-                                hash: encryptedBlock.hash,
                                 armoredSignature: encryptedBlock.armoredSignature,
                                 verificationToken: encryptedBlock.verificationToken,
                             },
@@ -508,12 +507,12 @@ class StreamUploader {
         uploadedBlocks.sort((a, b) => a.index - b.index);
         return uploadedBlocks.map((block) => block.originalSize);
     }
-    get manifest() {
+    async getManifest() {
         this.uploadedThumbnails.sort((a, b) => a.type - b.type);
         this.uploadedBlocks.sort((a, b) => a.index - b.index);
         const hashes = [
-            ...this.uploadedThumbnails.map(({ hash }) => hash),
-            ...this.uploadedBlocks.map(({ hash }) => hash),
+            ...(await Promise.all(this.uploadedThumbnails.map(({ hashPromise }) => hashPromise))),
+            ...(await Promise.all(this.uploadedBlocks.map(({ hashPromise }) => hashPromise))),
         ];
         return (0, utils_1.mergeUint8Arrays)(hashes);
     }