@protontech/drive-sdk 0.4.1 → 0.5.0

package/dist/protonDrivePublicLinkClient.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProtonDrivePublicLinkClient = void 0;
+const cache_1 = require("./cache");
 const config_1 = require("./config");
 const crypto_1 = require("./crypto");
 const telemetry_1 = require("./telemetry");
 const transformers_1 = require("./transformers");
 const apiService_1 = require("./internal/apiService");
+const download_1 = require("./internal/download");
 const sdkEvents_1 = require("./internal/sdkEvents");
 const sharingPublic_1 = require("./internal/sharingPublic");
 /**
@@ -25,26 +27,30 @@ class ProtonDrivePublicLinkClient {
     logger;
     sdkEvents;
     sharingPublic;
+    download;
     experimental;
-    constructor({ httpClient, cryptoCache, account, openPGPCryptoModule, srpModule, config, telemetry, token, password, }) {
+    constructor({ httpClient, account, openPGPCryptoModule, srpModule, config, telemetry, url, token, password, }) {
         if (!telemetry) {
             telemetry = new telemetry_1.Telemetry();
         }
         this.logger = telemetry.getLogger('interface');
+        // Use only in memory cache for public link as there are no events to keep it up to date if persisted.
+        const entitiesCache = new cache_1.MemoryCache();
+        const cryptoCache = new cache_1.MemoryCache();
         const fullConfig = (0, config_1.getConfig)(config);
         this.sdkEvents = new sdkEvents_1.SDKEvents(telemetry);
         const apiService = new apiService_1.DriveAPIService(telemetry, this.sdkEvents, httpClient, fullConfig.baseUrl, fullConfig.language);
-        const driveCrypto = new crypto_1.DriveCrypto(openPGPCryptoModule, srpModule);
-        this.sharingPublic = (0, sharingPublic_1.initSharingPublicModule)(telemetry, apiService, cryptoCache, driveCrypto, account, token, password);
+        const cryptoModule = new crypto_1.DriveCrypto(openPGPCryptoModule, srpModule);
+        this.sharingPublic = (0, sharingPublic_1.initSharingPublicModule)(telemetry, apiService, entitiesCache, cryptoCache, cryptoModule, account, url, token, password);
+        this.download = (0, download_1.initDownloadModule)(telemetry, apiService, cryptoModule, account, this.sharingPublic.shares, this.sharingPublic.nodes.access, this.sharingPublic.nodes.revisions);
         this.experimental = {
             getNodeUrl: async (nodeUid) => {
                 this.logger.debug(`Getting node URL for ${(0, transformers_1.getUid)(nodeUid)}`);
-                // TODO: public node has different URL
-                return '';
+                return this.sharingPublic.nodes.access.getNodeUrl((0, transformers_1.getUid)(nodeUid));
             },
             getDocsKey: async (nodeUid) => {
                 this.logger.debug(`Getting docs keys for ${(0, transformers_1.getUid)(nodeUid)}`);
-                const keys = await this.sharingPublic.getNodeKeys((0, transformers_1.getUid)(nodeUid));
+                const keys = await this.sharingPublic.nodes.access.getNodeKeys((0, transformers_1.getUid)(nodeUid));
                 if (!keys.contentKeyPacketSessionKey) {
                     throw new Error('Node does not have a content key packet session key');
                 }
@@ -57,16 +63,53 @@ class ProtonDrivePublicLinkClient {
      */
     async getRootNode() {
         this.logger.info(`Getting root node`);
-        return (0, transformers_1.convertInternalNodePromise)(this.sharingPublic.getRootNode());
+        const { rootNodeUid } = await this.sharingPublic.shares.getOwnVolumeIDs();
+        return (0, transformers_1.convertInternalNodePromise)(this.sharingPublic.nodes.access.getNode(rootNodeUid));
     }
     /**
      * Iterates the children of the given parent node.
      *
      * See `ProtonDriveClient.iterateFolderChildren` for more information.
      */
