@protontech/drive-sdk 0.9.9 → 0.11.0

package/dist/internal/photos/addToAlbum.test.js

@@ -0,0 +1,409 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("../../tests/logger");
+const addToAlbum_1 = require("./addToAlbum");
+const errors_1 = require("./errors");
+/**
+ * Helper to create a mock photo node with minimal required properties.
+ */
+function createMockPhotoNode(uid, overrides = {}) {
+    return {
+        uid,
+        parentUid: 'volume1~parent',
+        hash: 'hash',
+        photo: {
+            captureTime: new Date(),
+            mainPhotoNodeUid: undefined,
+            relatedPhotoNodeUids: [],
+            tags: [],
+            albums: [],
+        },
+        activeRevision: {
+            ok: true,
+            value: {
+                uid: 'rev1',
+                state: 'active',
+                creationTime: new Date(),
+                storageSize: 100,
+                signatureEmail: 'test@example.com',
+                claimedModificationTime: new Date(),
+                claimedSize: 100,
+                claimedDigests: { sha1: 'sha1hash' },
+                claimedBlockSizes: [100],
+            },
+        },
+        keyAuthor: { ok: true, value: 'test@example.com' },
+        ...overrides,
+    };
+}
+describe('AddToAlbumProcess', () => {
+    let apiService;
+    let cryptoService;
+    let nodesService;
+    let albumKeys;
+    let signingKeys;
+    beforeEach(() => {
+        albumKeys = {
+            key: 'albumKey',
+            hashKey: new Uint8Array([1, 2, 3]),
+            passphrase: 'passphrase',
+            passphraseSessionKey: 'passphraseSessionKey',
+        };
+        signingKeys = {
+            type: 'userAddress',
+            email: 'test@example.com',
+            addressId: 'addressId',
+            key: 'signingKey',
+        };
+        // @ts-expect-error Mocking for testing purposes
+        apiService = {
+            addPhotosToAlbum: jest.fn(),
+            copyPhotoToAlbum: jest.fn(),
+        };
+        // @ts-expect-error Mocking for testing purposes
+        cryptoService = {
+            encryptPhotoForAlbum: jest.fn(),
+        };
+        // @ts-expect-error Mocking for testing purposes
+        nodesService = {
+            iterateNodes: jest.fn(),
+            getNodePrivateAndSessionKeys: jest.fn(),
+            notifyNodeChanged: jest.fn(),
+            notifyChildCreated: jest.fn(),
+        };
+    });
+    function executeProcess(photoUids) {
+        const process = new addToAlbum_1.AddToAlbumProcess('volume1~album', albumKeys, signingKeys, apiService, cryptoService, nodesService, (0, logger_1.getMockLogger)());
+        return Array.fromAsync(process.execute(photoUids));
+    }
+    beforeEach(() => {
+        nodesService.iterateNodes.mockImplementation(async function* (uids) {
+            for (const uid of uids) {
+                const photoNode = createMockPhotoNode(uid);
+                // Handle uids in the form 'volumeId~mainPhoto-related:X' where X is the number of related photos
+                const relatedMatch = /^(.+)~(.+)-related:(\d+)$/.exec(uid);
+                if (relatedMatch) {
+                    const [, volumeId, mainPhoto, countStr] = relatedMatch;
+                    const count = parseInt(countStr, 10);
+                    photoNode.photo.relatedPhotoNodeUids = Array.from({ length: count }, (_, idx) => `${volumeId}~related${idx + 1}`);
+                }
+                yield photoNode;
+            }
+        });
+        nodesService.getNodePrivateAndSessionKeys.mockResolvedValue({
+            key: 'nodeKey',
+            nameSessionKey: 'sessionKey',
+            passphrase: 'passphrase',
+            passphraseSessionKey: 'passphraseSessionKey',
+        });
+        cryptoService.encryptPhotoForAlbum.mockResolvedValue({
+            contentHash: 'contentHash',
+            hash: 'nameHash',
+            encryptedName: 'encryptedName',
+            nameSignatureEmail: 'test@example.com',
+            armoredNodePassphrase: 'passphrase',
+            armoredNodePassphraseSignature: 'signature',
+            signatureEmail: 'test@example.com',
+        });
+        let addToAlbumReturnedMissing = false;
+        apiService.addPhotosToAlbum.mockImplementation(async function* (albumUid, payloads) {
+            for (const payload of payloads) {
+                let error;
+                if (payload.nodeUid.includes('missingRelatedTwice')) {
+                    error = new errors_1.MissingRelatedPhotosError(['volume1~missingRelatedTwice1']);
+                    addToAlbumReturnedMissing = true;
+                }
+                if (!addToAlbumReturnedMissing && payload.nodeUid.includes('missingRelatedOnce')) {
+                    error = new errors_1.MissingRelatedPhotosError(['volume1~missingRelatedOnce1']);
+                    addToAlbumReturnedMissing = true;
+                }
+                if (error) {
+                    yield { uid: payload.nodeUid, ok: false, error };
+                }
+                else {
+                    yield { uid: payload.nodeUid, ok: true };
+                }
+            }
+        });
+        let copyToAlbumReturnedMissing = false;
+        apiService.copyPhotoToAlbum.mockImplementation(async (albumUid, payload) => {
+            let error;
+            if (payload.nodeUid.includes('missingRelatedTwice')) {
+                error = new errors_1.MissingRelatedPhotosError(['volume2~missingRelatedTwice1']);
+                copyToAlbumReturnedMissing = true;
+            }
+            if (!copyToAlbumReturnedMissing && payload.nodeUid.includes('missingRelatedOnce')) {
+                error = new errors_1.MissingRelatedPhotosError(['volume2~missingRelatedOnce1']);
+                copyToAlbumReturnedMissing = true;
+            }
+            if (error) {
+                throw error;
+            }
+            return `volume1~copied${payload.nodeUid}`;
+        });
+    });
+    describe('Adding photos to the same volume', () => {
+        it('should prepare photo payloads in parallel without blocking', async () => {
+            // Setup: 25 photos (more than BATCH_LOADING_SIZE of 20)
+            const photoUids = Array.from({ length: 25 }, (_, i) => `volume1~photo${i}`);
+            let addPhotosCallCount = 0;
+            apiService.addPhotosToAlbum.mockImplementation(async function* (albumUid, payloads) {
+                addPhotosCallCount++;
+                // First call should happen before all 25 photos are prepared
+                // (should only have first batch of 20 prepared)
+                if (addPhotosCallCount === 1) {
+                    expect(nodesService.iterateNodes).toHaveBeenCalledTimes(1);
+                }
+                for (const payload of payloads) {
+                    yield { uid: payload.nodeUid, ok: true };
+                }
+            });
+            const results = await executeProcess(photoUids);
+            expect(results).toHaveLength(25);
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(2);
+            expect(nodesService.iterateNodes.mock.calls[0][0]).toHaveLength(20);
+            expect(nodesService.iterateNodes.mock.calls[1][0]).toHaveLength(5);
+            expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(3);
+            expect(apiService.addPhotosToAlbum.mock.calls[0][1].length).toBe(10);
+            expect(apiService.addPhotosToAlbum.mock.calls[1][1].length).toBe(10);
+            expect(apiService.addPhotosToAlbum.mock.calls[2][1].length).toBe(5);
+        });
+        it('should include related photos in the same batch even if it exceeds batch size', async () => {
+            // Create a photo with 15 related photos (total size = 16, which exceeds batch size of 10)
+            const mainPhotoUid = 'volume1~mainPhoto-related:15';
+            const results = await executeProcess([mainPhotoUid]);
+            expect(results).toMatchObject([{
+                    uid: mainPhotoUid,
+                    ok: true,
+                }]);
+            expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(1);
+            const params = apiService.addPhotosToAlbum.mock.calls[0];
+            expect(params[1].length).toBe(1);
+            expect(params[1][0].relatedPhotos?.length).toBe(15);
+        });
+        it('should re-queue photo when missing related photos error occurs', async () => {
+            const photoUid = 'volume1~mainPhoto-related:1-missingRelatedOnce';
+            const process = new addToAlbum_1.AddToAlbumProcess('volume1~album', albumKeys, signingKeys, apiService, cryptoService, nodesService, (0, logger_1.getMockLogger)());
+            const results = await Array.fromAsync(process.execute([photoUid]));
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: true,
+                }]);
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3); // main photo + related photo + missing related photo
+            expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(2); // two attempts
+        });
+        it('should return error if missing related photos error occurs twice', async () => {
+            const photoUid = 'volume1~photo1-missingRelatedTwice';
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: false,
+                    error: new errors_1.MissingRelatedPhotosError(['volume1~missingRelatedOnce1']),
+                }]);
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3); // main photo + related photo + missing related photo
+            expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(2); // two attempts
+        });
+        it('should return error when crypto service fails', async () => {
+            const photoUid = 'volume1~photo1';
+            const cryptoError = new Error('Crypto operation failed');
+            cryptoService.encryptPhotoForAlbum.mockRejectedValue(cryptoError);
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: false,
+                    error: cryptoError,
+                }]);
+        });
+        it('should return error when getNodePrivateAndSessionKeys fails', async () => {
+            const photoUid = 'volume1~photo1';
+            const keysError = new Error('Failed to get keys');
+            nodesService.getNodePrivateAndSessionKeys.mockRejectedValue(keysError);
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: false,
+                    error: keysError,
+                }]);
+        });
+        it('should notify node changed for successfully added photos', async () => {
+            const photoUid = 'volume1~photo1';
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: true,
+                }]);
+            expect(nodesService.notifyNodeChanged).toHaveBeenCalledTimes(1);
+            expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith(photoUid);
+        });
+        it('should not notify node changed for failed photos', async () => {
+            const photoUid = 'volume1~photo1';
+            apiService.addPhotosToAlbum.mockImplementation(async function* (albumUid, payloads) {
+                yield { uid: photoUid, ok: false, error: new Error('API error') };
+            });
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: false,
+                    error: new Error('API error'),
+                }]);
+            expect(nodesService.notifyNodeChanged).not.toHaveBeenCalled();
+        });
+    });
+    describe('Adding photos to a different volume', () => {
+        it('should prepare photo payloads in parallel without blocking', async () => {
+            // Setup: 25 photos from different volume (more than BATCH_LOADING_SIZE of 20)
+            const photoUids = Array.from({ length: 25 }, (_, i) => `volume2~photo${i}`);
+            let copyPhotoCallCount = 0;
+            apiService.copyPhotoToAlbum.mockImplementation(async (albumUid, payload) => {
+                copyPhotoCallCount++;
+                // First few calls should happen before all 25 photos are prepared
+                if (copyPhotoCallCount <= 20) {
+                    expect(nodesService.iterateNodes).toHaveBeenCalledTimes(1);
+                }
+                return `volume1~copied${copyPhotoCallCount}`;
+            });
+            const results = await executeProcess(photoUids);
+            expect(results).toHaveLength(25);
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(2);
+            expect(nodesService.iterateNodes.mock.calls[0][0]).toHaveLength(20);
+            expect(nodesService.iterateNodes.mock.calls[1][0]).toHaveLength(5);
+            expect(copyPhotoCallCount).toBe(25);
+        });
+        it('should include related photos in copy request', async () => {
+            const mainPhotoUid = 'volume2~mainPhoto-related:15';
+            const results = await executeProcess([mainPhotoUid]);
+            expect(results).toMatchObject([{
+                    uid: mainPhotoUid,
+                    ok: true,
+                }]);
+            expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(1);
+            const params = apiService.copyPhotoToAlbum.mock.calls[0];
+            expect(params[1].relatedPhotos?.length).toBe(15);
+        });
+        it('should re-queue photo when missing related photos error occurs', async () => {
+            const photoUid = 'volume2~photo1-related:1-missingRelatedOnce';
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: true,
+                }]);
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3); // main photo + related photo + missing related photo
+            expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(2); // two attempts
+        });
+        it('should return error if missing related photos error occurs twice', async () => {
+            const photoUid = 'volume2~photo1-missingRelatedTwice';
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: false,
+                    error: new errors_1.MissingRelatedPhotosError(['volume2~missingRelatedOnce1']),
+                }]);
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3); // main photo + related photo + missing related photo
+            expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(2); // two attempts
+        });
+        it('should return error when crypto service fails', async () => {
+            const photoUid = 'volume2~photo1';
+            const cryptoError = new Error('Crypto operation failed');
+            cryptoService.encryptPhotoForAlbum.mockRejectedValue(cryptoError);
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: false,
+                    error: cryptoError,
+                }]);
+        });
+        it('should return error when getNodePrivateAndSessionKeys fails', async () => {
+            const photoUid = 'volume2~photo1';
+            const keysError = new Error('Failed to get keys');
+            nodesService.getNodePrivateAndSessionKeys.mockRejectedValue(keysError);
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: false,
+                    error: keysError,
+                }]);
+        });
+        it('should notify child created for successfully copied photos', async () => {
+            const photoUid = 'volume2~photo1';
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: true,
+                }]);
+            expect(nodesService.notifyChildCreated).toHaveBeenCalledTimes(1);
+            expect(nodesService.notifyChildCreated.mock.calls[0][0]).toContain('volume1~copied');
+        });
+        it('should not notify for failed photo copies', async () => {
+            const photoUid = 'volume2~photo1';
+            apiService.copyPhotoToAlbum.mockRejectedValue(new Error('API error'));
+            const results = await executeProcess([photoUid]);
+            expect(results).toMatchObject([{
+                    uid: photoUid,
+                    ok: false,
+                    error: new Error('API error'),
+                }]);
+            expect(nodesService.notifyChildCreated).not.toHaveBeenCalled();
+        });
+    });
+    describe('Adding photos from both same and different volumes', () => {
+        it('should process same volume photos first, then different volume photos', async () => {
+            const sameVolumeUids = ['volume1~photo1', 'volume1~photo2'];
+            const differentVolumeUids = ['volume2~photo3', 'volume2~photo4'];
+            const allUids = [...sameVolumeUids, ...differentVolumeUids];
+            const results = await executeProcess(allUids);
+            expect(results).toMatchObject([{
+                    uid: sameVolumeUids[0],
+                    ok: true,
+                }, {
+                    uid: sameVolumeUids[1],
+                    ok: true,
+                }, {
+                    uid: differentVolumeUids[0],
+                    ok: true,
+                }, {
+                    uid: differentVolumeUids[1],
+                    ok: true,
+                }]);
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(2);
+            expect(nodesService.iterateNodes.mock.calls[0][0]).toMatchObject(sameVolumeUids);
+            expect(nodesService.iterateNodes.mock.calls[1][0]).toMatchObject(differentVolumeUids);
+            expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(1);
+            expect(apiService.addPhotosToAlbum.mock.calls[0][1].map(({ nodeUid }) => nodeUid)).toMatchObject(sameVolumeUids);
+            expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(2);
+            expect(apiService.copyPhotoToAlbum.mock.calls[0][1].nodeUid).toBe(differentVolumeUids[0]);
+            expect(apiService.copyPhotoToAlbum.mock.calls[1][1].nodeUid).toBe(differentVolumeUids[1]);
+        });
+        it('should prepare payloads in parallel for both queues', async () => {
+            // 25 photos from same volume, 25 from different volume
+            const sameVolumeUids = Array.from({ length: 25 }, (_, i) => `volume1~photo${i}`);
+            const differentVolumeUids = Array.from({ length: 25 }, (_, i) => `volume2~photo${i}`);
+            const allUids = [...sameVolumeUids, ...differentVolumeUids];
+            const results = await executeProcess(allUids);
+            expect(results).toHaveLength(50);
+            // Each volume should have been loaded in 2 batches (20 + 5)
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(2 + 2);
+        });
+        it('should handle retries correctly for both volumes', async () => {
+            const sameVolumeUid = 'volume1~photo1-related:1-missingRelatedOnce';
+            const differentVolumeUid = 'volume2~photo2-related:1-missingRelatedOnce';
+            const results = await executeProcess([sameVolumeUid, differentVolumeUid]);
+            expect(results).toHaveLength(2);
+            expect(results[0].ok).toBe(true);
+            expect(results[1].ok).toBe(true);
+            expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3 + 3); // main photo + related photo + missing related photo
+            expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(2); // two attempts
+            expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(2); // two attempts
+        });
+        it('should notify correctly for both volumes', async () => {
+            const sameVolumeUid = 'volume1~photo1';
+            const differentVolumeUid = 'volume2~photo2';
+            const results = await executeProcess([sameVolumeUid, differentVolumeUid]);
+            expect(results).toHaveLength(2);
+            expect(nodesService.notifyNodeChanged).toHaveBeenCalledTimes(1);
+            expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith(sameVolumeUid);
+            expect(nodesService.notifyChildCreated).toHaveBeenCalledTimes(1);
+            expect(nodesService.notifyChildCreated).toHaveBeenCalledWith('volume1~copiedvolume2~photo2');
+        });
+    });
+});
+//# sourceMappingURL=addToAlbum.test.js.map

