@protontech/drive-sdk 0.14.0 → 0.14.2

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

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const interface_1 = require("../../interface");
 const telemetry_1 = require("../../tests/telemetry");
 const fileUploader_1 = require("./fileUploader");
 const index_1 = require("./index");
-const smallFileUploader_1 = require("./smallFileUploader");
-const SMALL_FILE_SIZE_LIMIT = 128 * 1024; // 128 KiB, must match index.ts
-describe('initUploadModule - uploader selection', () => {
+const RAW_SMALL_FILE_SIZE_LIMIT = (128 * 1024) / 1.1; // 128 KiB, must match index.ts
+describe('initUploadModule', () => {
     const parentFolderUid = 'parent-folder-uid';
     const name = 'test-file.txt';
     const nodeUid = 'node-uid';
     let featureFlagProvider;
     let uploadModule;
+    let initSmallFileSpy;
+    let initSmallRevisionSpy;
+    let initStreamSpy;
+    let stream;
+    const thumbnail100k = { type: interface_1.ThumbnailType.Type1, thumbnail: new Uint8Array(100_000) };
     beforeEach(() => {
         const apiService = {};
         const driveCrypto = {};
@@ -20,52 +25,106 @@ describe('initUploadModule - uploader selection', () => {
             isEnabled: jest.fn().mockResolvedValue(true),
         };
         uploadModule = (0, index_1.initUploadModule)((0, telemetry_1.getMockTelemetry)(), apiService, driveCrypto, sharesService, nodesService, featureFlagProvider);
-    });
-    describe('getFileUploader', () => {
-        it('returns SmallFileUploader when feature flag is enabled and file size is below limit', async () => {
-            featureFlagProvider.isEnabled.mockResolvedValue(true);
-            const metadata = { expectedSize: 1, mediaType: 'text/plain' };
-            const uploader = await uploadModule.getFileUploader(parentFolderUid, name, metadata);
-            expect(uploader).toBeInstanceOf(smallFileUploader_1.SmallFileUploader);
-        });
-        it('returns FileUploader when feature flag is enabled but file size exceeds limit', async () => {
-            featureFlagProvider.isEnabled.mockResolvedValue(true);
-            const metadata = {
-                expectedSize: SMALL_FILE_SIZE_LIMIT,
-                mediaType: 'text/plain',
-            };
-            const uploader = await uploadModule.getFileUploader(parentFolderUid, name, metadata);
-            expect(uploader).toBeInstanceOf(fileUploader_1.FileUploader);
-        });
-        it('returns FileUploader when feature flag is disabled even for small file', async () => {
-            featureFlagProvider.isEnabled.mockResolvedValue(false);
-            const metadata = { expectedSize: 1, mediaType: 'text/plain' };
-            const uploader = await uploadModule.getFileUploader(parentFolderUid, name, metadata);
-            expect(uploader).toBeInstanceOf(fileUploader_1.FileUploader);
+        initSmallFileSpy = jest.spyOn(fileUploader_1.FileUploader.prototype, 'initSmallFileUploader').mockResolvedValue({
+            nodeRevisionUid: 'revision-uid',
+            nodeUid: 'node-uid',
         });
-    });
-    describe('getFileRevisionUploader', () => {
-        it('returns SmallFileRevisionUploader when feature flag is enabled and file size is below limit', async () => {
-            featureFlagProvider.isEnabled.mockResolvedValue(true);
-            const metadata = { expectedSize: 1, mediaType: 'text/plain' };
-            const uploader = await uploadModule.getFileRevisionUploader(nodeUid, metadata);
-            expect(uploader).toBeInstanceOf(smallFileUploader_1.SmallFileRevisionUploader);
+        initSmallRevisionSpy = jest
+            .spyOn(fileUploader_1.FileRevisionUploader.prototype, 'initSmallFileUploader')
+            .mockResolvedValue({
+            nodeRevisionUid: 'revision-uid',
+            nodeUid: 'node-uid',
         });
-        it('returns FileRevisionUploader when feature flag is enabled but file size exceeds limit', async () => {
-            featureFlagProvider.isEnabled.mockResolvedValue(true);
-            const metadata = {
-                expectedSize: SMALL_FILE_SIZE_LIMIT + 1,
-                mediaType: 'text/plain',
-            };
-            const uploader = await uploadModule.getFileRevisionUploader(nodeUid, metadata);
-            expect(uploader).toBeInstanceOf(fileUploader_1.FileRevisionUploader);
+        initStreamSpy = jest.spyOn(fileUploader_1.Uploader.prototype, 'initStreamUploader').mockResolvedValue({
+            start: jest.fn().mockResolvedValue({
+                nodeRevisionUid: 'revision-uid',
+                nodeUid: 'node-uid',
+            }),
         });
-        it('returns FileRevisionUploader when feature flag is disabled even for small file', async () => {
-            featureFlagProvider.isEnabled.mockResolvedValue(false);
-            const metadata = { expectedSize: 1, mediaType: 'text/plain' };
-            const uploader = await uploadModule.getFileRevisionUploader(nodeUid, metadata);
-            expect(uploader).toBeInstanceOf(fileUploader_1.FileRevisionUploader);
+        stream = new ReadableStream({
+            start(controller) {
+                controller.close();
+            },
         });
     });
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+    async function drainUpload(controller) {
+        await controller.completion();
+    }
+    const suites = [
+        {
+            method: 'getFileUploader',
+            getUploader: (metadata) => uploadModule.getFileUploader(parentFolderUid, name, metadata),
+            expect: (option) => {
+                if (option === 'stream') {
+                    expect(initStreamSpy).toHaveBeenCalled();
+                    expect(initSmallFileSpy).not.toHaveBeenCalled();
+                    expect(initSmallRevisionSpy).not.toHaveBeenCalled();
+                }
+                else {
+                    expect(initSmallFileSpy).toHaveBeenCalled();
+                    expect(initStreamSpy).not.toHaveBeenCalled();
+                    expect(initSmallRevisionSpy).not.toHaveBeenCalled();
+                }
+            },
+        },
+        {
+            method: 'getFileRevisionUploader',
+            getUploader: (metadata) => uploadModule.getFileRevisionUploader(nodeUid, metadata),
+            expect: (option) => {
+                if (option === 'stream') {
+                    expect(initStreamSpy).toHaveBeenCalled();
+                    expect(initSmallFileSpy).not.toHaveBeenCalled();
+                    expect(initSmallRevisionSpy).not.toHaveBeenCalled();
+                }
+                else {
+                    expect(initSmallRevisionSpy).toHaveBeenCalled();
+                    expect(initSmallFileSpy).not.toHaveBeenCalled();
+                    expect(initStreamSpy).not.toHaveBeenCalled();
+                }
+            },
+        },
+    ];
+    for (const suite of suites) {
+        describe(suite.method, () => {
+            it('uses stream path when feature flag is disabled even for small file', async () => {
+                featureFlagProvider.isEnabled.mockResolvedValue(false);
+                const metadata = { expectedSize: 1, mediaType: 'text/plain' };
+                const uploader = await suite.getUploader(metadata);
+                await drainUpload(await uploader.uploadFromStream(stream, []));
+                suite.expect('stream');
+            });
+            it('uses small-file path when flag is on and encrypted total size is below cap', async () => {
+                featureFlagProvider.isEnabled.mockResolvedValue(true);
+                const metadata = { expectedSize: 100, mediaType: 'text/plain' };
+                const uploader = await suite.getUploader(metadata);
+                await drainUpload(await uploader.uploadFromStream(stream, []));
+                suite.expect('small');
+            });
+            it('uses small-file path when flag is on and encrypted total size with thumbnails is below cap', async () => {
+                featureFlagProvider.isEnabled.mockResolvedValue(true);
+                const metadata = { expectedSize: 100, mediaType: 'image/jpeg' };
+                const uploader = await suite.getUploader(metadata);
+                await drainUpload(await uploader.uploadFromStream(stream, [thumbnail100k]));
+                suite.expect('small');
+            });
+            it('uses stream path when feature flag is enabled but raw file size exceeds limit', async () => {
+                featureFlagProvider.isEnabled.mockResolvedValue(true);
+                const metadata = { expectedSize: RAW_SMALL_FILE_SIZE_LIMIT, mediaType: 'text/plain' };
+                const uploader = await suite.getUploader(metadata);
+                await drainUpload(await uploader.uploadFromStream(stream, []));
+                suite.expect('stream');
+            });
+            it('uses stream path when thumbnail bytes push encrypted total size with thumbnail exceeds limit', async () => {
+                featureFlagProvider.isEnabled.mockResolvedValue(true);
+                const metadata = { expectedSize: 100_000, mediaType: 'image/jpeg' };
+                const uploader = await suite.getUploader(metadata);
+                await drainUpload(await uploader.uploadFromStream(stream, [thumbnail100k]));
+                suite.expect('stream');
+            });
+        });
+    }
 });
 //# sourceMappingURL=index.test.js.map

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

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

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

@@ -1,10 +1,7 @@
 import { PrivateKey, SessionKey } from '../../crypto';
 import { Logger, Thumbnail, ThumbnailType, UploadMetadata } from '../../interface';
-import { UploadAPIService } from './apiService';
-import { BlockVerifier } from './blockVerifier';
 import { UploadCryptoService } from './cryptoService';
-import { Uploader } from './fileUploader';
-import { NodeRevisionDraft, NodeCrypto } from './interface';
+import { NodeCrypto } from './interface';
 import { UploadManager } from './manager';
 import { UploadTelemetry } from './telemetry';
 export type NodeKeys = {
@@ -17,15 +14,17 @@ export type NodeKeys = {
  * Base uploader for small file and small revision uploads.
  * Shares the single-request flow: read content, get node crypto, encrypt, then call API.
  */
-declare abstract class SmallUploader extends Uploader {
+declare abstract class SmallUploader {
+    protected telemetry: UploadTelemetry;
+    protected cryptoService: UploadCryptoService;
+    protected manager: UploadManager;
+    protected metadata: UploadMetadata;
+    protected onFinish: () => void;
+    protected signal: AbortSignal | undefined;
     protected logger: Logger;
-    constructor(telemetry: UploadTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, manager: UploadManager, metadata: UploadMetadata, onFinish: () => void, signal: AbortSignal | undefined);
-    protected createRevisionDraft(): Promise<{
-        revisionDraft: NodeRevisionDraft;
-        blockVerifier: BlockVerifier;
-    }>;
-    protected deleteRevisionDraft(revisionDraft: NodeRevisionDraft): Promise<void>;
-    protected startUpload(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<{
+    protected abortController: AbortController;
+    constructor(telemetry: UploadTelemetry, cryptoService: UploadCryptoService, manager: UploadManager, metadata: UploadMetadata, onFinish: () => void, signal: AbortSignal | undefined);
+    upload(stream: ReadableStream, thumbnails: Thumbnail[], onProgress?: (uploadedBytes: number) => void): Promise<{
         nodeRevisionUid: string;
         nodeUid: string;
     }>;
@@ -52,6 +51,7 @@ declare abstract class SmallUploader extends Uploader {
     private readStreamContent;
     private encryptThumbnails;
     private encryptContentBlock;
+    private getManifest;
     private encryptCommitPayload;
 }
 /**
@@ -60,7 +60,7 @@ declare abstract class SmallUploader extends Uploader {
 export declare class SmallFileUploader extends SmallUploader {
     private parentFolderUid;
     private name;
-    constructor(telemetry: UploadTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, manager: UploadManager, metadata: UploadMetadata, onFinish: () => void, signal: AbortSignal | undefined, parentFolderUid: string, name: string);
+    constructor(telemetry: UploadTelemetry, cryptoService: UploadCryptoService, manager: UploadManager, metadata: UploadMetadata, onFinish: () => void, signal: AbortSignal | undefined, parentFolderUid: string, name: string);
     protected getTelemetryContextUid(): string;
     protected handleUpload(stream: ReadableStream, thumbnails: Thumbnail[]): Promise<{
         nodeUid: string;
@@ -73,7 +73,7 @@ export declare class SmallFileUploader extends SmallUploader {
  */
 export declare class SmallFileRevisionUploader extends SmallUploader {
     private nodeUid;
-    constructor(telemetry: UploadTelemetry, apiService: UploadAPIService, cryptoService: UploadCryptoService, manager: UploadManager, metadata: UploadMetadata, onFinish: () => void, signal: AbortSignal | undefined, nodeUid: string);
+    constructor(telemetry: UploadTelemetry, cryptoService: UploadCryptoService, manager: UploadManager, metadata: UploadMetadata, onFinish: () => void, signal: AbortSignal | undefined, nodeUid: string);
     protected getTelemetryContextUid(): string;
     protected handleUpload(stream: ReadableStream, thumbnails: Thumbnail[]): Promise<{
         nodeUid: string;

package/dist/internal/upload/smallFileUploader.js

@@ -4,29 +4,35 @@ exports.SmallFileRevisionUploader = exports.SmallFileUploader = void 0;
 const errors_1 = require("../../errors");
 const errors_2 = require("../errors");
 const nodes_1 = require("../nodes");
+const utils_1 = require("../utils");
 const blockVerifier_1 = require("./blockVerifier");
 const digests_1 = require("./digests");
-const fileUploader_1 = require("./fileUploader");
 const streamReader_1 = require("./streamReader");
 const streamUploader_1 = require("./streamUploader");
 /**
  * Base uploader for small file and small revision uploads.
  * Shares the single-request flow: read content, get node crypto, encrypt, then call API.
  */
-class SmallUploader extends fileUploader_1.Uploader {
+class SmallUploader {
+    telemetry;
+    cryptoService;
+    manager;
+    metadata;
+    onFinish;
+    signal;
     logger;
-    constructor(telemetry, apiService, cryptoService, manager, metadata, onFinish, signal) {
-        super(telemetry, apiService, cryptoService, manager, metadata, onFinish, signal);
+    abortController;
+    constructor(telemetry, cryptoService, manager, metadata, onFinish, signal) {
+        this.telemetry = telemetry;
+        this.cryptoService = cryptoService;
+        this.manager = manager;
+        this.metadata = metadata;
+        this.onFinish = onFinish;
+        this.signal = signal;
         this.logger = telemetry.getLoggerForSmallUpload();
+        this.abortController = new AbortController();
     }
-    async createRevisionDraft() {
-        throw new Error('Small upload does not use revision draft');
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async deleteRevisionDraft(revisionDraft) {
-        throw new Error('Small upload does not use revision draft');
-    }
-    async startUpload(stream, thumbnails, onProgress) {
+    async upload(stream, thumbnails, onProgress) {
         try {
             const result = await this.handleUpload(stream, thumbnails);
             onProgress?.(this.metadata.expectedSize);
@@ -47,7 +53,8 @@ class SmallUploader extends fileUploader_1.Uploader {
             this.encryptThumbnails(nodeKeys, thumbnails),
             this.encryptContentBlock(nodeKeys, content.data),
         ]);
-        const commitPayload = await this.encryptCommitPayload(nodeKeys, content.sha1, encryptedBlock);
+        const manifest = await this.getManifest(encryptedBlock, encryptedThumbnails);
+        const commitPayload = await this.encryptCommitPayload(nodeKeys, content.sha1, manifest);
         return {
             commitPayload,
             encryptedBlock,
@@ -81,7 +88,11 @@ class SmallUploader extends fileUploader_1.Uploader {
         for (const thumbnail of thumbnails) {
             this.logger.debug(`Encrypting thumbnail ${thumbnail.type}`);
             const enc = await this.cryptoService.encryptThumbnail(nodeKeys, thumbnail);
-            result.push({ type: thumbnail.type, encryptedData: enc.encryptedData });
+            result.push({
+                type: thumbnail.type,
+                encryptedData: enc.encryptedData,
+                blockHash: await enc.hashPromise,
+            });
         }
         return result;
     }
@@ -128,9 +139,16 @@ class SmallUploader extends fileUploader_1.Uploader {
             blockHash,
         };
     }
-    async encryptCommitPayload(nodeKeys, contentSha1, encryptedBlock) {
+    async getManifest(encryptedBlock, encryptedThumbnails) {
+        encryptedThumbnails.sort((a, b) => a.type - b.type);
+        const hashes = [
+            ...(await Promise.all(encryptedThumbnails.map(({ blockHash }) => blockHash))),
+            ...(encryptedBlock ? [encryptedBlock.blockHash] : []),
+        ];
+        return (0, utils_1.mergeUint8Arrays)(hashes);
+    }
+    async encryptCommitPayload(nodeKeys, contentSha1, manifest) {
         this.logger.debug(`Preparing commit payload`);
-        const manifest = encryptedBlock ? encryptedBlock.blockHash : new Uint8Array(0);
         const extendedAttributes = (0, nodes_1.generateFileExtendedAttributes)({
             modificationTime: this.metadata.modificationTime,
             size: this.metadata.expectedSize,
@@ -150,8 +168,8 @@ class SmallUploader extends fileUploader_1.Uploader {
 class SmallFileUploader extends SmallUploader {
     parentFolderUid;
     name;
-    constructor(telemetry, apiService, cryptoService, manager, metadata, onFinish, signal, parentFolderUid, name) {
-        super(telemetry, apiService, cryptoService, manager, metadata, onFinish, signal);
+    constructor(telemetry, cryptoService, manager, metadata, onFinish, signal, parentFolderUid, name) {
+        super(telemetry, cryptoService, manager, metadata, onFinish, signal);
         this.parentFolderUid = parentFolderUid;
         this.name = name;
         this.parentFolderUid = parentFolderUid;
@@ -179,8 +197,8 @@ exports.SmallFileUploader = SmallFileUploader;
  */
 class SmallFileRevisionUploader extends SmallUploader {
     nodeUid;
-    constructor(telemetry, apiService, cryptoService, manager, metadata, onFinish, signal, nodeUid) {
-        super(telemetry, apiService, cryptoService, manager, metadata, onFinish, signal);
+    constructor(telemetry, cryptoService, manager, metadata, onFinish, signal, nodeUid) {
+        super(telemetry, cryptoService, manager, metadata, onFinish, signal);
         this.nodeUid = nodeUid;
         this.nodeUid = nodeUid;
     }

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

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

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

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const errors_1 = require("../../errors");
 const interface_1 = require("../../interface");
 const smallFileUploader_1 = require("./smallFileUploader");
-const MOCK_BLOCK_HASH = new Uint8Array(32).fill(1);
-const MOCK_VERIFICATION_TOKEN = new Uint8Array(16).fill(2);
+const utils_1 = require("../utils");
+const MOCK_BLOCK_HASH = new Uint8Array(32).fill(4);
+const MOCK_VERIFICATION_TOKEN = new Uint8Array(16).fill(5);
 function createStream(bytes) {
     return new ReadableStream({
         start(controller) {
@@ -91,7 +92,7 @@ describe('SmallFileUploader', () => {
                 encryptedData: new Uint8Array(thumbnail.thumbnail),
                 originalSize: thumbnail.thumbnail.length,
                 encryptedSize: thumbnail.thumbnail.length + 100,
-                hash: 'thumbnailHash',
+                hashPromise: Promise.resolve(new Uint8Array(32).fill(thumbnail.type)),
             })),
             encryptBlock: jest.fn().mockImplementation(mockEncryptBlock),
             verifyBlock: jest.fn().mockResolvedValue({ verificationToken: MOCK_VERIFICATION_TOKEN }),
@@ -115,7 +116,7 @@ describe('SmallFileUploader', () => {
         abortController = new AbortController();
     });
     function createUploader() {
-        return new smallFileUploader_1.SmallFileUploader(telemetry, apiService, cryptoService, uploadManager, metadata, onFinish, abortController.signal, parentFolderUid, name);
+        return new smallFileUploader_1.SmallFileUploader(telemetry, cryptoService, uploadManager, metadata, onFinish, abortController.signal, parentFolderUid, name);
     }
     describe('uploadFromStream', () => {
         const thumbnails = [];
@@ -123,19 +124,12 @@ describe('SmallFileUploader', () => {
         it('should start upload and call manager.generateNewFileCrypto and manager.uploadFile', async () => {
             const uploader = createUploader();
             const stream = createStream([1, 2, 3]);
-            const controller = await uploader.uploadFromStream(stream, thumbnails, onProgress);
-            const result = await controller.completion();
+            const result = await uploader.upload(stream, thumbnails, onProgress);
             expect(uploadManager.generateNewFileCrypto).toHaveBeenCalledWith(parentFolderUid, name);
             expect(uploadManager.uploadFile).toHaveBeenCalledTimes(1);
             expect(result).toEqual({ nodeUid: 'nodeUid', nodeRevisionUid: 'nodeRevisionUid' });
             expect(onProgress).toHaveBeenCalledWith(metadata.expectedSize);
         });
-        it('should throw if upload already started', async () => {
-            const uploader = createUploader();
-            const stream = createStream([1, 2, 3]);
-            await uploader.uploadFromStream(stream, thumbnails, onProgress);
-            await expect(uploader.uploadFromStream(stream, thumbnails, onProgress)).rejects.toThrow('Upload already started');
-        });
     });
     describe('buildPayloads (via upload flow)', () => {
         it('should build commitPayload, encryptedBlock, and encryptedThumbnails from stream and pass to manager.uploadFile', async () => {
@@ -145,8 +139,7 @@ describe('SmallFileUploader', () => {
                 { type: interface_1.ThumbnailType.Type1, thumbnail: new Uint8Array([10, 20]) },
                 { type: interface_1.ThumbnailType.Type2, thumbnail: new Uint8Array([30, 40, 50]) },
             ];
-            await uploader.uploadFromStream(stream, thumbnails, undefined);
-            await uploader.controller.completion();
+            await uploader.upload(stream, thumbnails, undefined);
             expect(uploadManager.uploadFile).toHaveBeenCalledWith(parentFolderUid, mockNodeCrypto, metadata, expect.objectContaining({
                 armoredManifestSignature: 'mockManifestSignature',
                 armoredExtendedAttributes: 'mockExtendedAttributes',
@@ -155,20 +148,31 @@ describe('SmallFileUploader', () => {
                 armoredSignature: 'mockBlockSignature',
                 verificationToken: MOCK_VERIFICATION_TOKEN,
             }), [
-                { type: interface_1.ThumbnailType.Type1, encryptedData: expect.any(Uint8Array) },
-                { type: interface_1.ThumbnailType.Type2, encryptedData: expect.any(Uint8Array) },
+                {
+                    type: interface_1.ThumbnailType.Type1,
+                    encryptedData: expect.any(Uint8Array),
+                    blockHash: new Uint8Array(32).fill(interface_1.ThumbnailType.Type1),
+                },
+                {
+                    type: interface_1.ThumbnailType.Type2,
+                    encryptedData: expect.any(Uint8Array),
+                    blockHash: new Uint8Array(32).fill(interface_1.ThumbnailType.Type2),
+                },
             ]);
             expect(cryptoService.encryptBlock).toHaveBeenCalledTimes(1);
             expect(cryptoService.encryptThumbnail).toHaveBeenCalledTimes(2);
-            expect(cryptoService.commitFile).toHaveBeenCalledWith(expect.anything(), MOCK_BLOCK_HASH, expect.any(String));
+            expect(cryptoService.commitFile).toHaveBeenCalledWith(expect.anything(), (0, utils_1.mergeUint8Arrays)([
+                new Uint8Array(32).fill(interface_1.ThumbnailType.Type1),
+                new Uint8Array(32).fill(interface_1.ThumbnailType.Type2),
+                MOCK_BLOCK_HASH,
+            ]), expect.any(String));
         });
         it('should pass encrypted block data matching stream content to crypto.encryptBlock', async () => {
             const uploader = createUploader();
             const content = [5, 6, 7, 8, 9];
             metadata.expectedSize = content.length;
             const stream = createStream(content);
-            await uploader.uploadFromStream(stream, [], undefined);
-            await uploader.controller.completion();
+            await uploader.upload(stream, [], undefined);
             expect(cryptoService.encryptBlock).toHaveBeenCalledWith(expect.any(Function), expect.anything(), new Uint8Array(content), 0);
         });
         it('should pass each thumbnail to crypto.encryptThumbnail with nodeKeys', async () => {
@@ -177,8 +181,7 @@ describe('SmallFileUploader', () => {
                 { type: interface_1.ThumbnailType.Type1, thumbnail: new Uint8Array([1]) },
             ];
             const stream = createStream([1, 2, 3]);
-            await uploader.uploadFromStream(stream, thumbnails, undefined);
-            await uploader.controller.completion();
+            await uploader.upload(stream, thumbnails, undefined);
             expect(cryptoService.encryptThumbnail).toHaveBeenCalledWith(expect.objectContaining({
                 key: mockNodeCrypto.nodeKeys.decrypted.key,
                 contentKeyPacket: mockNodeCrypto.contentKey.encrypted.contentKeyPacket,
@@ -189,8 +192,7 @@ describe('SmallFileUploader', () => {
         it('should call commitFile with manifest and extended attributes', async () => {
             const uploader = createUploader();
             const stream = createStream([1, 2, 3]);
-            await uploader.uploadFromStream(stream, [], undefined);
-            await uploader.controller.completion();
+            await uploader.upload(stream, [], undefined);
             const [nodeKeys, manifest, extendedAttributes] = cryptoService.commitFile.mock.calls[0];
             expect(manifest).toEqual(MOCK_BLOCK_HASH);
             expect(extendedAttributes).toBeDefined();
@@ -202,9 +204,9 @@ describe('SmallFileUploader', () => {
             const uploader = createUploader();
             metadata.expectedSize = 5;
             const stream = createStream([1, 2, 3]); // only 3 bytes
-            const controller = await uploader.uploadFromStream(stream, [], undefined);
-            await expect(controller.completion()).rejects.toThrow(errors_1.IntegrityError);
-            await expect(controller.completion()).rejects.toMatchObject({
+            const promise = uploader.upload(stream, [], undefined);
+            await expect(promise).rejects.toThrow(errors_1.IntegrityError);
+            await expect(promise).rejects.toMatchObject({
                 debug: { actual: 3, expected: 5 },
             });
         });
@@ -212,9 +214,9 @@ describe('SmallFileUploader', () => {
             const uploader = createUploader();
             metadata.expectedSha1 = 'a'.repeat(40); // wrong sha1
             const stream = createStream([1, 2, 3]);
-            const controller = await uploader.uploadFromStream(stream, [], undefined);
-            await expect(controller.completion()).rejects.toThrow(errors_1.IntegrityError);
-            await expect(controller.completion()).rejects.toMatchObject({
+            const promise = uploader.upload(stream, [], undefined);
+            await expect(promise).rejects.toThrow(errors_1.IntegrityError);
+            await expect(promise).rejects.toMatchObject({
                 debug: expect.objectContaining({
                     expectedSha1: 'a'.repeat(40),
                 }),
@@ -227,8 +229,7 @@ describe('SmallFileUploader', () => {
             const uploader = createUploader();
             const stream = createStream([]);
             const onProgress = jest.fn();
-            const controller = await uploader.uploadFromStream(stream, [], onProgress);
-            const result = await controller.completion();
+            const result = await uploader.upload(stream, [], onProgress);
             expect(result).toEqual({ nodeUid: 'nodeUid', nodeRevisionUid: 'nodeRevisionUid' });
             expect(cryptoService.encryptBlock).not.toHaveBeenCalled();
             expect(uploadManager.uploadFile).toHaveBeenCalledWith(parentFolderUid, mockNodeCrypto, metadata, expect.objectContaining({
@@ -321,13 +322,12 @@ describe('SmallFileRevisionUploader', () => {
         abortController = new AbortController();
     });
     function createUploader() {
-        return new smallFileUploader_1.SmallFileRevisionUploader(telemetry, apiService, cryptoService, uploadManager, metadata, onFinish, abortController.signal, nodeUid);
+        return new smallFileUploader_1.SmallFileRevisionUploader(telemetry, cryptoService, uploadManager, metadata, onFinish, abortController.signal, nodeUid);
     }
     it('should get node crypto, build payloads, and call uploadSmallRevision', async () => {
         const uploader = createUploader();
         const stream = createStream([1, 2, 3]);
-        const controller = await uploader.uploadFromStream(stream, [], undefined);
-        const result = await controller.completion();
+        const result = await uploader.upload(stream, [], undefined);
         expect(result).toEqual({ nodeUid: 'nodeUid', nodeRevisionUid: 'nodeRevisionUid' });
         expect(cryptoService.encryptBlock).toHaveBeenCalledWith(expect.any(Function), expect.anything(), Uint8Array.from([1, 2, 3]), 0);
         expect(uploadManager.getExistingFileNodeCrypto).toHaveBeenCalledWith(nodeUid);
@@ -344,8 +344,7 @@ describe('SmallFileRevisionUploader', () => {
         metadata.expectedSize = 0;
         const uploader = createUploader();
         const stream = createStream([]);
-        const controller = await uploader.uploadFromStream(stream, [], undefined);
-        const result = await controller.completion();
+        const result = await uploader.upload(stream, [], undefined);
         expect(result).toEqual({ nodeUid: 'nodeUid', nodeRevisionUid: 'nodeRevisionUid' });
         expect(cryptoService.encryptBlock).not.toHaveBeenCalled();
         expect(uploadManager.uploadSmallRevision).toHaveBeenCalledWith(nodeUid, mockNodeKeys, expect.objectContaining({