@protontech/drive-sdk 0.12.1 → 0.13.1

package/src/internal/upload/manager.ts

@@ -1,6 +1,7 @@
 import { c } from 'ttag';
 
-import { Logger, ProtonDriveTelemetry, UploadMetadata } from '../../interface';
+import { PrivateKey, SessionKey } from '../../crypto';
+import { Logger, ProtonDriveTelemetry, ThumbnailType, UploadMetadata } from '../../interface';
 import { ValidationError, NodeWithSameNameExistsValidationError } from '../../errors';
 import { ErrorCode } from '../apiService';
 import { generateFileExtendedAttributes } from '../nodes';
@@ -8,6 +9,7 @@ import { UploadAPIService } from './apiService';
 import { UploadCryptoService } from './cryptoService';
 import { NodeRevisionDraft, NodesService, NodeCrypto } from './interface';
 import { makeNodeUid, splitNodeUid } from '../uids';
+import { reduceSizePrecision } from '../../telemetry';
 
 /**
  * UploadManager is responsible for creating and deleting draft nodes
@@ -32,20 +34,11 @@ export class UploadManager {
     }
 
     async createDraftNode(parentFolderUid: string, name: string, metadata: UploadMetadata): Promise<NodeRevisionDraft> {
-        const parentKeys = await this.nodesService.getNodeKeys(parentFolderUid);
-        if (!parentKeys.hashKey) {
-            throw new ValidationError(c('Error').t`Creating files in non-folders is not allowed`);
-        }
-
-        const generatedNodeCrypto = await this.cryptoService.generateFileCrypto(
-            parentFolderUid,
-            { key: parentKeys.key, hashKey: parentKeys.hashKey },
-            name,
-        );
+        const { parentHashKey, ...generatedNodeCrypto } = await this.generateNewFileCrypto(parentFolderUid, name);
 
         const { nodeUid, nodeRevisionUid } = await this.createDraftOnAPI(
             parentFolderUid,
-            parentKeys.hashKey,
+            parentHashKey,
             name,
             metadata,
             generatedNodeCrypto,
@@ -60,7 +53,7 @@ export class UploadManager {
                 signingKeys: generatedNodeCrypto.signingKeys,
             },
             parentNodeKeys: {
-                hashKey: parentKeys.hashKey,
+                hashKey: parentHashKey,
             },
             newNodeInfo: {
                 parentUid: parentFolderUid,
@@ -71,6 +64,57 @@ export class UploadManager {
         };
     }
 
+    async generateNewFileCrypto(
+        parentFolderUid: string,
+        name: string,
+    ): Promise<NodeCrypto & { parentHashKey: Uint8Array<ArrayBuffer> }> {
+        const parentKeys = await this.nodesService.getNodeKeys(parentFolderUid);
+        if (!parentKeys.hashKey) {
+            throw new ValidationError(c('Error').t`Creating files in non-folders is not allowed`);
+        }
+
+        const generatedNodeCrypto = await this.cryptoService.generateFileCrypto(
+            parentFolderUid,
+            { key: parentKeys.key, hashKey: parentKeys.hashKey },
+            name,
+        );
+
+        return {
+            ...generatedNodeCrypto,
+            parentHashKey: parentKeys.hashKey,
+        };
+    }
+
+    async getExistingFileNodeCrypto(nodeUid: string): Promise<{
+        key: PrivateKey;
+        contentKeyPacket: Uint8Array<ArrayBuffer>;
+        contentKeyPacketSessionKey: SessionKey;
+        signingKeys: NodeCrypto['signingKeys'];
+    }> {
+        const node = await this.nodesService.getNode(nodeUid);
+        const nodeKeys = await this.nodesService.getNodeKeys(nodeUid);
+
+        if (!node.activeRevision?.ok || !nodeKeys.contentKeyPacketSessionKey) {
+            throw new ValidationError(c('Error').t`Creating revisions in non-files is not allowed`);
+        }
+
+        if (!nodeKeys.contentKeyPacket) {
+            throw new ValidationError(c('Error').t`Content key packet is required for small revision upload`);
+        }
+
+        const signingKeys = await this.cryptoService.getSigningKeysForExistingNode({
+            nodeUid,
+            parentNodeUid: node.parentUid,
+        });
+
+        return {
+            key: nodeKeys.key,
+            contentKeyPacket: nodeKeys.contentKeyPacket,
+            contentKeyPacketSessionKey: nodeKeys.contentKeyPacketSessionKey,
+            signingKeys,
+        };
+    }
+
     private async createDraftOnAPI(
         parentFolderUid: string,
         parentHashKey: Uint8Array<ArrayBuffer>,
@@ -86,7 +130,7 @@ export class UploadManager {
                 armoredEncryptedName: generatedNodeCrypto.encryptedNode.encryptedName,
                 hash: generatedNodeCrypto.encryptedNode.hash,
                 mediaType: metadata.mediaType,
-                intendedUploadSize: metadata.expectedSize,
+                intendedUploadSize: reduceSizePrecision(metadata.expectedSize),
                 armoredNodeKey: generatedNodeCrypto.nodeKeys.encrypted.armoredKey,
                 armoredNodePassphrase: generatedNodeCrypto.nodeKeys.encrypted.armoredPassphrase,
                 armoredNodePassphraseSignature: generatedNodeCrypto.nodeKeys.encrypted.armoredPassphraseSignature,
@@ -97,80 +141,187 @@ export class UploadManager {
             });
             return result;
         } catch (error: unknown) {
-            if (error instanceof ValidationError) {
-                if (error.code === ErrorCode.ALREADY_EXISTS) {
-                    this.logger.info(`Node with given name already exists`);
-
-                    const typedDetails = error.details as
-                        | {
-                              ConflictLinkID: string;
-                              ConflictRevisionID?: string;
-                              ConflictDraftRevisionID?: string;
-                              ConflictDraftClientUID?: string;
+            return this.handleConflictError(parentFolderUid, metadata, error, async () => {
+                return this.createDraftOnAPI(parentFolderUid, parentHashKey, name, metadata, generatedNodeCrypto);
+            });
+        }
+    }
+
+    async uploadFile(
+        parentFolderUid: string,
+        nodeCrypto: NodeCrypto,
+        metadata: UploadMetadata,
+        commitPayload: {
+            armoredManifestSignature: string;
+            armoredExtendedAttributes: string;
+        },
+        encryptedBlock:
+            | {
+                  encryptedData: Uint8Array<ArrayBuffer>;
+                  armoredSignature: string;
+                  verificationToken: Uint8Array<ArrayBuffer>;
+              }
+            | undefined,
+        encryptedThumbnails: { type: ThumbnailType; encryptedData: Uint8Array<ArrayBuffer> }[],
+        signal?: AbortSignal,
+    ): Promise<{ nodeUid: string; nodeRevisionUid: string }> {
+        try {
+            const result = await this.apiService.uploadSmallFile(
+                parentFolderUid,
+                {
+                    armoredEncryptedName: nodeCrypto.encryptedNode.encryptedName,
+                    hash: nodeCrypto.encryptedNode.hash,
+                    mediaType: metadata.mediaType ?? 'application/octet-stream',
+                    armoredNodeKey: nodeCrypto.nodeKeys.encrypted.armoredKey,
+                    armoredNodePassphrase: nodeCrypto.nodeKeys.encrypted.armoredPassphrase,
+                    armoredNodePassphraseSignature: nodeCrypto.nodeKeys.encrypted.armoredPassphraseSignature,
+                    base64ContentKeyPacket: nodeCrypto.contentKey.encrypted.base64ContentKeyPacket,
+                    armoredContentKeyPacketSignature: nodeCrypto.contentKey.encrypted.armoredContentKeyPacketSignature,
+                    armoredExtendedAttributes: commitPayload.armoredExtendedAttributes,
+                    signatureEmail: nodeCrypto.signingKeys.email ?? null,
+                },
+                {
+                    armoredManifestSignature: commitPayload.armoredManifestSignature,
+                    block: encryptedBlock
+                        ? {
+                              encryptedData: encryptedBlock.encryptedData,
+                              armoredSignature: encryptedBlock.armoredSignature,
+                              verificationToken: encryptedBlock.verificationToken,
                           }
-                        | undefined;
-
-                    // If the client doesn't specify the client UID, it should
-                    // never be considered own draft.
-                    const isOwnDraftConflict =
-                        typedDetails?.ConflictDraftRevisionID &&
-                        this.clientUid &&
-                        typedDetails?.ConflictDraftClientUID === this.clientUid;
-
-                    // 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 (
-                        typedDetails?.ConflictDraftRevisionID &&
-                        (isOwnDraftConflict || metadata.overrideExistingDraftByOtherClient)
-                    ) {
-                        const existingDraftNodeUid = makeNodeUid(
-                            splitNodeUid(parentFolderUid).volumeId,
-                            typedDetails.ConflictLinkID,
-                        );
+                        : undefined,
+                    thumbnails: encryptedThumbnails,
+                },
+                signal,
+            );
+            await this.nodesService.notifyChildCreated(parentFolderUid);
+            return result;
+        } catch (error: unknown) {
+            return this.handleConflictError(parentFolderUid, metadata, error, async () => {
+                return this.uploadFile(
+                    parentFolderUid,
+                    nodeCrypto,
+                    metadata,
+                    commitPayload,
+                    encryptedBlock,
+                    encryptedThumbnails,
+                    signal,
+                );
+            });
+        }
+    }
 
-                        let deleteFailed = false;
-                        try {
-                            this.logger.warn(
-                                `Deleting existing draft node ${existingDraftNodeUid} by ${typedDetails.ConflictDraftClientUID}`,
-                            );
-                            await this.apiService.deleteDraft(existingDraftNodeUid);
-                        } catch (deleteDraftError: unknown) {
-                            // Do not throw, let throw the conflict error.
-                            deleteFailed = true;
-                            this.logger.error('Failed to delete existing draft node', deleteDraftError);
-                        }
-                        if (!deleteFailed) {
-                            return this.createDraftOnAPI(
-                                parentFolderUid,
-                                parentHashKey,
-                                name,
-                                metadata,
-                                generatedNodeCrypto,
-                            );
-                        }
-                    }
+    async uploadSmallRevision(
+        nodeUid: string,
+        nodeCrypto: Pick<NodeCrypto, 'signingKeys'>,
+        commitPayload: {
+            armoredManifestSignature: string;
+            armoredExtendedAttributes: string;
+        },
+        encryptedBlock:
+            | {
+                  encryptedData: Uint8Array<ArrayBuffer>;
+                  armoredSignature: string;
+                  verificationToken: Uint8Array<ArrayBuffer>;
+              }
+            | undefined,
+        encryptedThumbnails: { type: ThumbnailType; encryptedData: Uint8Array<ArrayBuffer> }[],
+        signal?: AbortSignal,
+    ): Promise<{ nodeUid: string; nodeRevisionUid: string }> {
+        const node = await this.nodesService.getNode(nodeUid);
+        if (!node.activeRevision?.ok) {
+            throw new ValidationError(c('Error').t`File has no revision`);
+        }
+        const result = await this.apiService.uploadSmallRevision(
+            nodeUid,
+            node.activeRevision.value.uid,
+            {
+                signatureEmail: nodeCrypto.signingKeys.email ?? null,
+                armoredExtendedAttributes: commitPayload.armoredExtendedAttributes,
+            },
+            {
+                armoredManifestSignature: commitPayload.armoredManifestSignature,
+                block: encryptedBlock,
+                thumbnails: encryptedThumbnails,
+            },
+            signal,
+        );
+        await this.nodesService.notifyNodeChanged(nodeUid);
+        return result;
+    }
+
+    private async handleConflictError(
+        parentFolderUid: string,
+        metadata: UploadMetadata,
+        error: unknown,
+        onRetryAfterDraftDeleted: () => Promise<{ nodeUid: string; nodeRevisionUid: string }>,
+    ): Promise<{ nodeUid: string; nodeRevisionUid: string }> {
+        if (error instanceof ValidationError) {
+            if (error.code === ErrorCode.ALREADY_EXISTS) {
+                this.logger.info(`Node with given name already exists`);
+
+                const typedDetails = error.details as
+                    | {
+                          ConflictLinkID: string;
+                          ConflictRevisionID?: string;
+                          ConflictDraftRevisionID?: string;
+                          ConflictDraftClientUID?: string;
+                      }
+                    | undefined;
+
+                // If the client doesn't specify the client UID, it should
+                // never be considered own draft.
+                const isOwnDraftConflict =
+                    typedDetails?.ConflictDraftRevisionID &&
+                    this.clientUid &&
+                    typedDetails?.ConflictDraftClientUID === this.clientUid;
+
+                // 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 (
+                    typedDetails?.ConflictDraftRevisionID &&
+                    (isOwnDraftConflict || metadata.overrideExistingDraftByOtherClient)
+                ) {
+                    const existingDraftNodeUid = makeNodeUid(
+                        splitNodeUid(parentFolderUid).volumeId,
+                        typedDetails.ConflictLinkID,
+                    );
 
-                    if (isOwnDraftConflict) {
+                    let deleteFailed = false;
+                    try {
                         this.logger.warn(
-                            `Existing draft conflict by another client ${typedDetails.ConflictDraftClientUID}`,
+                            `Deleting existing draft node ${existingDraftNodeUid} by ${typedDetails.ConflictDraftClientUID}`,
                         );
+                        await this.apiService.deleteDraft(existingDraftNodeUid);
+                    } catch (deleteDraftError: unknown) {
+                        // Do not throw, let throw the conflict error.
+                        deleteFailed = true;
+                        this.logger.error('Failed to delete existing draft node', deleteDraftError);
                     }
+                    if (!deleteFailed) {
+                        return onRetryAfterDraftDeleted();
+                    }
+                }
 
-                    const existingNodeUid = typedDetails
-                        ? makeNodeUid(splitNodeUid(parentFolderUid).volumeId, typedDetails.ConflictLinkID)
-                        : undefined;
-
-                    throw new NodeWithSameNameExistsValidationError(
-                        error.message,
-                        error.code,
-                        existingNodeUid,
-                        !!typedDetails?.ConflictDraftRevisionID,
+                if (isOwnDraftConflict) {
+                    this.logger.warn(
+                        `Existing draft conflict by another client ${typedDetails.ConflictDraftClientUID}`,
                     );
                 }
+
+                const existingNodeUid = typedDetails
+                    ? makeNodeUid(splitNodeUid(parentFolderUid).volumeId, typedDetails.ConflictLinkID)
+                    : undefined;
+
+                throw new NodeWithSameNameExistsValidationError(
+                    error.message,
+                    error.code,
+                    existingNodeUid,
+                    !!typedDetails?.ConflictDraftRevisionID,
+                );
             }
-            throw error;
         }
+        throw error;
     }
 
     async deleteDraftNode(nodeUid: string): Promise<void> {
@@ -199,7 +350,7 @@ export class UploadManager {
 
         const { nodeRevisionUid } = await this.apiService.createDraftRevision(nodeUid, {
             currentRevisionUid: node.activeRevision.value.uid,
-            intendedUploadSize: metadata.expectedSize,
+            intendedUploadSize: reduceSizePrecision(metadata.expectedSize),
         });
 
         return {