package/dist/internal/photos/addToAlbum.test.js.map

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

package/dist/internal/photos/albumsCrypto.d.ts

@@ -1,4 +1,5 @@
-import { DriveCrypto, PrivateKey } from '../../crypto';
+import { DriveCrypto, PrivateKey, SessionKey } from '../../crypto';
+import { InvalidNameError, Result } from '../../interface';
 import { DecryptedNodeKeys, NodeSigningKeys } from '../nodes/interface';
 /**
  * Provides crypto operations for albums.
@@ -11,7 +12,7 @@ export declare class AlbumsCryptoService {
     constructor(driveCrypto: DriveCrypto);
     createAlbum(parentKeys: {
         key: PrivateKey;
-        hashKey: Uint8Array;
+        hashKey: Uint8Array<ArrayBuffer>;
     }, signingKeys: NodeSigningKeys, name: string): Promise<{
         encryptedCrypto: {
             encryptedName: string;
@@ -26,10 +27,26 @@ export declare class AlbumsCryptoService {
     }>;
     renameAlbum(parentKeys: {
         key: PrivateKey;
-        hashKey?: Uint8Array;
+        hashKey?: Uint8Array<ArrayBuffer>;
     }, encryptedName: string, signingKeys: NodeSigningKeys, newName: string): Promise<{
         signatureEmail: string;
         armoredNodeName: string;
         hash: string;
     }>;
+    encryptPhotoForAlbum(nodeName: Result<string, Error | InvalidNameError>, sha1: string, nodeKeys: {
+        passphrase: string;
+        passphraseSessionKey: SessionKey;
+        nameSessionKey: SessionKey;
+    }, albumKeys: {
+        key: PrivateKey;
+        hashKey: Uint8Array<ArrayBuffer>;
+    }, signingKeys: NodeSigningKeys): Promise<{
+        encryptedName: string;
+        hash: string;
+        contentHash: string;
+        armoredNodePassphrase: string;
+        armoredNodePassphraseSignature: string;
+        signatureEmail: string;
+        nameSignatureEmail: string;
+    }>;
 }

package/dist/internal/photos/albumsCrypto.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AlbumsCryptoService = void 0;
+const ttag_1 = require("ttag");
+const errors_1 = require("../../errors");
 /**
  * Provides crypto operations for albums.
  *
@@ -61,6 +63,31 @@ class AlbumsCryptoService {
             hash,
         };
     }
+    async encryptPhotoForAlbum(nodeName, sha1, nodeKeys, albumKeys, signingKeys) {
+        if (!nodeName.ok) {
+            throw new errors_1.ValidationError((0, ttag_1.c)('Error').t `Cannot add photo to album without a valid name`);
+        }
+        if (signingKeys.type !== 'userAddress') {
+            throw new Error('Adding photos to album by anonymous user is not supported');
+        }
+        const email = signingKeys.email;
+        const signingKey = signingKeys.key;
+        const [{ armoredNodeName }, hash, contentHash, { armoredPassphrase, armoredPassphraseSignature }] = await Promise.all([
+            this.driveCrypto.encryptNodeName(nodeName.value, nodeKeys.nameSessionKey, albumKeys.key, signingKey),
+            this.driveCrypto.generateLookupHash(nodeName.value, albumKeys.hashKey),
+            this.driveCrypto.generateLookupHash(sha1, albumKeys.hashKey),
+            this.driveCrypto.encryptPassphrase(nodeKeys.passphrase, nodeKeys.passphraseSessionKey, [albumKeys.key], signingKey),
+        ]);
+        return {
+            encryptedName: armoredNodeName,
+            hash,
+            contentHash,
+            armoredNodePassphrase: armoredPassphrase,
+            armoredNodePassphraseSignature: armoredPassphraseSignature,
+            signatureEmail: email,
+            nameSignatureEmail: email,
+        };
+    }
 }
 exports.AlbumsCryptoService = AlbumsCryptoService;
 //# sourceMappingURL=albumsCrypto.js.map

package/dist/internal/photos/albumsCrypto.js.map

@@ -1 +1 @@
-{"version":3,"file":"albumsCrypto.js","sourceRoot":"","sources":["../../../src/internal/photos/albumsCrypto.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,MAAa,mBAAmB;IACR;IAApB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;QACxC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,WAAW,CACb,UAAoD,EACpD,WAA4B,EAC5B,IAAY;QAaZ,IAAI,WAAW,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;QAChC,MAAM,2BAA2B,GAAG,WAAW,CAAC,GAAG,CAAC;QAEpD,MAAM,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5D,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,2BAA2B,CAAC;YAC3E,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,EAAE,2BAA2B,CAAC;YAC9F,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC;SAChE,CAAC,CAAC;QAEH,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAEnG,OAAO;YACH,eAAe,EAAE;gBACb,aAAa,EAAE,eAAe;gBAC9B,IAAI;gBACJ,UAAU,EAAE,QAAQ,CAAC,SAAS,CAAC,UAAU;gBACzC,qBAAqB,EAAE,QAAQ,CAAC,SAAS,CAAC,iBAAiB;gBAC3D,8BAA8B,EAAE,QAAQ,CAAC,SAAS,CAAC,0BAA0B;gBAC7E,cAAc,EAAE,KAAK;gBACrB,cAAc;aACjB;YACD,IAAI,EAAE;gBACF,UAAU,EAAE,QAAQ,CAAC,SAAS,CAAC,UAAU;gBACzC,GAAG,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG;gBAC3B,oBAAoB,EAAE,QAAQ,CAAC,SAAS,CAAC,oBAAoB;gBAC7D,OAAO;aACV;SACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CACb,UAAqD,EACrD,aAAqB,EACrB,WAA4B,EAC5B,OAAe;QAMf,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,WAAW,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;QAChC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC;QAEvC,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAEnG,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9D,OAAO,EACP,kBAAkB,EAClB,UAAU,CAAC,GAAG,EACd,cAAc,CACjB,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QAEpF,OAAO;YACH,cAAc,EAAE,KAAK;YACrB,eAAe;YACf,IAAI;SACP,CAAC;IACN,CAAC;CACJ;AA1FD,kDA0FC"}
+{"version":3,"file":"albumsCrypto.js","sourceRoot":"","sources":["../../../src/internal/photos/albumsCrypto.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,yCAA+C;AAI/C;;;;;GAKG;AACH,MAAa,mBAAmB;IACR;IAApB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;QACxC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,WAAW,CACb,UAAiE,EACjE,WAA4B,EAC5B,IAAY;QAaZ,IAAI,WAAW,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;QAChC,MAAM,2BAA2B,GAAG,WAAW,CAAC,GAAG,CAAC;QAEpD,MAAM,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5D,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,2BAA2B,CAAC;YAC3E,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,EAAE,2BAA2B,CAAC;YAC9F,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC;SAChE,CAAC,CAAC;QAEH,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAEnG,OAAO;YACH,eAAe,EAAE;gBACb,aAAa,EAAE,eAAe;gBAC9B,IAAI;gBACJ,UAAU,EAAE,QAAQ,CAAC,SAAS,CAAC,UAAU;gBACzC,qBAAqB,EAAE,QAAQ,CAAC,SAAS,CAAC,iBAAiB;gBAC3D,8BAA8B,EAAE,QAAQ,CAAC,SAAS,CAAC,0BAA0B;gBAC7E,cAAc,EAAE,KAAK;gBACrB,cAAc;aACjB;YACD,IAAI,EAAE;gBACF,UAAU,EAAE,QAAQ,CAAC,SAAS,CAAC,UAAU;gBACzC,GAAG,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG;gBAC3B,oBAAoB,EAAE,QAAQ,CAAC,SAAS,CAAC,oBAAoB;gBAC7D,OAAO;aACV;SACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CACb,UAAkE,EAClE,aAAqB,EACrB,WAA4B,EAC5B,OAAe;QAMf,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,WAAW,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;QAChC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC;QAEvC,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAEnG,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAC9D,OAAO,EACP,kBAAkB,EAClB,UAAU,CAAC,GAAG,EACd,cAAc,CACjB,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QAEpF,OAAO;YACH,cAAc,EAAE,KAAK;YACrB,eAAe;YACf,IAAI;SACP,CAAC;IACN,CAAC;IAED,KAAK,CAAC,oBAAoB,CACtB,QAAkD,EAClD,IAAY,EACZ,QAA8F,EAC9F,SAAgE,EAChE,WAA4B;QAU5B,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACf,MAAM,IAAI,wBAAe,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,gDAAgD,CAAC,CAAC;QAC5F,CAAC;QACD,IAAI,WAAW,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QACjF,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;QAChC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC;QAEnC,MAAM,CAAC,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,CAAC,GAC7F,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;YACpG,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC;YACtE,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC;YAC5D,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAC9B,QAAQ,CAAC,UAAU,EACnB,QAAQ,CAAC,oBAAoB,EAC7B,CAAC,SAAS,CAAC,GAAG,CAAC,EACf,UAAU,CACb;SACJ,CAAC,CAAC;QAEP,OAAO;YACH,aAAa,EAAE,eAAe;YAC9B,IAAI;YACJ,WAAW;YACX,qBAAqB,EAAE,iBAAiB;YACxC,8BAA8B,EAAE,0BAA0B;YAC1D,cAAc,EAAE,KAAK;YACrB,kBAAkB,EAAE,KAAK;SAC5B,CAAC;IACN,CAAC;CACJ;AA1ID,kDA0IC"}

package/dist/internal/photos/{albums.d.ts → albumsManager.d.ts}

@@ -1,4 +1,4 @@
-import { NodeResult } from '../../interface';
+import { NodeResultWithError, ProtonDriveTelemetry } from '../../interface';
 import { DecryptedNode } from '../nodes';
 import { AlbumsCryptoService } from './albumsCrypto';
 import { PhotosAPIService } from './apiService';
@@ -8,12 +8,13 @@ import { PhotoSharesManager } from './shares';
 /**
  * Provides access and high-level actions for managing albums.
  */
