@protontech/drive-sdk 0.0.11 → 0.0.13

package/dist/internal/upload/fileUploader.test.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const interface_1 = require("../../interface");
-const apiService_1 = require("../apiService");
 const fileUploader_1 = require("./fileUploader");
 const controller_1 = require("./controller");
-const errors_1 = require("../../errors");
 const BLOCK_ENCRYPTION_OVERHEAD = 10000;
 async function mockEncryptBlock(verifyBlock, _, block, index) {
     await verifyBlock(block);
@@ -33,6 +30,7 @@ describe('FileUploader', () => {
     let onFinish;
     let abortController;
     let uploader;
+    let startUploadSpy;
     beforeEach(() => {
         // @ts-expect-error No need to implement all methods for mocking
         telemetry = {
@@ -87,306 +85,54 @@ describe('FileUploader', () => {
                 signatureAddress: { addressId: 'addressId' },
             },
         };
-        metadata = {
-            // 3 blocks: 4 + 4 + 2 MB
-            expectedSize: 10 * 1024 * 1024,
-        };
+        metadata = {};
         controller = new controller_1.UploadController();
         onFinish = jest.fn();
         abortController = new AbortController();
-        uploader = new fileUploader_1.Fileuploader(telemetry, apiService, cryptoService, uploadManager, blockVerifier, revisionDraft, metadata, onFinish, abortController.signal);
+        uploader = new fileUploader_1.FileUploader(telemetry, apiService, cryptoService, uploadManager, 'parentFolderUid', 'name', metadata, onFinish, abortController.signal);
+        startUploadSpy = jest.spyOn(uploader, 'startUpload').mockReturnValue(Promise.resolve('revisionUid'));
     });
     describe('writeFile', () => {
-        it('should set modification time if not set', () => {
-            // @ts-expect-error Ignore mocking File
-            const file = {
-                lastModified: 123456789,
-                stream: jest.fn().mockReturnValue('stream'),
-            };
-            const thumbnails = [];
-            const onProgress = jest.fn();
-            const writeStreamSpy = jest.spyOn(uploader, 'writeStream').mockReturnValue(controller);
-            uploader.writeFile(file, thumbnails, onProgress);
+        // @ts-expect-error Ignore mocking File
+        const file = {
+            type: 'image/png',
+            size: 1000,
+            lastModified: 123456789,
+            stream: jest.fn().mockReturnValue('stream'),
+        };
+        const thumbnails = [];
+        const onProgress = jest.fn();
+        it('should set media type if not set', async () => {
+            await uploader.writeFile(file, thumbnails, onProgress);
+            expect(metadata.mediaType).toEqual('image/png');
+            expect(startUploadSpy).toHaveBeenCalledWith('stream', thumbnails, onProgress);
+        });
+        it('should set expected size if not set', async () => {
+            await uploader.writeFile(file, thumbnails, onProgress);
+            expect(metadata.expectedSize).toEqual(file.size);
+            expect(startUploadSpy).toHaveBeenCalledWith('stream', thumbnails, onProgress);
+        });
+        it('should set modification time if not set', async () => {
+            await uploader.writeFile(file, thumbnails, onProgress);
             expect(metadata.modificationTime).toEqual(new Date(123456789));
-            expect(writeStreamSpy).toHaveBeenCalledWith('stream', thumbnails, onProgress);
+            expect(startUploadSpy).toHaveBeenCalledWith('stream', thumbnails, onProgress);
+        });
+        it('should throw an error if upload already started', async () => {
+            await uploader.writeFile(file, thumbnails, onProgress);
+            await expect(uploader.writeFile(file, thumbnails, onProgress)).rejects.toThrow('Upload already started');
         });
     });
     describe('writeStream', () => {
-        let uploadStreamSpy;
-        beforeEach(() => {
-            uploadStreamSpy = jest.spyOn(uploader, 'uploadStream').mockResolvedValue('revisionUid');
-        });
-        it('should throw an error if upload already started', () => {
-            uploader.writeStream(new ReadableStream(), [], jest.fn());
-            expect(() => {
-                uploader.writeStream(new ReadableStream(), [], jest.fn());
-            }).toThrow('Upload already started');
-        });
+        const stream = new ReadableStream();
+        const thumbnails = [];
+        const onProgress = jest.fn();
         it('should start the upload process', async () => {
-            const stream = new ReadableStream();
-            const thumbnails = [];
-            const onProgress = jest.fn();
-            uploader.writeStream(stream, thumbnails, onProgress);
-            expect(uploadStreamSpy).toHaveBeenCalledWith(stream, thumbnails, onProgress);
-        });
-    });
-    describe('uploadStream', () => {
-        let thumbnails;
-        let thumbnailSize;
-        let onProgress;
-        let stream;
-        const verifySuccess = async () => {
-            const controller = uploader.writeStream(stream, thumbnails, onProgress);
-            await controller.completion();
-            const numberOfExpectedBlocks = Math.ceil(metadata.expectedSize / fileUploader_1.FILE_CHUNK_SIZE);
-            expect(uploadManager.commitDraft).toHaveBeenCalledTimes(1);
-            expect(uploadManager.commitDraft).toHaveBeenCalledWith(revisionDraft, expect.anything(), metadata, {
-                size: metadata.expectedSize,
-                blockSizes: metadata.expectedSize ? [
-                    ...Array(numberOfExpectedBlocks - 1).fill(fileUploader_1.FILE_CHUNK_SIZE),
-                    metadata.expectedSize % fileUploader_1.FILE_CHUNK_SIZE
-                ] : [],
-                modificationTime: undefined,
-                digests: {
-                    sha1: expect.anything(),
-                }
-            }, metadata.expectedSize + numberOfExpectedBlocks * BLOCK_ENCRYPTION_OVERHEAD);
-            expect(telemetry.uploadFinished).toHaveBeenCalledTimes(1);
-            expect(telemetry.uploadFinished).toHaveBeenCalledWith('revisionUid', metadata.expectedSize + thumbnailSize);
-            expect(telemetry.uploadFailed).not.toHaveBeenCalled();
-            expect(onFinish).toHaveBeenCalledTimes(1);
-            expect(onFinish).toHaveBeenCalledWith(false);
-        };
-        const verifyFailure = async (error, uploadedBytes, expectedSize = metadata.expectedSize) => {
-            const controller = uploader.writeStream(stream, thumbnails, onProgress);
-            await expect(controller.completion()).rejects.toThrow(error);
-            expect(telemetry.uploadFinished).not.toHaveBeenCalled();
-            expect(telemetry.uploadFailed).toHaveBeenCalledTimes(1);
-            expect(telemetry.uploadFailed).toHaveBeenCalledWith('revisionUid', new Error(error), uploadedBytes === undefined ? expect.anything() : uploadedBytes, expectedSize);
-            expect(onFinish).toHaveBeenCalledTimes(1);
-            expect(onFinish).toHaveBeenCalledWith(true);
-        };
-        const verifyOnProgress = async (uploadedBytes) => {
-            expect(onProgress).toHaveBeenCalledTimes(uploadedBytes.length);
-            for (let i = 0; i < uploadedBytes.length; i++) {
-                expect(onProgress).toHaveBeenNthCalledWith(i + 1, uploadedBytes[i]);
-            }
-        };
-        beforeEach(() => {
-            onProgress = jest.fn();
-            thumbnails = [
-                {
-                    type: interface_1.ThumbnailType.Type1,
-                    thumbnail: new Uint8Array(1024),
-                }
-            ];
-            thumbnailSize = thumbnails.reduce((acc, thumbnail) => acc + thumbnail.thumbnail.length, 0);
-            stream = new ReadableStream({
-                start(controller) {
-                    const chunkSize = 1024;
-                    const chunkCount = metadata.expectedSize / chunkSize;
-                    for (let i = 1; i <= chunkCount; i++) {
-                        controller.enqueue(new Uint8Array(chunkSize));
-                    }
-                    controller.close();
-                },
-            });
-        });
-        it("should upload successfully", async () => {
-            await verifySuccess();
-            expect(apiService.requestBlockUpload).toHaveBeenCalledTimes(1);
-            expect(apiService.uploadBlock).toHaveBeenCalledTimes(4); // 3 blocks + 1 thumbnail
-            expect(blockVerifier.verifyBlock).toHaveBeenCalledTimes(3); // 3 blocks
-            expect(telemetry.logBlockVerificationError).not.toHaveBeenCalled();
-            await verifyOnProgress([thumbnailSize, 4 * 1024 * 1024, 4 * 1024 * 1024, 2 * 1024 * 1024]);
-        });
-        it("should upload successfully empty file without thumbnail", async () => {
-            metadata = {
-                expectedSize: 0,
-            };
-            stream = new ReadableStream({
-                start(controller) {
-                    controller.close();
-                },
-            });
-            thumbnails = [];
-            thumbnailSize = 0;
-            uploader = new fileUploader_1.Fileuploader(telemetry, apiService, cryptoService, uploadManager, blockVerifier, revisionDraft, metadata, onFinish);
-            await verifySuccess();
-            expect(apiService.requestBlockUpload).toHaveBeenCalledTimes(0);
-            expect(apiService.uploadBlock).toHaveBeenCalledTimes(0);
-            expect(blockVerifier.verifyBlock).toHaveBeenCalledTimes(0);
-            await verifyOnProgress([]);
-        });
-        it("should upload successfully empty file with thumbnail", async () => {
-            metadata = {
-                expectedSize: 0,
-            };
-            stream = new ReadableStream({
-                start(controller) {
-                    controller.close();
-                },
-            });
-            uploader = new fileUploader_1.Fileuploader(telemetry, apiService, cryptoService, uploadManager, blockVerifier, revisionDraft, metadata, onFinish);
-            await verifySuccess();
-            expect(apiService.requestBlockUpload).toHaveBeenCalledTimes(1);
-            expect(apiService.uploadBlock).toHaveBeenCalledTimes(1);
-            expect(blockVerifier.verifyBlock).toHaveBeenCalledTimes(0);
-            await verifyOnProgress([thumbnailSize]);
-        });
-        it('should handle failure when encrypting thumbnails', async () => {
-            cryptoService.encryptThumbnail = jest.fn().mockImplementation(async function () {
-                throw new Error('Failed to encrypt thumbnail');
-            });
-            await verifyFailure('Failed to encrypt thumbnail', 0);
-            expect(cryptoService.encryptThumbnail).toHaveBeenCalledTimes(1);
-        });
-        it('should handle failure when encrypting block', async () => {
-            cryptoService.encryptBlock = jest.fn().mockImplementation(async function () {
-                throw new Error('Failed to encrypt block');
-            });
-            // Encrypting thumbnails is before blocks, thus it can be uploaded before failure.
-            await verifyFailure('Failed to encrypt block', 1024);
-            // 1 block + 1 retry, others are skipped
-            expect(cryptoService.encryptBlock).toHaveBeenCalledTimes(2);
-        });
-        it('should handle one time-off failure when encrypting block', async () => {
-            let count = 0;
-            cryptoService.encryptBlock = jest.fn().mockImplementation(async function (verifyBlock, keys, block, index) {
-                if (count === 0) {
-                    count++;
-                    throw new Error('Failed to encrypt block');
-                }
-                return mockEncryptBlock(verifyBlock, keys, block, index);
-            });
-            await verifySuccess();
-            // 1 block + 1 retry + 2 other blocks without retry
-            expect(cryptoService.encryptBlock).toHaveBeenCalledTimes(4);
-            await verifyOnProgress([thumbnailSize, 4 * 1024 * 1024, 4 * 1024 * 1024, 2 * 1024 * 1024]);
-        });
-        it('should handle failure when requesting tokens', async () => {
-            apiService.requestBlockUpload = jest.fn().mockImplementation(async function () {
-                throw new Error('Failed to request tokens');
-            });
-            await verifyFailure('Failed to request tokens', 0);
-        });
-        it('should handle failure when uploading thumbnail', async () => {
-            apiService.uploadBlock = jest.fn().mockImplementation(async function (bareUrl, token, block, onProgress) {
-                if (token === 'token/thumbnail:1') {
-                    throw new Error('Failed to upload thumbnail');
-                }
-                return mockUploadBlock(bareUrl, token, block, onProgress);
-            });
-            // 10 MB uploaded as blocks still uploaded
-            await verifyFailure('Failed to upload thumbnail', 10 * 1024 * 1024);
-        });
-        it('should handle one time-off failure when uploading thubmnail', async () => {
-            let count = 0;
-            apiService.uploadBlock = jest.fn().mockImplementation(async function (bareUrl, token, block, onProgress) {
-                if (token === 'token/thumbnail:1' && count === 0) {
-                    count++;
-                    throw new Error('Failed to upload thumbnail');
-                }
-                return mockUploadBlock(bareUrl, token, block, onProgress);
-            });
-            await verifySuccess();
-            expect(apiService.requestBlockUpload).toHaveBeenCalledTimes(1);
-            // 3 blocks + 1 retry + 1 thumbnail
-            expect(apiService.uploadBlock).toHaveBeenCalledTimes(5);
-            await verifyOnProgress([4 * 1024 * 1024, 4 * 1024 * 1024, 2 * 1024 * 1024, 1024]);
-        });
-        it('should handle failure when uploading block', async () => {
-            apiService.uploadBlock = jest.fn().mockImplementation(async function (bareUrl, token, block, onProgress) {
-                if (token === 'token/block:3') {
-                    throw new Error('Failed to upload block');
-                }
-                return mockUploadBlock(bareUrl, token, block, onProgress);
-            });
-            // ~8 MB uploaded as 2 first blocks + 1 thumbnail still uploaded
-            await verifyFailure('Failed to upload block', 8 * 1024 * 1024 + 1024);
-        });
-        it('should handle one time-off failure when uploading block', async () => {
-            let count = 0;
-            apiService.uploadBlock = jest.fn().mockImplementation(async function (bareUrl, token, block, onProgress) {
-                if (token === 'token/block:2' && count === 0) {
-                    count++;
-                    throw new Error('Failed to upload block');
-                }
-                return mockUploadBlock(bareUrl, token, block, onProgress);
-            });
-            await verifySuccess();
-            expect(apiService.requestBlockUpload).toHaveBeenCalledTimes(1);
-            // 3 blocks + 1 retry + 1 thumbnail
-            expect(apiService.uploadBlock).toHaveBeenCalledTimes(5);
-            await verifyOnProgress([1024, 4 * 1024 * 1024, 2 * 1024 * 1024, 4 * 1024 * 1024]);
-        });
-        it('should handle expired token when uploading block', async () => {
-            let count = 0;
-            apiService.uploadBlock = jest.fn().mockImplementation(async function (bareUrl, token, block, onProgress) {
-                if (token === 'token/block:2' && count === 0) {
-                    count++;
-                    throw new apiService_1.APIHTTPError('Expired token', 404 /* HTTPErrorCode.NOT_FOUND */);
-                }
-                return mockUploadBlock(bareUrl, token, block, onProgress);
-            });
-            await verifySuccess();
-            // 1 for first try + 1 for retry
-            expect(apiService.requestBlockUpload).toHaveBeenCalledTimes(2);
-            expect(apiService.requestBlockUpload).toHaveBeenCalledWith(revisionDraft.nodeRevisionUid, revisionDraft.nodeKeys.signatureAddress.addressId, {
-                contentBlocks: [
-                    {
-                        index: 2,
-                        encryptedSize: 4 * 1024 * 1024 + 10000,
-                        hash: 'blockHash',
-                        armoredSignature: 'signature',
-                        verificationToken: 'verificationToken',
-                    }
-                ],
-            });
-            // 3 blocks + 1 retry + 1 thumbnail
-            expect(apiService.uploadBlock).toHaveBeenCalledTimes(5);
-            await verifyOnProgress([1024, 4 * 1024 * 1024, 2 * 1024 * 1024, 4 * 1024 * 1024]);
-        });
-        it('should handle abortion', async () => {
-            const error = new Error('Aborted');
-            const controller = uploader.writeStream(stream, thumbnails, onProgress);
-            abortController.abort(error);
-            await controller.completion();
-            expect(apiService.uploadBlock.mock.calls[0][4]?.aborted).toBe(true);
+            await uploader.writeStream(stream, thumbnails, onProgress);
+            expect(startUploadSpy).toHaveBeenCalledWith(stream, thumbnails, onProgress);
         });
-        describe('verifyIntegrity', () => {
-            it('should report block verification error', async () => {
-                blockVerifier.verifyBlock = jest.fn().mockRejectedValue(new errors_1.IntegrityError('Block verification error'));
-                await verifyFailure('Block verification error', 1024);
-                expect(telemetry.logBlockVerificationError).toHaveBeenCalledWith(false);
-            });
-            it('should report block verification error when retry helped', async () => {
-                blockVerifier.verifyBlock = jest.fn().mockRejectedValueOnce(new errors_1.IntegrityError('Block verification error')).mockResolvedValue({
-                    verificationToken: new Uint8Array(),
-                });
-                await verifySuccess();
-                expect(telemetry.logBlockVerificationError).toHaveBeenCalledWith(true);
-            });
-            it('should throw an error if block count does not match', async () => {
-                uploader = new fileUploader_1.Fileuploader(telemetry, apiService, cryptoService, uploadManager, blockVerifier, revisionDraft, {
-                    // Fake expected size to break verification
-                    expectedSize: 1 * 1024 * 1024 + 1024,
-                    mediaType: '',
-                }, onFinish);
-                await verifyFailure('Some file parts failed to upload', 10 * 1024 * 1024 + 1024, 1 * 1024 * 1024 + 1024);
-            });
-            it('should throw an error if file size does not match', async () => {
-                cryptoService.encryptBlock = jest.fn().mockImplementation(async (_, __, block, index) => ({
-                    index,
-                    encryptedData: block,
-                    armoredSignature: 'signature',
-                    verificationToken: 'verificationToken',
-                    originalSize: 0, // Fake original size to break verification
-                    encryptedSize: block.length + 10000,
-                    hash: 'blockHash',
-                }));
-                await verifyFailure('Some file bytes failed to upload', 10 * 1024 * 1024 + 1024);
-            });
+        it('should throw an error if upload already started', async () => {
+            await uploader.writeStream(stream, thumbnails, onProgress);
+            await expect(uploader.writeStream(stream, thumbnails, onProgress)).rejects.toThrow('Upload already started');
         });
     });
 });

package/dist/internal/upload/fileUploader.test.js.map

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

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

@@ -1,8 +1,8 @@
 import { ProtonDriveTelemetry, UploadMetadata } from "../../interface";
 import { DriveAPIService } from "../apiService";
 import { DriveCrypto } from "../../crypto";
+import { FileUploader, FileRevisionUploader } from "./fileUploader";
 import { NodesService, NodesEvents, SharesService } from "./interface";
-import { Fileuploader } from "./fileUploader";
 /**
  * Provides facade for the upload module.
  *
@@ -11,6 +11,6 @@ import { Fileuploader } from "./fileUploader";
  * and verifications.
  */
 export declare function initUploadModule(telemetry: ProtonDriveTelemetry, apiService: DriveAPIService, driveCrypto: DriveCrypto, sharesService: SharesService, nodesService: NodesService, nodesEvents: NodesEvents): {
-    getFileUploader: (parentFolderUid: string, name: string, metadata: UploadMetadata, signal?: AbortSignal) => Promise<Fileuploader>;
-    getFileRevisionUploader: (nodeUid: string, metadata: UploadMetadata, signal?: AbortSignal) => Promise<Fileuploader>;
+    getFileUploader: (parentFolderUid: string, name: string, metadata: UploadMetadata, signal?: AbortSignal) => Promise<FileUploader>;
+    getFileRevisionUploader: (nodeUid: string, metadata: UploadMetadata, signal?: AbortSignal) => Promise<FileRevisionUploader>;
 };

package/dist/internal/upload/index.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initUploadModule = initUploadModule;
 const apiService_1 = require("./apiService");
 const cryptoService_1 = require("./cryptoService");
-const queue_1 = require("./queue");
 const fileUploader_1 = require("./fileUploader");
-const telemetry_1 = require("./telemetry");
 const manager_1 = require("./manager");
-const blockVerifier_1 = require("./blockVerifier");
+const queue_1 = require("./queue");
+const telemetry_1 = require("./telemetry");
 /**
  * Provides facade for the upload module.
  *
@@ -21,53 +20,33 @@ function initUploadModule(telemetry, apiService, driveCrypto, sharesService, nod
     const uploadTelemetry = new telemetry_1.UploadTelemetry(telemetry, sharesService);
     const manager = new manager_1.UploadManager(telemetry, api, cryptoService, nodesService, nodesEvents);
     const queue = new queue_1.UploadQueue();
+    /**
+     * Returns a FileUploader instance that can be used to upload a file to
+     * a parent folder.
+     *
+     * This operation does not call the API, it only returns a FileUploader
+     * instance when the upload queue has capacity.
+     */
     async function getFileUploader(parentFolderUid, name, metadata, signal) {
         await queue.waitForCapacity(signal);
-        let revisionDraft, blockVerifier;
-        try {
-            revisionDraft = await manager.createDraftNode(parentFolderUid, name, metadata);
-            blockVerifier = new blockVerifier_1.BlockVerifier(api, cryptoService, revisionDraft.nodeKeys.key, revisionDraft.nodeRevisionUid);
-            await blockVerifier.loadVerificationData();
-        }
-        catch (error) {
-            queue.releaseCapacity();
-            if (revisionDraft) {
-                await manager.deleteDraftNode(revisionDraft.nodeUid);
-            }
-            void uploadTelemetry.uploadInitFailed(parentFolderUid, error, metadata.expectedSize);
-            throw error;
-        }
-        const onFinish = async (failure) => {
+        const onFinish = () => {
             queue.releaseCapacity();
-            if (failure) {
-                await manager.deleteDraftNode(revisionDraft.nodeUid);
-            }
         };
-        return new fileUploader_1.Fileuploader(uploadTelemetry, api, cryptoService, manager, blockVerifier, revisionDraft, metadata, onFinish, signal);
+        return new fileUploader_1.FileUploader(uploadTelemetry, api, cryptoService, manager, parentFolderUid, name, metadata, onFinish, signal);
     }
+    /**
+     * Returns a FileUploader instance that can be used to upload a new
+     * revision of a file.
+     *
+     * This operation does not call the API, it only returns a
+     * FileRevisionUploader instance when the upload queue has capacity.
+     */
     async function getFileRevisionUploader(nodeUid, metadata, signal) {
         await queue.waitForCapacity(signal);
-        let revisionDraft, blockVerifier;
-        try {
-            revisionDraft = await manager.createDraftRevision(nodeUid, metadata);
-            blockVerifier = new blockVerifier_1.BlockVerifier(api, cryptoService, revisionDraft.nodeKeys.key, revisionDraft.nodeRevisionUid);
-            await blockVerifier.loadVerificationData();
-        }
-        catch (error) {
-            queue.releaseCapacity();
-            if (revisionDraft) {
-                await manager.deleteDraftRevision(revisionDraft.nodeRevisionUid);
-            }
-            void uploadTelemetry.uploadInitFailed(nodeUid, error, metadata.expectedSize);
-            throw error;
-        }
-        const onFinish = async (failure) => {
+        const onFinish = () => {
             queue.releaseCapacity();
-            if (failure) {
-                await manager.deleteDraftNode(revisionDraft.nodeUid);
-            }
         };
-        return new fileUploader_1.Fileuploader(uploadTelemetry, api, cryptoService, manager, blockVerifier, revisionDraft, metadata, onFinish, signal);
+        return new fileUploader_1.FileRevisionUploader(uploadTelemetry, api, cryptoService, manager, nodeUid, metadata, onFinish, signal);
     }
     return {
         getFileUploader,

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/upload/index.ts"],"names":[],"mappings":"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"}
+{"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,WAAwB;IAExB,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,UAAU,CAAC,CAAC;IAC7C,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,WAAW,CAAC,CAAC;IAE5F,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"}

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

@@ -16,7 +16,7 @@ export declare class UploadManager {
     constructor(telemetry: ProtonDriveTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, nodesService: NodesService, nodesEvents: NodesEvents);
     createDraftNode(parentFolderUid: string, name: string, metadata: UploadMetadata): Promise<NodeRevisionDraft>;
     private createDraftOnAPI;
-    private findAvailableName;
+    findAvailableName(parentFolderUid: string, name: string): Promise<string>;
     deleteDraftNode(nodeUid: string): Promise<void>;
     createDraftRevision(nodeUid: string, metadata: UploadMetadata): Promise<NodeRevisionDraft>;
     deleteDraftRevision(nodeRevisionUid: string): Promise<void>;

package/dist/internal/upload/manager.js

@@ -5,6 +5,7 @@ const ttag_1 = require("ttag");
 const interface_1 = require("../../interface");
 const errors_1 = require("../../errors");
 const nodes_1 = require("../nodes");
+const uids_1 = require("../uids");
 /**
  * UploadManager is responsible for creating and deleting draft nodes
  * on the server. It handles the creation of draft nodes, including
@@ -70,18 +71,19 @@ class UploadManager {
             if (error instanceof errors_1.ValidationError) {
                 if (error.code === 2500 /* ErrorCode.ALREADY_EXISTS */) {
                     this.logger.info(`Node with given name already exists`);
-                    const availableName = await this.findAvailableName(parentFolderUid, parentHashKey, name, generatedNodeCrypto.encryptedNode.hash);
+                    const typedDetails = error.details;
                     // If there is existing draft created by this client,
                     // automatically delete it and try to create a new one
                     // with the same name again.
-                    if (availableName.existingDraftNodeUid) {
+                    if (typedDetails?.ConflictDraftRevisionID) {
+                        const existingDraftNodeUid = (0, uids_1.makeNodeUid)((0, uids_1.splitNodeUid)(parentFolderUid).volumeId, typedDetails.ConflictLinkID);
                         let deleteFailed = false;
                         try {
-                            this.logger.warn(`Deleting existing draft node ${availableName.existingDraftNodeUid}`);
-                            await this.apiService.deleteDraft(availableName.existingDraftNodeUid);
+                            this.logger.warn(`Deleting existing draft node ${existingDraftNodeUid}`);
+                            await this.apiService.deleteDraft(existingDraftNodeUid);
                         }
                         catch (deleteDraftError) {
-                            // Do not throw, let return the next available name to the client.
+                            // Do not throw, let throw the conflict error.
                             deleteFailed = true;
                             this.logger.error('Failed to delete existing draft node', deleteDraftError);
                         }
@@ -89,15 +91,20 @@ class UploadManager {
                             return this.createDraftOnAPI(parentFolderUid, parentHashKey, name, metadata, generatedNodeCrypto);
                         }
                     }
+                    const existingNodeUid = typedDetails ? (0, uids_1.makeNodeUid)((0, uids_1.splitNodeUid)(parentFolderUid).volumeId, typedDetails.ConflictLinkID) : undefined;
                     // If there is existing node, return special error
                     // that includes the available name the client can use.
-                    throw new errors_1.NodeAlreadyExistsValidationError(error.message, error.code, availableName.availableName);
+                    throw new errors_1.NodeAlreadyExistsValidationError(error.message, error.code, existingNodeUid);
                 }
             }
             throw error;
         }
     }
-    async findAvailableName(parentFolderUid, parentHashKey, name, nameHash) {
+    async findAvailableName(parentFolderUid, name) {
+        const { hashKey: parentHashKey } = await this.nodesService.getNodeKeys(parentFolderUid);
+        if (!parentHashKey) {
+            throw new errors_1.ValidationError((0, ttag_1.c)('Error').t `Creating files in non-folders is not allowed`);
+        }
         const [namePart, extension] = splitExtension(name);
         const batchSize = 10;
         let startIndex = 1;
@@ -107,12 +114,7 @@ class UploadManager {
                 namesToCheck.push(joinNameAndExtension(namePart, i, extension));
             }
             const hashesToCheck = await this.cryptoService.generateNameHashes(parentHashKey, namesToCheck);
-            const { pendingHashes, availalbleHashes } = await this.apiService.checkAvailableHashes(parentFolderUid, [
-                ...hashesToCheck.map(({ hash }) => hash),
-                // Adding the current name hash to get the existing draft
-                // node UID if it exists.
-                ...startIndex ? [nameHash] : [],
-            ]);
+            const { availalbleHashes } = await this.apiService.checkAvailableHashes(parentFolderUid, hashesToCheck.map(({ hash }) => hash));
             if (!availalbleHashes.length) {
                 startIndex += batchSize;
                 continue;
@@ -121,12 +123,7 @@ class UploadManager {
             if (!availableHash) {
                 throw Error('Backend returned unexpected hash');
             }
-            // FIXME: use client UID to ensure its own pending draft
-            const ownPendingHash = pendingHashes.find(({ hash }) => hash === nameHash);
-            return {
-                availableName: availableHash.name,
-                existingDraftNodeUid: ownPendingHash?.nodeUid,
-            };
+            return availableHash.name;
         }
     }
     async deleteDraftNode(nodeUid) {