@protontech/drive-sdk 0.9.9 → 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 +5 -3
- package/dist/internal/photos/albums.js +13 -1
- package/dist/internal/photos/albums.js.map +1 -1
- package/dist/internal/photos/albums.test.js +2 -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 +19 -3
- package/dist/internal/photos/apiService.js +104 -5
- 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.js +1 -1
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +15 -1
- 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/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 +17 -2
- package/dist/protonDrivePhotosClient.js +21 -1
- package/dist/protonDrivePhotosClient.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 +20 -23
- package/src/internal/photos/albums.ts +31 -2
- package/src/internal/photos/albumsCrypto.ts +54 -3
- package/src/internal/photos/apiService.test.ts +233 -0
- package/src/internal/photos/apiService.ts +172 -27
- package/src/internal/photos/errors.ts +11 -0
- package/src/internal/photos/index.ts +1 -1
- package/src/internal/photos/interface.ts +18 -3
- package/src/internal/photos/nodes.test.ts +27 -6
- package/src/internal/photos/nodes.ts +34 -2
- 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 +39 -15
- package/src/transformers.ts +2 -0
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AlbumsCryptoService = void 0;
|
|
4
|
+
const ttag_1 = require("ttag");
|
|
5
|
+
const errors_1 = require("../../errors");
|
|
4
6
|
/**
|
|
5
7
|
* Provides crypto operations for albums.
|
|
6
8
|
*
|
|
@@ -61,6 +63,31 @@ class AlbumsCryptoService {
|
|
|
61
63
|
hash,
|
|
62
64
|
};
|
|
63
65
|
}
|
|
66
|
+
async encryptPhotoForAlbum(nodeName, sha1, nodeKeys, albumKeys, signingKeys) {
|
|
67
|
+
if (!nodeName.ok) {
|
|
68
|
+
throw new errors_1.ValidationError((0, ttag_1.c)('Error').t `Cannot add photo to album without a valid name`);
|
|
69
|
+
}
|
|
70
|
+
if (signingKeys.type !== 'userAddress') {
|
|
71
|
+
throw new Error('Adding photos to album by anonymous user is not supported');
|
|
72
|
+
}
|
|
73
|
+
const email = signingKeys.email;
|
|
74
|
+
const signingKey = signingKeys.key;
|
|
75
|
+
const [{ armoredNodeName }, hash, contentHash, { armoredPassphrase, armoredPassphraseSignature }] = await Promise.all([
|
|
76
|
+
this.driveCrypto.encryptNodeName(nodeName.value, nodeKeys.nameSessionKey, albumKeys.key, signingKey),
|
|
77
|
+
this.driveCrypto.generateLookupHash(nodeName.value, albumKeys.hashKey),
|
|
78
|
+
this.driveCrypto.generateLookupHash(sha1, albumKeys.hashKey),
|
|
79
|
+
this.driveCrypto.encryptPassphrase(nodeKeys.passphrase, nodeKeys.passphraseSessionKey, [albumKeys.key], signingKey),
|
|
80
|
+
]);
|
|
81
|
+
return {
|
|
82
|
+
encryptedName: armoredNodeName,
|
|
83
|
+
hash,
|
|
84
|
+
contentHash,
|
|
85
|
+
armoredNodePassphrase: armoredPassphrase,
|
|
86
|
+
armoredNodePassphraseSignature: armoredPassphraseSignature,
|
|
87
|
+
signatureEmail: email,
|
|
88
|
+
nameSignatureEmail: email,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
64
91
|
}
|
|
65
92
|
exports.AlbumsCryptoService = AlbumsCryptoService;
|
|
66
93
|
//# sourceMappingURL=albumsCrypto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"albumsCrypto.js","sourceRoot":"","sources":["../../../src/internal/photos/albumsCrypto.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"albumsCrypto.js","sourceRoot":"","sources":["../../../src/internal/photos/albumsCrypto.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { NodeResultWithError } from '../../interface';
|
|
2
2
|
import { DriveAPIService } from '../apiService';
|
|
3
3
|
import { EncryptedRootShare, EncryptedShareCrypto } from '../shares/interface';
|
|
4
|
-
import { AlbumItem } from './interface';
|
|
4
|
+
import { AddToAlbumEncryptedPhotoPayload, AlbumItem } from './interface';
|
|
5
5
|
/**
|
|
6
6
|
* Provides API communication for fetching and manipulating photos and albums
|
|
7
7
|
* metadata.
|
|
@@ -63,5 +63,21 @@ export declare class PhotosAPIService {
|
|
|
63
63
|
deleteAlbum(albumNodeUid: string, options?: {
|
|
64
64
|
force?: boolean;
|
|
65
65
|
}): Promise<void>;
|
|
66
|
-
|
|
66
|
+
/**
|
|
67
|
+
* Add photos from the same volume to an album.
|
|
68
|
+
*
|
|
69
|
+
* To add photos from different volumes, use the {@link copyPhotoToAlbum} method.
|
|
70
|
+
*
|
|
71
|
+
* In the future, these two methods will be merged into a single one.
|
|
72
|
+
*/
|
|
73
|
+
addPhotosToAlbum(albumNodeUid: string, photoPayloads: AddToAlbumEncryptedPhotoPayload[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
74
|
+
/**
|
|
75
|
+
* Copy a photo to a shared album on a different volume.
|
|
76
|
+
*
|
|
77
|
+
* To add photos from the same volume to an album, use the {@link addPhotosToAlbum} method.
|
|
78
|
+
*
|
|
79
|
+
* In the future, these two methods will be merged into a single one.
|
|
80
|
+
*/
|
|
81
|
+
copyPhotoToAlbum(albumNodeUid: string, payload: AddToAlbumEncryptedPhotoPayload, signal?: AbortSignal): Promise<string>;
|
|
82
|
+
removePhotosFromAlbum(albumNodeUid: string, photoNodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
67
83
|
}
|
|
@@ -7,6 +7,7 @@ const apiService_1 = require("../apiService");
|
|
|
7
7
|
const batch_1 = require("../batch");
|
|
8
8
|
const interface_1 = require("../shares/interface");
|
|
9
9
|
const uids_1 = require("../uids");
|
|
10
|
+
const errors_2 = require("./errors");
|
|
10
11
|
const ALBUM_CONTAINS_PHOTOS_NOT_IN_TIMELINE_ERROR_CODE = 200302;
|
|
11
12
|
/**
|
|
12
13
|
* Provides API communication for fetching and manipulating photos and albums
|
|
@@ -174,24 +175,122 @@ class PhotosAPIService {
|
|
|
174
175
|
throw error;
|
|
175
176
|
}
|
|
176
177
|
}
|
|
178
|
+
/**
|
|
179
|
+
* Add photos from the same volume to an album.
|
|
180
|
+
*
|
|
181
|
+
* To add photos from different volumes, use the {@link copyPhotoToAlbum} method.
|
|
182
|
+
*
|
|
183
|
+
* In the future, these two methods will be merged into a single one.
|
|
184
|
+
*/
|
|
185
|
+
async *addPhotosToAlbum(albumNodeUid, photoPayloads, signal) {
|
|
186
|
+
const { volumeId, nodeId: albumLinkId } = (0, uids_1.splitNodeUid)(albumNodeUid);
|
|
187
|
+
const allPhotoPayloads = photoPayloads.flatMap((photoPayload) => [
|
|
188
|
+
photoPayload,
|
|
189
|
+
...(photoPayload.relatedPhotos || []),
|
|
190
|
+
]);
|
|
191
|
+
const allPhotoData = allPhotoPayloads.map((photoPayload) => {
|
|
192
|
+
const { nodeId } = (0, uids_1.splitNodeUid)(photoPayload.nodeUid);
|
|
193
|
+
return {
|
|
194
|
+
LinkID: nodeId,
|
|
195
|
+
Hash: photoPayload.nameHash,
|
|
196
|
+
Name: photoPayload.encryptedName,
|
|
197
|
+
NameSignatureEmail: photoPayload.nameSignatureEmail,
|
|
198
|
+
NodePassphrase: photoPayload.nodePassphrase,
|
|
199
|
+
ContentHash: photoPayload.contentHash,
|
|
200
|
+
};
|
|
201
|
+
});
|
|
202
|
+
const response = await this.apiService.post(`drive/photos/volumes/${volumeId}/albums/${albumLinkId}/add-multiple`, {
|
|
203
|
+
AlbumData: allPhotoData,
|
|
204
|
+
}, signal);
|
|
205
|
+
const errors = new Map();
|
|
206
|
+
for (const r of response.Responses || []) {
|
|
207
|
+
// @ts-expect-error - API definition is not correct.
|
|
208
|
+
const details = r;
|
|
209
|
+
if (!details.Response.Code || !(0, apiService_1.isCodeOk)(details.Response.Code) || details.Response?.Error) {
|
|
210
|
+
const nodeUid = (0, uids_1.makeNodeUid)(volumeId, details.LinkID);
|
|
211
|
+
if (details.Response.Details?.Missing) {
|
|
212
|
+
const missingNodeUids = details.Response.Details.Missing.map((linkId) => (0, uids_1.makeNodeUid)(volumeId, linkId));
|
|
213
|
+
errors.set(nodeUid, new errors_2.MissingRelatedPhotosError(missingNodeUids));
|
|
214
|
+
}
|
|
215
|
+
else {
|
|
216
|
+
errors.set(nodeUid, new apiService_1.APICodeError(details.Response.Error || (0, ttag_1.c)('Error').t `Unknown error`, details.Response.Code));
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
for (const photoPayload of photoPayloads) {
|
|
221
|
+
const uid = photoPayload.nodeUid;
|
|
222
|
+
const error = errors.get(uid);
|
|
223
|
+
if (error) {
|
|
224
|
+
yield { uid, ok: false, error };
|
|
225
|
+
}
|
|
226
|
+
else {
|
|
227
|
+
yield { uid, ok: true };
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
/**
|
|
232
|
+
* Copy a photo to a shared album on a different volume.
|
|
233
|
+
*
|
|
234
|
+
* To add photos from the same volume to an album, use the {@link addPhotosToAlbum} method.
|
|
235
|
+
*
|
|
236
|
+
* In the future, these two methods will be merged into a single one.
|
|
237
|
+
*/
|
|
238
|
+
async copyPhotoToAlbum(albumNodeUid, payload, signal) {
|
|
239
|
+
const { volumeId: sourceVolumeId, nodeId: sourceLinkId } = (0, uids_1.splitNodeUid)(payload.nodeUid);
|
|
240
|
+
const { volumeId: targetVolumeId, nodeId: targetAlbumLinkId } = (0, uids_1.splitNodeUid)(albumNodeUid);
|
|
241
|
+
try {
|
|
242
|
+
const response = await this.apiService.post(`drive/volumes/${sourceVolumeId}/links/${sourceLinkId}/copy`, {
|
|
243
|
+
TargetVolumeID: targetVolumeId,
|
|
244
|
+
TargetParentLinkID: targetAlbumLinkId,
|
|
245
|
+
Hash: payload.nameHash,
|
|
246
|
+
Name: payload.encryptedName,
|
|
247
|
+
NameSignatureEmail: payload.nameSignatureEmail,
|
|
248
|
+
NodePassphrase: payload.nodePassphrase,
|
|
249
|
+
// @ts-expect-error: API accepts NodePassphraseSignature as optional.
|
|
250
|
+
NodePassphraseSignature: payload.nodePassphraseSignature,
|
|
251
|
+
// @ts-expect-error: API accepts SignatureEmail as optional.
|
|
252
|
+
SignatureEmail: payload.signatureEmail,
|
|
253
|
+
Photos: {
|
|
254
|
+
ContentHash: payload.contentHash,
|
|
255
|
+
RelatedPhotos: payload.relatedPhotos?.map((related) => ({
|
|
256
|
+
LinkID: (0, uids_1.splitNodeUid)(related.nodeUid).nodeId,
|
|
257
|
+
Hash: related.nameHash,
|
|
258
|
+
Name: related.encryptedName,
|
|
259
|
+
NodePassphrase: related.nodePassphrase,
|
|
260
|
+
ContentHash: related.contentHash,
|
|
261
|
+
})) || [],
|
|
262
|
+
},
|
|
263
|
+
}, signal);
|
|
264
|
+
return (0, uids_1.makeNodeUid)(targetVolumeId, response.LinkID);
|
|
265
|
+
}
|
|
266
|
+
catch (error) {
|
|
267
|
+
if (error instanceof apiService_1.InvalidRequirementsAPIError) {
|
|
268
|
+
const { Missing: missingLinkIds } = error.details;
|
|
269
|
+
if (missingLinkIds.length > 0) {
|
|
270
|
+
throw new errors_2.MissingRelatedPhotosError(missingLinkIds.map((linkId) => (0, uids_1.makeNodeUid)(sourceVolumeId, linkId)));
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
throw error;
|
|
274
|
+
}
|
|
275
|
+
}
|
|
177
276
|
async *removePhotosFromAlbum(albumNodeUid, photoNodeUids, signal) {
|
|
178
277
|
const { volumeId, nodeId: albumLinkId } = (0, uids_1.splitNodeUid)(albumNodeUid);
|
|
179
278
|
const batchSize = 50;
|
|
180
279
|
for (const photoNodeUidsBatch of (0, batch_1.batch)(photoNodeUids, batchSize)) {
|
|
181
280
|
const linkIds = photoNodeUidsBatch.map((nodeUid) => (0, uids_1.splitNodeUid)(nodeUid).nodeId);
|
|
182
|
-
let
|
|
281
|
+
let error;
|
|
183
282
|
try {
|
|
184
283
|
await this.apiService.post(`drive/photos/volumes/${volumeId}/albums/${albumLinkId}/remove-multiple`, {
|
|
185
284
|
LinkIDs: linkIds,
|
|
186
285
|
}, signal);
|
|
187
286
|
}
|
|
188
|
-
catch (
|
|
189
|
-
|
|
287
|
+
catch (e) {
|
|
288
|
+
error = e instanceof Error ? e : new Error((0, ttag_1.c)('Error').t `Unknown error`);
|
|
190
289
|
}
|
|
191
290
|
// The API does not return individual results for each photo.
|
|
192
291
|
for (const uid of photoNodeUidsBatch) {
|
|
193
|
-
if (
|
|
194
|
-
yield { uid, ok: false, error
|
|
292
|
+
if (error) {
|
|
293
|
+
yield { uid, ok: false, error };
|
|
195
294
|
}
|
|
196
295
|
else {
|
|
197
296
|
yield { uid, ok: true };
|
|
@@ -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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,199 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const errors_1 = require("../apiService/errors");
|
|
4
|
+
const apiService_1 = require("./apiService");
|
|
5
|
+
const errors_2 = require("./errors");
|
|
6
|
+
describe('photosAPIService', () => {
|
|
7
|
+
let apiMock;
|
|
8
|
+
let api;
|
|
9
|
+
beforeEach(() => {
|
|
10
|
+
jest.clearAllMocks();
|
|
11
|
+
// @ts-expect-error Mocking for testing purposes
|
|
12
|
+
apiMock = {
|
|
13
|
+
get: jest.fn(),
|
|
14
|
+
post: jest.fn(),
|
|
15
|
+
put: jest.fn(),
|
|
16
|
+
};
|
|
17
|
+
api = new apiService_1.PhotosAPIService(apiMock);
|
|
18
|
+
});
|
|
19
|
+
const albumNodeUid = 'volumeId1~albumNodeId';
|
|
20
|
+
describe('addPhotosToAlbum', () => {
|
|
21
|
+
const photoPayloads = [
|
|
22
|
+
{
|
|
23
|
+
nodeUid: 'volumeId1~photoNodeId1',
|
|
24
|
+
contentHash: 'contentHash1',
|
|
25
|
+
nameHash: 'nameHash1',
|
|
26
|
+
encryptedName: 'encryptedName1',
|
|
27
|
+
nameSignatureEmail: 'nameSignatureEmail1',
|
|
28
|
+
nodePassphrase: 'nodePassphrase1',
|
|
29
|
+
nodePassphraseSignature: 'nodePassphraseSignature1',
|
|
30
|
+
signatureEmail: 'signatureEmail1',
|
|
31
|
+
relatedPhotos: [
|
|
32
|
+
{
|
|
33
|
+
nodeUid: 'volumeId1~photoNodeId2',
|
|
34
|
+
contentHash: 'contentHash2',
|
|
35
|
+
nameHash: 'nameHash2',
|
|
36
|
+
encryptedName: 'encryptedName2',
|
|
37
|
+
nameSignatureEmail: 'nameSignatureEmail2',
|
|
38
|
+
nodePassphrase: 'nodePassphrase2',
|
|
39
|
+
nodePassphraseSignature: 'nodePassphraseSignature2',
|
|
40
|
+
signatureEmail: 'signatureEmail2',
|
|
41
|
+
},
|
|
42
|
+
],
|
|
43
|
+
},
|
|
44
|
+
];
|
|
45
|
+
it('should add photos to album', async () => {
|
|
46
|
+
apiMock.post = jest.fn().mockResolvedValue({
|
|
47
|
+
Code: 1000,
|
|
48
|
+
Responses: [
|
|
49
|
+
{
|
|
50
|
+
LinkID: 'photoNodeId1',
|
|
51
|
+
Response: {
|
|
52
|
+
Code: 1000,
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
],
|
|
56
|
+
});
|
|
57
|
+
const result = await Array.fromAsync(api.addPhotosToAlbum(albumNodeUid, photoPayloads));
|
|
58
|
+
expect(result).toEqual([
|
|
59
|
+
{
|
|
60
|
+
uid: 'volumeId1~photoNodeId1',
|
|
61
|
+
ok: true,
|
|
62
|
+
},
|
|
63
|
+
]);
|
|
64
|
+
expect(apiMock.post).toHaveBeenCalledWith(`drive/photos/volumes/volumeId1/albums/albumNodeId/add-multiple`, {
|
|
65
|
+
AlbumData: [
|
|
66
|
+
expect.objectContaining({
|
|
67
|
+
LinkID: 'photoNodeId1',
|
|
68
|
+
Hash: 'nameHash1',
|
|
69
|
+
Name: 'encryptedName1',
|
|
70
|
+
NameSignatureEmail: 'nameSignatureEmail1',
|
|
71
|
+
}),
|
|
72
|
+
expect.objectContaining({
|
|
73
|
+
LinkID: 'photoNodeId2',
|
|
74
|
+
Hash: 'nameHash2',
|
|
75
|
+
Name: 'encryptedName2',
|
|
76
|
+
NameSignatureEmail: 'nameSignatureEmail2',
|
|
77
|
+
}),
|
|
78
|
+
],
|
|
79
|
+
}, undefined);
|
|
80
|
+
});
|
|
81
|
+
it('should return MissingRelatedPhotosError if related photos are missing', async () => {
|
|
82
|
+
apiMock.post = jest.fn().mockResolvedValue({
|
|
83
|
+
Code: 1000,
|
|
84
|
+
Responses: [
|
|
85
|
+
{
|
|
86
|
+
LinkID: 'photoNodeId1',
|
|
87
|
+
Response: {
|
|
88
|
+
Code: 2000,
|
|
89
|
+
Details: {
|
|
90
|
+
Missing: ['photoNodeId3'],
|
|
91
|
+
},
|
|
92
|
+
},
|
|
93
|
+
},
|
|
94
|
+
],
|
|
95
|
+
});
|
|
96
|
+
const result = await Array.fromAsync(api.addPhotosToAlbum(albumNodeUid, photoPayloads));
|
|
97
|
+
expect(result).toEqual([
|
|
98
|
+
{
|
|
99
|
+
uid: 'volumeId1~photoNodeId1',
|
|
100
|
+
ok: false,
|
|
101
|
+
error: new errors_2.MissingRelatedPhotosError([]),
|
|
102
|
+
},
|
|
103
|
+
]);
|
|
104
|
+
expect(result[0].error.missingNodeUids).toEqual(['volumeId1~photoNodeId3']);
|
|
105
|
+
});
|
|
106
|
+
it('should return error for unknown error', async () => {
|
|
107
|
+
apiMock.post = jest.fn().mockResolvedValue({
|
|
108
|
+
Code: 1000,
|
|
109
|
+
Responses: [
|
|
110
|
+
{
|
|
111
|
+
LinkID: 'photoNodeId1',
|
|
112
|
+
Response: {
|
|
113
|
+
Code: 3000,
|
|
114
|
+
Error: 'Some error',
|
|
115
|
+
},
|
|
116
|
+
},
|
|
117
|
+
],
|
|
118
|
+
});
|
|
119
|
+
const result = await Array.fromAsync(api.addPhotosToAlbum(albumNodeUid, photoPayloads));
|
|
120
|
+
expect(result).toEqual([
|
|
121
|
+
{
|
|
122
|
+
uid: 'volumeId1~photoNodeId1',
|
|
123
|
+
ok: false,
|
|
124
|
+
error: new errors_1.APICodeError('Some error', 3000),
|
|
125
|
+
},
|
|
126
|
+
]);
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
describe('copyPhotoToAlbum', () => {
|
|
130
|
+
const photoPayloads = [
|
|
131
|
+
{
|
|
132
|
+
nodeUid: 'volumeId2~photoNodeId1',
|
|
133
|
+
contentHash: 'contentHash1',
|
|
134
|
+
nameHash: 'nameHash1',
|
|
135
|
+
encryptedName: 'encryptedName1',
|
|
136
|
+
nameSignatureEmail: 'nameSignatureEmail1',
|
|
137
|
+
nodePassphrase: 'nodePassphrase1',
|
|
138
|
+
nodePassphraseSignature: 'nodePassphraseSignature1',
|
|
139
|
+
signatureEmail: 'signatureEmail1',
|
|
140
|
+
relatedPhotos: [
|
|
141
|
+
{
|
|
142
|
+
nodeUid: 'volumeId2~photoNodeId2',
|
|
143
|
+
contentHash: 'contentHash2',
|
|
144
|
+
nameHash: 'nameHash2',
|
|
145
|
+
encryptedName: 'encryptedName2',
|
|
146
|
+
nameSignatureEmail: 'nameSignatureEmail2',
|
|
147
|
+
nodePassphrase: 'nodePassphrase2',
|
|
148
|
+
nodePassphraseSignature: 'nodePassphraseSignature2',
|
|
149
|
+
signatureEmail: 'signatureEmail2',
|
|
150
|
+
},
|
|
151
|
+
],
|
|
152
|
+
},
|
|
153
|
+
];
|
|
154
|
+
it('should copy photo to album', async () => {
|
|
155
|
+
apiMock.post = jest.fn().mockResolvedValue({
|
|
156
|
+
Code: 1000,
|
|
157
|
+
LinkID: 'photoNodeId1',
|
|
158
|
+
});
|
|
159
|
+
const result = await api.copyPhotoToAlbum(albumNodeUid, photoPayloads[0]);
|
|
160
|
+
expect(result).toEqual('volumeId1~photoNodeId1');
|
|
161
|
+
expect(apiMock.post).toHaveBeenCalledWith(`drive/volumes/volumeId2/links/photoNodeId1/copy`, expect.objectContaining({
|
|
162
|
+
TargetVolumeID: 'volumeId1',
|
|
163
|
+
TargetParentLinkID: 'albumNodeId',
|
|
164
|
+
Hash: 'nameHash1',
|
|
165
|
+
Name: 'encryptedName1',
|
|
166
|
+
Photos: {
|
|
167
|
+
ContentHash: 'contentHash1',
|
|
168
|
+
RelatedPhotos: expect.arrayContaining([
|
|
169
|
+
expect.objectContaining({
|
|
170
|
+
LinkID: 'photoNodeId2',
|
|
171
|
+
Hash: 'nameHash2',
|
|
172
|
+
Name: 'encryptedName2',
|
|
173
|
+
}),
|
|
174
|
+
]),
|
|
175
|
+
},
|
|
176
|
+
}), undefined);
|
|
177
|
+
});
|
|
178
|
+
it('should return MissingRelatedPhotosError if related photos are missing', async () => {
|
|
179
|
+
apiMock.post = jest.fn().mockRejectedValue(new errors_1.InvalidRequirementsAPIError('Missing related photos', 2000, {
|
|
180
|
+
Missing: ['photoNodeId3'],
|
|
181
|
+
}));
|
|
182
|
+
const promise = api.copyPhotoToAlbum(albumNodeUid, photoPayloads[0]);
|
|
183
|
+
await expect(promise).rejects.toThrow(errors_2.MissingRelatedPhotosError);
|
|
184
|
+
try {
|
|
185
|
+
await promise;
|
|
186
|
+
}
|
|
187
|
+
catch (error) {
|
|
188
|
+
expect(error.missingNodeUids).toEqual(['volumeId2~photoNodeId3']);
|
|
189
|
+
}
|
|
190
|
+
});
|
|
191
|
+
it('should return error for unknown error', async () => {
|
|
192
|
+
const error = new errors_1.APICodeError('Some error', 3000);
|
|
193
|
+
apiMock.post = jest.fn().mockRejectedValue(error);
|
|
194
|
+
const promise = api.copyPhotoToAlbum(albumNodeUid, photoPayloads[0]);
|
|
195
|
+
await expect(promise).rejects.toThrow(error);
|
|
196
|
+
});
|
|
197
|
+
});
|
|
198
|
+
});
|
|
199
|
+
//# sourceMappingURL=apiService.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apiService.test.js","sourceRoot":"","sources":["../../../src/internal/photos/apiService.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MissingRelatedPhotosError = void 0;
|
|
4
|
+
const ttag_1 = require("ttag");
|
|
5
|
+
class MissingRelatedPhotosError extends Error {
|
|
6
|
+
missingNodeUids;
|
|
7
|
+
constructor(missingNodeUids) {
|
|
8
|
+
// We do not want to leak the technical details of the error to the user.
|
|
9
|
+
// When this error happens, it is retried by the SDK, so very likely the
|
|
10
|
+
// user will not see this error unless the operation fails twice in a row.
|
|
11
|
+
super((0, ttag_1.c)('Error').t `Operation failed, try again later`);
|
|
12
|
+
this.missingNodeUids = missingNodeUids;
|
|
13
|
+
this.name = 'MissingRelatedPhotosError';
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
exports.MissingRelatedPhotosError = MissingRelatedPhotosError;
|
|
17
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -35,7 +35,7 @@ function initPhotosModule(telemetry, apiService, driveCrypto, photoShares, nodes
|
|
|
35
35
|
const api = new apiService_1.PhotosAPIService(apiService);
|
|
36
36
|
const albumsCryptoService = new albumsCrypto_1.AlbumsCryptoService(driveCrypto);
|
|
37
37
|
const timeline = new timeline_1.PhotosTimeline(telemetry.getLogger('photos-timeline'), api, driveCrypto, photoShares, nodesService);
|
|
38
|
-
const albums = new albums_1.Albums(api, albumsCryptoService, photoShares, nodesService);
|
|
38
|
+
const albums = new albums_1.Albums(telemetry, api, albumsCryptoService, photoShares, nodesService);
|
|
39
39
|
return {
|
|
40
40
|
timeline,
|
|
41
41
|
albums,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/photos/index.ts"],"names":[],"mappings":";;;AA8CA,4CAsBC;AASD,sDAsBC;AAQD,sDA0BC;AAQD,sDA4CC;AAjLD,0DAA4D;AAC5D,4DAA8D;AAC9D,sDAAwD;AACxD,4CAAqD;AACrD,4DAAwD;AACxD,sCAA4C;AAC5C,2CAA8C;AAC9C,uDAA0D;AAC1D,2DAA8D;AAE9D,mDAAsD;AACtD,2CAA8C;AAC9C,qCAAkC;AAClC,iDAAqD;AACrD,6CAAgD;AAEhD,mCAA4G;AAC5G,qCAA8C;AAC9C,yCAA4C;AAC5C,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,eAAM,CAAC,GAAG,EAAE,mBAAmB,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/photos/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PrivateKey } from '../../crypto';
|
|
2
|
-
import { MetricVolumeType, PhotoAttributes } from '../../interface';
|
|
2
|
+
import { MetricVolumeType, PhotoAttributes, AlbumAttributes } from '../../interface';
|
|
3
3
|
import { DecryptedNode, EncryptedNode, DecryptedUnparsedNode } from '../nodes/interface';
|
|
4
4
|
import { EncryptedShare } from '../shares';
|
|
5
5
|
export interface SharesService {
|
|
@@ -26,12 +26,15 @@ export interface SharesService {
|
|
|
26
26
|
}
|
|
27
27
|
export type EncryptedPhotoNode = EncryptedNode & {
|
|
28
28
|
photo?: EcnryptedPhotoAttributes;
|
|
29
|
+
album?: AlbumAttributes;
|
|
29
30
|
};
|
|
30
31
|
export type DecryptedUnparsedPhotoNode = DecryptedUnparsedNode & {
|
|
31
32
|
photo?: PhotoAttributes;
|
|
33
|
+
album?: AlbumAttributes;
|
|
32
34
|
};
|
|
33
35
|
export type DecryptedPhotoNode = DecryptedNode & {
|
|
34
36
|
photo?: PhotoAttributes;
|
|
37
|
+
album?: AlbumAttributes;
|
|
35
38
|
};
|
|
36
39
|
export type EcnryptedPhotoAttributes = Omit<PhotoAttributes, 'albums'> & {
|
|
37
40
|
contentHash?: string;
|
|
@@ -61,3 +64,14 @@ export declare enum PhotoTag {
|
|
|
61
64
|
Panoramas = 8,
|
|
62
65
|
Raw = 9
|
|
63
66
|
}
|
|
67
|
+
export type AddToAlbumEncryptedPhotoPayload = {
|
|
68
|
+
nodeUid: string;
|
|
69
|
+
contentHash: string;
|
|
70
|
+
nameHash: string;
|
|
71
|
+
encryptedName: string;
|
|
72
|
+
nameSignatureEmail: string;
|
|
73
|
+
nodePassphrase: string;
|
|
74
|
+
nodePassphraseSignature?: string;
|
|
75
|
+
signatureEmail?: string;
|
|
76
|
+
relatedPhotos?: Omit<AddToAlbumEncryptedPhotoPayload, 'relatedPhotos'>[];
|
|
77
|
+
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/internal/photos/interface.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/internal/photos/interface.ts"],"names":[],"mappings":";;;AA2DA,IAAY,QAWX;AAXD,WAAY,QAAQ;IAChB,iDAAa,CAAA;IACb,qDAAe,CAAA;IACf,2CAAU,CAAA;IACV,mDAAc,CAAA;IACd,uDAAgB,CAAA;IAChB,6CAAW,CAAA;IACX,iDAAa,CAAA;IACb,2CAAU,CAAA;IACV,iDAAa,CAAA;IACb,qCAAO,CAAA;AACX,CAAC,EAXW,QAAQ,wBAAR,QAAQ,QAWnB"}
|
|
@@ -39,11 +39,21 @@ class PhotosNodesAPIService extends apiService_1.NodeAPIServiceBase {
|
|
|
39
39
|
},
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
|
-
if (link.Link.Type === 3) {
|
|
42
|
+
if (link.Link.Type === 3 && link.Album) {
|
|
43
43
|
return {
|
|
44
44
|
...baseNodeMetadata,
|
|
45
|
+
album: {
|
|
46
|
+
photoCount: link.Album.PhotoCount,
|
|
47
|
+
coverPhotoNodeUid: link.Album.CoverLinkID
|
|
48
|
+
? (0, uids_1.makeNodeUid)(volumeId, link.Album.CoverLinkID)
|
|
49
|
+
: undefined,
|
|
50
|
+
},
|
|
45
51
|
encryptedCrypto: {
|
|
46
52
|
...baseCryptoNodeMetadata,
|
|
53
|
+
folder: {
|
|
54
|
+
armoredExtendedAttributes: link.Album.XAttr || undefined,
|
|
55
|
+
armoredHashKey: link.Album.NodeHashKey,
|
|
56
|
+
},
|
|
47
57
|
},
|
|
48
58
|
};
|
|
49
59
|
}
|
|
@@ -71,7 +81,8 @@ class PhotosNodesCache extends cache_1.NodesCacheBase {
|
|
|
71
81
|
typeof node !== 'object' ||
|
|
72
82
|
(typeof node.photo !== 'object' && node.photo !== undefined) ||
|
|
73
83
|
(typeof node.photo?.captureTime !== 'string' && node.folder?.captureTime !== undefined) ||
|
|
74
|
-
(typeof node.photo?.albums !== 'object' && node.photo?.albums !== undefined)
|
|
84
|
+
(typeof node.photo?.albums !== 'object' && node.photo?.albums !== undefined) ||
|
|
85
|
+
(typeof node.album !== 'object' && node.album !== undefined)) {
|
|
75
86
|
throw new Error(`Invalid node data: ${nodeData}`);
|
|
76
87
|
}
|
|
77
88
|
return {
|
|
@@ -138,6 +149,17 @@ class PhotosNodesAccess extends nodesAccess_1.NodesAccessBase {
|
|
|
138
149
|
type: interface_1.NodeType.Photo,
|
|
139
150
|
};
|
|
140
151
|
}
|
|
152
|
+
if (unparsedNode.type === interface_1.NodeType.Album) {
|
|
153
|
+
const node = (0, nodesAccess_1.parseNode)(this.logger, {
|
|
154
|
+
...unparsedNode,
|
|
155
|
+
type: interface_1.NodeType.Folder,
|
|
156
|
+
});
|
|
157
|
+
return {
|
|
158
|
+
...node,
|
|
159
|
+
album: unparsedNode.album,
|
|
160
|
+
type: interface_1.NodeType.Album,
|
|
161
|
+
};
|
|
162
|
+
}
|
|
141
163
|
return (0, nodesAccess_1.parseNode)(this.logger, unparsedNode);
|
|
142
164
|
}
|
|
143
165
|
}
|
|
@@ -153,6 +175,14 @@ class PhotosNodesCryptoService extends cryptoService_1.NodesCryptoService {
|
|
|
153
175
|
},
|
|
154
176
|
};
|
|
155
177
|
}
|
|
178
|
+
if (decryptedNode.node.type === interface_1.NodeType.Album) {
|
|
179
|
+
return {
|
|
180
|
+
node: {
|
|
181
|
+
...decryptedNode.node,
|
|
182
|
+
album: encryptedNode.album,
|
|
183
|
+
},
|
|
184
|
+
};
|
|
185
|
+
}
|
|
156
186
|
return decryptedNode;
|
|
157
187
|
}
|
|
158
188
|
}
|