@protontech/drive-sdk 0.13.0 → 0.14.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/interface/events.d.ts +1 -1
- package/dist/interface/telemetry.d.ts +9 -4
- package/dist/interface/telemetry.js +1 -0
- package/dist/interface/telemetry.js.map +1 -1
- package/dist/internal/apiService/driveTypes.d.ts +52 -0
- package/dist/internal/download/telemetry.js +6 -1
- package/dist/internal/download/telemetry.js.map +1 -1
- package/dist/internal/download/telemetry.test.js +5 -0
- package/dist/internal/download/telemetry.test.js.map +1 -1
- package/dist/internal/events/index.js +2 -2
- package/dist/internal/events/index.js.map +1 -1
- package/dist/internal/events/interface.d.ts +1 -1
- package/dist/internal/nodes/cryptoReporter.js +2 -2
- package/dist/internal/nodes/cryptoReporter.js.map +1 -1
- package/dist/internal/photos/addToAlbum.d.ts +6 -0
- package/dist/internal/photos/addToAlbum.js +1 -0
- package/dist/internal/photos/addToAlbum.js.map +1 -1
- package/dist/internal/photos/albumsManager.d.ts +4 -1
- package/dist/internal/photos/albumsManager.js +22 -2
- package/dist/internal/photos/albumsManager.js.map +1 -1
- package/dist/internal/photos/albumsManager.test.js +41 -1
- package/dist/internal/photos/albumsManager.test.js.map +1 -1
- package/dist/internal/photos/apiService.d.ts +1 -0
- package/dist/internal/photos/apiService.js +59 -5
- package/dist/internal/photos/apiService.js.map +1 -1
- package/dist/internal/photos/apiService.test.js +137 -0
- package/dist/internal/photos/apiService.test.js.map +1 -1
- package/dist/internal/photos/errors.d.ts +5 -0
- package/dist/internal/photos/errors.js +10 -1
- package/dist/internal/photos/errors.js.map +1 -1
- package/dist/internal/photos/index.js +1 -1
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/photosManager.d.ts +1 -0
- package/dist/internal/photos/photosManager.js +42 -4
- package/dist/internal/photos/photosManager.js.map +1 -1
- package/dist/internal/photos/photosManager.test.js +35 -0
- package/dist/internal/photos/photosManager.test.js.map +1 -1
- package/dist/internal/photos/photosTransferPayloadBuilder.d.ts +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js.map +1 -1
- package/dist/internal/sharing/apiService.js +1 -1
- package/dist/internal/sharing/apiService.js.map +1 -1
- package/dist/internal/upload/manager.js +3 -2
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +1 -1
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/telemetry.js +4 -1
- package/dist/internal/upload/telemetry.js.map +1 -1
- package/dist/internal/upload/telemetry.test.js +6 -0
- package/dist/internal/upload/telemetry.test.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +4 -3
- package/dist/protonDrivePhotosClient.js +3 -3
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/telemetry.d.ts +1 -0
- package/dist/telemetry.js +21 -0
- package/dist/telemetry.js.map +1 -1
- package/dist/telemetry.test.d.ts +1 -0
- package/dist/telemetry.test.js +37 -0
- package/dist/telemetry.test.js.map +1 -0
- package/package.json +1 -1
- package/src/interface/events.ts +1 -1
- package/src/interface/telemetry.ts +9 -4
- package/src/internal/apiService/driveTypes.ts +52 -0
- package/src/internal/download/telemetry.test.ts +5 -0
- package/src/internal/download/telemetry.ts +7 -3
- package/src/internal/events/index.ts +2 -2
- package/src/internal/events/interface.ts +1 -1
- package/src/internal/nodes/cryptoReporter.ts +4 -2
- package/src/internal/photos/addToAlbum.ts +1 -1
- package/src/internal/photos/albumsManager.test.ts +61 -1
- package/src/internal/photos/albumsManager.ts +23 -3
- package/src/internal/photos/apiService.test.ts +155 -0
- package/src/internal/photos/apiService.ts +92 -3
- package/src/internal/photos/errors.ts +11 -0
- package/src/internal/photos/index.ts +1 -1
- package/src/internal/photos/photosManager.test.ts +43 -1
- package/src/internal/photos/photosManager.ts +61 -3
- package/src/internal/photos/photosTransferPayloadBuilder.ts +3 -1
- package/src/internal/sharing/apiService.ts +5 -5
- package/src/internal/upload/manager.test.ts +1 -1
- package/src/internal/upload/manager.ts +3 -2
- package/src/internal/upload/telemetry.test.ts +6 -0
- package/src/internal/upload/telemetry.ts +5 -3
- package/src/protonDrivePhotosClient.ts +4 -4
- package/src/telemetry.test.ts +40 -0
- package/src/telemetry.ts +22 -0
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PhotosAPIService = void 0;
|
|
4
4
|
const ttag_1 = require("ttag");
|
|
5
|
-
const errors_1 = require("../../errors");
|
|
6
5
|
const apiService_1 = require("../apiService");
|
|
7
6
|
const batch_1 = require("../batch");
|
|
8
7
|
const interface_1 = require("../shares/interface");
|
|
9
8
|
const uids_1 = require("../uids");
|
|
10
|
-
const
|
|
9
|
+
const errors_1 = require("./errors");
|
|
11
10
|
const ALBUM_CONTAINS_PHOTOS_NOT_IN_TIMELINE_ERROR_CODE = 200302;
|
|
12
11
|
/**
|
|
13
12
|
* Provides API communication for fetching and manipulating photos and albums
|
|
@@ -170,7 +169,9 @@ class PhotosAPIService {
|
|
|
170
169
|
}
|
|
171
170
|
catch (error) {
|
|
172
171
|
if (error instanceof apiService_1.APICodeError && error.code === ALBUM_CONTAINS_PHOTOS_NOT_IN_TIMELINE_ERROR_CODE) {
|
|
173
|
-
|
|
172
|
+
const childLinkIds = error.debug?.ChildLinkIDs || [];
|
|
173
|
+
const nodeUids = childLinkIds.map((linkId) => (0, uids_1.makeNodeUid)(volumeId, linkId));
|
|
174
|
+
throw new errors_1.AlbumContainsPhotosNotInTimelineError(error.message, error.code, nodeUids);
|
|
174
175
|
}
|
|
175
176
|
throw error;
|
|
176
177
|
}
|
|
@@ -207,7 +208,7 @@ class PhotosAPIService {
|
|
|
207
208
|
const nodeUid = (0, uids_1.makeNodeUid)(volumeId, details.LinkID);
|
|
208
209
|
if (details.Response.Details?.Missing) {
|
|
209
210
|
const missingNodeUids = details.Response.Details.Missing.map((linkId) => (0, uids_1.makeNodeUid)(volumeId, linkId));
|
|
210
|
-
errors.set(nodeUid, new
|
|
211
|
+
errors.set(nodeUid, new errors_1.MissingRelatedPhotosError(missingNodeUids));
|
|
211
212
|
}
|
|
212
213
|
else {
|
|
213
214
|
errors.set(nodeUid, new apiService_1.APICodeError(details.Response.Error || (0, ttag_1.c)('Error').t `Unknown error`, details.Response.Code));
|
|
@@ -264,7 +265,7 @@ class PhotosAPIService {
|
|
|
264
265
|
if (error instanceof apiService_1.InvalidRequirementsAPIError) {
|
|
265
266
|
const { Missing: missingLinkIds } = error.details;
|
|
266
267
|
if (missingLinkIds.length > 0) {
|
|
267
|
-
throw new
|
|
268
|
+
throw new errors_1.MissingRelatedPhotosError(missingLinkIds.map((linkId) => (0, uids_1.makeNodeUid)(sourceVolumeId, linkId)));
|
|
268
269
|
}
|
|
269
270
|
}
|
|
270
271
|
throw error;
|
|
@@ -330,6 +331,59 @@ class PhotosAPIService {
|
|
|
330
331
|
: undefined;
|
|
331
332
|
await this.apiService.post(`drive/photos/volumes/${volumeId}/links/${linkId}/favorite`, requestBody);
|
|
332
333
|
}
|
|
334
|
+
async *transferPhotos(newParentNodeUid, photoPayloads, signal) {
|
|
335
|
+
const { volumeId, nodeId: newParentNodeId } = (0, uids_1.splitNodeUid)(newParentNodeUid);
|
|
336
|
+
if (photoPayloads.length === 0) {
|
|
337
|
+
return;
|
|
338
|
+
}
|
|
339
|
+
const nameSignatureEmail = photoPayloads[0].nameSignatureEmail;
|
|
340
|
+
if (photoPayloads.some((photoPayload) => photoPayload.nameSignatureEmail !== nameSignatureEmail)) {
|
|
341
|
+
throw new Error('All photos must have the same name signature email');
|
|
342
|
+
}
|
|
343
|
+
const allPhotoPayloads = photoPayloads.flatMap((photoPayload) => [photoPayload, ...photoPayload.relatedPhotos]);
|
|
344
|
+
const allLinksData = allPhotoPayloads.map((photoPayload) => {
|
|
345
|
+
const { nodeId } = (0, uids_1.splitNodeUid)(photoPayload.nodeUid);
|
|
346
|
+
return {
|
|
347
|
+
LinkID: nodeId,
|
|
348
|
+
Hash: photoPayload.nameHash,
|
|
349
|
+
OriginalHash: photoPayload.originalNameHash,
|
|
350
|
+
Name: photoPayload.encryptedName,
|
|
351
|
+
NodePassphrase: photoPayload.nodePassphrase,
|
|
352
|
+
ContentHash: photoPayload.contentHash,
|
|
353
|
+
NodePassphraseSignature: null, // Required when moving an anonymous node.
|
|
354
|
+
};
|
|
355
|
+
});
|
|
356
|
+
const response = await this.apiService.put(`drive/photos/volumes/${volumeId}/links/transfer-multiple`, {
|
|
357
|
+
ParentLinkID: newParentNodeId,
|
|
358
|
+
Links: allLinksData,
|
|
359
|
+
NameSignatureEmail: nameSignatureEmail,
|
|
360
|
+
SignatureEmail: null, // Required when moving an anonymous node.
|
|
361
|
+
}, signal);
|
|
362
|
+
const errors = new Map();
|
|
363
|
+
for (const r of response.Responses || []) {
|
|
364
|
+
const details = r;
|
|
365
|
+
if (!details.Response.Code || !(0, apiService_1.isCodeOk)(details.Response.Code) || details.Response?.Error) {
|
|
366
|
+
const nodeUid = (0, uids_1.makeNodeUid)(volumeId, details.LinkID);
|
|
367
|
+
if (details.Response.Details?.Missing) {
|
|
368
|
+
const missingNodeUids = details.Response.Details.Missing.map((linkId) => (0, uids_1.makeNodeUid)(volumeId, linkId));
|
|
369
|
+
errors.set(nodeUid, new errors_1.MissingRelatedPhotosError(missingNodeUids));
|
|
370
|
+
}
|
|
371
|
+
else {
|
|
372
|
+
errors.set(nodeUid, new apiService_1.APICodeError(details.Response.Error || (0, ttag_1.c)('Error').t `Unknown error`, details.Response.Code));
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
for (const photoPayload of photoPayloads) {
|
|
377
|
+
const uid = photoPayload.nodeUid;
|
|
378
|
+
const error = errors.get(uid);
|
|
379
|
+
if (error) {
|
|
380
|
+
yield { uid, ok: false, error };
|
|
381
|
+
}
|
|
382
|
+
else {
|
|
383
|
+
yield { uid, ok: true };
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
}
|
|
333
387
|
}
|
|
334
388
|
exports.PhotosAPIService = PhotosAPIService;
|
|
335
389
|
//# sourceMappingURL=apiService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/photos/apiService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/photos/apiService.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ describe('photosAPIService', () => {
|
|
|
23
23
|
nodeUid: 'volumeId1~photoNodeId1',
|
|
24
24
|
contentHash: 'contentHash1',
|
|
25
25
|
nameHash: 'nameHash1',
|
|
26
|
+
originalNameHash: 'originalNameHash1',
|
|
26
27
|
encryptedName: 'encryptedName1',
|
|
27
28
|
nameSignatureEmail: 'nameSignatureEmail1',
|
|
28
29
|
nodePassphrase: 'nodePassphrase1',
|
|
@@ -33,6 +34,7 @@ describe('photosAPIService', () => {
|
|
|
33
34
|
nodeUid: 'volumeId1~photoNodeId2',
|
|
34
35
|
contentHash: 'contentHash2',
|
|
35
36
|
nameHash: 'nameHash2',
|
|
37
|
+
originalNameHash: 'originalNameHash2',
|
|
36
38
|
encryptedName: 'encryptedName2',
|
|
37
39
|
nameSignatureEmail: 'nameSignatureEmail2',
|
|
38
40
|
nodePassphrase: 'nodePassphrase2',
|
|
@@ -132,6 +134,7 @@ describe('photosAPIService', () => {
|
|
|
132
134
|
nodeUid: 'volumeId2~photoNodeId1',
|
|
133
135
|
contentHash: 'contentHash1',
|
|
134
136
|
nameHash: 'nameHash1',
|
|
137
|
+
originalNameHash: 'originalNameHash1',
|
|
135
138
|
encryptedName: 'encryptedName1',
|
|
136
139
|
nameSignatureEmail: 'nameSignatureEmail1',
|
|
137
140
|
nodePassphrase: 'nodePassphrase1',
|
|
@@ -142,6 +145,7 @@ describe('photosAPIService', () => {
|
|
|
142
145
|
nodeUid: 'volumeId2~photoNodeId2',
|
|
143
146
|
contentHash: 'contentHash2',
|
|
144
147
|
nameHash: 'nameHash2',
|
|
148
|
+
originalNameHash: 'originalNameHash2',
|
|
145
149
|
encryptedName: 'encryptedName2',
|
|
146
150
|
nameSignatureEmail: 'nameSignatureEmail2',
|
|
147
151
|
nodePassphrase: 'nodePassphrase2',
|
|
@@ -195,5 +199,138 @@ describe('photosAPIService', () => {
|
|
|
195
199
|
await expect(promise).rejects.toThrow(error);
|
|
196
200
|
});
|
|
197
201
|
});
|
|
202
|
+
describe('transferPhotos', () => {
|
|
203
|
+
const photoPayloads = [
|
|
204
|
+
{
|
|
205
|
+
nodeUid: 'volumeId1~photoNodeId1',
|
|
206
|
+
contentHash: 'contentHash1',
|
|
207
|
+
nameHash: 'nameHash1',
|
|
208
|
+
originalNameHash: 'originalNameHash1',
|
|
209
|
+
encryptedName: 'encryptedName1',
|
|
210
|
+
nameSignatureEmail: 'nameSignatureEmail1',
|
|
211
|
+
nodePassphrase: 'nodePassphrase1',
|
|
212
|
+
nodePassphraseSignature: 'nodePassphraseSignature1',
|
|
213
|
+
signatureEmail: 'signatureEmail1',
|
|
214
|
+
relatedPhotos: [
|
|
215
|
+
{
|
|
216
|
+
nodeUid: 'volumeId1~photoNodeId2',
|
|
217
|
+
contentHash: 'contentHash2',
|
|
218
|
+
nameHash: 'nameHash2',
|
|
219
|
+
originalNameHash: 'originalNameHash2',
|
|
220
|
+
encryptedName: 'encryptedName2',
|
|
221
|
+
nameSignatureEmail: 'nameSignatureEmail2',
|
|
222
|
+
nodePassphrase: 'nodePassphrase2',
|
|
223
|
+
nodePassphraseSignature: 'nodePassphraseSignature2',
|
|
224
|
+
signatureEmail: 'signatureEmail2',
|
|
225
|
+
},
|
|
226
|
+
],
|
|
227
|
+
},
|
|
228
|
+
];
|
|
229
|
+
it('should transfer photos', async () => {
|
|
230
|
+
apiMock.put = jest.fn().mockResolvedValue({
|
|
231
|
+
Code: 1000,
|
|
232
|
+
Responses: [
|
|
233
|
+
{
|
|
234
|
+
LinkID: 'photoNodeId1',
|
|
235
|
+
Response: {
|
|
236
|
+
Code: 1000,
|
|
237
|
+
},
|
|
238
|
+
},
|
|
239
|
+
],
|
|
240
|
+
});
|
|
241
|
+
const result = await Array.fromAsync(api.transferPhotos(albumNodeUid, photoPayloads));
|
|
242
|
+
expect(result).toEqual([
|
|
243
|
+
{
|
|
244
|
+
uid: 'volumeId1~photoNodeId1',
|
|
245
|
+
ok: true,
|
|
246
|
+
},
|
|
247
|
+
]);
|
|
248
|
+
expect(apiMock.put).toHaveBeenCalledWith(`drive/photos/volumes/volumeId1/links/transfer-multiple`, {
|
|
249
|
+
ParentLinkID: 'albumNodeId',
|
|
250
|
+
Links: [
|
|
251
|
+
expect.objectContaining({
|
|
252
|
+
LinkID: 'photoNodeId1',
|
|
253
|
+
Hash: 'nameHash1',
|
|
254
|
+
OriginalHash: 'originalNameHash1',
|
|
255
|
+
Name: 'encryptedName1',
|
|
256
|
+
NodePassphrase: 'nodePassphrase1',
|
|
257
|
+
ContentHash: 'contentHash1',
|
|
258
|
+
NodePassphraseSignature: null,
|
|
259
|
+
}),
|
|
260
|
+
expect.objectContaining({
|
|
261
|
+
LinkID: 'photoNodeId2',
|
|
262
|
+
Hash: 'nameHash2',
|
|
263
|
+
OriginalHash: 'originalNameHash2',
|
|
264
|
+
Name: 'encryptedName2',
|
|
265
|
+
NodePassphrase: 'nodePassphrase2',
|
|
266
|
+
ContentHash: 'contentHash2',
|
|
267
|
+
NodePassphraseSignature: null,
|
|
268
|
+
}),
|
|
269
|
+
],
|
|
270
|
+
NameSignatureEmail: 'nameSignatureEmail1',
|
|
271
|
+
SignatureEmail: null,
|
|
272
|
+
}, undefined);
|
|
273
|
+
});
|
|
274
|
+
it('should return MissingRelatedPhotosError if related photos are missing', async () => {
|
|
275
|
+
apiMock.put = jest.fn().mockResolvedValue({
|
|
276
|
+
Code: 1000,
|
|
277
|
+
Responses: [
|
|
278
|
+
{
|
|
279
|
+
LinkID: 'photoNodeId1',
|
|
280
|
+
Response: {
|
|
281
|
+
Code: 2000,
|
|
282
|
+
Details: {
|
|
283
|
+
Missing: ['photoNodeId3'],
|
|
284
|
+
},
|
|
285
|
+
},
|
|
286
|
+
},
|
|
287
|
+
],
|
|
288
|
+
});
|
|
289
|
+
const result = await Array.fromAsync(api.transferPhotos(albumNodeUid, photoPayloads));
|
|
290
|
+
expect(result).toEqual([
|
|
291
|
+
{
|
|
292
|
+
uid: 'volumeId1~photoNodeId1',
|
|
293
|
+
ok: false,
|
|
294
|
+
error: new errors_2.MissingRelatedPhotosError([]),
|
|
295
|
+
},
|
|
296
|
+
]);
|
|
297
|
+
expect(result[0].error.missingNodeUids).toEqual(['volumeId1~photoNodeId3']);
|
|
298
|
+
});
|
|
299
|
+
it('should return error for unknown error', async () => {
|
|
300
|
+
apiMock.put = jest.fn().mockResolvedValue({
|
|
301
|
+
Code: 1000,
|
|
302
|
+
Responses: [
|
|
303
|
+
{
|
|
304
|
+
LinkID: 'photoNodeId1',
|
|
305
|
+
Response: {
|
|
306
|
+
Code: 3000,
|
|
307
|
+
Error: 'Some error',
|
|
308
|
+
},
|
|
309
|
+
},
|
|
310
|
+
],
|
|
311
|
+
});
|
|
312
|
+
const result = await Array.fromAsync(api.transferPhotos(albumNodeUid, photoPayloads));
|
|
313
|
+
expect(result).toEqual([
|
|
314
|
+
{
|
|
315
|
+
uid: 'volumeId1~photoNodeId1',
|
|
316
|
+
ok: false,
|
|
317
|
+
error: new errors_1.APICodeError('Some error', 3000),
|
|
318
|
+
},
|
|
319
|
+
]);
|
|
320
|
+
});
|
|
321
|
+
it('should throw if name signature emails differ', async () => {
|
|
322
|
+
const mixedPayloads = [
|
|
323
|
+
photoPayloads[0],
|
|
324
|
+
{
|
|
325
|
+
...photoPayloads[0],
|
|
326
|
+
nodeUid: 'volumeId1~photoNodeIdOther',
|
|
327
|
+
nameSignatureEmail: 'other@example.com',
|
|
328
|
+
relatedPhotos: [],
|
|
329
|
+
},
|
|
330
|
+
];
|
|
331
|
+
await expect(Array.fromAsync(api.transferPhotos(albumNodeUid, mixedPayloads))).rejects.toThrow('All photos must have the same name signature email');
|
|
332
|
+
expect(apiMock.put).not.toHaveBeenCalled();
|
|
333
|
+
});
|
|
334
|
+
});
|
|
198
335
|
});
|
|
199
336
|
//# sourceMappingURL=apiService.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.test.js","sourceRoot":"","sources":["../../../src/internal/photos/apiService.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apiService.test.js","sourceRoot":"","sources":["../../../src/internal/photos/apiService.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
+
import { ValidationError } from '../../errors';
|
|
1
2
|
export declare class MissingRelatedPhotosError extends Error {
|
|
2
3
|
missingNodeUids: string[];
|
|
3
4
|
constructor(missingNodeUids: string[]);
|
|
4
5
|
}
|
|
6
|
+
export declare class AlbumContainsPhotosNotInTimelineError extends ValidationError {
|
|
7
|
+
readonly photosOnlyInAlbumNodeUids: string[];
|
|
8
|
+
constructor(message: string, code: number, photosOnlyInAlbumNodeUids: string[]);
|
|
9
|
+
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MissingRelatedPhotosError = void 0;
|
|
3
|
+
exports.AlbumContainsPhotosNotInTimelineError = exports.MissingRelatedPhotosError = void 0;
|
|
4
4
|
const ttag_1 = require("ttag");
|
|
5
|
+
const errors_1 = require("../../errors");
|
|
5
6
|
class MissingRelatedPhotosError extends Error {
|
|
6
7
|
missingNodeUids;
|
|
7
8
|
constructor(missingNodeUids) {
|
|
@@ -14,4 +15,12 @@ class MissingRelatedPhotosError extends Error {
|
|
|
14
15
|
}
|
|
15
16
|
}
|
|
16
17
|
exports.MissingRelatedPhotosError = MissingRelatedPhotosError;
|
|
18
|
+
class AlbumContainsPhotosNotInTimelineError extends errors_1.ValidationError {
|
|
19
|
+
photosOnlyInAlbumNodeUids;
|
|
20
|
+
constructor(message, code, photosOnlyInAlbumNodeUids) {
|
|
21
|
+
super(message, code);
|
|
22
|
+
this.photosOnlyInAlbumNodeUids = photosOnlyInAlbumNodeUids;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
exports.AlbumContainsPhotosNotInTimelineError = AlbumContainsPhotosNotInTimelineError;
|
|
17
26
|
//# sourceMappingURL=errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/internal/photos/errors.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,MAAa,yBAA0B,SAAQ,KAAK;IAC7B;IAAnB,YAAmB,eAAyB;QACxC,yEAAyE;QACzE,wEAAwE;QACxE,0EAA0E;QAC1E,KAAK,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,mCAAmC,CAAC,CAAC;QAJxC,oBAAe,GAAf,eAAe,CAAU;QAKxC,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC;IAC5C,CAAC;CACJ;AARD,8DAQC"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/internal/photos/errors.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,yCAA+C;AAE/C,MAAa,yBAA0B,SAAQ,KAAK;IAC7B;IAAnB,YAAmB,eAAyB;QACxC,yEAAyE;QACzE,wEAAwE;QACxE,0EAA0E;QAC1E,KAAK,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,mCAAmC,CAAC,CAAC;QAJxC,oBAAe,GAAf,eAAe,CAAU;QAKxC,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC;IAC5C,CAAC;CACJ;AARD,8DAQC;AAED,MAAa,qCAAsC,SAAQ,wBAAe;IACtD,yBAAyB,CAAW;IAEpD,YAAY,OAAe,EAAE,IAAY,EAAE,yBAAmC;QAC1E,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;IAC/D,CAAC;CACJ;AAPD,sFAOC"}
|
|
@@ -36,8 +36,8 @@ function initPhotosModule(telemetry, apiService, driveCrypto, photoShares, nodes
|
|
|
36
36
|
const api = new apiService_1.PhotosAPIService(apiService);
|
|
37
37
|
const albumsCryptoService = new albumsCrypto_1.AlbumsCryptoService(driveCrypto);
|
|
38
38
|
const timeline = new timeline_1.PhotosTimeline(telemetry.getLogger('photos-timeline'), api, driveCrypto, photoShares, nodesService);
|
|
39
|
-
const albums = new albumsManager_1.AlbumsManager(telemetry, api, albumsCryptoService, photoShares, nodesService);
|
|
40
39
|
const photos = new photosManager_1.PhotosManager(telemetry.getLogger('photos-update'), api, albumsCryptoService, nodesService);
|
|
40
|
+
const albums = new albumsManager_1.AlbumsManager(telemetry, api, albumsCryptoService, photoShares, nodesService, photos);
|
|
41
41
|
return {
|
|
42
42
|
timeline,
|
|
43
43
|
albums,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/photos/index.ts"],"names":[],"mappings":";;;AAgDA,4CAwBC;AASD,sDAsBC;AAQD,sDA0BC;AAQD,sDA6CC;AArLD,0DAA4D;AAC5D,4DAA8D;AAC9D,sDAAwD;AACxD,4CAAqD;AACrD,4DAAwD;AACxD,sCAA4C;AAC5C,2CAA8C;AAC9C,uDAA0D;AAC1D,2DAA8D;AAE9D,mDAAsD;AACtD,2CAA8C;AAC9C,mDAAgD;AAChD,iDAAqD;AACrD,6CAAgD;AAEhD,mCAA4G;AAC5G,qCAA8C;AAC9C,yCAA4C;AAC5C,mDAAgD;AAChD,qCAMkB;AAIlB,yDAAyD;AAC5C,QAAA,yBAAyB,GAAG,CAAC,wBAAe,CAAC,KAAK,EAAE,wBAAe,CAAC,KAAK,CAAC,CAAC;AAExF;;;;;GAKG;AACH,SAAgB,gBAAgB,CAC5B,SAA+B,EAC/B,UAA2B,EAC3B,WAAwB,EACxB,WAA+B,EAC/B,YAA+B;IAE/B,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,mBAAmB,GAAG,IAAI,kCAAmB,CAAC,WAAW,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,IAAI,yBAAc,CAC/B,SAAS,CAAC,SAAS,CAAC,iBAAiB,CAAC,EACtC,GAAG,EACH,WAAW,EACX,WAAW,EACX,YAAY,CACf,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,6BAAa,CAAC,SAAS,EAAE,GAAG,EAAE,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/photos/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export declare class PhotosManager {
|
|
|
17
17
|
private readonly nodesService;
|
|
18
18
|
private readonly payloadBuilder;
|
|
19
19
|
constructor(logger: Logger, apiService: PhotosAPIService, albumsCryptoService: AlbumsCryptoService, nodesService: PhotosNodesAccess);
|
|
20
|
+
saveToTimeline(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
20
21
|
updatePhotos(photos: UpdatePhotoSettings[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
21
22
|
private iterateNodeUidsWithFavoritePayloads;
|
|
22
23
|
}
|
|
@@ -2,11 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PhotosManager = void 0;
|
|
4
4
|
const ttag_1 = require("ttag");
|
|
5
|
-
const interface_1 = require("../../interface");
|
|
6
|
-
const photosTransferPayloadBuilder_1 = require("./photosTransferPayloadBuilder");
|
|
7
5
|
const errors_1 = require("../../errors");
|
|
8
|
-
const
|
|
6
|
+
const interface_1 = require("../../interface");
|
|
9
7
|
const batch_1 = require("../batch");
|
|
8
|
+
const photosTransferPayloadBuilder_1 = require("./photosTransferPayloadBuilder");
|
|
9
|
+
const addToAlbum_1 = require("./addToAlbum");
|
|
10
|
+
const errors_2 = require("./errors");
|
|
11
|
+
/**
|
|
12
|
+
* The number of photos that are loaded in parallel to prepare the payloads.
|
|
13
|
+
*/
|
|
14
|
+
const BATCH_LOADING_SIZE = 20;
|
|
10
15
|
/**
|
|
11
16
|
* Manages updating photos: adding/removing tags and favoriting.
|
|
12
17
|
* Uses the same encrypted payload as add-to-album/copy for the favorite endpoint.
|
|
@@ -22,6 +27,39 @@ class PhotosManager {
|
|
|
22
27
|
this.nodesService = nodesService;
|
|
23
28
|
this.payloadBuilder = new photosTransferPayloadBuilder_1.PhotoTransferPayloadBuilder(albumsCryptoService, nodesService);
|
|
24
29
|
}
|
|
30
|
+
async *saveToTimeline(nodeUids, signal) {
|
|
31
|
+
const rootNode = await this.nodesService.getVolumeRootFolder();
|
|
32
|
+
const volumeRootKeys = await this.nodesService.getNodeKeys(rootNode.uid);
|
|
33
|
+
const signingKeys = await this.nodesService.getNodeSigningKeys({ nodeUid: rootNode.uid });
|
|
34
|
+
const queue = nodeUids.map((nodeUid) => ({ photoNodeUid: nodeUid, additionalRelatedPhotoNodeUids: [] }));
|
|
35
|
+
const retriedPhotoUids = new Set();
|
|
36
|
+
while (queue.length > 0) {
|
|
37
|
+
const items = queue.splice(0, BATCH_LOADING_SIZE);
|
|
38
|
+
const { payloads, errors } = await this.payloadBuilder.preparePhotoPayloads(items, rootNode.uid, volumeRootKeys, signingKeys, signal);
|
|
39
|
+
for (const [uid, error] of errors) {
|
|
40
|
+
yield { uid, ok: false, error };
|
|
41
|
+
}
|
|
42
|
+
for (const batch of (0, addToAlbum_1.createBatches)(payloads)) {
|
|
43
|
+
for await (const result of this.apiService.transferPhotos(rootNode.uid, batch, signal)) {
|
|
44
|
+
if (!result.ok &&
|
|
45
|
+
result.error instanceof errors_2.MissingRelatedPhotosError &&
|
|
46
|
+
!retriedPhotoUids.has(result.uid)) {
|
|
47
|
+
retriedPhotoUids.add(result.uid);
|
|
48
|
+
this.logger.info(`Missing related photos for saving ${result.uid}, re-queuing: ${result.error.missingNodeUids.join(', ')}`);
|
|
49
|
+
queue.push({
|
|
50
|
+
photoNodeUid: result.uid,
|
|
51
|
+
additionalRelatedPhotoNodeUids: result.error.missingNodeUids,
|
|
52
|
+
});
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
55
|
+
if (result.ok) {
|
|
56
|
+
await this.nodesService.notifyNodeChanged(result.uid);
|
|
57
|
+
}
|
|
58
|
+
yield result;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
25
63
|
async *updatePhotos(photos, signal) {
|
|
26
64
|
for await (const { photoSettings: { nodeUid, tagsToAdd, tagsToRemove }, payloadForFavorite, error, } of this.iterateNodeUidsWithFavoritePayloads(photos, signal)) {
|
|
27
65
|
if (signal?.aborted) {
|
|
@@ -68,7 +106,7 @@ class PhotosManager {
|
|
|
68
106
|
const volumeRootKeys = await this.nodesService.getNodeKeys(rootNode.uid);
|
|
69
107
|
const signingKeys = await this.nodesService.getNodeSigningKeys({ nodeUid: rootNode.uid });
|
|
70
108
|
// Batch iteration to fetch metadata for preparing the payloads in parallel.
|
|
71
|
-
for (const photoSettingsBatch of (0, batch_1.batch)(photosSettingsWithFavorite,
|
|
109
|
+
for (const photoSettingsBatch of (0, batch_1.batch)(photosSettingsWithFavorite, BATCH_LOADING_SIZE)) {
|
|
72
110
|
if (signal?.aborted) {
|
|
73
111
|
throw new errors_1.AbortError();
|
|
74
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"photosManager.js","sourceRoot":"","sources":["../../../src/internal/photos/photosManager.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,+CAAwE;
|
|
1
|
+
{"version":3,"file":"photosManager.js","sourceRoot":"","sources":["../../../src/internal/photos/photosManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const interface_1 = require("../../interface");
|
|
4
4
|
const logger_1 = require("../../tests/logger");
|
|
5
5
|
const photosManager_1 = require("./photosManager");
|
|
6
|
+
const errors_1 = require("./errors");
|
|
6
7
|
function createMockPhotoNode(uid, overrides = {}) {
|
|
7
8
|
return {
|
|
8
9
|
uid,
|
|
@@ -41,6 +42,13 @@ async function collectUpdateResults(manager, photos, signal) {
|
|
|
41
42
|
}
|
|
42
43
|
return results;
|
|
43
44
|
}
|
|
45
|
+
async function collectSaveToTimelineResults(manager, nodeUids, signal) {
|
|
46
|
+
const results = [];
|
|
47
|
+
for await (const result of manager.saveToTimeline(nodeUids, signal)) {
|
|
48
|
+
results.push(result);
|
|
49
|
+
}
|
|
50
|
+
return results;
|
|
51
|
+
}
|
|
44
52
|
describe('PhotosManager', () => {
|
|
45
53
|
let logger;
|
|
46
54
|
let apiService;
|
|
@@ -63,6 +71,7 @@ describe('PhotosManager', () => {
|
|
|
63
71
|
addPhotoTags: jest.fn().mockResolvedValue(undefined),
|
|
64
72
|
removePhotoTags: jest.fn().mockResolvedValue(undefined),
|
|
65
73
|
setPhotoFavorite: jest.fn().mockResolvedValue(undefined),
|
|
74
|
+
transferPhotos: jest.fn().mockImplementation(async function* () { }),
|
|
66
75
|
};
|
|
67
76
|
cryptoService = {
|
|
68
77
|
encryptPhotoForAlbum: jest.fn().mockResolvedValue({
|
|
@@ -218,5 +227,31 @@ describe('PhotosManager', () => {
|
|
|
218
227
|
});
|
|
219
228
|
});
|
|
220
229
|
});
|
|
230
|
+
describe('saveToTimeline', () => {
|
|
231
|
+
it('re-queues once on MissingRelatedPhotosError then succeeds without yielding the retry error', async () => {
|
|
232
|
+
const missingRelatedUid = 'volume1~related1';
|
|
233
|
+
let transferCall = 0;
|
|
234
|
+
apiService.transferPhotos.mockImplementation(async function* (_rootUid, payloads) {
|
|
235
|
+
transferCall++;
|
|
236
|
+
for (const payload of payloads) {
|
|
237
|
+
if (transferCall === 1) {
|
|
238
|
+
yield {
|
|
239
|
+
uid: payload.nodeUid,
|
|
240
|
+
ok: false,
|
|
241
|
+
error: new errors_1.MissingRelatedPhotosError([missingRelatedUid]),
|
|
242
|
+
};
|
|
243
|
+
}
|
|
244
|
+
else {
|
|
245
|
+
yield { uid: payload.nodeUid, ok: true };
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
});
|
|
249
|
+
const results = await collectSaveToTimelineResults(manager, ['volume1~photo1']);
|
|
250
|
+
expect(results).toEqual([{ uid: 'volume1~photo1', ok: true }]);
|
|
251
|
+
expect(apiService.transferPhotos).toHaveBeenCalledTimes(2);
|
|
252
|
+
expect(logger.info).toHaveBeenCalledWith(`Missing related photos for saving volume1~photo1, re-queuing: ${missingRelatedUid}`);
|
|
253
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith('volume1~photo1');
|
|
254
|
+
});
|
|
255
|
+
});
|
|
221
256
|
});
|
|
222
257
|
//# sourceMappingURL=photosManager.test.js.map
|