@protontech/drive-sdk 0.9.8 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/crypto/driveCrypto.d.ts +15 -15
- package/dist/crypto/driveCrypto.js.map +1 -1
- package/dist/crypto/hmac.d.ts +3 -3
- package/dist/crypto/hmac.js.map +1 -1
- package/dist/crypto/interface.d.ts +45 -25
- package/dist/crypto/interface.js.map +1 -1
- package/dist/crypto/openPGPCrypto.d.ts +37 -37
- package/dist/crypto/openPGPCrypto.js.map +1 -1
- package/dist/crypto/utils.d.ts +1 -1
- package/dist/interface/index.d.ts +3 -3
- package/dist/interface/index.js.map +1 -1
- package/dist/interface/nodes.d.ts +8 -0
- package/dist/interface/photos.d.ts +18 -1
- package/dist/interface/sharing.d.ts +2 -0
- package/dist/interface/telemetry.d.ts +1 -0
- package/dist/interface/telemetry.js.map +1 -1
- package/dist/interface/thumbnail.d.ts +2 -2
- package/dist/internal/apiService/apiService.js +25 -12
- package/dist/internal/apiService/apiService.js.map +1 -1
- package/dist/internal/apiService/apiService.test.js +33 -5
- package/dist/internal/apiService/apiService.test.js.map +1 -1
- package/dist/internal/apiService/driveTypes.d.ts +2942 -3187
- package/dist/internal/apiService/errors.test.js +17 -7
- package/dist/internal/apiService/errors.test.js.map +1 -1
- package/dist/internal/devices/manager.d.ts +1 -0
- package/dist/internal/devices/manager.js +11 -0
- package/dist/internal/devices/manager.js.map +1 -1
- package/dist/internal/download/apiService.d.ts +1 -1
- package/dist/internal/download/cryptoService.d.ts +4 -4
- package/dist/internal/download/cryptoService.js.map +1 -1
- package/dist/internal/download/fileDownloader.js.map +1 -1
- package/dist/internal/download/fileDownloader.test.js.map +1 -1
- package/dist/internal/download/thumbnailDownloader.js.map +1 -1
- package/dist/internal/nodes/cryptoService.d.ts +4 -4
- package/dist/internal/nodes/cryptoService.js +5 -3
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.test.js.map +1 -1
- package/dist/internal/nodes/interface.d.ts +1 -1
- package/dist/internal/nodes/nodesManagement.js +0 -1
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/photos/addToAlbum.d.ts +46 -0
- package/dist/internal/photos/addToAlbum.js +257 -0
- package/dist/internal/photos/addToAlbum.js.map +1 -0
- package/dist/internal/photos/addToAlbum.test.d.ts +1 -0
- package/dist/internal/photos/addToAlbum.test.js +409 -0
- package/dist/internal/photos/addToAlbum.test.js.map +1 -0
- package/dist/internal/photos/albums.d.ts +7 -2
- package/dist/internal/photos/albums.js +24 -1
- package/dist/internal/photos/albums.js.map +1 -1
- package/dist/internal/photos/albums.test.js +26 -1
- package/dist/internal/photos/albums.test.js.map +1 -1
- package/dist/internal/photos/albumsCrypto.d.ts +20 -3
- package/dist/internal/photos/albumsCrypto.js +27 -0
- package/dist/internal/photos/albumsCrypto.js.map +1 -1
- package/dist/internal/photos/apiService.d.ts +20 -0
- package/dist/internal/photos/apiService.js +142 -0
- package/dist/internal/photos/apiService.js.map +1 -1
- package/dist/internal/photos/apiService.test.d.ts +1 -0
- package/dist/internal/photos/apiService.test.js +199 -0
- package/dist/internal/photos/apiService.test.js.map +1 -0
- package/dist/internal/photos/errors.d.ts +4 -0
- package/dist/internal/photos/errors.js +17 -0
- package/dist/internal/photos/errors.js.map +1 -0
- package/dist/internal/photos/index.d.ts +1 -1
- package/dist/internal/photos/index.js +1 -1
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +36 -1
- package/dist/internal/photos/interface.js +14 -0
- package/dist/internal/photos/interface.js.map +1 -1
- package/dist/internal/photos/nodes.js +32 -2
- package/dist/internal/photos/nodes.js.map +1 -1
- package/dist/internal/photos/nodes.test.js +25 -5
- package/dist/internal/photos/nodes.test.js.map +1 -1
- package/dist/internal/photos/timeline.d.ts +2 -5
- package/dist/internal/photos/timeline.js.map +1 -1
- package/dist/internal/photos/upload.d.ts +2 -2
- package/dist/internal/photos/upload.js.map +1 -1
- package/dist/internal/shares/apiService.js +1 -0
- package/dist/internal/shares/apiService.js.map +1 -1
- package/dist/internal/shares/interface.d.ts +1 -0
- package/dist/internal/sharing/apiService.d.ts +8 -1
- package/dist/internal/sharing/apiService.js +23 -1
- package/dist/internal/sharing/apiService.js.map +1 -1
- package/dist/internal/sharing/cryptoService.js +8 -4
- package/dist/internal/sharing/cryptoService.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.d.ts +1 -0
- package/dist/internal/sharing/sharingManagement.js +15 -2
- package/dist/internal/sharing/sharingManagement.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.test.js +30 -5
- package/dist/internal/sharing/sharingManagement.test.js.map +1 -1
- package/dist/internal/sharingPublic/nodes.d.ts +2 -2
- package/dist/internal/sharingPublic/nodes.js.map +1 -1
- package/dist/internal/upload/apiService.d.ts +5 -5
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/blockVerifier.d.ts +2 -2
- package/dist/internal/upload/blockVerifier.js.map +1 -1
- package/dist/internal/upload/chunkStreamReader.d.ts +2 -2
- package/dist/internal/upload/chunkStreamReader.js.map +1 -1
- package/dist/internal/upload/chunkStreamReader.test.js.map +1 -1
- package/dist/internal/upload/cryptoService.d.ts +7 -7
- package/dist/internal/upload/cryptoService.js.map +1 -1
- package/dist/internal/upload/interface.d.ts +6 -6
- package/dist/internal/upload/manager.d.ts +1 -1
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/streamUploader.d.ts +1 -1
- package/dist/internal/utils.d.ts +1 -1
- package/dist/protonDriveClient.d.ts +8 -0
- package/dist/protonDriveClient.js +11 -0
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +42 -7
- package/dist/protonDrivePhotosClient.js +50 -2
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/protonDrivePublicLinkClient.d.ts +9 -0
- package/dist/protonDrivePublicLinkClient.js +12 -0
- package/dist/protonDrivePublicLinkClient.js.map +1 -1
- package/dist/transformers.js +2 -0
- package/dist/transformers.js.map +1 -1
- package/package.json +4 -4
- package/src/crypto/driveCrypto.ts +15 -15
- package/src/crypto/hmac.ts +4 -4
- package/src/crypto/interface.ts +58 -27
- package/src/crypto/openPGPCrypto.ts +26 -26
- package/src/interface/index.ts +10 -2
- package/src/interface/nodes.ts +1 -0
- package/src/interface/photos.ts +19 -1
- package/src/interface/sharing.ts +2 -0
- package/src/interface/telemetry.ts +1 -0
- package/src/interface/thumbnail.ts +2 -2
- package/src/internal/apiService/apiService.test.ts +38 -6
- package/src/internal/apiService/apiService.ts +33 -12
- package/src/internal/apiService/driveTypes.ts +2942 -3187
- package/src/internal/devices/manager.ts +14 -0
- package/src/internal/download/apiService.ts +1 -1
- package/src/internal/download/cryptoService.ts +4 -4
- package/src/internal/download/fileDownloader.test.ts +4 -4
- package/src/internal/download/fileDownloader.ts +6 -6
- package/src/internal/download/thumbnailDownloader.ts +4 -4
- package/src/internal/nodes/cryptoService.test.ts +2 -2
- package/src/internal/nodes/cryptoService.ts +11 -8
- package/src/internal/nodes/interface.ts +1 -1
- package/src/internal/nodes/nodesManagement.ts +0 -1
- package/src/internal/photos/addToAlbum.test.ts +515 -0
- package/src/internal/photos/addToAlbum.ts +341 -0
- package/src/internal/photos/albums.test.ts +46 -22
- package/src/internal/photos/albums.ts +48 -2
- package/src/internal/photos/albumsCrypto.ts +54 -3
- package/src/internal/photos/apiService.test.ts +233 -0
- package/src/internal/photos/apiService.ts +234 -15
- package/src/internal/photos/errors.ts +11 -0
- package/src/internal/photos/index.ts +2 -2
- package/src/internal/photos/interface.ts +40 -1
- package/src/internal/photos/nodes.test.ts +27 -6
- package/src/internal/photos/nodes.ts +34 -2
- package/src/internal/photos/timeline.ts +2 -5
- package/src/internal/photos/upload.ts +2 -2
- package/src/internal/shares/apiService.ts +1 -0
- package/src/internal/shares/interface.ts +1 -0
- package/src/internal/sharing/apiService.ts +49 -5
- package/src/internal/sharing/cryptoService.ts +10 -4
- package/src/internal/sharing/sharingManagement.test.ts +33 -5
- package/src/internal/sharing/sharingManagement.ts +28 -6
- package/src/internal/sharingPublic/nodes.ts +1 -1
- package/src/internal/upload/apiService.ts +5 -5
- package/src/internal/upload/blockVerifier.ts +3 -3
- package/src/internal/upload/chunkStreamReader.test.ts +7 -7
- package/src/internal/upload/chunkStreamReader.ts +3 -3
- package/src/internal/upload/cryptoService.ts +9 -9
- package/src/internal/upload/interface.ts +6 -6
- package/src/internal/upload/manager.ts +2 -2
- package/src/internal/upload/streamUploader.ts +1 -1
- package/src/protonDriveClient.ts +15 -3
- package/src/protonDrivePhotosClient.ts +78 -22
- package/src/protonDrivePublicLinkClient.ts +13 -0
- package/src/transformers.ts +2 -0
|
@@ -0,0 +1,409 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const logger_1 = require("../../tests/logger");
|
|
4
|
+
const addToAlbum_1 = require("./addToAlbum");
|
|
5
|
+
const errors_1 = require("./errors");
|
|
6
|
+
/**
|
|
7
|
+
* Helper to create a mock photo node with minimal required properties.
|
|
8
|
+
*/
|
|
9
|
+
function createMockPhotoNode(uid, overrides = {}) {
|
|
10
|
+
return {
|
|
11
|
+
uid,
|
|
12
|
+
parentUid: 'volume1~parent',
|
|
13
|
+
hash: 'hash',
|
|
14
|
+
photo: {
|
|
15
|
+
captureTime: new Date(),
|
|
16
|
+
mainPhotoNodeUid: undefined,
|
|
17
|
+
relatedPhotoNodeUids: [],
|
|
18
|
+
tags: [],
|
|
19
|
+
albums: [],
|
|
20
|
+
},
|
|
21
|
+
activeRevision: {
|
|
22
|
+
ok: true,
|
|
23
|
+
value: {
|
|
24
|
+
uid: 'rev1',
|
|
25
|
+
state: 'active',
|
|
26
|
+
creationTime: new Date(),
|
|
27
|
+
storageSize: 100,
|
|
28
|
+
signatureEmail: 'test@example.com',
|
|
29
|
+
claimedModificationTime: new Date(),
|
|
30
|
+
claimedSize: 100,
|
|
31
|
+
claimedDigests: { sha1: 'sha1hash' },
|
|
32
|
+
claimedBlockSizes: [100],
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
keyAuthor: { ok: true, value: 'test@example.com' },
|
|
36
|
+
...overrides,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
describe('AddToAlbumProcess', () => {
|
|
40
|
+
let apiService;
|
|
41
|
+
let cryptoService;
|
|
42
|
+
let nodesService;
|
|
43
|
+
let albumKeys;
|
|
44
|
+
let signingKeys;
|
|
45
|
+
beforeEach(() => {
|
|
46
|
+
albumKeys = {
|
|
47
|
+
key: 'albumKey',
|
|
48
|
+
hashKey: new Uint8Array([1, 2, 3]),
|
|
49
|
+
passphrase: 'passphrase',
|
|
50
|
+
passphraseSessionKey: 'passphraseSessionKey',
|
|
51
|
+
};
|
|
52
|
+
signingKeys = {
|
|
53
|
+
type: 'userAddress',
|
|
54
|
+
email: 'test@example.com',
|
|
55
|
+
addressId: 'addressId',
|
|
56
|
+
key: 'signingKey',
|
|
57
|
+
};
|
|
58
|
+
// @ts-expect-error Mocking for testing purposes
|
|
59
|
+
apiService = {
|
|
60
|
+
addPhotosToAlbum: jest.fn(),
|
|
61
|
+
copyPhotoToAlbum: jest.fn(),
|
|
62
|
+
};
|
|
63
|
+
// @ts-expect-error Mocking for testing purposes
|
|
64
|
+
cryptoService = {
|
|
65
|
+
encryptPhotoForAlbum: jest.fn(),
|
|
66
|
+
};
|
|
67
|
+
// @ts-expect-error Mocking for testing purposes
|
|
68
|
+
nodesService = {
|
|
69
|
+
iterateNodes: jest.fn(),
|
|
70
|
+
getNodePrivateAndSessionKeys: jest.fn(),
|
|
71
|
+
notifyNodeChanged: jest.fn(),
|
|
72
|
+
notifyChildCreated: jest.fn(),
|
|
73
|
+
};
|
|
74
|
+
});
|
|
75
|
+
function executeProcess(photoUids) {
|
|
76
|
+
const process = new addToAlbum_1.AddToAlbumProcess('volume1~album', albumKeys, signingKeys, apiService, cryptoService, nodesService, (0, logger_1.getMockLogger)());
|
|
77
|
+
return Array.fromAsync(process.execute(photoUids));
|
|
78
|
+
}
|
|
79
|
+
beforeEach(() => {
|
|
80
|
+
nodesService.iterateNodes.mockImplementation(async function* (uids) {
|
|
81
|
+
for (const uid of uids) {
|
|
82
|
+
const photoNode = createMockPhotoNode(uid);
|
|
83
|
+
// Handle uids in the form 'volumeId~mainPhoto-related:X' where X is the number of related photos
|
|
84
|
+
const relatedMatch = /^(.+)~(.+)-related:(\d+)$/.exec(uid);
|
|
85
|
+
if (relatedMatch) {
|
|
86
|
+
const [, volumeId, mainPhoto, countStr] = relatedMatch;
|
|
87
|
+
const count = parseInt(countStr, 10);
|
|
88
|
+
photoNode.photo.relatedPhotoNodeUids = Array.from({ length: count }, (_, idx) => `${volumeId}~related${idx + 1}`);
|
|
89
|
+
}
|
|
90
|
+
yield photoNode;
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
nodesService.getNodePrivateAndSessionKeys.mockResolvedValue({
|
|
94
|
+
key: 'nodeKey',
|
|
95
|
+
nameSessionKey: 'sessionKey',
|
|
96
|
+
passphrase: 'passphrase',
|
|
97
|
+
passphraseSessionKey: 'passphraseSessionKey',
|
|
98
|
+
});
|
|
99
|
+
cryptoService.encryptPhotoForAlbum.mockResolvedValue({
|
|
100
|
+
contentHash: 'contentHash',
|
|
101
|
+
hash: 'nameHash',
|
|
102
|
+
encryptedName: 'encryptedName',
|
|
103
|
+
nameSignatureEmail: 'test@example.com',
|
|
104
|
+
armoredNodePassphrase: 'passphrase',
|
|
105
|
+
armoredNodePassphraseSignature: 'signature',
|
|
106
|
+
signatureEmail: 'test@example.com',
|
|
107
|
+
});
|
|
108
|
+
let addToAlbumReturnedMissing = false;
|
|
109
|
+
apiService.addPhotosToAlbum.mockImplementation(async function* (albumUid, payloads) {
|
|
110
|
+
for (const payload of payloads) {
|
|
111
|
+
let error;
|
|
112
|
+
if (payload.nodeUid.includes('missingRelatedTwice')) {
|
|
113
|
+
error = new errors_1.MissingRelatedPhotosError(['volume1~missingRelatedTwice1']);
|
|
114
|
+
addToAlbumReturnedMissing = true;
|
|
115
|
+
}
|
|
116
|
+
if (!addToAlbumReturnedMissing && payload.nodeUid.includes('missingRelatedOnce')) {
|
|
117
|
+
error = new errors_1.MissingRelatedPhotosError(['volume1~missingRelatedOnce1']);
|
|
118
|
+
addToAlbumReturnedMissing = true;
|
|
119
|
+
}
|
|
120
|
+
if (error) {
|
|
121
|
+
yield { uid: payload.nodeUid, ok: false, error };
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
yield { uid: payload.nodeUid, ok: true };
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
let copyToAlbumReturnedMissing = false;
|
|
129
|
+
apiService.copyPhotoToAlbum.mockImplementation(async (albumUid, payload) => {
|
|
130
|
+
let error;
|
|
131
|
+
if (payload.nodeUid.includes('missingRelatedTwice')) {
|
|
132
|
+
error = new errors_1.MissingRelatedPhotosError(['volume2~missingRelatedTwice1']);
|
|
133
|
+
copyToAlbumReturnedMissing = true;
|
|
134
|
+
}
|
|
135
|
+
if (!copyToAlbumReturnedMissing && payload.nodeUid.includes('missingRelatedOnce')) {
|
|
136
|
+
error = new errors_1.MissingRelatedPhotosError(['volume2~missingRelatedOnce1']);
|
|
137
|
+
copyToAlbumReturnedMissing = true;
|
|
138
|
+
}
|
|
139
|
+
if (error) {
|
|
140
|
+
throw error;
|
|
141
|
+
}
|
|
142
|
+
return `volume1~copied${payload.nodeUid}`;
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
describe('Adding photos to the same volume', () => {
|
|
146
|
+
it('should prepare photo payloads in parallel without blocking', async () => {
|
|
147
|
+
// Setup: 25 photos (more than BATCH_LOADING_SIZE of 20)
|
|
148
|
+
const photoUids = Array.from({ length: 25 }, (_, i) => `volume1~photo${i}`);
|
|
149
|
+
let addPhotosCallCount = 0;
|
|
150
|
+
apiService.addPhotosToAlbum.mockImplementation(async function* (albumUid, payloads) {
|
|
151
|
+
addPhotosCallCount++;
|
|
152
|
+
// First call should happen before all 25 photos are prepared
|
|
153
|
+
// (should only have first batch of 20 prepared)
|
|
154
|
+
if (addPhotosCallCount === 1) {
|
|
155
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(1);
|
|
156
|
+
}
|
|
157
|
+
for (const payload of payloads) {
|
|
158
|
+
yield { uid: payload.nodeUid, ok: true };
|
|
159
|
+
}
|
|
160
|
+
});
|
|
161
|
+
const results = await executeProcess(photoUids);
|
|
162
|
+
expect(results).toHaveLength(25);
|
|
163
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(2);
|
|
164
|
+
expect(nodesService.iterateNodes.mock.calls[0][0]).toHaveLength(20);
|
|
165
|
+
expect(nodesService.iterateNodes.mock.calls[1][0]).toHaveLength(5);
|
|
166
|
+
expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(3);
|
|
167
|
+
expect(apiService.addPhotosToAlbum.mock.calls[0][1].length).toBe(10);
|
|
168
|
+
expect(apiService.addPhotosToAlbum.mock.calls[1][1].length).toBe(10);
|
|
169
|
+
expect(apiService.addPhotosToAlbum.mock.calls[2][1].length).toBe(5);
|
|
170
|
+
});
|
|
171
|
+
it('should include related photos in the same batch even if it exceeds batch size', async () => {
|
|
172
|
+
// Create a photo with 15 related photos (total size = 16, which exceeds batch size of 10)
|
|
173
|
+
const mainPhotoUid = 'volume1~mainPhoto-related:15';
|
|
174
|
+
const results = await executeProcess([mainPhotoUid]);
|
|
175
|
+
expect(results).toMatchObject([{
|
|
176
|
+
uid: mainPhotoUid,
|
|
177
|
+
ok: true,
|
|
178
|
+
}]);
|
|
179
|
+
expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(1);
|
|
180
|
+
const params = apiService.addPhotosToAlbum.mock.calls[0];
|
|
181
|
+
expect(params[1].length).toBe(1);
|
|
182
|
+
expect(params[1][0].relatedPhotos?.length).toBe(15);
|
|
183
|
+
});
|
|
184
|
+
it('should re-queue photo when missing related photos error occurs', async () => {
|
|
185
|
+
const photoUid = 'volume1~mainPhoto-related:1-missingRelatedOnce';
|
|
186
|
+
const process = new addToAlbum_1.AddToAlbumProcess('volume1~album', albumKeys, signingKeys, apiService, cryptoService, nodesService, (0, logger_1.getMockLogger)());
|
|
187
|
+
const results = await Array.fromAsync(process.execute([photoUid]));
|
|
188
|
+
expect(results).toMatchObject([{
|
|
189
|
+
uid: photoUid,
|
|
190
|
+
ok: true,
|
|
191
|
+
}]);
|
|
192
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3); // main photo + related photo + missing related photo
|
|
193
|
+
expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(2); // two attempts
|
|
194
|
+
});
|
|
195
|
+
it('should return error if missing related photos error occurs twice', async () => {
|
|
196
|
+
const photoUid = 'volume1~photo1-missingRelatedTwice';
|
|
197
|
+
const results = await executeProcess([photoUid]);
|
|
198
|
+
expect(results).toMatchObject([{
|
|
199
|
+
uid: photoUid,
|
|
200
|
+
ok: false,
|
|
201
|
+
error: new errors_1.MissingRelatedPhotosError(['volume1~missingRelatedOnce1']),
|
|
202
|
+
}]);
|
|
203
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3); // main photo + related photo + missing related photo
|
|
204
|
+
expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(2); // two attempts
|
|
205
|
+
});
|
|
206
|
+
it('should return error when crypto service fails', async () => {
|
|
207
|
+
const photoUid = 'volume1~photo1';
|
|
208
|
+
const cryptoError = new Error('Crypto operation failed');
|
|
209
|
+
cryptoService.encryptPhotoForAlbum.mockRejectedValue(cryptoError);
|
|
210
|
+
const results = await executeProcess([photoUid]);
|
|
211
|
+
expect(results).toMatchObject([{
|
|
212
|
+
uid: photoUid,
|
|
213
|
+
ok: false,
|
|
214
|
+
error: cryptoError,
|
|
215
|
+
}]);
|
|
216
|
+
});
|
|
217
|
+
it('should return error when getNodePrivateAndSessionKeys fails', async () => {
|
|
218
|
+
const photoUid = 'volume1~photo1';
|
|
219
|
+
const keysError = new Error('Failed to get keys');
|
|
220
|
+
nodesService.getNodePrivateAndSessionKeys.mockRejectedValue(keysError);
|
|
221
|
+
const results = await executeProcess([photoUid]);
|
|
222
|
+
expect(results).toMatchObject([{
|
|
223
|
+
uid: photoUid,
|
|
224
|
+
ok: false,
|
|
225
|
+
error: keysError,
|
|
226
|
+
}]);
|
|
227
|
+
});
|
|
228
|
+
it('should notify node changed for successfully added photos', async () => {
|
|
229
|
+
const photoUid = 'volume1~photo1';
|
|
230
|
+
const results = await executeProcess([photoUid]);
|
|
231
|
+
expect(results).toMatchObject([{
|
|
232
|
+
uid: photoUid,
|
|
233
|
+
ok: true,
|
|
234
|
+
}]);
|
|
235
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledTimes(1);
|
|
236
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith(photoUid);
|
|
237
|
+
});
|
|
238
|
+
it('should not notify node changed for failed photos', async () => {
|
|
239
|
+
const photoUid = 'volume1~photo1';
|
|
240
|
+
apiService.addPhotosToAlbum.mockImplementation(async function* (albumUid, payloads) {
|
|
241
|
+
yield { uid: photoUid, ok: false, error: new Error('API error') };
|
|
242
|
+
});
|
|
243
|
+
const results = await executeProcess([photoUid]);
|
|
244
|
+
expect(results).toMatchObject([{
|
|
245
|
+
uid: photoUid,
|
|
246
|
+
ok: false,
|
|
247
|
+
error: new Error('API error'),
|
|
248
|
+
}]);
|
|
249
|
+
expect(nodesService.notifyNodeChanged).not.toHaveBeenCalled();
|
|
250
|
+
});
|
|
251
|
+
});
|
|
252
|
+
describe('Adding photos to a different volume', () => {
|
|
253
|
+
it('should prepare photo payloads in parallel without blocking', async () => {
|
|
254
|
+
// Setup: 25 photos from different volume (more than BATCH_LOADING_SIZE of 20)
|
|
255
|
+
const photoUids = Array.from({ length: 25 }, (_, i) => `volume2~photo${i}`);
|
|
256
|
+
let copyPhotoCallCount = 0;
|
|
257
|
+
apiService.copyPhotoToAlbum.mockImplementation(async (albumUid, payload) => {
|
|
258
|
+
copyPhotoCallCount++;
|
|
259
|
+
// First few calls should happen before all 25 photos are prepared
|
|
260
|
+
if (copyPhotoCallCount <= 20) {
|
|
261
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(1);
|
|
262
|
+
}
|
|
263
|
+
return `volume1~copied${copyPhotoCallCount}`;
|
|
264
|
+
});
|
|
265
|
+
const results = await executeProcess(photoUids);
|
|
266
|
+
expect(results).toHaveLength(25);
|
|
267
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(2);
|
|
268
|
+
expect(nodesService.iterateNodes.mock.calls[0][0]).toHaveLength(20);
|
|
269
|
+
expect(nodesService.iterateNodes.mock.calls[1][0]).toHaveLength(5);
|
|
270
|
+
expect(copyPhotoCallCount).toBe(25);
|
|
271
|
+
});
|
|
272
|
+
it('should include related photos in copy request', async () => {
|
|
273
|
+
const mainPhotoUid = 'volume2~mainPhoto-related:15';
|
|
274
|
+
const results = await executeProcess([mainPhotoUid]);
|
|
275
|
+
expect(results).toMatchObject([{
|
|
276
|
+
uid: mainPhotoUid,
|
|
277
|
+
ok: true,
|
|
278
|
+
}]);
|
|
279
|
+
expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(1);
|
|
280
|
+
const params = apiService.copyPhotoToAlbum.mock.calls[0];
|
|
281
|
+
expect(params[1].relatedPhotos?.length).toBe(15);
|
|
282
|
+
});
|
|
283
|
+
it('should re-queue photo when missing related photos error occurs', async () => {
|
|
284
|
+
const photoUid = 'volume2~photo1-related:1-missingRelatedOnce';
|
|
285
|
+
const results = await executeProcess([photoUid]);
|
|
286
|
+
expect(results).toMatchObject([{
|
|
287
|
+
uid: photoUid,
|
|
288
|
+
ok: true,
|
|
289
|
+
}]);
|
|
290
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3); // main photo + related photo + missing related photo
|
|
291
|
+
expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(2); // two attempts
|
|
292
|
+
});
|
|
293
|
+
it('should return error if missing related photos error occurs twice', async () => {
|
|
294
|
+
const photoUid = 'volume2~photo1-missingRelatedTwice';
|
|
295
|
+
const results = await executeProcess([photoUid]);
|
|
296
|
+
expect(results).toMatchObject([{
|
|
297
|
+
uid: photoUid,
|
|
298
|
+
ok: false,
|
|
299
|
+
error: new errors_1.MissingRelatedPhotosError(['volume2~missingRelatedOnce1']),
|
|
300
|
+
}]);
|
|
301
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3); // main photo + related photo + missing related photo
|
|
302
|
+
expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(2); // two attempts
|
|
303
|
+
});
|
|
304
|
+
it('should return error when crypto service fails', async () => {
|
|
305
|
+
const photoUid = 'volume2~photo1';
|
|
306
|
+
const cryptoError = new Error('Crypto operation failed');
|
|
307
|
+
cryptoService.encryptPhotoForAlbum.mockRejectedValue(cryptoError);
|
|
308
|
+
const results = await executeProcess([photoUid]);
|
|
309
|
+
expect(results).toMatchObject([{
|
|
310
|
+
uid: photoUid,
|
|
311
|
+
ok: false,
|
|
312
|
+
error: cryptoError,
|
|
313
|
+
}]);
|
|
314
|
+
});
|
|
315
|
+
it('should return error when getNodePrivateAndSessionKeys fails', async () => {
|
|
316
|
+
const photoUid = 'volume2~photo1';
|
|
317
|
+
const keysError = new Error('Failed to get keys');
|
|
318
|
+
nodesService.getNodePrivateAndSessionKeys.mockRejectedValue(keysError);
|
|
319
|
+
const results = await executeProcess([photoUid]);
|
|
320
|
+
expect(results).toMatchObject([{
|
|
321
|
+
uid: photoUid,
|
|
322
|
+
ok: false,
|
|
323
|
+
error: keysError,
|
|
324
|
+
}]);
|
|
325
|
+
});
|
|
326
|
+
it('should notify child created for successfully copied photos', async () => {
|
|
327
|
+
const photoUid = 'volume2~photo1';
|
|
328
|
+
const results = await executeProcess([photoUid]);
|
|
329
|
+
expect(results).toMatchObject([{
|
|
330
|
+
uid: photoUid,
|
|
331
|
+
ok: true,
|
|
332
|
+
}]);
|
|
333
|
+
expect(nodesService.notifyChildCreated).toHaveBeenCalledTimes(1);
|
|
334
|
+
expect(nodesService.notifyChildCreated.mock.calls[0][0]).toContain('volume1~copied');
|
|
335
|
+
});
|
|
336
|
+
it('should not notify for failed photo copies', async () => {
|
|
337
|
+
const photoUid = 'volume2~photo1';
|
|
338
|
+
apiService.copyPhotoToAlbum.mockRejectedValue(new Error('API error'));
|
|
339
|
+
const results = await executeProcess([photoUid]);
|
|
340
|
+
expect(results).toMatchObject([{
|
|
341
|
+
uid: photoUid,
|
|
342
|
+
ok: false,
|
|
343
|
+
error: new Error('API error'),
|
|
344
|
+
}]);
|
|
345
|
+
expect(nodesService.notifyChildCreated).not.toHaveBeenCalled();
|
|
346
|
+
});
|
|
347
|
+
});
|
|
348
|
+
describe('Adding photos from both same and different volumes', () => {
|
|
349
|
+
it('should process same volume photos first, then different volume photos', async () => {
|
|
350
|
+
const sameVolumeUids = ['volume1~photo1', 'volume1~photo2'];
|
|
351
|
+
const differentVolumeUids = ['volume2~photo3', 'volume2~photo4'];
|
|
352
|
+
const allUids = [...sameVolumeUids, ...differentVolumeUids];
|
|
353
|
+
const results = await executeProcess(allUids);
|
|
354
|
+
expect(results).toMatchObject([{
|
|
355
|
+
uid: sameVolumeUids[0],
|
|
356
|
+
ok: true,
|
|
357
|
+
}, {
|
|
358
|
+
uid: sameVolumeUids[1],
|
|
359
|
+
ok: true,
|
|
360
|
+
}, {
|
|
361
|
+
uid: differentVolumeUids[0],
|
|
362
|
+
ok: true,
|
|
363
|
+
}, {
|
|
364
|
+
uid: differentVolumeUids[1],
|
|
365
|
+
ok: true,
|
|
366
|
+
}]);
|
|
367
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(2);
|
|
368
|
+
expect(nodesService.iterateNodes.mock.calls[0][0]).toMatchObject(sameVolumeUids);
|
|
369
|
+
expect(nodesService.iterateNodes.mock.calls[1][0]).toMatchObject(differentVolumeUids);
|
|
370
|
+
expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(1);
|
|
371
|
+
expect(apiService.addPhotosToAlbum.mock.calls[0][1].map(({ nodeUid }) => nodeUid)).toMatchObject(sameVolumeUids);
|
|
372
|
+
expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(2);
|
|
373
|
+
expect(apiService.copyPhotoToAlbum.mock.calls[0][1].nodeUid).toBe(differentVolumeUids[0]);
|
|
374
|
+
expect(apiService.copyPhotoToAlbum.mock.calls[1][1].nodeUid).toBe(differentVolumeUids[1]);
|
|
375
|
+
});
|
|
376
|
+
it('should prepare payloads in parallel for both queues', async () => {
|
|
377
|
+
// 25 photos from same volume, 25 from different volume
|
|
378
|
+
const sameVolumeUids = Array.from({ length: 25 }, (_, i) => `volume1~photo${i}`);
|
|
379
|
+
const differentVolumeUids = Array.from({ length: 25 }, (_, i) => `volume2~photo${i}`);
|
|
380
|
+
const allUids = [...sameVolumeUids, ...differentVolumeUids];
|
|
381
|
+
const results = await executeProcess(allUids);
|
|
382
|
+
expect(results).toHaveLength(50);
|
|
383
|
+
// Each volume should have been loaded in 2 batches (20 + 5)
|
|
384
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(2 + 2);
|
|
385
|
+
});
|
|
386
|
+
it('should handle retries correctly for both volumes', async () => {
|
|
387
|
+
const sameVolumeUid = 'volume1~photo1-related:1-missingRelatedOnce';
|
|
388
|
+
const differentVolumeUid = 'volume2~photo2-related:1-missingRelatedOnce';
|
|
389
|
+
const results = await executeProcess([sameVolumeUid, differentVolumeUid]);
|
|
390
|
+
expect(results).toHaveLength(2);
|
|
391
|
+
expect(results[0].ok).toBe(true);
|
|
392
|
+
expect(results[1].ok).toBe(true);
|
|
393
|
+
expect(nodesService.iterateNodes).toHaveBeenCalledTimes(3 + 3); // main photo + related photo + missing related photo
|
|
394
|
+
expect(apiService.addPhotosToAlbum).toHaveBeenCalledTimes(2); // two attempts
|
|
395
|
+
expect(apiService.copyPhotoToAlbum).toHaveBeenCalledTimes(2); // two attempts
|
|
396
|
+
});
|
|
397
|
+
it('should notify correctly for both volumes', async () => {
|
|
398
|
+
const sameVolumeUid = 'volume1~photo1';
|
|
399
|
+
const differentVolumeUid = 'volume2~photo2';
|
|
400
|
+
const results = await executeProcess([sameVolumeUid, differentVolumeUid]);
|
|
401
|
+
expect(results).toHaveLength(2);
|
|
402
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledTimes(1);
|
|
403
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith(sameVolumeUid);
|
|
404
|
+
expect(nodesService.notifyChildCreated).toHaveBeenCalledTimes(1);
|
|
405
|
+
expect(nodesService.notifyChildCreated).toHaveBeenCalledWith('volume1~copiedvolume2~photo2');
|
|
406
|
+
});
|
|
407
|
+
});
|
|
408
|
+
});
|
|
409
|
+
//# sourceMappingURL=addToAlbum.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addToAlbum.test.js","sourceRoot":"","sources":["../../../src/internal/photos/addToAlbum.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { NodeResultWithError, ProtonDriveTelemetry } from '../../interface';
|
|
1
2
|
import { DecryptedNode } from '../nodes';
|
|
2
3
|
import { AlbumsCryptoService } from './albumsCrypto';
|
|
3
4
|
import { PhotosAPIService } from './apiService';
|
|
4
|
-
import { DecryptedPhotoNode } from './interface';
|
|
5
|
+
import { AlbumItem, DecryptedPhotoNode } from './interface';
|
|
5
6
|
import { PhotosNodesAccess } from './nodes';
|
|
6
7
|
import { PhotoSharesManager } from './shares';
|
|
7
8
|
/**
|
|
@@ -12,8 +13,10 @@ export declare class Albums {
|
|
|
12
13
|
private cryptoService;
|
|
13
14
|
private photoShares;
|
|
14
15
|
private nodesService;
|
|
15
|
-
|
|
16
|
+
private logger;
|
|
17
|
+
constructor(telemetry: ProtonDriveTelemetry, apiService: PhotosAPIService, cryptoService: AlbumsCryptoService, photoShares: PhotoSharesManager, nodesService: PhotosNodesAccess);
|
|
16
18
|
iterateAlbums(signal?: AbortSignal): AsyncGenerator<DecryptedNode>;
|
|
19
|
+
iterateAlbum(albumNodeUid: string, signal?: AbortSignal): AsyncGenerator<AlbumItem>;
|
|
17
20
|
createAlbum(name: string): Promise<DecryptedPhotoNode>;
|
|
18
21
|
updateAlbum(nodeUid: string, updates: {
|
|
19
22
|
name?: string;
|
|
@@ -22,5 +25,7 @@ export declare class Albums {
|
|
|
22
25
|
deleteAlbum(nodeUid: string, options?: {
|
|
23
26
|
force?: boolean;
|
|
24
27
|
}): Promise<void>;
|
|
28
|
+
addPhotos(albumNodeUid: string, photoNodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
29
|
+
removePhotos(albumNodeUid: string, photoNodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
25
30
|
private iterateNodesAndIgnoreMissingOnes;
|
|
26
31
|
}
|
|
@@ -6,6 +6,7 @@ const batchLoading_1 = require("../batchLoading");
|
|
|
6
6
|
const mediaTypes_1 = require("../nodes/mediaTypes");
|
|
7
7
|
const validations_1 = require("../nodes/validations");
|
|
8
8
|
const uids_1 = require("../uids");
|
|
9
|
+
const addToAlbum_1 = require("./addToAlbum");
|
|
9
10
|
const BATCH_LOADING_SIZE = 10;
|
|
10
11
|
/**
|
|
11
12
|
* Provides access and high-level actions for managing albums.
|
|
@@ -15,11 +16,13 @@ class Albums {
|
|
|
15
16
|
cryptoService;
|
|
16
17
|
photoShares;
|
|
17
18
|
nodesService;
|
|
18
|
-
|
|
19
|
+
logger;
|
|
20
|
+
constructor(telemetry, apiService, cryptoService, photoShares, nodesService) {
|
|
19
21
|
this.apiService = apiService;
|
|
20
22
|
this.cryptoService = cryptoService;
|
|
21
23
|
this.photoShares = photoShares;
|
|
22
24
|
this.nodesService = nodesService;
|
|
25
|
+
this.logger = telemetry.getLogger('albums');
|
|
23
26
|
this.apiService = apiService;
|
|
24
27
|
this.cryptoService = cryptoService;
|
|
25
28
|
this.photoShares = photoShares;
|
|
@@ -36,6 +39,9 @@ class Albums {
|
|
|
36
39
|
}
|
|
37
40
|
yield* batchLoading.loadRest();
|
|
38
41
|
}
|
|
42
|
+
async *iterateAlbum(albumNodeUid, signal) {
|
|
43
|
+
yield* this.apiService.iterateAlbumChildren(albumNodeUid, signal);
|
|
44
|
+
}
|
|
39
45
|
async createAlbum(name) {
|
|
40
46
|
(0, validations_1.validateNodeName)(name);
|
|
41
47
|
const rootNode = await this.nodesService.getVolumeRootFolder();
|
|
@@ -108,6 +114,23 @@ class Albums {
|
|
|
108
114
|
await this.apiService.deleteAlbum(nodeUid, options);
|
|
109
115
|
await this.nodesService.notifyNodeDeleted(nodeUid);
|
|
110
116
|
}
|
|
117
|
+
async *addPhotos(albumNodeUid, photoNodeUids, signal) {
|
|
118
|
+
const albumKeys = await this.nodesService.getNodeKeys(albumNodeUid);
|
|
119
|
+
if (!albumKeys.hashKey) {
|
|
120
|
+
throw new Error('Cannot add photos to album: album hash key not available');
|
|
121
|
+
}
|
|
122
|
+
const signingKeys = await this.nodesService.getNodeSigningKeys({ nodeUid: albumNodeUid });
|
|
123
|
+
const process = new addToAlbum_1.AddToAlbumProcess(albumNodeUid, albumKeys, signingKeys, this.apiService, this.cryptoService, this.nodesService, this.logger, signal);
|
|
124
|
+
yield* process.execute(photoNodeUids);
|
|
125
|
+
}
|
|
126
|
+
async *removePhotos(albumNodeUid, photoNodeUids, signal) {
|
|
127
|
+
for await (const result of this.apiService.removePhotosFromAlbum(albumNodeUid, photoNodeUids, signal)) {
|
|
128
|
+
if (result.ok) {
|
|
129
|
+
await this.nodesService.notifyNodeChanged(result.uid);
|
|
130
|
+
}
|
|
131
|
+
yield result;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
111
134
|
async *iterateNodesAndIgnoreMissingOnes(nodeUids, signal) {
|
|
112
135
|
const nodeGenerator = this.nodesService.iterateNodes(nodeUids, signal);
|
|
113
136
|
for await (const node of nodeGenerator) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"albums.js","sourceRoot":"","sources":["../../../src/internal/photos/albums.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"albums.js","sourceRoot":"","sources":["../../../src/internal/photos/albums.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const interface_1 = require("../../interface");
|
|
4
4
|
const errors_1 = require("../../errors");
|
|
5
|
+
const telemetry_1 = require("../../tests/telemetry");
|
|
5
6
|
const albums_1 = require("./albums");
|
|
6
7
|
describe('Albums', () => {
|
|
7
8
|
let apiService;
|
|
@@ -30,6 +31,7 @@ describe('Albums', () => {
|
|
|
30
31
|
createAlbum: jest.fn().mockResolvedValue('volumeId~newAlbumNodeId'),
|
|
31
32
|
updateAlbum: jest.fn(),
|
|
32
33
|
deleteAlbum: jest.fn(),
|
|
34
|
+
removePhotosFromAlbum: jest.fn(),
|
|
33
35
|
};
|
|
34
36
|
// @ts-expect-error No need to implement all methods for mocking
|
|
35
37
|
cryptoService = {
|
|
@@ -84,7 +86,7 @@ describe('Albums', () => {
|
|
|
84
86
|
notifyNodeDeleted: jest.fn(),
|
|
85
87
|
notifyChildCreated: jest.fn(),
|
|
86
88
|
};
|
|
87
|
-
albums = new albums_1.Albums(apiService, cryptoService, photoShares, nodesService);
|
|
89
|
+
albums = new albums_1.Albums((0, telemetry_1.getMockTelemetry)(), apiService, cryptoService, photoShares, nodesService);
|
|
88
90
|
});
|
|
89
91
|
describe('createAlbum', () => {
|
|
90
92
|
it('creates album and returns decrypted node', async () => {
|
|
@@ -189,5 +191,28 @@ describe('Albums', () => {
|
|
|
189
191
|
expect(nodesService.notifyNodeDeleted).toHaveBeenCalledWith('albumNodeUid');
|
|
190
192
|
});
|
|
191
193
|
});
|
|
194
|
+
describe('removePhotos', () => {
|
|
195
|
+
it('notifies nodes service only for successfully removed photos', async () => {
|
|
196
|
+
apiService.removePhotosFromAlbum = jest.fn().mockImplementation(async function* () {
|
|
197
|
+
yield { uid: 'photo1', ok: true };
|
|
198
|
+
yield { uid: 'photo2', ok: false, error: 'Some error' };
|
|
199
|
+
yield { uid: 'photo3', ok: true };
|
|
200
|
+
});
|
|
201
|
+
const results = [];
|
|
202
|
+
for await (const result of albums.removePhotos('albumNodeUid', ['photo1', 'photo2', 'photo3'])) {
|
|
203
|
+
results.push(result);
|
|
204
|
+
}
|
|
205
|
+
expect(results).toEqual([
|
|
206
|
+
{ uid: 'photo1', ok: true },
|
|
207
|
+
{ uid: 'photo2', ok: false, error: 'Some error' },
|
|
208
|
+
{ uid: 'photo3', ok: true },
|
|
209
|
+
]);
|
|
210
|
+
expect(apiService.removePhotosFromAlbum).toHaveBeenCalledWith('albumNodeUid', ['photo1', 'photo2', 'photo3'], undefined);
|
|
211
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledTimes(2);
|
|
212
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith('photo1');
|
|
213
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith('photo3');
|
|
214
|
+
expect(nodesService.notifyNodeChanged).not.toHaveBeenCalledWith('photo2');
|
|
215
|
+
});
|
|
216
|
+
});
|
|
192
217
|
});
|
|
193
218
|
//# sourceMappingURL=albums.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"albums.test.js","sourceRoot":"","sources":["../../../src/internal/photos/albums.test.ts"],"names":[],"mappings":";;AAAA,+
|
|
1
|
+
{"version":3,"file":"albums.test.js","sourceRoot":"","sources":["../../../src/internal/photos/albums.test.ts"],"names":[],"mappings":"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"}
|