-    async *iterateFolderChildren(parentUid, signal) {
+    async *iterateFolderChildren(parentUid, filterOptions, signal) {
         this.logger.info(`Iterating children of ${(0, transformers_1.getUid)(parentUid)}`);
-        yield* (0, transformers_1.convertInternalNodeIterator)(this.sharingPublic.iterateFolderChildren((0, transformers_1.getUid)(parentUid), signal));
+        yield* (0, transformers_1.convertInternalNodeIterator)(this.sharingPublic.nodes.access.iterateFolderChildren((0, transformers_1.getUid)(parentUid), filterOptions, signal));
+    }
+    /**
+     * Iterates the nodes by their UIDs.
+     *
+     * See `ProtonDriveClient.iterateNodes` for more information.
+     */
+    async *iterateNodes(nodeUids, signal) {
+        this.logger.info(`Iterating ${nodeUids.length} nodes`);
+        yield* (0, transformers_1.convertInternalMissingNodeIterator)(this.sharingPublic.nodes.access.iterateNodes((0, transformers_1.getUids)(nodeUids), signal));
+    }
+    /**
+     * Get the node by its UID.
+     *
+     * See `ProtonDriveClient.getNode` for more information.
+     */
+    async getNode(nodeUid) {
+        this.logger.info(`Getting node ${(0, transformers_1.getUid)(nodeUid)}`);
+        return (0, transformers_1.convertInternalNodePromise)(this.sharingPublic.nodes.access.getNode((0, transformers_1.getUid)(nodeUid)));
+    }
+    /**
+     * Get the file downloader to download the node content.
+     *
+     * See `ProtonDriveClient.getFileDownloader` for more information.
+     */
+    async getFileDownloader(nodeUid, signal) {
+        this.logger.info(`Getting file downloader for ${(0, transformers_1.getUid)(nodeUid)}`);
+        return this.download.getFileDownloader((0, transformers_1.getUid)(nodeUid), signal);
+    }
+    /**
+     * Iterates the thumbnails of the given nodes.
+     *
+     * See `ProtonDriveClient.iterateThumbnails` for more information.
+     */
+    async *iterateThumbnails(nodeUids, thumbnailType, signal) {
+        this.logger.info(`Iterating ${nodeUids.length} thumbnails`);
+        yield* this.download.iterateThumbnails((0, transformers_1.getUids)(nodeUids), thumbnailType, signal);
     }
 }
 exports.ProtonDrivePublicLinkClient = ProtonDrivePublicLinkClient;