-export declare class Albums {
+export declare class AlbumsManager {
     private apiService;
     private cryptoService;
     private photoShares;
     private nodesService;
-    constructor(apiService: PhotosAPIService, cryptoService: AlbumsCryptoService, photoShares: PhotoSharesManager, nodesService: PhotosNodesAccess);
+    private logger;
+    constructor(telemetry: ProtonDriveTelemetry, apiService: PhotosAPIService, cryptoService: AlbumsCryptoService, photoShares: PhotoSharesManager, nodesService: PhotosNodesAccess);
     iterateAlbums(signal?: AbortSignal): AsyncGenerator<DecryptedNode>;
     iterateAlbum(albumNodeUid: string, signal?: AbortSignal): AsyncGenerator<AlbumItem>;
     createAlbum(name: string): Promise<DecryptedPhotoNode>;
@@ -24,6 +25,7 @@ export declare class Albums {
     deleteAlbum(nodeUid: string, options?: {
         force?: boolean;
     }): Promise<void>;
-    removePhotos(albumNodeUid: string, photoNodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResult>;
+    addPhotos(albumNodeUid: string, photoNodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
+    removePhotos(albumNodeUid: string, photoNodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
     private iterateNodesAndIgnoreMissingOnes;
 }

package/dist/internal/photos/{albums.js → albumsManager.js}

@@ -1,25 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Albums = void 0;
+exports.AlbumsManager = void 0;
 const interface_1 = require("../../interface");
 const batchLoading_1 = require("../batchLoading");
 const mediaTypes_1 = require("../nodes/mediaTypes");
 const validations_1 = require("../nodes/validations");
 const uids_1 = require("../uids");
+const addToAlbum_1 = require("./addToAlbum");
 const BATCH_LOADING_SIZE = 10;
 /**
  * Provides access and high-level actions for managing albums.
  */
-class Albums {
+class AlbumsManager {
     apiService;
     cryptoService;
     photoShares;
     nodesService;
-    constructor(apiService, cryptoService, photoShares, nodesService) {
+    logger;
+    constructor(telemetry, apiService, cryptoService, photoShares, nodesService) {
         this.apiService = apiService;
         this.cryptoService = cryptoService;
         this.photoShares = photoShares;
         this.nodesService = nodesService;
+        this.logger = telemetry.getLogger('albums');
         this.apiService = apiService;
         this.cryptoService = cryptoService;
         this.photoShares = photoShares;
@@ -111,6 +114,15 @@ class Albums {
         await this.apiService.deleteAlbum(nodeUid, options);
         await this.nodesService.notifyNodeDeleted(nodeUid);
     }
+    async *addPhotos(albumNodeUid, photoNodeUids, signal) {
+        const albumKeys = await this.nodesService.getNodeKeys(albumNodeUid);
+        if (!albumKeys.hashKey) {
+            throw new Error('Cannot add photos to album: album hash key not available');
+        }
+        const signingKeys = await this.nodesService.getNodeSigningKeys({ nodeUid: albumNodeUid });
+        const process = new addToAlbum_1.AddToAlbumProcess(albumNodeUid, albumKeys, signingKeys, this.apiService, this.cryptoService, this.nodesService, this.logger, signal);
+        yield* process.execute(photoNodeUids);
+    }
     async *removePhotos(albumNodeUid, photoNodeUids, signal) {
         for await (const result of this.apiService.removePhotosFromAlbum(albumNodeUid, photoNodeUids, signal)) {
             if (result.ok) {
@@ -129,5 +141,5 @@ class Albums {
         }
     }
 }
-exports.Albums = Albums;
-//# sourceMappingURL=albums.js.map
+exports.AlbumsManager = AlbumsManager;
+//# sourceMappingURL=albumsManager.js.map

package/dist/internal/photos/albumsManager.js.map

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

package/dist/internal/photos/albumsManager.test.d.ts

@@ -0,0 +1 @@
+export {};