@protontech/drive-sdk 0.9.9 → 0.11.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 +19 -16
- package/dist/crypto/driveCrypto.js +23 -1
- package/dist/crypto/driveCrypto.js.map +1 -1
- package/dist/crypto/driveCrypto.test.js +2 -1
- package/dist/crypto/driveCrypto.test.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/diagnostic/telemetry.js +3 -0
- package/dist/diagnostic/telemetry.js.map +1 -1
- package/dist/interface/index.d.ts +4 -3
- package/dist/interface/index.js +3 -1
- package/dist/interface/index.js.map +1 -1
- package/dist/interface/nodes.d.ts +8 -0
- package/dist/interface/photos.d.ts +31 -2
- package/dist/interface/photos.js +14 -0
- package/dist/interface/photos.js.map +1 -1
- package/dist/interface/sharing.d.ts +2 -0
- package/dist/interface/telemetry.d.ts +13 -1
- package/dist/interface/telemetry.js.map +1 -1
- package/dist/interface/thumbnail.d.ts +2 -2
- package/dist/internal/apiService/apiService.d.ts +1 -1
- package/dist/internal/apiService/apiService.js +27 -14
- 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/apiService.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/nodesAccess.js +1 -1
- package/dist/internal/nodes/nodesAccess.js.map +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 +42 -0
- package/dist/internal/photos/addToAlbum.js +178 -0
- package/dist/internal/photos/addToAlbum.js.map +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/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/{albums.d.ts → albumsManager.d.ts} +6 -4
- package/dist/internal/photos/{albums.js → albumsManager.js} +17 -5
- package/dist/internal/photos/albumsManager.js.map +1 -0
- package/dist/internal/photos/albumsManager.test.d.ts +1 -0
- package/dist/internal/photos/{albums.test.js → albumsManager.test.js} +4 -3
- package/dist/internal/photos/albumsManager.test.js.map +1 -0
- package/dist/internal/photos/apiService.d.ts +22 -2
- package/dist/internal/photos/apiService.js +136 -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.d.ts +5 -3
- package/dist/internal/photos/index.js +5 -2
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +6 -15
- package/dist/internal/photos/interface.js +0 -14
- package/dist/internal/photos/interface.js.map +1 -1
- package/dist/internal/photos/nodes.js +33 -3
- 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/photosManager.d.ts +22 -0
- package/dist/internal/photos/photosManager.js +101 -0
- package/dist/internal/photos/photosManager.js.map +1 -0
- package/dist/internal/photos/photosManager.test.d.ts +1 -0
- package/dist/internal/photos/photosManager.test.js +222 -0
- package/dist/internal/photos/photosManager.test.js.map +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.d.ts +57 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js +113 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js.map +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.test.d.ts +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.test.js +289 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.test.js.map +1 -0
- package/dist/internal/photos/upload.d.ts +2 -2
- package/dist/internal/photos/upload.js +1 -1
- 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 +3 -7
- package/dist/internal/upload/apiService.js +0 -4
- 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 +4 -4
- 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/upload/streamUploader.js +12 -13
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +28 -4
- package/dist/internal/upload/streamUploader.test.js.map +1 -1
- package/dist/internal/utils.d.ts +1 -1
- package/dist/protonDriveClient.d.ts +8 -0
- package/dist/protonDriveClient.js +12 -1
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +35 -3
- package/dist/protonDrivePhotosClient.js +42 -2
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/protonDrivePublicLinkClient.js +1 -1
- 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.test.ts +2 -1
- package/src/crypto/driveCrypto.ts +50 -16
- package/src/crypto/hmac.ts +4 -4
- package/src/crypto/interface.ts +58 -27
- package/src/crypto/openPGPCrypto.ts +26 -26
- package/src/diagnostic/telemetry.ts +3 -0
- package/src/interface/index.ts +11 -2
- package/src/interface/nodes.ts +1 -0
- package/src/interface/photos.ts +33 -2
- package/src/interface/sharing.ts +2 -0
- package/src/interface/telemetry.ts +15 -1
- package/src/interface/thumbnail.ts +2 -2
- package/src/internal/apiService/apiService.test.ts +38 -6
- package/src/internal/apiService/apiService.ts +39 -14
- 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/apiService.ts +2 -2
- 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/nodesAccess.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 +234 -0
- package/src/internal/photos/albumsCrypto.ts +54 -3
- package/src/internal/photos/{albums.test.ts → albumsManager.test.ts} +22 -25
- package/src/internal/photos/{albums.ts → albumsManager.ts} +32 -3
- package/src/internal/photos/apiService.test.ts +233 -0
- package/src/internal/photos/apiService.ts +228 -26
- package/src/internal/photos/errors.ts +11 -0
- package/src/internal/photos/index.ts +6 -3
- package/src/internal/photos/interface.ts +8 -18
- package/src/internal/photos/nodes.test.ts +27 -6
- package/src/internal/photos/nodes.ts +35 -3
- package/src/internal/photos/photosManager.test.ts +266 -0
- package/src/internal/photos/photosManager.ts +144 -0
- package/src/internal/photos/photosTransferPayloadBuilder.test.ts +380 -0
- package/src/internal/photos/photosTransferPayloadBuilder.ts +203 -0
- package/src/internal/photos/upload.ts +8 -3
- 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 +10 -12
- 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 +11 -12
- package/src/internal/upload/interface.ts +6 -6
- package/src/internal/upload/manager.ts +2 -2
- package/src/internal/upload/streamUploader.test.ts +33 -4
- package/src/internal/upload/streamUploader.ts +13 -13
- package/src/protonDriveClient.ts +16 -4
- package/src/protonDrivePhotosClient.ts +73 -17
- package/src/protonDrivePublicLinkClient.ts +1 -1
- package/src/transformers.ts +2 -0
- package/dist/internal/photos/albums.js.map +0 -1
- package/dist/internal/photos/albums.test.js.map +0 -1
- /package/dist/internal/photos/{albums.test.d.ts → addToAlbum.test.d.ts} +0 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PrivateKey } from '../../crypto';
|
|
2
|
-
import { MetricVolumeType, PhotoAttributes } from '../../interface';
|
|
2
|
+
import { MetricVolumeType, PhotoAttributes, AlbumAttributes, PhotoTag } from '../../interface';
|
|
3
3
|
import { DecryptedNode, EncryptedNode, DecryptedUnparsedNode } from '../nodes/interface';
|
|
4
4
|
import { EncryptedShare } from '../shares';
|
|
5
5
|
export interface SharesService {
|
|
@@ -25,15 +25,18 @@ export interface SharesService {
|
|
|
25
25
|
getVolumeMetricContext(volumeId: string): Promise<MetricVolumeType>;
|
|
26
26
|
}
|
|
27
27
|
export type EncryptedPhotoNode = EncryptedNode & {
|
|
28
|
-
photo?:
|
|
28
|
+
photo?: EncryptedPhotoAttributes;
|
|
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
|
-
export type
|
|
39
|
+
export type EncryptedPhotoAttributes = Omit<PhotoAttributes, 'albums'> & {
|
|
37
40
|
contentHash?: string;
|
|
38
41
|
albums: (PhotoAttributes['albums'][0] & {
|
|
39
42
|
nameHash?: string;
|
|
@@ -49,15 +52,3 @@ export type AlbumItem = {
|
|
|
49
52
|
nodeUid: string;
|
|
50
53
|
captureTime: Date;
|
|
51
54
|
};
|
|
52
|
-
export declare enum PhotoTag {
|
|
53
|
-
Favorites = 0,
|
|
54
|
-
Screenshots = 1,
|
|
55
|
-
Videos = 2,
|
|
56
|
-
LivePhotos = 3,
|
|
57
|
-
MotionPhotos = 4,
|
|
58
|
-
Selfies = 5,
|
|
59
|
-
Portraits = 6,
|
|
60
|
-
Bursts = 7,
|
|
61
|
-
Panoramas = 8,
|
|
62
|
-
Raw = 9
|
|
63
|
-
}
|
|
@@ -1,17 +1,3 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PhotoTag = void 0;
|
|
4
|
-
var PhotoTag;
|
|
5
|
-
(function (PhotoTag) {
|
|
6
|
-
PhotoTag[PhotoTag["Favorites"] = 0] = "Favorites";
|
|
7
|
-
PhotoTag[PhotoTag["Screenshots"] = 1] = "Screenshots";
|
|
8
|
-
PhotoTag[PhotoTag["Videos"] = 2] = "Videos";
|
|
9
|
-
PhotoTag[PhotoTag["LivePhotos"] = 3] = "LivePhotos";
|
|
10
|
-
PhotoTag[PhotoTag["MotionPhotos"] = 4] = "MotionPhotos";
|
|
11
|
-
PhotoTag[PhotoTag["Selfies"] = 5] = "Selfies";
|
|
12
|
-
PhotoTag[PhotoTag["Portraits"] = 6] = "Portraits";
|
|
13
|
-
PhotoTag[PhotoTag["Bursts"] = 7] = "Bursts";
|
|
14
|
-
PhotoTag[PhotoTag["Panoramas"] = 8] = "Panoramas";
|
|
15
|
-
PhotoTag[PhotoTag["Raw"] = 9] = "Raw";
|
|
16
|
-
})(PhotoTag || (exports.PhotoTag = PhotoTag = {}));
|
|
17
3
|
//# sourceMappingURL=interface.js.map
|
|
@@ -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":""}
|
|
@@ -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 {
|
|
@@ -121,7 +132,7 @@ class PhotosNodesAccess extends nodesAccess_1.NodesAccessBase {
|
|
|
121
132
|
}
|
|
122
133
|
// This is bug that should not happen.
|
|
123
134
|
// API cannot provide node without parent or share or album.
|
|
124
|
-
throw new Error(
|
|
135
|
+
throw new Error(`Node has neither parent node nor share nor album: ${node.uid}`);
|
|
125
136
|
}
|
|
126
137
|
getDegradedUndecryptableNode(encryptedNode, error) {
|
|
127
138
|
return this.getDegradedUndecryptableNodeBase(encryptedNode, error);
|
|
@@ -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
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/internal/photos/nodes.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAE3C,oDAA+G;AAC/G,0CAAgF;AAChF,0DAA4D;AAE5D,sDAAmF;AACnF,8DAA+D;AAC/D,kCAAsC;AAUtC,MAAa,qBAAsB,SAAQ,+BAG1C;IACa,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,OAAiB,EAAE,MAAoB;QACvF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACvC,wBAAwB,QAAQ,QAAQ,EACxC;YACI,OAAO,EAAE,OAAO;SACnB,EACD,MAAM,CACT,CAAC;QACF,OAAO,QAAQ,CAAC,KAAK,CAAC;IAC1B,CAAC;IAES,mBAAmB,CACzB,QAAgB,EAChB,IAA+C,EAC/C,aAAsB;QAEtB,MAAM,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,GAAG,IAAA,4CAA+B,EAChF,IAAI,CAAC,MAAM,EACX,QAAQ,EACR,IAAI,EACJ,aAAa,CAChB,CAAC;QAEF,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YAClE,MAAM,IAAI,GAAG,IAAA,gCAAmB,EAC5B,IAAI,CAAC,MAAM,EACX,QAAQ,EACR,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAC3C,aAAa,CAChB,CAAC;YACF,OAAO;gBACH,GAAG,IAAI;gBACP,IAAI,EAAE,oBAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE;oBACH,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;oBACpD,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe;wBACxC,CAAC,CAAC,IAAA,kBAAW,EAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;wBACnD,CAAC,CAAC,SAAS;oBACf,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CACxE,IAAA,kBAAW,EAAC,QAAQ,EAAE,aAAa,CAAC,CACvC;oBACD,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,SAAS;oBAChD,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;oBACrB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;wBACtC,OAAO,EAAE,IAAA,kBAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC;wBACjD,YAAY,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;wBAC9C,QAAQ,EAAE,KAAK,CAAC,IAAI;wBACpB,WAAW,EAAE,KAAK,CAAC,WAAW;qBACjC,CAAC,CAAC;iBACN;aACJ,CAAC;QACN,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/internal/photos/nodes.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,6 +42,10 @@ function generateAPIAlbumNode(linkOverrides = {}, overrides = {}) {
|
|
|
42
42
|
...node,
|
|
43
43
|
Link: { ...node.Link, Type: 3, ...linkOverrides },
|
|
44
44
|
Photo: null,
|
|
45
|
+
Album: {
|
|
46
|
+
PhotoCount: 1,
|
|
47
|
+
CoverLinkID: 'coverLinkId',
|
|
48
|
+
},
|
|
45
49
|
Folder: null,
|
|
46
50
|
...overrides,
|
|
47
51
|
};
|
|
@@ -96,18 +100,19 @@ describe('PhotosNodesAPIService', () => {
|
|
|
96
100
|
const nodes = await Array.fromAsync(api.iterateNodes(['volumeId~nodeId'], 'volumeId'));
|
|
97
101
|
expect(nodes).toHaveLength(1);
|
|
98
102
|
expect(nodes[0].type).toBe(expectedType);
|
|
103
|
+
return nodes;
|
|
99
104
|
}
|
|
100
105
|
it('should convert folder (type 1) to folder node', async () => {
|
|
101
106
|
await testIterateNodes(generateAPIFolderNode(), interface_1.NodeType.Folder);
|
|
102
107
|
});
|
|
103
108
|
it('should convert album (type 3) to album node', async () => {
|
|
104
|
-
await testIterateNodes(generateAPIAlbumNode(), interface_1.NodeType.Album);
|
|
109
|
+
const nodes = await testIterateNodes(generateAPIAlbumNode(), interface_1.NodeType.Album);
|
|
110
|
+
expect(nodes[0].album).toBeDefined();
|
|
111
|
+
expect(nodes[0].album?.photoCount).toEqual(1);
|
|
112
|
+
expect(nodes[0].album?.coverPhotoNodeUid).toBe('volumeId~coverLinkId');
|
|
105
113
|
});
|
|
106
114
|
it('should convert photo (type 2) to photo node with photo attributes', async () => {
|
|
107
|
-
|
|
108
|
-
const nodes = await Array.fromAsync(api.iterateNodes(['volumeId~nodeId'], 'volumeId'));
|
|
109
|
-
expect(nodes).toHaveLength(1);
|
|
110
|
-
expect(nodes[0].type).toBe(interface_1.NodeType.Photo);
|
|
115
|
+
const nodes = await testIterateNodes(generateAPIPhotoNode(), interface_1.NodeType.Photo);
|
|
111
116
|
expect(nodes[0].photo).toBeDefined();
|
|
112
117
|
expect(nodes[0].photo?.captureTime).toEqual(new Date(1700000000 * 1000));
|
|
113
118
|
expect(nodes[0].photo?.tags).toEqual([1, 2]);
|
|
@@ -146,6 +151,10 @@ describe('PhotosNodesCache', () => {
|
|
|
146
151
|
},
|
|
147
152
|
],
|
|
148
153
|
},
|
|
154
|
+
album: {
|
|
155
|
+
photoCount: 1,
|
|
156
|
+
coverPhotoNodeUid: 'volumeId~coverLinkId',
|
|
157
|
+
},
|
|
149
158
|
});
|
|
150
159
|
const node = cache.deserialiseNode(serialisedNode);
|
|
151
160
|
expect(node.photo).toBeDefined();
|
|
@@ -153,6 +162,9 @@ describe('PhotosNodesCache', () => {
|
|
|
153
162
|
expect(node.photo?.captureTime).toEqual(new Date('2023-11-14T22:13:20.000Z'));
|
|
154
163
|
expect(node.photo?.albums[0].additionTime).toBeInstanceOf(Date);
|
|
155
164
|
expect(node.photo?.albums[0].additionTime).toEqual(new Date('2023-11-15T10:00:00.000Z'));
|
|
165
|
+
expect(node.album).toBeDefined();
|
|
166
|
+
expect(node.album?.photoCount).toEqual(1);
|
|
167
|
+
expect(node.album?.coverPhotoNodeUid).toBe('volumeId~coverLinkId');
|
|
156
168
|
});
|
|
157
169
|
it('should handle node without photo attributes', () => {
|
|
158
170
|
const serialisedNode = JSON.stringify({
|
|
@@ -167,6 +179,7 @@ describe('PhotosNodesCache', () => {
|
|
|
167
179
|
});
|
|
168
180
|
const node = cache.deserialiseNode(serialisedNode);
|
|
169
181
|
expect(node.photo).toBeUndefined();
|
|
182
|
+
expect(node.album).toBeUndefined();
|
|
170
183
|
});
|
|
171
184
|
});
|
|
172
185
|
});
|
|
@@ -220,6 +233,10 @@ describe('PhotosNodesAccess', () => {
|
|
|
220
233
|
tags: [1, 2],
|
|
221
234
|
albums: [],
|
|
222
235
|
},
|
|
236
|
+
album: {
|
|
237
|
+
photoCount: 1,
|
|
238
|
+
coverPhotoNodeUid: 'volumeId~coverLinkId',
|
|
239
|
+
},
|
|
223
240
|
};
|
|
224
241
|
// @ts-expect-error Accessing protected method for testing
|
|
225
242
|
const parsedNode = nodesAccess.parseNode(unparsedNode);
|
|
@@ -227,6 +244,9 @@ describe('PhotosNodesAccess', () => {
|
|
|
227
244
|
expect(parsedNode.photo).toBeDefined();
|
|
228
245
|
expect(parsedNode.photo?.captureTime).toEqual(new Date('2023-11-14T22:13:20.000Z'));
|
|
229
246
|
expect(parsedNode.photo?.tags).toEqual([1, 2]);
|
|
247
|
+
expect(parsedNode.album).toBeDefined();
|
|
248
|
+
expect(parsedNode.album?.photoCount).toEqual(1);
|
|
249
|
+
expect(parsedNode.album?.coverPhotoNodeUid).toBe('volumeId~coverLinkId');
|
|
230
250
|
});
|
|
231
251
|
});
|
|
232
252
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodes.test.js","sourceRoot":"","sources":["../../../src/internal/photos/nodes.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"nodes.test.js","sourceRoot":"","sources":["../../../src/internal/photos/nodes.test.ts"],"names":[],"mappings":";;AAAA,uCAA0C;AAC1C,+CAAuD;AACvD,+CAAmD;AACnD,qDAAyD;AAEzD,mCAA+G;AAE/G,SAAS,eAAe;IACpB,OAAO;QACH,IAAI,EAAE;YACF,MAAM,EAAE,QAAQ;YAChB,YAAY,EAAE,cAAc;YAC5B,QAAQ,EAAE,UAAU;YACpB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,CAAC;YACZ,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,UAAU;YAC1B,kBAAkB,EAAE,cAAc;YAClC,OAAO,EAAE,SAAS;YAClB,cAAc,EAAE,UAAU;YAC1B,uBAAuB,EAAE,aAAa;SACzC;QACD,cAAc,EAAE,IAAI;QACpB,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,IAAI;KACnB,CAAC;AACN,CAAC;AAED,SAAS,qBAAqB,CAAC,aAAa,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE;IAC7D,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;IAC/B,OAAO;QACH,GAAG,IAAI;QACP,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,aAAa,EAAE;QACjD,MAAM,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE;QACzD,KAAK,EAAE,IAAI;QACX,GAAG,SAAS;KACf,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CAAC,aAAa,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE;IAC5D,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;IAC/B,OAAO;QACH,GAAG,IAAI;QACP,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,aAAa,EAAE;QACjD,KAAK,EAAE,IAAI;QACX,KAAK,EAAE;YACH,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,aAAa;SAC7B;QACD,MAAM,EAAE,IAAI;QACZ,GAAG,SAAS;KACf,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CAAC,aAAa,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE;IAC5D,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;IAC/B,OAAO;QACH,GAAG,IAAI;QACP,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,aAAa,EAAE;QACjD,KAAK,EAAE;YACH,WAAW,EAAE,UAAU;YACvB,eAAe,EAAE,IAAI;YACrB,oBAAoB,EAAE,EAAE;YACxB,WAAW,EAAE,gBAAgB;YAC7B,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACZ,MAAM,EAAE;gBACJ;oBACI,WAAW,EAAE,cAAc;oBAC3B,SAAS,EAAE,UAAU;oBACrB,IAAI,EAAE,WAAW;oBACjB,WAAW,EAAE,kBAAkB;iBAClC;aACJ;YACD,cAAc,EAAE;gBACZ,UAAU,EAAE,YAAY;gBACxB,UAAU,EAAE,UAAU;gBACtB,cAAc,EAAE,aAAa;gBAC7B,KAAK,EAAE,SAAS;gBAChB,aAAa,EAAE,EAAE;aACpB;YACD,SAAS,EAAE,YAAY;YACvB,gBAAgB,EAAE,kBAAkB;YACpC,yBAAyB,EAAE,qBAAqB;SACnD;QACD,MAAM,EAAE,IAAI;QACZ,GAAG,SAAS;KACf,CAAC;AACN,CAAC;AAED,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACnC,IAAI,OAAwB,CAAC;IAC7B,IAAI,GAA0B,CAAC;IAE/B,UAAU,CAAC,GAAG,EAAE;QACZ,gDAAgD;QAChD,OAAO,GAAG;YACN,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;SAClB,CAAC;QACF,GAAG,GAAG,IAAI,6BAAqB,CAAC,IAAA,sBAAa,GAAE,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACjC,KAAK,UAAU,gBAAgB,CAAC,UAAkB,EAAE,YAAsB;YACtE,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAEpE,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;YACvF,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAEzC,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,gBAAgB,CAAC,qBAAqB,EAAE,EAAE,oBAAQ,CAAC,MAAM,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YACzD,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,EAAE,oBAAQ,CAAC,KAAK,CAAC,CAAC;YAE7E,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YAC/E,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,EAAE,oBAAQ,CAAC,KAAK,CAAC,CAAC;YAE7E,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC;YACzE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACxE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,IAAI,KAAuB,CAAC;IAE5B,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,WAAW,GAAG,IAAI,mBAAW,EAAU,CAAC;QAC9C,KAAK,GAAG,IAAI,wBAAgB,CAAC,IAAA,sBAAa,GAAE,EAAE,WAAW,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;YAC1E,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;gBAClC,GAAG,EAAE,iBAAiB;gBACtB,SAAS,EAAE,uBAAuB;gBAClC,IAAI,EAAE,oBAAQ,CAAC,KAAK;gBACpB,UAAU,EAAE,sBAAU,CAAC,KAAK;gBAC5B,QAAQ,EAAE,KAAK;gBACf,gBAAgB,EAAE,KAAK;gBACvB,YAAY,EAAE,0BAA0B;gBACxC,gBAAgB,EAAE,0BAA0B;gBAC5C,KAAK,EAAE;oBACH,WAAW,EAAE,0BAA0B;oBACvC,gBAAgB,EAAE,SAAS;oBAC3B,oBAAoB,EAAE,EAAE;oBACxB,IAAI,EAAE,CAAC,CAAC,CAAC;oBACT,MAAM,EAAE;wBACJ;4BACI,OAAO,EAAE,kBAAkB;4BAC3B,YAAY,EAAE,0BAA0B;yBAC3C;qBACJ;iBACJ;gBACD,KAAK,EAAE;oBACH,UAAU,EAAE,CAAC;oBACb,iBAAiB,EAAE,sBAAsB;iBAC5C;aACJ,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,KAAK,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;YAEnD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACjC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC;YAC9E,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAChE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC;YACzF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACjC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACnD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;gBAClC,GAAG,EAAE,iBAAiB;gBACtB,SAAS,EAAE,uBAAuB;gBAClC,IAAI,EAAE,oBAAQ,CAAC,MAAM;gBACrB,UAAU,EAAE,sBAAU,CAAC,KAAK;gBAC5B,QAAQ,EAAE,KAAK;gBACf,gBAAgB,EAAE,KAAK;gBACvB,YAAY,EAAE,0BAA0B;gBACxC,gBAAgB,EAAE,0BAA0B;aAC/C,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,KAAK,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;YAEnD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YACzD,MAAM,SAAS,GAAG,IAAA,4BAAgB,GAAE,CAAC;YAErC,gDAAgD;YAChD,MAAM,aAAa,GAA6B,EAAE,CAAC;YACnD,gDAAgD;YAChD,MAAM,UAAU,GAA0B,EAAE,CAAC;YAC7C,gDAAgD;YAChD,MAAM,YAAY,GAAqB,EAAE,CAAC;YAC1C,gDAAgD;YAChD,MAAM,WAAW,GAAqB,EAAE,CAAC;YACzC,gDAAgD;YAChD,MAAM,aAAa,GAAkB,EAAE,CAAC;YAExC,8DAA8D;YAC9D,MAAM,WAAW,GAAG,IAAI,yBAAiB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;YAE1H,MAAM,YAAY,GAAG;gBACjB,GAAG,EAAE,iBAAiB;gBACtB,SAAS,EAAE,uBAAuB;gBAClC,IAAI,EAAE,oBAAQ,CAAC,KAAK;gBACpB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;gBACf,UAAU,EAAE,sBAAU,CAAC,KAAK;gBAC5B,QAAQ,EAAE,KAAK;gBACf,gBAAgB,EAAE,KAAK;gBACvB,YAAY,EAAE,IAAI,IAAI,EAAE;gBACxB,gBAAgB,EAAE,IAAI,IAAI,EAAE;gBAC5B,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,YAAY;gBACvB,MAAM,EAAE,SAAS;gBACjB,IAAI,EAAE;oBACF,cAAc,EAAE;wBACZ,GAAG,EAAE,YAAY;wBACjB,KAAK,EAAE,QAAiB;wBACxB,YAAY,EAAE,IAAI,IAAI,EAAE;wBACxB,WAAW,EAAE,GAAG;wBAChB,cAAc,EAAE,kBAAkB;wBAClC,uBAAuB,EAAE,IAAI,IAAI,EAAE;wBACnC,WAAW,EAAE,GAAG;wBAChB,cAAc,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;wBACpC,iBAAiB,EAAE,CAAC,GAAG,CAAC;qBAC3B;iBACJ;gBACD,KAAK,EAAE;oBACH,WAAW,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC;oBACjD,gBAAgB,EAAE,SAAS;oBAC3B,oBAAoB,EAAE,EAAE;oBACxB,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;oBACZ,MAAM,EAAE,EAAE;iBACb;gBACD,KAAK,EAAE;oBACH,UAAU,EAAE,CAAC;oBACb,iBAAiB,EAAE,sBAAsB;iBAC5C;aACJ,CAAC;YAEF,0DAA0D;YAC1D,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAEvD,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,oBAAQ,CAAC,KAAK,CAAC,CAAC;YAC7C,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACvC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC;YACpF,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACvC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChD,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Logger, NodeResultWithError, PhotoTag } from '../../interface';
|
|
2
|
+
import { PhotosAPIService } from './apiService';
|
|
3
|
+
import { PhotosNodesAccess } from './nodes';
|
|
4
|
+
import { AlbumsCryptoService } from './albumsCrypto';
|
|
5
|
+
export type UpdatePhotoSettings = {
|
|
6
|
+
nodeUid: string;
|
|
7
|
+
tagsToAdd: PhotoTag[];
|
|
8
|
+
tagsToRemove: PhotoTag[];
|
|
9
|
+
};
|
|
10
|
+
/**
|
|
11
|
+
* Manages updating photos: adding/removing tags and favoriting.
|
|
12
|
+
* Uses the same encrypted payload as add-to-album/copy for the favorite endpoint.
|
|
13
|
+
*/
|
|
14
|
+
export declare class PhotosManager {
|
|
15
|
+
private readonly logger;
|
|
16
|
+
private readonly apiService;
|
|
17
|
+
private readonly nodesService;
|
|
18
|
+
private readonly payloadBuilder;
|
|
19
|
+
constructor(logger: Logger, apiService: PhotosAPIService, albumsCryptoService: AlbumsCryptoService, nodesService: PhotosNodesAccess);
|
|
20
|
+
updatePhotos(photos: UpdatePhotoSettings[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
21
|
+
private iterateNodeUidsWithFavoritePayloads;
|
|
22
|
+
}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PhotosManager = void 0;
|
|
4
|
+
const ttag_1 = require("ttag");
|
|
5
|
+
const interface_1 = require("../../interface");
|
|
6
|
+
const photosTransferPayloadBuilder_1 = require("./photosTransferPayloadBuilder");
|
|
7
|
+
const errors_1 = require("../../errors");
|
|
8
|
+
const sharingAccess_1 = require("../sharing/sharingAccess");
|
|
9
|
+
const batch_1 = require("../batch");
|
|
10
|
+
/**
|
|
11
|
+
* Manages updating photos: adding/removing tags and favoriting.
|
|
12
|
+
* Uses the same encrypted payload as add-to-album/copy for the favorite endpoint.
|
|
13
|
+
*/
|
|
14
|
+
class PhotosManager {
|
|
15
|
+
logger;
|
|
16
|
+
apiService;
|
|
17
|
+
nodesService;
|
|
18
|
+
payloadBuilder;
|
|
19
|
+
constructor(logger, apiService, albumsCryptoService, nodesService) {
|
|
20
|
+
this.logger = logger;
|
|
21
|
+
this.apiService = apiService;
|
|
22
|
+
this.nodesService = nodesService;
|
|
23
|
+
this.payloadBuilder = new photosTransferPayloadBuilder_1.PhotoTransferPayloadBuilder(albumsCryptoService, nodesService);
|
|
24
|
+
}
|
|
25
|
+
async *updatePhotos(photos, signal) {
|
|
26
|
+
for await (const { photoSettings: { nodeUid, tagsToAdd, tagsToRemove }, payloadForFavorite, error, } of this.iterateNodeUidsWithFavoritePayloads(photos, signal)) {
|
|
27
|
+
if (signal?.aborted) {
|
|
28
|
+
throw new errors_1.AbortError();
|
|
29
|
+
}
|
|
30
|
+
if (error) {
|
|
31
|
+
yield { uid: nodeUid, ok: false, error };
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
34
|
+
try {
|
|
35
|
+
if (tagsToAdd.includes(interface_1.PhotoTag.Favorites)) {
|
|
36
|
+
await this.apiService.setPhotoFavorite(nodeUid, payloadForFavorite);
|
|
37
|
+
}
|
|
38
|
+
const addTags = tagsToAdd.filter((tag) => tag !== interface_1.PhotoTag.Favorites);
|
|
39
|
+
if (addTags.length) {
|
|
40
|
+
await this.apiService.addPhotoTags(nodeUid, addTags);
|
|
41
|
+
}
|
|
42
|
+
if (tagsToRemove.length) {
|
|
43
|
+
await this.apiService.removePhotoTags(nodeUid, tagsToRemove);
|
|
44
|
+
}
|
|
45
|
+
await this.nodesService.notifyNodeChanged(nodeUid);
|
|
46
|
+
yield { uid: nodeUid, ok: true };
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
this.logger.error(`Update photos failed for ${nodeUid}`, error);
|
|
50
|
+
yield {
|
|
51
|
+
uid: nodeUid,
|
|
52
|
+
ok: false,
|
|
53
|
+
error: error instanceof Error ? error : new Error((0, ttag_1.c)('Error').t `Unknown error`, { cause: error }),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
async *iterateNodeUidsWithFavoritePayloads(photosSettings, signal) {
|
|
59
|
+
const photosSettingsWithoutFavorite = photosSettings.filter((photoSettings) => !photoSettings.tagsToAdd?.includes(interface_1.PhotoTag.Favorites));
|
|
60
|
+
const photosSettingsWithFavorite = photosSettings.filter((photoSettings) => photoSettings.tagsToAdd?.includes(interface_1.PhotoTag.Favorites));
|
|
61
|
+
for (const photoSettings of photosSettingsWithoutFavorite) {
|
|
62
|
+
yield { photoSettings };
|
|
63
|
+
}
|
|
64
|
+
if (!photosSettingsWithFavorite.length) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
const rootNode = await this.nodesService.getVolumeRootFolder();
|
|
68
|
+
const volumeRootKeys = await this.nodesService.getNodeKeys(rootNode.uid);
|
|
69
|
+
const signingKeys = await this.nodesService.getNodeSigningKeys({ nodeUid: rootNode.uid });
|
|
70
|
+
// Batch iteration to fetch metadata for preparing the payloads in parallel.
|
|
71
|
+
for (const photoSettingsBatch of (0, batch_1.batch)(photosSettingsWithFavorite, sharingAccess_1.BATCH_LOADING_SIZE)) {
|
|
72
|
+
if (signal?.aborted) {
|
|
73
|
+
throw new errors_1.AbortError();
|
|
74
|
+
}
|
|
75
|
+
const result = await this.payloadBuilder.preparePhotoPayloads(photoSettingsBatch.map(({ nodeUid }) => ({ photoNodeUid: nodeUid })), rootNode.uid, volumeRootKeys, signingKeys, signal);
|
|
76
|
+
for (const [nodeUid, error] of result.errors) {
|
|
77
|
+
const photoSettings = photosSettingsWithFavorite.find((photoSettings) => photoSettings.nodeUid === nodeUid);
|
|
78
|
+
if (!photoSettings) {
|
|
79
|
+
this.logger.error(`Photo settings not found for ${nodeUid}, unexpected error`);
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
// If the photo is already in the root node, we only set the favorite tag.
|
|
83
|
+
if (error instanceof photosTransferPayloadBuilder_1.PhotoAlreadyInTargetError) {
|
|
84
|
+
yield { photoSettings };
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
yield { photoSettings, error };
|
|
88
|
+
}
|
|
89
|
+
for (const payloadForFavorite of result.payloads) {
|
|
90
|
+
const photoSettings = photosSettingsWithFavorite.find((photoSettings) => photoSettings.nodeUid === payloadForFavorite.nodeUid);
|
|
91
|
+
if (!photoSettings) {
|
|
92
|
+
this.logger.error(`Photo settings not found for ${payloadForFavorite.nodeUid}, unexpected payload`);
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
95
|
+
yield { photoSettings, payloadForFavorite };
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
exports.PhotosManager = PhotosManager;
|
|
101
|
+
//# sourceMappingURL=photosManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"photosManager.js","sourceRoot":"","sources":["../../../src/internal/photos/photosManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|