package/dist/protonDrivePublicLinkClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"protonDrivePublicLinkClient.js","sourceRoot":"","sources":["../src/protonDrivePublicLinkClient.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,qCAA6E;AAW7E,2CAAwC;AACxC,iDAAiG;AACjG,sDAAwD;AACxD,oDAAiD;AACjD,4DAAmE;AAEnE;;;;;;;;;;;;GAYG;AACH,MAAa,2BAA2B;IAC5B,MAAM,CAAS;IACf,SAAS,CAAY;IACrB,aAAa,CAA6C;IAE3D,YAAY,CAejB;IAEF,YAAY,EACR,UAAU,EACV,WAAW,EACX,OAAO,EACP,mBAAmB,EACnB,SAAS,EACT,MAAM,EACN,SAAS,EACT,KAAK,EACL,QAAQ,GAWX;QACG,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,IAAA,kBAAS,EAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC,SAAS,CAAC,CAAC;QAE1C,MAAM,UAAU,GAAG,IAAI,4BAAe,CAClC,SAAS,EACT,IAAI,CAAC,SAAS,EACd,UAAU,EACV,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,QAAQ,CACtB,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,oBAAW,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;QACpE,IAAI,CAAC,aAAa,GAAG,IAAA,uCAAuB,EACxC,SAAS,EACT,UAAU,EACV,WAAW,EACX,WAAW,EACX,OAAO,EACP,KAAK,EACL,QAAQ,CACX,CAAC;QAEF,IAAI,CAAC,YAAY,GAAG;YAChB,UAAU,EAAE,KAAK,EAAE,OAAkB,EAAE,EAAE;gBACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,IAAA,qBAAM,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC7D,sCAAsC;gBACtC,OAAO,EAAE,CAAC;YACd,CAAC;YACD,UAAU,EAAE,KAAK,EAAE,OAAkB,EAAE,EAAE;gBACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,IAAA,qBAAM,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAA,qBAAM,EAAC,OAAO,CAAC,CAAC,CAAC;gBACnE,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;oBACnC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBAC3E,CAAC;gBACD,OAAO,IAAI,CAAC,0BAA0B,CAAC;YAC3C,CAAC;SACJ,CAAC;IACN,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW;QACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACtC,OAAO,IAAA,yCAA0B,EAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;IACxE,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,CAAC,qBAAqB,CAAC,SAAoB,EAAE,MAAoB;QACnE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAA,qBAAM,EAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC/D,KAAM,CAAC,CAAC,IAAA,0CAA2B,EAAC,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,IAAA,qBAAM,EAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7G,CAAC;CACJ;AAvGD,kEAuGC"}
+{"version":3,"file":"protonDrivePublicLinkClient.js","sourceRoot":"","sources":["../src/protonDrivePublicLinkClient.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@protontech/drive-sdk",
-    "version": "0.4.1",
+    "version": "0.5.0",
     "description": "Proton Drive SDK",
     "license": "GPL-3.0",
     "main": "dist/index.js",

package/src/diagnostic/sdkDiagnostic.ts

@@ -133,7 +133,7 @@ export class SDKDiagnostic implements Diagnostic {
         const claimedSizeInBytes = downloader.getClaimedSizeInBytes();
 
         const integrityVerificationStream = new IntegrityVerificationStream();
-        const controller = downloader.writeToStream(integrityVerificationStream);
+        const controller = downloader.downloadToStream(integrityVerificationStream);
 
         try {
             await controller.completion();

package/src/interface/download.ts

@@ -15,14 +15,14 @@ export interface FileDownloader {
      *
      * @param onProgress - Callback that is called with the number of downloaded bytes
      */
-    writeToStream(streamFactory: WritableStream, onProgress?: (downloadedBytes: number) => void): DownloadController;
+    downloadToStream(streamFactory: WritableStream, onProgress?: (downloadedBytes: number) => void): DownloadController;
 
     /**
-     * Same as `writeToStream` but without verification checks.
+     * Same as `downloadToStream` but without verification checks.
      *
      * Use this only for debugging purposes.
      */
-    unsafeWriteToStream(
+    unsafeDownloadToStream(
         streamFactory: WritableStream,
         onProgress?: (downloadedBytes: number) => void,
     ): DownloadController;
@@ -34,7 +34,7 @@ export interface FileDownloader {
      * need to download the entire file.
      *
      * Stream doesn't verify data integrity. For the full integrity of
-     * the file, use `writeToStream` instead.
+     * the file, use `downloadToStream` instead.
      *
      * The stream is not opportunitistically downloading the data ahead of
      * the time. It will only download the data when it is requested. To

package/src/interface/upload.ts

@@ -41,7 +41,7 @@ export interface FileRevisionUploader {
      *
      * The function will reject if the node with the given name already exists.
      */
-    writeStream(
+    uploadFromStream(
         stream: ReadableStream,
         thumnbails: Thumbnail[],
         onProgress?: (uploadedBytes: number) => void,
@@ -57,7 +57,7 @@ export interface FileRevisionUploader {
      *
      * The function will reject if the node with the given name already exists.
      */
-    writeFile(
+    uploadFromFile(
         fileObject: File,
         thumnbails: Thumbnail[],
         onProgress?: (uploadedBytes: number) => void,
@@ -79,5 +79,5 @@ export interface FileUploader extends FileRevisionUploader {
 export interface UploadController {
     pause(): void;
     resume(): void;
-    completion(): Promise<string>;
+    completion(): Promise<{ nodeRevisionUid: string, nodeUid: string }>;
 }

package/src/internal/apiService/apiService.test.ts

@@ -1,3 +1,4 @@
+import { AbortError } from '../../errors';
 import { ProtonDriveHTTPClient, SDKEvent } from '../../interface';
 import { getMockTelemetry } from '../../tests/telemetry';
 import { SDKEvents } from '../sdkEvents';
@@ -112,6 +113,16 @@ describe('DriveAPIService', () => {
     });
 
     describe('should throw', () => {
+        it('AbortError on aborted error from the provided HTTP client', async () => {
+            const abortError = new Error('AbortError');
+            abortError.name = 'AbortError';
+
+            httpClient.fetchJson = jest.fn(() => Promise.reject(abortError));
+
+            await expect(api.get('test')).rejects.toThrow(new AbortError('Request aborted'));
+            expectSDKEvents();
+        });
+
         it('APIHTTPError on 4xx response without JSON body', async () => {
             httpClient.fetchJson = jest.fn(() =>
                 Promise.resolve(new Response('Not found', { status: 404, statusText: 'Not found' })),
@@ -314,5 +325,44 @@ describe('DriveAPIService', () => {
             expect(httpClient.fetchJson).toHaveBeenCalledTimes(35);
             expectSDKEvents();
         });
+
+        it('notify about offline error', async () => {
+            jest.useFakeTimers();
+            const offlineError = new Error('OfflineError');
+            offlineError.name = 'OfflineError';
+
+            let attempt = 0;
+            httpClient.fetchJson = jest.fn().mockImplementation(() => {
+                if (attempt++ >= 15) {
+                    return generateOkResponse();
+                }
+                throw offlineError;
+            });
+
+            const promise = api.get('test');
+
+            // First 9 calls (first is immediate, then 8 with 5 second delay), no events are sent yet
+            await jest.advanceTimersByTimeAsync(5 * 8 * 1000);
+            expect(httpClient.fetchJson).toHaveBeenCalledTimes(9);
+            expectSDKEvents();
+
+            // 10th call, service sends TransfersPaused event
+            await jest.advanceTimersByTimeAsync(5 * 1000);
+            expect(httpClient.fetchJson).toHaveBeenCalledTimes(10);
+            expectSDKEvents(SDKEvent.TransfersPaused);
+
+            // Next 5 calls, still offline, no more events are sent
+            await jest.advanceTimersByTimeAsync(5 * 5 * 1000);
+            expect(httpClient.fetchJson).toHaveBeenCalledTimes(15);
+            expectSDKEvents(SDKEvent.TransfersPaused);
+
+            // 16th call, mock returns OK response, service sends TransfersResumed event
+            await jest.advanceTimersByTimeAsync(5 * 1000);
+            expect(httpClient.fetchJson).toHaveBeenCalledTimes(16);
+            expectSDKEvents(SDKEvent.TransfersPaused, SDKEvent.TransfersResumed);
+
+            await promise;
+        });
+
     });
 });

package/src/internal/apiService/apiService.ts

@@ -40,6 +40,11 @@ const TOO_MANY_SUBSEQUENT_SERVER_ERRORS = 10;
  */
 const TOO_MANY_SUBSEQUENT_SERVER_ERRORS_TIMEOUT_IN_SECONDS = 60;
 
+/**
+ * How many subsequent offline errors are allowed before we consider the client offline.
+ */
+const TOO_MANY_SUBSEQUENT_OFFLINE_ERRORS = 10;
+
 /**
  * After how long to re-try after 5xx or timeout error.
  */
@@ -88,6 +93,8 @@ export class DriveAPIService {
     private subsequentServerErrorsCounter = 0;
     private lastServerErrorAt?: number;
 
+    private subsequentOfflineErrorsCounter = 0;
+
     private logger: Logger;
 
     constructor(
@@ -219,7 +226,7 @@ export class DriveAPIService {
                 if (error instanceof ProtonDriveError) {
                     throw error;
                 }
-                throw apiErrorFactory({ response });
+                throw apiErrorFactory({ response, error });
             }
         }
         return response;
@@ -261,7 +268,13 @@ export class DriveAPIService {
             response = await callback();
         } catch (error: unknown) {
             if (error instanceof Error) {
+                if (error.name === 'AbortError') {
+                    this.logger.debug(`${request.method} ${request.url}: Aborted`);
+                    throw new AbortError(c('Error').t`Request aborted`);
+                }
+
                 if (error.name === 'OfflineError') {
+                    this.offlineErrorHappened();
                     this.logger.info(`${request.method} ${request.url}: Offline error, retrying`);
                     await waitSeconds(OFFLINE_RETRY_DELAY_SECONDS);
                     return this.fetch(request, callback, attempt + 1);
@@ -282,6 +295,8 @@ export class DriveAPIService {
             throw error;
         }
 
+        this.clearSubsequentOfflineErrors();
+
         const end = Date.now();
         const duration = end - start;
 
@@ -342,7 +357,7 @@ export class DriveAPIService {
         // the client is very limited. This is generic event and it doesn't
         // take into account that various endpoints can be rate limited
         // independently.
-        if (this.subsequentTooManyRequestsCounter >= TOO_MANY_SUBSEQUENT_429_ERRORS) {
+        if (this.subsequentTooManyRequestsCounter === TOO_MANY_SUBSEQUENT_429_ERRORS) {
             this.sdkEvents.requestsThrottled();
         }
     }
@@ -373,4 +388,20 @@ export class DriveAPIService {
         this.subsequentServerErrorsCounter = 0;
         this.lastServerErrorAt = undefined;
     }
+
+    private offlineErrorHappened() {
+        this.subsequentOfflineErrorsCounter++;
+
+        if (this.subsequentOfflineErrorsCounter === TOO_MANY_SUBSEQUENT_OFFLINE_ERRORS) {
+            this.sdkEvents.transfersPaused();
+        }
+    }
+
+    private clearSubsequentOfflineErrors() {
+        if (this.subsequentOfflineErrorsCounter >= TOO_MANY_SUBSEQUENT_OFFLINE_ERRORS) {
+            this.sdkEvents.transfersResumed();
+        }
+
+        this.subsequentOfflineErrorsCounter = 0;
+    }
 }

package/src/internal/apiService/driveTypes.ts

@@ -1540,10 +1540,16 @@ export interface paths {
             path?: never;
             cookie?: never;
         };
-        /** Get status of migration from legacy photo share on a regular volume into a new Photo Volume */
+        /**
+         * Get status of migration from legacy photo share on a regular volume into a new Photo Volume
+         * @deprecated
+         */
         get: operations['get_drive-photos-migrate-legacy'];
         put?: never;
-        /** Start migration from legacy photo share on a regular volume into a new Photo Volume */
+        /**
+         * DEPRECATED: All shares have been migrated, always returns share not found
+         * @deprecated
+         */
         post: operations['post_drive-photos-migrate-legacy'];
         delete?: never;
         options?: never;
@@ -3502,7 +3508,7 @@ export interface components {
             Thumbnail: number | null;
             /**
              * @deprecated
-             * @description Hash of thumbnail contents
+             * @description sha256 hash of thumbnail contents
              * @default null
              */
             ThumbnailHash: string | null;
@@ -3679,7 +3685,6 @@ export interface components {
              */
             Code: 1000;
         };
-        MigrateFromLegacyRequest: Record<string, never>;
         RemoveTagsRequestDto: {
             Tags: components['schemas']['TagType'][];
         };
@@ -5097,7 +5102,10 @@ export interface components {
             File: components['schemas']['FileDto'];
             /** @default null */
             Sharing: components['schemas']['SharingDto'] | null;
-            /** @default null */
+            /**
+             * @description Will be null if the user is not a member or is the owner.
+             * @default null
+             */
             Membership: components['schemas']['MembershipDto'] | null;
             /** @default null */
             Folder: null | null;
@@ -5109,7 +5117,10 @@ export interface components {
             Folder: components['schemas']['FolderDto'];
             /** @default null */
             Sharing: components['schemas']['SharingDto'] | null;
-            /** @default null */
+            /**
+             * @description Will be null if the user is not a member or is the owner.
+             * @default null
+             */
             Membership: components['schemas']['MembershipDto'] | null;
             /** @default null */
             File: null | null;
@@ -5235,7 +5246,7 @@ export interface components {
             Size: number;
             /** @description Index of block in list (must be consecutive starting at 1) */
             Index: number;
-            /** @description Hash of encrypted block, base64 encoded */
+            /** @description sha256 hash of encrypted block, base64 encoded */
             Hash: string;
             /** @default null */
             Verifier: components['schemas']['Verifier'] | null;
@@ -5249,7 +5260,7 @@ export interface components {
             /** @description Block size in bytes. WARNING: when type is NOT 2=HDPreview(1920) then the max size is 65536 */
             Size: number;
             Type: components['schemas']['ThumbnailType'];
-            /** @description Hash of encrypted block, base64 encoded */
+            /** @description sha256 hash of encrypted block, base64 encoded */
             Hash: string;
         };
         BlockURL: {
@@ -5330,7 +5341,7 @@ export interface components {
             Size: number;
             /** @description Index of block in list (must be consecutive starting at 1) */
             Index: number;
-            /** @description Hash of encrypted block, base64 encoded */
+            /** @description sha256 hash of encrypted block, base64 encoded */
             Hash: string;
             Verifier: components['schemas']['Verifier'];
             /**
@@ -5387,7 +5398,10 @@ export interface components {
             Folder: components['schemas']['FolderDto2'];
             /** @default null */
             Sharing: components['schemas']['SharingDto2'] | null;
-            /** @default null */
+            /**
+             * @description Will be null if the user is not a member or is the owner.
+             * @default null
+             */
             Membership: components['schemas']['MembershipDto2'] | null;
             /** @default null */
             File: null | null;
@@ -5400,10 +5414,10 @@ export interface components {
          */
         ShareType: 1 | 2 | 3 | 4;
         /**
-         * @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>4</td><td>Migrating</td></tr><tr><td>5</td><td>Migrated</td></tr><tr><td>6</td><td>Locked</td></tr></table></details></details>
+         * @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>5</td><td>Migrated</td></tr><tr><td>6</td><td>Locked</td></tr></table></details></details>
          * @enum {integer}
          */
-        ShareState: 1 | 2 | 3 | 4 | 5 | 6;
+        ShareState: 1 | 2 | 3 | 5 | 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>
          * @enum {integer}
@@ -5518,6 +5532,7 @@ export interface components {
              */
             Token: string;
             LinkType: components['schemas']['NodeType3'];
+            VolumeID: components['schemas']['Id2'];
             LinkID: components['schemas']['Id2'];
             SharePasswordSalt: components['schemas']['BinaryString2'];
             SharePassphrase: components['schemas']['PGPMessage2'];
@@ -6921,7 +6936,6 @@ export interface operations {
                     'application/json': {
                         /** @description Potential codes and their meaning:
                          *      - 2500: A volume is already active
-                         *      - 2500: Cannot create the new Photo volume. Should be migrated from current Photo stream
                          *      - 2001: Invalid PGP message
                          *      - 200501: Operation failed: Please retry
                          *      - 200200: Address not found
@@ -8717,6 +8731,7 @@ export interface operations {
                         | {
                               /** @description Potential codes and their meaning:
                                *      - 200003: Max file size limited to 100 MB on your plan. Please upgrade.
+                               *      - 200303: Cannot commit related photo with main already in album
                                *      */
                               Code: number;
                           }
@@ -8837,6 +8852,7 @@ export interface operations {
                         | {
                               /** @description Potential codes and their meaning:
                                *      - 200003: Max file size limited to 100 MB on your plan. Please upgrade.
+                               *      - 200303: Cannot commit related photo with main already in album
                                *      */
                               Code: number;
                           }
@@ -10257,22 +10273,8 @@ export interface operations {
             path?: never;
             cookie?: never;
         };
-        requestBody?: {
-            content: {
-                'application/json': components['schemas']['MigrateFromLegacyRequest'];
-            };
-        };
+        requestBody?: never;
         responses: {
-            /** @description Accepted */
-            202: {
-                headers: {
-                    'x-pm-code': 1002;
-                    [name: string]: unknown;
-                };
-                content: {
-                    'application/json': components['schemas']['AcceptedResponse'];
-                };
-            };
             /** @description Unprocessable Entity */
             422: {
                 headers: {
@@ -10281,32 +10283,12 @@ export interface operations {
                 content: {
                     'application/json': {
                         /** @description Potential codes and their meaning:
-                         *      - 2500: Migration in progress
                          *      - 2501: Share not found
-                         *      - 2501: Volume not found
-                         *      - 2501: Address not found
                          *      */
                         Code: number;
                     };
                 };
             };
-            /** @description Failed dependency */
-            424: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    'application/json': {
-                        /**
-                         * @description Potential codes:
-                         *      - 2032
-                         *
-                         * @enum {integer}
-                         */
-                        Code: 2032;
-                    };
-                };
-            };
         };
     };
     'get_drive-volumes-{volumeID}-photos': {
@@ -10482,6 +10464,7 @@ export interface operations {
                               /** @description Potential codes and their meaning:
                                *      - 2011: The current ShareURL does not have read+write permissions.
                                *      - 200003: Max file size limited to 100 MB on your plan. Please upgrade.
+                               *      - 200303: Cannot commit related photo with main already in album
                                *      */
                               Code: number;
                           }

package/src/internal/apiService/errors.test.ts

@@ -1,3 +1,4 @@
+import { AbortError } from '../../errors';
 import { apiErrorFactory } from './errors';
 import * as errors from './errors';
 import { ErrorCode } from './errorCodes';
@@ -17,6 +18,15 @@ function mockAPIResponseAndResult(options: {
 }
 
 describe('apiErrorFactory should return', () => {
+    it('AbortError on aborted error', () => {
+        const abortError = new Error('AbortError');
+        abortError.name = 'AbortError';
+
+        const error = apiErrorFactory({ response: new Response(), error: abortError });
+        expect(error).toBeInstanceOf(AbortError);
+        expect(error.message).toBe('Request aborted');
+    });
+
     it('generic APIHTTPError when there is no specifc body', () => {
         const response = new Response('', { status: 404, statusText: 'Not found' });
         const error = apiErrorFactory({ response });

package/src/internal/apiService/errors.ts

@@ -1,6 +1,6 @@
 import { c } from 'ttag';
 
-import { ServerError, ValidationError } from '../../errors';
+import { AbortError, ServerError, ValidationError } from '../../errors';
 import { ErrorCode, HTTPErrorCode } from './errorCodes';
 
 export function apiErrorFactory({
@@ -12,6 +12,10 @@ export function apiErrorFactory({
     result?: unknown;
     error?: unknown;
 }): ServerError {
+    if (error && error instanceof Error && error.name === 'AbortError') {
+        return new AbortError(c('Error').t`Request aborted`);
+    }
+
     // Backend responses with 404 both in the response and body code.
     // In such a case we want to stick to APIHTTPError to be very clear
     // it is not NotFoundAPIError.

package/src/internal/asyncIteratorMap.test.ts

@@ -1,3 +1,4 @@
+import { AbortError } from '../errors';
 import { asyncIteratorMap } from './asyncIteratorMap';
 
 // Helper function to create an async generator from array
@@ -147,4 +148,15 @@ describe('asyncIteratorMap', () => {
         expect(maxConcurrentExecutions).toBe(concurrencyLimit);
         expect(results).toEqual([2, 4, 6, 8, 10, 12, 14, 16]);
     });
+
+    test('throws AbortError if signal is aborted', async () => {
+        const inputGen = createAsyncGenerator([1, 2, 3, 4, 5]);
+        const mapper = async (x: number) => x * 2;
+
+        const ac = new AbortController();
+        ac.abort();
+
+        const mappedGen = asyncIteratorMap(inputGen, mapper, 1, ac.signal);
+        await expect(collectResults(mappedGen)).rejects.toThrow(AbortError);
+    });
 });

package/src/internal/asyncIteratorMap.ts

@@ -1,3 +1,7 @@
+import { c } from 'ttag';
+
+import { AbortError } from '../errors';
+
 const DEFAULT_CONCURRENCY = 10;
 
 /**
@@ -18,6 +22,7 @@ export async function* asyncIteratorMap<I, O>(
     inputIterator: AsyncGenerator<I>,
     mapper: (item: I) => Promise<O>,
     concurrency: number = DEFAULT_CONCURRENCY,
+    signal?: AbortSignal,
 ): AsyncGenerator<O> {
     let done = false;
 
@@ -50,6 +55,9 @@ export async function* asyncIteratorMap<I, O>(
     };
 
     while (!done || executing.size > 0 || results.length > 0) {
+        if (signal?.aborted) {
+            throw new AbortError(c('Error').t`Operation aborted`);
+        }
         while (!done && executing.size < concurrency) {
             await pump();
         }