@protontech/drive-sdk 0.7.3 → 0.9.0

package/src/internal/apiService/driveTypes.ts

@@ -491,7 +491,8 @@ export interface paths {
         get?: never;
         put?: never;
         /**
-         * Delete children
+         * Delete drafts from folder
+         * @deprecated
          * @description Permanently delete children from folder, skipping trash. Can only be done for draft links.
          */
         post: operations["post_drive-shares-{shareID}-folders-{linkID}-delete_multiple"];
@@ -531,8 +532,8 @@ export interface paths {
         get?: never;
         put?: never;
         /**
-         * Trash children
-         * @description Send children to trash
+         * Trash children from folder
+         * @deprecated
          */
         post: operations["post_drive-shares-{shareID}-folders-{linkID}-trash_multiple"];
         delete?: never;
@@ -672,8 +673,8 @@ export interface paths {
         get?: never;
         put?: never;
         /**
-         * Delete multiple (v2)
-         * @description Permanently delete links, skipping trash. Can only be done for draft links.
+         * Delete drafts
+         * @description Permanently delete files, skipping trash. Can only be done for draft links.
          */
         post: operations["post_drive-v2-volumes-{volumeID}-delete_multiple"];
         delete?: never;
@@ -815,6 +816,32 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/drive/v2/volumes/{volumeID}/remove-mine": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /**
+         * Remove my nodes skipping trash
+         * @description This is called by Web SDK on public sharing to remove active nodes created by the same user
+         *     as a way to delete wrongly uploaded files without going to trash. It's supported on the following conditions:
+         *     - anonymous users must have created the node in their own session
+         *     - for authenticated users the signature email must match
+         *     - file/folder must have been created within the last 1 hour
+         *     - folders must be empty
+         *     - files must have all revisions created by this user
+         */
+        post: operations["post_drive-v2-volumes-{volumeID}-remove-mine"];
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/drive/v2/volumes/{volumeID}/links/{linkID}/rename": {
         parameters: {
             query?: never;
@@ -829,6 +856,11 @@ export interface paths {
          *
          *     Clients renaming a file or folder MUST reuse the existing session key
          *     for the name as it is also used by shares pointing to the link.
+         *
+         *     Users with access only through a public sharing URL (no editor membership) are limited to renaming
+         *     their own files and folders:
+         *     - Unauthenticated users must have created them in their session
+         *     - Authenticated users' email must match the signature email on the node for folders or active revision for files
          */
         put: operations["put_drive-v2-volumes-{volumeID}-links-{linkID}-rename"];
         post?: never;
@@ -852,6 +884,11 @@ export interface paths {
          *
          *     Clients renaming a file or folder MUST reuse the existing session key
          *     for the name as it is also used by shares pointing to the link.
+         *
+         *     Users with access only through a public sharing URL (no editor membership) are limited to renaming
+         *     their own files and folders:
+         *     - Unauthenticated users must have created them in their session
+         *     - Authenticated users' email must match the signature email on the node for folders or active revision for files
          */
         put: operations["put_drive-shares-{shareID}-links-{linkID}-rename"];
         post?: never;
@@ -2227,7 +2264,7 @@ export interface paths {
         get?: never;
         put?: never;
         /**
-         * Delete multiple (v2)
+         * Delete drafts
          * @description See /drive/v2/volumes/{volumeID}/delete_multiple for full documentation
          */
         post: operations["post_drive-unauth-v2-volumes-{volumeID}-delete_multiple"];
@@ -2297,6 +2334,26 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/drive/unauth/v2/volumes/{volumeID}/remove-mine": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /**
+         * Remove my nodes skipping trash
+         * @description See /drive/v2/volumes/{volumeID}/remove-mine for full documentation
+         */
+        post: operations["post_drive-unauth-v2-volumes-{volumeID}-remove-mine"];
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/drive/unauth/v2/volumes/{volumeID}/links/{linkID}/rename": {
         parameters: {
             query?: never;
@@ -2978,6 +3035,30 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/drive/organization/volumes": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /**
+         * Create Organization volume
+         * @description Only allowed to Org administrators
+         *
+         *     This new volume would have:
+         *      + OwnerOrgID filled with the orgID of the request
+         *      + specific membership for the owner (OrgAdmin to true)
+         */
+        post: operations["post_drive-organization-volumes"];
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/drive/volumes": {
         parameters: {
             query?: never;
@@ -4852,6 +4933,31 @@ export interface components {
             /** @description Order and visibility of Photo Tags, tags not in the list should not be shown; Use defaults when NULL; Show no tags if empty array. */
             PhotoTags?: components["schemas"]["TagType"][] | null;
         };
+        CreateOrgVolumeRequestDto: {
+            AddressID: components["schemas"]["AddressID"];
+            /** @description XX's encrypted AddressKeyID. Must be the primary key from the AddressID */
+            AddressKeyID: string;
+            ShareKey: components["schemas"]["PGPPrivateKey"];
+            SharePassphrase: components["schemas"]["PGPMessage"];
+            SharePassphraseSignature: components["schemas"]["PGPSignature"];
+            FolderName: components["schemas"]["PGPMessage"];
+            FolderKey: components["schemas"]["PGPPrivateKey"];
+            FolderPassphrase: components["schemas"]["PGPMessage"];
+            FolderPassphraseSignature: components["schemas"]["PGPSignature"];
+            FolderHashKey: components["schemas"]["PGPMessage"];
+            OrganizationID: components["schemas"]["Id"];
+            /** @description Name of the org. volume. It's plain text so that name can be displayed in UI menu */
+            VolumeName: string;
+        };
+        GetVolumeResponseDto: {
+            Volume: components["schemas"]["VolumeResponseDto"];
+            /**
+             * ProtonResponseCode
+             * @example 1000
+             * @enum {integer}
+             */
+            Code: 1000;
+        };
         CreateVolumeRequestDto: {
             AddressID: components["schemas"]["AddressID"];
             ShareKey: components["schemas"]["PGPPrivateKey"];
@@ -4875,15 +4981,6 @@ export interface components {
              */
             ShareName: string | null;
         };
-        GetVolumeResponseDto: {
-            Volume: components["schemas"]["VolumeResponseDto"];
-            /**
-             * ProtonResponseCode
-             * @example 1000
-             * @enum {integer}
-             */
-            Code: 1000;
-        };
         ListVolumesResponseDto: {
             Volumes: components["schemas"]["VolumeResponseDto"][];
             /**
@@ -6213,20 +6310,20 @@ export interface components {
             Album: null | null;
         };
         /**
-         * @description <p>1=Main, 2=Standard, 3=Device, 4=Photo</p><details><summary>See values descriptions</summary><details><summary>See values descriptions</summary><table><tr><th>Value</th><th>Name</th><th>Description</th></tr><tr><td>1</td><td>Main</td><td>* Root share for my files</td></tr><tr><td>2</td><td>Standard</td><td>* Collaborative share anywhere in the link tree (but not at the root folder as it cannot be shared)</td></tr><tr><td>3</td><td>Device</td><td>* Root share of devices</td></tr><tr><td>4</td><td>Photo</td><td>* Root share for photos</td></tr></table></details></details>
+         * @description <p>1=Main, 2=Standard, 3=Device, 4=Photo</p><details><summary>See values descriptions</summary><details><summary>See values descriptions</summary><table><tr><th>Value</th><th>Name</th><th>Description</th></tr><tr><td>1</td><td>Main</td><td>* Root share for my files</td></tr><tr><td>2</td><td>Standard</td><td>* Collaborative share anywhere in the link tree (but not at the root folder as it cannot be shared)</td></tr><tr><td>3</td><td>Device</td><td>* Root share of devices</td></tr><tr><td>4</td><td>Photo</td><td>* Root share for photos</td></tr><tr><td>5</td><td>Organization</td><td>* Root share for organization</td></tr></table></details></details>
          * @enum {integer}
          */
-        ShareType: 1 | 2 | 3 | 4;
+        ShareType: 1 | 2 | 3 | 4 | 5;
         /**
          * @description <p>1=Active, 3=Restored</p><details><summary>See values descriptions</summary><details><summary>See values descriptions</summary><table><tr><th>Value</th><th>Description</th></tr><tr><td>1</td><td>Active</td></tr><tr><td>2</td><td>Deleted</td></tr><tr><td>3</td><td>Restored</td></tr><tr><td>6</td><td>Locked</td></tr></table></details></details>
          * @enum {integer}
          */
         ShareState: 1 | 2 | 3 | 6;
         /**
-         * @description <p>1=Regular, 2=Photo</p><details><summary>See values descriptions</summary><details><summary>See values descriptions</summary><table><tr><th>Value</th><th>Description</th></tr><tr><td>1</td><td>Regular</td></tr><tr><td>2</td><td>Photo</td></tr></table></details></details>
+         * @description <p>1=Regular, 2=Photo</p><details><summary>See values descriptions</summary><details><summary>See values descriptions</summary><table><tr><th>Value</th><th>Description</th></tr><tr><td>1</td><td>Regular</td></tr><tr><td>2</td><td>Photo</td></tr><tr><td>3</td><td>Organization</td></tr></table></details></details>
          * @enum {integer}
          */
-        VolumeType: 1 | 2;
+        VolumeType: 1 | 2 | 3;
         /**
          * @description <p>1=folder, 2=file</p><details><summary>See values descriptions</summary><details><summary>See values descriptions</summary><table><tr><th>Value</th><th>Description</th></tr><tr><td>1</td><td>Folder</td></tr><tr><td>2</td><td>File</td></tr><tr><td>3</td><td>Album</td></tr></table></details></details>
          * @enum {integer}
@@ -6776,10 +6873,10 @@ export interface components {
             LinkID: components["schemas"]["Id2"];
         };
         /**
-         * @description <details><summary>See values descriptions</summary><details><summary>See values descriptions</summary><table><tr><th>Value</th><th>Description</th></tr><tr><td>1</td><td>Regular</td></tr><tr><td>2</td><td>Photo</td></tr></table></details></details>
+         * @description <details><summary>See values descriptions</summary><details><summary>See values descriptions</summary><table><tr><th>Value</th><th>Description</th></tr><tr><td>1</td><td>Regular</td></tr><tr><td>2</td><td>Photo</td></tr><tr><td>3</td><td>Organization</td></tr></table></details></details>
          * @enum {integer}
          */
-        VolumeType2: 1 | 2;
+        VolumeType2: 1 | 2 | 3;
         /**
          * @description <p>Can be null if the Link was deleted</p><details><summary>See values descriptions</summary><details><summary>See values descriptions</summary><table><tr><th>Value</th><th>Description</th></tr><tr><td>0</td><td>Draft</td></tr><tr><td>1</td><td>Active</td></tr><tr><td>2</td><td>Trashed</td></tr></table></details></details>
          * @enum {integer}
@@ -9119,6 +9216,36 @@ export interface operations {
             };
         };
     };
+    "post_drive-v2-volumes-{volumeID}-remove-mine": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path: {
+                volumeID: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: {
+            content: {
+                "application/json": components["schemas"]["LinkIDsRequestDto"];
+            };
+        };
+        responses: {
+            /** @description Ok */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": {
+                        /** @enum {integer} */
+                        Code?: 1001;
+                        Responses?: components["schemas"]["MultiDeleteTransformer"][];
+                    };
+                };
+            };
+        };
+    };
     "put_drive-v2-volumes-{volumeID}-links-{linkID}-rename": {
         parameters: {
             query?: never;
@@ -12150,6 +12277,29 @@ export interface operations {
             };
         };
     };
+    "post_drive-unauth-v2-volumes-{volumeID}-remove-mine": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path: {
+                volumeID: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: {
+            content: {
+                "application/json": components["schemas"]["LinkIDsRequestDto"];
+            };
+        };
+        responses: {
+            default: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content?: never;
+            };
+        };
+    };
     "put_drive-unauth-v2-volumes-{volumeID}-links-{linkID}-rename": {
         parameters: {
             query?: never;
@@ -12404,7 +12554,7 @@ export interface operations {
                 /** @description Show disabled shares as well, i.e. Shares where the ShareMemberShip for the user is non-active (locked), otherwise only return with active Membership */
                 ShowAll?: 0 | 1;
                 /** @description Filter on Share Type */
-                ShareType?: 1 | 2 | 3 | 4;
+                ShareType?: 1 | 2 | 3 | 4 | 5;
             };
             header?: never;
             path?: never;
@@ -13477,6 +13627,31 @@ export interface operations {
             };
         };
     };
+    "post_drive-organization-volumes": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        requestBody?: {
+            content: {
+                "application/json": components["schemas"]["CreateOrgVolumeRequestDto"];
+            };
+        };
+        responses: {
+            /** @description Success */
+            200: {
+                headers: {
+                    "x-pm-code": 1000;
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["GetVolumeResponseDto"];
+                };
+            };
+        };
+    };
     "get_drive-volumes": {
         parameters: {
             query?: {

package/src/internal/download/controller.ts

@@ -4,6 +4,7 @@ import { waitForCondition } from '../wait';
 export class DownloadController {
     private paused = false;
     public promise?: Promise<void>;
+    private _isDownloadCompleteWithSignatureIssues = false;
 
     constructor(private signal?: AbortSignal) {
         this.signal = signal;
@@ -31,4 +32,12 @@ export class DownloadController {
     async completion(): Promise<void> {
         await this.promise;
     }
+
+    isDownloadCompleteWithSignatureIssues(): boolean {
+        return this._isDownloadCompleteWithSignatureIssues;
+    }
+
+    setIsDownloadCompleteWithSignatureIssues(value: boolean): void {
+        this._isDownloadCompleteWithSignatureIssues = value;
+    }
 }

package/src/internal/download/cryptoService.ts

@@ -12,7 +12,7 @@ import { ProtonDriveAccount, Revision } from '../../interface';
 import { DecryptionError, IntegrityError } from '../../errors';
 import { getErrorMessage } from '../errors';
 import { mergeUint8Arrays } from '../utils';
-import { RevisionKeys } from './interface';
+import { RevisionKeys, SignatureVerificationError } from './interface';
 
 export class DownloadCryptoService {
     constructor(
@@ -90,13 +90,23 @@ export class DownloadCryptoService {
         allBlockHashes: Uint8Array[],
         armoredManifestSignature?: string,
     ): Promise<void> {
-        const verificationKeys = await this.getRevisionVerificationKeys(revision, nodeKey);
         const hash = mergeUint8Arrays(allBlockHashes);
 
         if (!armoredManifestSignature) {
             throw new IntegrityError(c('Error').t`Missing integrity signature`);
         }
 
+        let verificationKeys;
+        try {
+            verificationKeys = await this.getRevisionVerificationKeys(revision, nodeKey);
+        } catch (error: unknown) {
+            throw new SignatureVerificationError(
+                c('Error').t`Failed to get verification keys`,
+                { revisionUid: revision.uid, contentAuthor: revision.contentAuthor },
+                { cause: error },
+            );
+        }
+
         const { verified, verificationErrors } = await this.driveCrypto.verifyManifest(
             hash,
             armoredManifestSignature,
@@ -104,7 +114,7 @@ export class DownloadCryptoService {
         );
 
         if (verified !== VERIFICATION_STATUS.SIGNED_AND_VALID) {
-            throw new IntegrityError(c('Error').t`Data integrity check failed`, {
+            throw new SignatureVerificationError(c('Error').t`Data integrity check failed`, {
                 verificationErrors,
             });
         }

package/src/internal/download/fileDownloader.test.ts

@@ -4,6 +4,8 @@ import { FileDownloader } from './fileDownloader';
 import { DownloadTelemetry } from './telemetry';
 import { DownloadAPIService } from './apiService';
 import { DownloadCryptoService } from './cryptoService';
+import { SignatureVerificationError } from './interface';
+import { IntegrityError } from '../..';
 
 function mockBlockDownload(_: string, token: string, onProgress: (downloadedBytes: number) => void) {
     const index = parseInt(token.slice(5, 6));
@@ -94,8 +96,6 @@ describe('FileDownloader', () => {
 
             expect(apiService.iterateRevisionBlocks).toHaveBeenCalledWith('revisionUid', undefined);
             expect(cryptoService.verifyManifest).toHaveBeenCalledTimes(1);
-            expect(writer.close).toHaveBeenCalledTimes(1);
-            expect(writer.abort).not.toHaveBeenCalled();
             expect(telemetry.downloadFinished).toHaveBeenCalledTimes(1);
             expect(telemetry.downloadFinished).toHaveBeenCalledWith('revisionUid', fileProgress);
             expect(telemetry.downloadFailed).not.toHaveBeenCalled();
@@ -108,8 +108,6 @@ describe('FileDownloader', () => {
             await expect(controller.completion()).rejects.toThrow(error);
 
             expect(apiService.iterateRevisionBlocks).toHaveBeenCalledWith('revisionUid', undefined);
-            expect(writer.close).not.toHaveBeenCalled();
-            expect(writer.abort).toHaveBeenCalledTimes(1);
             expect(telemetry.downloadFinished).not.toHaveBeenCalled();
             expect(telemetry.downloadFailed).toHaveBeenCalledTimes(1);
             expect(telemetry.downloadFailed).toHaveBeenCalledWith(
@@ -119,6 +117,8 @@ describe('FileDownloader', () => {
                 revision.claimedSize,
             );
             expect(onFinish).toHaveBeenCalledTimes(1);
+
+            return controller;
         };
 
         const verifyOnProgress = async (downloadedBytes: number[]) => {
@@ -137,8 +137,6 @@ describe('FileDownloader', () => {
             // @ts-expect-error Mocking WritableStreamDefaultWriter
             writer = {
                 write: jest.fn(),
-                close: jest.fn(),
-                abort: jest.fn(),
             };
             // @ts-expect-error Mocking WritableStream
             stream = {
@@ -338,12 +336,22 @@ describe('FileDownloader', () => {
             await verifyOnProgress([1, 2, 3]);
         });
 
-        it('should handle failure when verifying manifest', async () => {
+        it('should handle failure when verifying manifest with non-recoverable integrity error', async () => {
+            cryptoService.verifyManifest = jest.fn().mockImplementation(async function () {
+                throw new IntegrityError('Failed to verify manifest');
+            });
+
+            const controller = await verifyFailure('Failed to verify manifest', 6); // All blocks of length 1, 2, 3.
+            expect(controller.isDownloadCompleteWithSignatureIssues()).toBe(false);
+        });
+
+        it('should handle failure when verifying manifest with recoverable signature verification error', async () => {
             cryptoService.verifyManifest = jest.fn().mockImplementation(async function () {
-                throw new Error('Failed to verify manifest');
+                throw new SignatureVerificationError('Failed to verify manifest');
             });
 
-            await verifyFailure('Failed to verify manifest', 6); // All blocks of length 1, 2, 3.
+            const controller = await verifyFailure('Failed to verify manifest', 6); // All blocks of length 1, 2, 3.
+            expect(controller.isDownloadCompleteWithSignatureIssues()).toBe(true);
         });
     });
 
@@ -389,8 +397,6 @@ describe('FileDownloader', () => {
             expect(apiService.downloadBlock).toHaveBeenCalledTimes(3);
             expect(cryptoService.verifyBlockIntegrity).not.toHaveBeenCalled();
             expect(cryptoService.decryptBlock).toHaveBeenCalledTimes(3);
-            expect(writer.close).toHaveBeenCalledTimes(1);
-            expect(writer.abort).not.toHaveBeenCalled();
             expect(telemetry.downloadFinished).toHaveBeenCalledTimes(1);
             expect(telemetry.downloadFinished).toHaveBeenCalledWith('revisionUid', 6); // 3 blocks of length 1, 2, 3.
             expect(telemetry.downloadFailed).not.toHaveBeenCalled();

package/src/internal/download/fileDownloader.ts

@@ -1,7 +1,7 @@
 import { c } from 'ttag';
 
 import { PrivateKey, SessionKey, base64StringToUint8Array } from '../../crypto';
-import { AbortError } from '../../errors';
+import { AbortError, IntegrityError } from '../../errors';
 import { Logger } from '../../interface';
 import { LoggerWithPrefix } from '../../telemetry';
 import { APIHTTPError, HTTPErrorCode } from '../apiService';
@@ -10,7 +10,7 @@ import { DownloadAPIService } from './apiService';
 import { getBlockIndex } from './blockIndex';
 import { DownloadController } from './controller';
 import { DownloadCryptoService } from './cryptoService';
-import { BlockMetadata, RevisionKeys } from './interface';
+import { BlockMetadata, RevisionKeys, SignatureVerificationError } from './interface';
 import { BufferedSeekableStream } from './seekableStream';
 import { DownloadTelemetry } from './telemetry';
 
@@ -233,13 +233,17 @@ export class FileDownloader {
                 );
             }
 
-            await writer.close();
             void this.telemetry.downloadFinished(this.revision.uid, fileProgress);
             this.logger.info(`Download succeeded`);
         } catch (error: unknown) {
-            this.logger.error(`Download failed`, error);
+            if (error instanceof SignatureVerificationError) {
+                this.logger.warn(`Download finished with signature verification issues`);
+                this.controller.setIsDownloadCompleteWithSignatureIssues(true);
+                error = new IntegrityError(error.message, error.debug, { cause: error });
+            } else {
+                this.logger.error(`Download failed`, error);
+            }
             void this.telemetry.downloadFailed(this.revision.uid, error, fileProgress, this.getClaimedSizeInBytes());
-            await writer.abort?.();
             throw error;
         } finally {
             this.logger.debug(`Download cleanup`);

package/src/internal/download/interface.ts

@@ -1,4 +1,5 @@
 import { PrivateKey, PublicKey, SessionKey } from '../../crypto';
+import { IntegrityError } from '../../errors';
 import { NodeType, Result, MissingNode, MetricVolumeType } from '../../interface';
 import { DecryptedNode, DecryptedRevision } from '../nodes';
 
@@ -35,3 +36,17 @@ export interface NodesServiceNode {
 export interface RevisionsService {
     getRevision(nodeRevisionUid: string): Promise<DecryptedRevision>;
 }
+
+/**
+ * Error thrown when the manifest signature verification fails.
+ * This is a special case that is reported as download complete with signature
+ * issues. The client must then ask the user to agree to save the file anyway
+ * or abort and clean up the file.
+ *
+ * This error is not exposed to the client. It is only used internally to track
+ * the signature verification issues. For the client it must be reported as
+ * the IntegrityError.
+ */
+export class SignatureVerificationError extends IntegrityError {
+    name = 'SignatureVerificationError';
+}

package/src/internal/nodes/apiService.ts

@@ -57,6 +57,9 @@ type PostCopyNodeRequest = Extract<
 type PostCopyNodeResponse =
     drivePaths['/drive/volumes/{volumeID}/links/{linkID}/copy']['post']['responses']['200']['content']['application/json'];
 
+type EmptyTrashResponse =
+    drivePaths['/drive/volumes/{volumeID}/trash']['delete']['responses']['200']['content']['application/json'];
+
 type PostTrashNodesRequest = Extract<
     drivePaths['/drive/v2/volumes/{volumeID}/trash_multiple']['post']['requestBody'],
     { content: object }
@@ -71,13 +74,20 @@ type PutRestoreNodesRequest = Extract<
 type PutRestoreNodesResponse =
     drivePaths['/drive/v2/volumes/{volumeID}/trash/restore_multiple']['put']['responses']['200']['content']['application/json'];
 
-type PostDeleteNodesRequest = Extract<
+type PostDeleteTrashedNodesRequest = Extract<
     drivePaths['/drive/v2/volumes/{volumeID}/trash/delete_multiple']['post']['requestBody'],
     { content: object }
 >['content']['application/json'];
-type PostDeleteNodesResponse =
+type PostDeleteTrashedNodesResponse =
     drivePaths['/drive/v2/volumes/{volumeID}/trash/delete_multiple']['post']['responses']['200']['content']['application/json'];
 
+type PostDeleteMyNodesRequest = Extract<
+    drivePaths['/drive/v2/volumes/{volumeID}/remove-mine']['post']['requestBody'],
+    { content: object }
+>['content']['application/json'];
+type PostDeleteMyNodesResponse =
+    drivePaths['/drive/v2/volumes/{volumeID}/remove-mine']['post']['responses']['200']['content']['application/json'];
+
 type PostCreateFolderRequest = Extract<
     drivePaths['/drive/v2/volumes/{volumeID}/folders']['post']['requestBody'],
     { content: object }
@@ -429,6 +439,10 @@ export abstract class NodeAPIServiceBase<
         }
     }
 
+    async emptyTrash(volumeId: string): Promise<void> {
+        await this.apiService.delete<EmptyTrashResponse>(`drive/volumes/${volumeId}/trash`);
+    }
+
     async *restoreNodes(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResult> {
         for (const { volumeId, batchNodeIds, batchNodeUids } of groupNodeUidsByVolumeAndIteratePerBatch(nodeUids)) {
             const response = await this.apiService.put<PutRestoreNodesRequest, PutRestoreNodesResponse>(
@@ -446,7 +460,7 @@ export abstract class NodeAPIServiceBase<
 
     async *deleteTrashedNodes(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResult> {
         for (const { volumeId, batchNodeIds, batchNodeUids } of groupNodeUidsByVolumeAndIteratePerBatch(nodeUids)) {
-            const response = await this.apiService.post<PostDeleteNodesRequest, PostDeleteNodesResponse>(
+            const response = await this.apiService.post<PostDeleteTrashedNodesRequest, PostDeleteTrashedNodesResponse>(
                 `drive/v2/volumes/${volumeId}/trash/delete_multiple`,
                 {
                     LinkIDs: batchNodeIds,
@@ -459,10 +473,10 @@ export abstract class NodeAPIServiceBase<
         }
     }
 
-    async *deleteExistingNodes(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResult> {
+    async *deleteMyNodes(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResult> {
         for (const { volumeId, batchNodeIds, batchNodeUids } of groupNodeUidsByVolumeAndIteratePerBatch(nodeUids)) {
-            const response = await this.apiService.post<PostDeleteNodesRequest, PostDeleteNodesResponse>(
-                `drive/v2/volumes/${volumeId}/delete_multiple`,
+            const response = await this.apiService.post<PostDeleteMyNodesRequest, PostDeleteMyNodesResponse>(
+                `drive/v2/volumes/${volumeId}/remove-mine`,
                 {
                     LinkIDs: batchNodeIds,
                 },