@protontech/drive-sdk 0.3.2 → 0.4.1
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/nodes.d.ts +4 -0
- package/dist/interface/nodes.js.map +1 -1
- package/dist/internal/apiService/errorCodes.d.ts +1 -0
- package/dist/internal/apiService/errors.d.ts +3 -0
- package/dist/internal/apiService/errors.js +7 -1
- package/dist/internal/apiService/errors.js.map +1 -1
- package/dist/internal/devices/interface.d.ts +1 -1
- package/dist/internal/devices/manager.js +1 -1
- package/dist/internal/devices/manager.js.map +1 -1
- package/dist/internal/devices/manager.test.js +3 -3
- package/dist/internal/devices/manager.test.js.map +1 -1
- package/dist/internal/events/apiService.js +1 -1
- package/dist/internal/events/apiService.js.map +1 -1
- package/dist/internal/events/coreEventManager.js +1 -1
- package/dist/internal/events/coreEventManager.js.map +1 -1
- package/dist/internal/events/coreEventManager.test.js +18 -24
- package/dist/internal/events/coreEventManager.test.js.map +1 -1
- package/dist/internal/events/index.d.ts +3 -4
- package/dist/internal/events/index.js +4 -4
- package/dist/internal/events/index.js.map +1 -1
- package/dist/internal/events/interface.d.ts +3 -0
- package/dist/internal/nodes/apiService.d.ts +12 -3
- package/dist/internal/nodes/apiService.js +54 -13
- package/dist/internal/nodes/apiService.js.map +1 -1
- package/dist/internal/nodes/apiService.test.js +35 -2
- package/dist/internal/nodes/apiService.test.js.map +1 -1
- package/dist/internal/nodes/cache.test.js +1 -0
- package/dist/internal/nodes/cache.test.js.map +1 -1
- package/dist/internal/nodes/cryptoService.d.ts +1 -1
- package/dist/internal/nodes/cryptoService.js +1 -1
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.test.js +4 -4
- package/dist/internal/nodes/cryptoService.test.js.map +1 -1
- package/dist/internal/nodes/errors.d.ts +4 -0
- package/dist/internal/nodes/errors.js +9 -0
- package/dist/internal/nodes/errors.js.map +1 -0
- package/dist/internal/nodes/extendedAttributes.d.ts +2 -2
- package/dist/internal/nodes/extendedAttributes.js +15 -11
- package/dist/internal/nodes/extendedAttributes.js.map +1 -1
- package/dist/internal/nodes/extendedAttributes.test.js +19 -1
- package/dist/internal/nodes/extendedAttributes.test.js.map +1 -1
- package/dist/internal/nodes/index.test.js +2 -1
- package/dist/internal/nodes/index.test.js.map +1 -1
- package/dist/internal/nodes/interface.d.ts +5 -1
- package/dist/internal/nodes/nodesAccess.d.ts +3 -3
- package/dist/internal/nodes/nodesAccess.js +25 -15
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesAccess.test.js +48 -8
- package/dist/internal/nodes/nodesAccess.test.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.d.ts +2 -0
- package/dist/internal/nodes/nodesManagement.js +87 -9
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.test.js +81 -5
- package/dist/internal/nodes/nodesManagement.test.js.map +1 -1
- package/dist/internal/photos/albums.d.ts +9 -7
- package/dist/internal/photos/albums.js +26 -13
- package/dist/internal/photos/albums.js.map +1 -1
- package/dist/internal/photos/apiService.d.ts +34 -3
- package/dist/internal/photos/apiService.js +96 -3
- package/dist/internal/photos/apiService.js.map +1 -1
- package/dist/internal/photos/index.d.ts +31 -4
- package/dist/internal/photos/index.js +57 -7
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +25 -1
- package/dist/internal/photos/shares.d.ts +43 -0
- package/dist/internal/photos/shares.js +112 -0
- package/dist/internal/photos/shares.js.map +1 -0
- package/dist/internal/photos/timeline.d.ts +15 -0
- package/dist/internal/photos/timeline.js +22 -0
- package/dist/internal/photos/timeline.js.map +1 -0
- package/dist/internal/photos/upload.d.ts +59 -0
- package/dist/internal/photos/upload.js +104 -0
- package/dist/internal/photos/upload.js.map +1 -0
- package/dist/internal/shares/manager.d.ts +1 -1
- package/dist/internal/shares/manager.js +4 -4
- package/dist/internal/shares/manager.js.map +1 -1
- package/dist/internal/shares/manager.test.js +7 -7
- package/dist/internal/shares/manager.test.js.map +1 -1
- package/dist/internal/sharing/interface.d.ts +1 -1
- package/dist/internal/sharing/sharingAccess.js +1 -1
- package/dist/internal/sharing/sharingAccess.js.map +1 -1
- package/dist/internal/sharing/sharingAccess.test.js +1 -1
- package/dist/internal/sharing/sharingAccess.test.js.map +1 -1
- package/dist/internal/sharingPublic/apiService.js +2 -0
- package/dist/internal/sharingPublic/apiService.js.map +1 -1
- package/dist/internal/upload/apiService.d.ts +2 -2
- package/dist/internal/upload/apiService.js +1 -1
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/cryptoService.d.ts +2 -2
- package/dist/internal/upload/cryptoService.js.map +1 -1
- package/dist/internal/upload/fileUploader.d.ts +1 -0
- package/dist/internal/upload/fileUploader.js +3 -0
- package/dist/internal/upload/fileUploader.js.map +1 -1
- package/dist/internal/upload/interface.d.ts +3 -0
- package/dist/internal/upload/manager.d.ts +12 -11
- package/dist/internal/upload/manager.js +8 -2
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +8 -0
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/streamUploader.d.ts +34 -24
- package/dist/internal/upload/streamUploader.js +7 -4
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +1 -1
- package/dist/internal/upload/streamUploader.test.js.map +1 -1
- package/dist/protonDriveClient.d.ts +20 -3
- package/dist/protonDriveClient.js +23 -4
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +102 -12
- package/dist/protonDrivePhotosClient.js +149 -29
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/transformers.d.ts +1 -1
- package/dist/transformers.js +1 -0
- package/dist/transformers.js.map +1 -1
- package/package.json +1 -1
- package/src/interface/nodes.ts +4 -0
- package/src/internal/apiService/errorCodes.ts +1 -0
- package/src/internal/apiService/errors.ts +6 -0
- package/src/internal/devices/interface.ts +1 -1
- package/src/internal/devices/manager.test.ts +3 -3
- package/src/internal/devices/manager.ts +1 -1
- package/src/internal/events/apiService.ts +1 -1
- package/src/internal/events/coreEventManager.test.ts +21 -27
- package/src/internal/events/coreEventManager.ts +1 -1
- package/src/internal/events/index.ts +3 -4
- package/src/internal/events/interface.ts +4 -0
- package/src/internal/nodes/apiService.test.ts +58 -1
- package/src/internal/nodes/apiService.ts +104 -17
- package/src/internal/nodes/cache.test.ts +1 -0
- package/src/internal/nodes/cryptoService.test.ts +8 -8
- package/src/internal/nodes/cryptoService.ts +1 -1
- package/src/internal/nodes/errors.ts +5 -0
- package/src/internal/nodes/extendedAttributes.test.ts +23 -1
- package/src/internal/nodes/extendedAttributes.ts +26 -18
- package/src/internal/nodes/index.test.ts +2 -1
- package/src/internal/nodes/interface.ts +6 -1
- package/src/internal/nodes/nodesAccess.test.ts +68 -8
- package/src/internal/nodes/nodesAccess.ts +42 -15
- package/src/internal/nodes/nodesManagement.test.ts +100 -5
- package/src/internal/nodes/nodesManagement.ts +101 -13
- package/src/internal/photos/albums.ts +31 -12
- package/src/internal/photos/apiService.ts +159 -4
- package/src/internal/photos/index.ts +116 -9
- package/src/internal/photos/interface.ts +23 -1
- package/src/internal/photos/shares.ts +134 -0
- package/src/internal/photos/timeline.ts +24 -0
- package/src/internal/photos/upload.ts +209 -0
- package/src/internal/shares/manager.test.ts +7 -7
- package/src/internal/shares/manager.ts +4 -4
- package/src/internal/sharing/interface.ts +1 -1
- package/src/internal/sharing/sharingAccess.test.ts +1 -1
- package/src/internal/sharing/sharingAccess.ts +1 -1
- package/src/internal/sharingPublic/apiService.ts +2 -0
- package/src/internal/upload/apiService.ts +3 -3
- package/src/internal/upload/cryptoService.ts +2 -2
- package/src/internal/upload/fileUploader.ts +12 -0
- package/src/internal/upload/interface.ts +3 -0
- package/src/internal/upload/manager.test.ts +8 -0
- package/src/internal/upload/manager.ts +20 -10
- package/src/internal/upload/streamUploader.test.ts +17 -12
- package/src/internal/upload/streamUploader.ts +35 -27
- package/src/protonDriveClient.ts +33 -4
- package/src/protonDrivePhotosClient.ts +251 -32
- package/src/transformers.ts +2 -0
- package/dist/internal/photos/cache.d.ts +0 -6
- package/dist/internal/photos/cache.js +0 -15
- package/dist/internal/photos/cache.js.map +0 -1
- package/dist/internal/photos/photosTimeline.d.ts +0 -10
- package/dist/internal/photos/photosTimeline.js +0 -19
- package/dist/internal/photos/photosTimeline.js.map +0 -1
- package/src/internal/photos/cache.ts +0 -11
- package/src/internal/photos/photosTimeline.ts +0 -17
|
@@ -5,9 +5,10 @@ const ttag_1 = require("ttag");
|
|
|
5
5
|
const interface_1 = require("../../interface");
|
|
6
6
|
const errors_1 = require("../../errors");
|
|
7
7
|
const errors_2 = require("../errors");
|
|
8
|
+
const uids_1 = require("../uids");
|
|
9
|
+
const errors_3 = require("./errors");
|
|
8
10
|
const validations_1 = require("./validations");
|
|
9
11
|
const extendedAttributes_1 = require("./extendedAttributes");
|
|
10
|
-
const uids_1 = require("../uids");
|
|
11
12
|
/**
|
|
12
13
|
* Provides high-level actions for managing nodes.
|
|
13
14
|
*
|
|
@@ -47,13 +48,24 @@ class NodesManagement {
|
|
|
47
48
|
if (!options.allowRenameRootNode && !hash) {
|
|
48
49
|
throw new Error('Node hash not generated');
|
|
49
50
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
51
|
+
try {
|
|
52
|
+
await this.apiService.renameNode(nodeUid, {
|
|
53
|
+
hash: node.hash,
|
|
54
|
+
}, {
|
|
55
|
+
encryptedName: armoredNodeName,
|
|
56
|
+
nameSignatureEmail: signatureEmail,
|
|
57
|
+
hash: hash,
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
// If node is out of sync, we notify cache to refresh it before next usage.
|
|
62
|
+
// We let the code still throw the error as it must bubble to the user
|
|
63
|
+
// so user can re-open the node to ensure they still want to rename it.
|
|
64
|
+
if (error instanceof errors_3.NodeOutOfSyncError) {
|
|
65
|
+
await this.nodesAccess.notifyNodeChanged(nodeUid);
|
|
66
|
+
}
|
|
67
|
+
throw error;
|
|
68
|
+
}
|
|
57
69
|
await this.nodesAccess.notifyNodeChanged(nodeUid);
|
|
58
70
|
const newNode = {
|
|
59
71
|
...node,
|
|
@@ -101,7 +113,7 @@ class NodesManagement {
|
|
|
101
113
|
if (!newParentKeys.hashKey) {
|
|
102
114
|
throw new errors_1.ValidationError((0, ttag_1.c)('Error').t `Moving item to a non-folder is not allowed`);
|
|
103
115
|
}
|
|
104
|
-
const encryptedCrypto = await this.cryptoService.
|
|
116
|
+
const encryptedCrypto = await this.cryptoService.encryptNodeWithNewParent(node, keys, { key: newParentKeys.key, hashKey: newParentKeys.hashKey }, address);
|
|
105
117
|
// Node could be uploaded or renamed by anonymous user and thus have
|
|
106
118
|
// missing signatures that must be added to the move request.
|
|
107
119
|
// Node passphrase and signature email must be passed if and only if
|
|
@@ -135,6 +147,71 @@ class NodesManagement {
|
|
|
135
147
|
await this.nodesAccess.notifyNodeChanged(node.uid, newParentUid);
|
|
136
148
|
return newNode;
|
|
137
149
|
}
|
|
150
|
+
// Improvement requested: copy nodes in parallel
|
|
151
|
+
async *copyNodes(nodeUids, newParentNodeUid, signal) {
|
|
152
|
+
for (const nodeUid of nodeUids) {
|
|
153
|
+
if (signal?.aborted) {
|
|
154
|
+
throw new errors_1.AbortError((0, ttag_1.c)('Error').t `Copy operation aborted`);
|
|
155
|
+
}
|
|
156
|
+
try {
|
|
157
|
+
await this.copyNode(nodeUid, newParentNodeUid);
|
|
158
|
+
yield {
|
|
159
|
+
uid: nodeUid,
|
|
160
|
+
ok: true,
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
catch (error) {
|
|
164
|
+
yield {
|
|
165
|
+
uid: nodeUid,
|
|
166
|
+
ok: false,
|
|
167
|
+
error: (0, errors_2.getErrorMessage)(error),
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
async copyNode(nodeUid, newParentUid) {
|
|
173
|
+
const [node, address] = await Promise.all([
|
|
174
|
+
this.nodesAccess.getNode(nodeUid),
|
|
175
|
+
this.nodesAccess.getRootNodeEmailKey(newParentUid),
|
|
176
|
+
]);
|
|
177
|
+
const [keys, newParentKeys] = await Promise.all([
|
|
178
|
+
this.nodesAccess.getNodePrivateAndSessionKeys(nodeUid),
|
|
179
|
+
this.nodesAccess.getNodeKeys(newParentUid),
|
|
180
|
+
]);
|
|
181
|
+
if (!newParentKeys.hashKey) {
|
|
182
|
+
throw new errors_1.ValidationError((0, ttag_1.c)('Error').t `Copying item to a non-folder is not allowed`);
|
|
183
|
+
}
|
|
184
|
+
const encryptedCrypto = await this.cryptoService.encryptNodeWithNewParent(node, keys, { key: newParentKeys.key, hashKey: newParentKeys.hashKey }, address);
|
|
185
|
+
// Node could be uploaded or renamed by anonymous user and thus have
|
|
186
|
+
// missing signatures that must be added to the copy request.
|
|
187
|
+
// Node passphrase and signature email must be passed if and only if
|
|
188
|
+
// the the signatures are missing (key author is null).
|
|
189
|
+
const anonymousKey = node.keyAuthor.ok && node.keyAuthor.value === null;
|
|
190
|
+
const keySignatureProperties = !anonymousKey
|
|
191
|
+
? {}
|
|
192
|
+
: {
|
|
193
|
+
signatureEmail: encryptedCrypto.signatureEmail,
|
|
194
|
+
armoredNodePassphraseSignature: encryptedCrypto.armoredNodePassphraseSignature,
|
|
195
|
+
};
|
|
196
|
+
await this.apiService.copyNode(nodeUid, {
|
|
197
|
+
...keySignatureProperties,
|
|
198
|
+
parentUid: newParentUid,
|
|
199
|
+
armoredNodePassphrase: encryptedCrypto.armoredNodePassphrase,
|
|
200
|
+
encryptedName: encryptedCrypto.encryptedName,
|
|
201
|
+
nameSignatureEmail: encryptedCrypto.nameSignatureEmail,
|
|
202
|
+
hash: encryptedCrypto.hash,
|
|
203
|
+
});
|
|
204
|
+
const newNode = {
|
|
205
|
+
...node,
|
|
206
|
+
encryptedName: encryptedCrypto.encryptedName,
|
|
207
|
+
parentUid: newParentUid,
|
|
208
|
+
hash: encryptedCrypto.hash,
|
|
209
|
+
keyAuthor: (0, interface_1.resultOk)(encryptedCrypto.signatureEmail),
|
|
210
|
+
nameAuthor: (0, interface_1.resultOk)(encryptedCrypto.nameSignatureEmail),
|
|
211
|
+
};
|
|
212
|
+
await this.nodesAccess.notifyChildCreated(newParentUid);
|
|
213
|
+
return newNode;
|
|
214
|
+
}
|
|
138
215
|
async *trashNodes(nodeUids, signal) {
|
|
139
216
|
for await (const result of this.apiService.trashNodes(nodeUids, signal)) {
|
|
140
217
|
if (result.ok) {
|
|
@@ -192,6 +269,7 @@ class NodesManagement {
|
|
|
192
269
|
creationTime: new Date(),
|
|
193
270
|
// Share node metadata
|
|
194
271
|
isShared: false,
|
|
272
|
+
isSharedPublicly: false,
|
|
195
273
|
directRole: interface_1.MemberRole.Inherited,
|
|
196
274
|
// Decrypted metadata
|
|
197
275
|
isStale: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodesManagement.js","sourceRoot":"","sources":["../../../src/internal/nodes/nodesManagement.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,+CAA6E;AAC7E,yCAA2D;AAC3D,sCAA4C;
|
|
1
|
+
{"version":3,"file":"nodesManagement.js","sourceRoot":"","sources":["../../../src/internal/nodes/nodesManagement.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const nodesManagement_1 = require("./nodesManagement");
|
|
4
|
+
const errors_1 = require("./errors");
|
|
4
5
|
describe('NodesManagement', () => {
|
|
5
6
|
let apiService;
|
|
6
7
|
let cryptoCache;
|
|
@@ -41,6 +42,7 @@ describe('NodesManagement', () => {
|
|
|
41
42
|
apiService = {
|
|
42
43
|
renameNode: jest.fn(),
|
|
43
44
|
moveNode: jest.fn(),
|
|
45
|
+
copyNode: jest.fn(),
|
|
44
46
|
trashNodes: jest.fn(async function* (uids) {
|
|
45
47
|
yield* uids.map((uid) => ({ ok: true, uid }));
|
|
46
48
|
}),
|
|
@@ -63,7 +65,7 @@ describe('NodesManagement', () => {
|
|
|
63
65
|
armoredNodeName: 'newArmoredNodeName',
|
|
64
66
|
hash: 'newHash',
|
|
65
67
|
}),
|
|
66
|
-
|
|
68
|
+
encryptNodeWithNewParent: jest.fn(),
|
|
67
69
|
createFolder: jest.fn(),
|
|
68
70
|
};
|
|
69
71
|
// @ts-expect-error No need to implement all methods for mocking
|
|
@@ -90,6 +92,7 @@ describe('NodesManagement', () => {
|
|
|
90
92
|
getRootNodeEmailKey: jest.fn().mockResolvedValue({ email: 'root-email', addressKey: 'root-key' }),
|
|
91
93
|
notifyNodeChanged: jest.fn(),
|
|
92
94
|
notifyNodeDeleted: jest.fn(),
|
|
95
|
+
notifyChildCreated: jest.fn(),
|
|
93
96
|
};
|
|
94
97
|
management = new nodesManagement_1.NodesManagement(apiService, cryptoCache, cryptoService, nodesAccess);
|
|
95
98
|
});
|
|
@@ -107,6 +110,12 @@ describe('NodesManagement', () => {
|
|
|
107
110
|
expect(apiService.renameNode).toHaveBeenCalledWith(nodes.nodeUid.uid, { hash: nodes.nodeUid.hash }, { encryptedName: 'newArmoredNodeName', nameSignatureEmail: 'newSignatureEmail', hash: 'newHash' });
|
|
108
111
|
expect(nodesAccess.notifyNodeChanged).toHaveBeenCalledWith('nodeUid');
|
|
109
112
|
});
|
|
113
|
+
it('renameNode refreshes cache if node is out of sync', async () => {
|
|
114
|
+
const error = new errors_1.NodeOutOfSyncError('Node is out of sync');
|
|
115
|
+
apiService.renameNode = jest.fn().mockRejectedValue(error);
|
|
116
|
+
await expect(management.renameNode('nodeUid', 'new name')).rejects.toThrow(error);
|
|
117
|
+
expect(nodesAccess.notifyNodeChanged).toHaveBeenCalledWith('nodeUid');
|
|
118
|
+
});
|
|
110
119
|
it('moveNode manages move and updates cache', async () => {
|
|
111
120
|
const encryptedCrypto = {
|
|
112
121
|
encryptedName: 'movedArmoredNodeName',
|
|
@@ -116,7 +125,7 @@ describe('NodesManagement', () => {
|
|
|
116
125
|
signatureEmail: 'movedSignatureEmail',
|
|
117
126
|
nameSignatureEmail: 'movedNameSignatureEmail',
|
|
118
127
|
};
|
|
119
|
-
cryptoService.
|
|
128
|
+
cryptoService.encryptNodeWithNewParent = jest.fn().mockResolvedValue(encryptedCrypto);
|
|
120
129
|
const newNode = await management.moveNode('nodeUid', 'newParentNodeUid');
|
|
121
130
|
expect(newNode).toEqual({
|
|
122
131
|
...nodes.nodeUid,
|
|
@@ -127,7 +136,7 @@ describe('NodesManagement', () => {
|
|
|
127
136
|
nameAuthor: { ok: true, value: 'movedNameSignatureEmail' },
|
|
128
137
|
});
|
|
129
138
|
expect(nodesAccess.getRootNodeEmailKey).toHaveBeenCalledWith('newParentNodeUid');
|
|
130
|
-
expect(cryptoService.
|
|
139
|
+
expect(cryptoService.encryptNodeWithNewParent).toHaveBeenCalledWith(nodes.nodeUid, expect.objectContaining({
|
|
131
140
|
key: 'nodeUid-key',
|
|
132
141
|
passphrase: 'nodeUid-passphrase',
|
|
133
142
|
passphraseSessionKey: 'nodeUid-passphraseSessionKey',
|
|
@@ -153,9 +162,9 @@ describe('NodesManagement', () => {
|
|
|
153
162
|
signatureEmail: 'movedSignatureEmail',
|
|
154
163
|
nameSignatureEmail: 'movedNameSignatureEmail',
|
|
155
164
|
};
|
|
156
|
-
cryptoService.
|
|
165
|
+
cryptoService.encryptNodeWithNewParent = jest.fn().mockResolvedValue(encryptedCrypto);
|
|
157
166
|
const newNode = await management.moveNode('anonymousNodeUid', 'newParentNodeUid');
|
|
158
|
-
expect(cryptoService.
|
|
167
|
+
expect(cryptoService.encryptNodeWithNewParent).toHaveBeenCalledWith(nodes.anonymousNodeUid, expect.objectContaining({
|
|
159
168
|
key: 'anonymousNodeUid-key',
|
|
160
169
|
passphrase: 'anonymousNodeUid-passphrase',
|
|
161
170
|
passphraseSessionKey: 'anonymousNodeUid-passphraseSessionKey',
|
|
@@ -177,6 +186,73 @@ describe('NodesManagement', () => {
|
|
|
177
186
|
...encryptedCrypto,
|
|
178
187
|
});
|
|
179
188
|
});
|
|
189
|
+
it('copyNode manages copy and updates cache', async () => {
|
|
190
|
+
const encryptedCrypto = {
|
|
191
|
+
encryptedName: 'copiedArmoredNodeName',
|
|
192
|
+
hash: 'copiedHash',
|
|
193
|
+
armoredNodePassphrase: 'copiedArmoredNodePassphrase',
|
|
194
|
+
armoredNodePassphraseSignature: 'copiedArmoredNodePassphraseSignature',
|
|
195
|
+
signatureEmail: 'copiedSignatureEmail',
|
|
196
|
+
nameSignatureEmail: 'copiedNameSignatureEmail',
|
|
197
|
+
};
|
|
198
|
+
cryptoService.encryptNodeWithNewParent = jest.fn().mockResolvedValue(encryptedCrypto);
|
|
199
|
+
const newNode = await management.copyNode('nodeUid', 'newParentNodeUid');
|
|
200
|
+
expect(newNode).toEqual({
|
|
201
|
+
...nodes.nodeUid,
|
|
202
|
+
parentUid: 'newParentNodeUid',
|
|
203
|
+
encryptedName: 'copiedArmoredNodeName',
|
|
204
|
+
hash: 'copiedHash',
|
|
205
|
+
keyAuthor: { ok: true, value: 'copiedSignatureEmail' },
|
|
206
|
+
nameAuthor: { ok: true, value: 'copiedNameSignatureEmail' },
|
|
207
|
+
});
|
|
208
|
+
expect(nodesAccess.getRootNodeEmailKey).toHaveBeenCalledWith('newParentNodeUid');
|
|
209
|
+
expect(cryptoService.encryptNodeWithNewParent).toHaveBeenCalledWith(nodes.nodeUid, expect.objectContaining({
|
|
210
|
+
key: 'nodeUid-key',
|
|
211
|
+
passphrase: 'nodeUid-passphrase',
|
|
212
|
+
passphraseSessionKey: 'nodeUid-passphraseSessionKey',
|
|
213
|
+
contentKeyPacketSessionKey: 'nodeUid-contentKeyPacketSessionKey',
|
|
214
|
+
nameSessionKey: 'nodeUid-nameSessionKey',
|
|
215
|
+
}), expect.objectContaining({ key: 'newParentNodeUid-key', hashKey: 'newParentNodeUid-hashKey' }), { email: 'root-email', addressKey: 'root-key' });
|
|
216
|
+
expect(apiService.copyNode).toHaveBeenCalledWith('nodeUid', {
|
|
217
|
+
parentUid: 'newParentNodeUid',
|
|
218
|
+
...encryptedCrypto,
|
|
219
|
+
armoredNodePassphraseSignature: undefined,
|
|
220
|
+
signatureEmail: undefined,
|
|
221
|
+
});
|
|
222
|
+
expect(nodesAccess.notifyNodeChanged).not.toHaveBeenCalledWith();
|
|
223
|
+
expect(nodesAccess.notifyChildCreated).toHaveBeenCalledWith('newParentNodeUid');
|
|
224
|
+
});
|
|
225
|
+
it('copyNode manages copy of anonymous node', async () => {
|
|
226
|
+
const encryptedCrypto = {
|
|
227
|
+
encryptedName: 'copiedArmoredNodeName',
|
|
228
|
+
hash: 'copiedHash',
|
|
229
|
+
armoredNodePassphrase: 'copiedArmoredNodePassphrase',
|
|
230
|
+
armoredNodePassphraseSignature: 'copiedArmoredNodePassphraseSignature',
|
|
231
|
+
signatureEmail: 'copiedSignatureEmail',
|
|
232
|
+
nameSignatureEmail: 'copiedNameSignatureEmail',
|
|
233
|
+
};
|
|
234
|
+
cryptoService.encryptNodeWithNewParent = jest.fn().mockResolvedValue(encryptedCrypto);
|
|
235
|
+
const newNode = await management.copyNode('anonymousNodeUid', 'newParentNodeUid');
|
|
236
|
+
expect(cryptoService.encryptNodeWithNewParent).toHaveBeenCalledWith(nodes.anonymousNodeUid, expect.objectContaining({
|
|
237
|
+
key: 'anonymousNodeUid-key',
|
|
238
|
+
passphrase: 'anonymousNodeUid-passphrase',
|
|
239
|
+
passphraseSessionKey: 'anonymousNodeUid-passphraseSessionKey',
|
|
240
|
+
contentKeyPacketSessionKey: 'anonymousNodeUid-contentKeyPacketSessionKey',
|
|
241
|
+
nameSessionKey: 'anonymousNodeUid-nameSessionKey',
|
|
242
|
+
}), expect.objectContaining({ key: 'newParentNodeUid-key', hashKey: 'newParentNodeUid-hashKey' }), { email: 'root-email', addressKey: 'root-key' });
|
|
243
|
+
expect(newNode).toEqual({
|
|
244
|
+
...nodes.anonymousNodeUid,
|
|
245
|
+
parentUid: 'newParentNodeUid',
|
|
246
|
+
encryptedName: 'copiedArmoredNodeName',
|
|
247
|
+
hash: 'copiedHash',
|
|
248
|
+
keyAuthor: { ok: true, value: 'copiedSignatureEmail' },
|
|
249
|
+
nameAuthor: { ok: true, value: 'copiedNameSignatureEmail' },
|
|
250
|
+
});
|
|
251
|
+
expect(apiService.copyNode).toHaveBeenCalledWith('anonymousNodeUid', {
|
|
252
|
+
parentUid: 'newParentNodeUid',
|
|
253
|
+
...encryptedCrypto,
|
|
254
|
+
});
|
|
255
|
+
});
|
|
180
256
|
it('trashes node and updates cache', async () => {
|
|
181
257
|
const uids = ['v1~n1', 'v1~n2'];
|
|
182
258
|
const trashed = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodesManagement.test.js","sourceRoot":"","sources":["../../../src/internal/nodes/nodesManagement.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"nodesManagement.test.js","sourceRoot":"","sources":["../../../src/internal/nodes/nodesManagement.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
|
+
import { DecryptedNode } from '../nodes';
|
|
1
2
|
import { PhotosAPIService } from './apiService';
|
|
2
|
-
import { PhotosCache } from './cache';
|
|
3
3
|
import { NodesService } from './interface';
|
|
4
|
+
import { PhotoSharesManager } from './shares';
|
|
5
|
+
/**
|
|
6
|
+
* Provides access and high-level actions for managing albums.
|
|
7
|
+
*/
|
|
4
8
|
export declare class Albums {
|
|
5
9
|
private apiService;
|
|
6
|
-
private
|
|
10
|
+
private photoShares;
|
|
7
11
|
private nodesService;
|
|
8
|
-
constructor(apiService: PhotosAPIService,
|
|
9
|
-
iterateAlbums(): AsyncGenerator<
|
|
10
|
-
|
|
11
|
-
}, void, unknown>;
|
|
12
|
-
createAlbum(albumName: string): Promise<void>;
|
|
12
|
+
constructor(apiService: PhotosAPIService, photoShares: PhotoSharesManager, nodesService: NodesService);
|
|
13
|
+
iterateAlbums(signal?: AbortSignal): AsyncGenerator<DecryptedNode>;
|
|
14
|
+
private iterateNodesAndIgnoreMissingOnes;
|
|
13
15
|
}
|
|
@@ -1,29 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Albums = void 0;
|
|
4
|
+
const batchLoading_1 = require("../batchLoading");
|
|
5
|
+
const BATCH_LOADING_SIZE = 10;
|
|
6
|
+
/**
|
|
7
|
+
* Provides access and high-level actions for managing albums.
|
|
8
|
+
*/
|
|
4
9
|
class Albums {
|
|
5
10
|
apiService;
|
|
6
|
-
|
|
11
|
+
photoShares;
|
|
7
12
|
nodesService;
|
|
8
|
-
constructor(apiService,
|
|
13
|
+
constructor(apiService, photoShares, nodesService) {
|
|
9
14
|
this.apiService = apiService;
|
|
10
|
-
this.
|
|
15
|
+
this.photoShares = photoShares;
|
|
11
16
|
this.nodesService = nodesService;
|
|
12
17
|
this.apiService = apiService;
|
|
13
|
-
this.
|
|
18
|
+
this.photoShares = photoShares;
|
|
14
19
|
this.nodesService = nodesService;
|
|
15
20
|
}
|
|
16
|
-
async *iterateAlbums() {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
async *iterateAlbums(signal) {
|
|
22
|
+
const { volumeId } = await this.photoShares.getOwnVolumeIDs();
|
|
23
|
+
const batchLoading = new batchLoading_1.BatchLoading({
|
|
24
|
+
iterateItems: (nodeUids) => this.iterateNodesAndIgnoreMissingOnes(nodeUids, signal),
|
|
25
|
+
batchSize: BATCH_LOADING_SIZE,
|
|
26
|
+
});
|
|
27
|
+
for await (const album of this.apiService.iterateAlbums(volumeId, signal)) {
|
|
28
|
+
yield* batchLoading.load(album.albumUid);
|
|
22
29
|
}
|
|
30
|
+
yield* batchLoading.loadRest();
|
|
23
31
|
}
|
|
24
|
-
async
|
|
25
|
-
const
|
|
26
|
-
await
|
|
32
|
+
async *iterateNodesAndIgnoreMissingOnes(nodeUids, signal) {
|
|
33
|
+
const nodeGenerator = this.nodesService.iterateNodes(nodeUids, signal);
|
|
34
|
+
for await (const node of nodeGenerator) {
|
|
35
|
+
if ('missingUid' in node) {
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
yield node;
|
|
39
|
+
}
|
|
27
40
|
}
|
|
28
41
|
}
|
|
29
42
|
exports.Albums = Albums;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"albums.js","sourceRoot":"","sources":["../../../src/internal/photos/albums.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"albums.js","sourceRoot":"","sources":["../../../src/internal/photos/albums.ts"],"names":[],"mappings":";;;AAAA,kDAA+C;AAM/C,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B;;GAEG;AACH,MAAa,MAAM;IAEH;IACA;IACA;IAHZ,YACY,UAA4B,EAC5B,WAA+B,EAC/B,YAA0B;QAF1B,eAAU,GAAV,UAAU,CAAkB;QAC5B,gBAAW,GAAX,WAAW,CAAoB;QAC/B,iBAAY,GAAZ,YAAY,CAAc;QAElC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,CAAC,aAAa,CAAC,MAAoB;QACrC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC;QAE9D,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAwB;YACzD,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,QAAQ,EAAE,MAAM,CAAC;YACnF,SAAS,EAAE,kBAAkB;SAChC,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;YACxE,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC;QACD,KAAK,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,CAAC,gCAAgC,CAC3C,QAAkB,EAClB,MAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACvE,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACrC,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;gBACvB,SAAS;YACb,CAAC;YACD,MAAM,IAAI,CAAC;QACf,CAAC;IACL,CAAC;CACJ;AApCD,wBAoCC"}
|
|
@@ -1,8 +1,39 @@
|
|
|
1
1
|
import { DriveAPIService } from '../apiService';
|
|
2
|
+
import { EncryptedRootShare, EncryptedShareCrypto } from '../shares/interface';
|
|
3
|
+
/**
|
|
4
|
+
* Provides API communication for fetching and manipulating photos and albums
|
|
5
|
+
* metadata.
|
|
6
|
+
*
|
|
7
|
+
* The service is responsible for transforming local objects to API payloads
|
|
8
|
+
* and vice versa. It should not contain any business logic.
|
|
9
|
+
*/
|
|
2
10
|
export declare class PhotosAPIService {
|
|
3
11
|
private apiService;
|
|
4
12
|
constructor(apiService: DriveAPIService);
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
13
|
+
getPhotoShare(): Promise<EncryptedRootShare>;
|
|
14
|
+
createPhotoVolume(share: {
|
|
15
|
+
addressId: string;
|
|
16
|
+
addressKeyId: string;
|
|
17
|
+
} & EncryptedShareCrypto, node: {
|
|
18
|
+
encryptedName: string;
|
|
19
|
+
armoredKey: string;
|
|
20
|
+
armoredPassphrase: string;
|
|
21
|
+
armoredPassphraseSignature: string;
|
|
22
|
+
armoredHashKey: string;
|
|
23
|
+
}): Promise<{
|
|
24
|
+
volumeId: string;
|
|
25
|
+
shareId: string;
|
|
26
|
+
rootNodeId: string;
|
|
27
|
+
}>;
|
|
28
|
+
iterateTimeline(volumeId: string, signal?: AbortSignal): AsyncGenerator<{
|
|
29
|
+
nodeUid: string;
|
|
30
|
+
captureTime: Date;
|
|
31
|
+
tags: number[];
|
|
32
|
+
}>;
|
|
33
|
+
iterateAlbums(volumeId: string, signal?: AbortSignal): AsyncGenerator<{
|
|
34
|
+
albumUid: string;
|
|
35
|
+
coverNodeUid?: string;
|
|
36
|
+
photoCount: number;
|
|
37
|
+
lastActivityTime: Date;
|
|
38
|
+
}>;
|
|
8
39
|
}
|
|
@@ -1,15 +1,108 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PhotosAPIService = void 0;
|
|
4
|
+
const ttag_1 = require("ttag");
|
|
5
|
+
const apiService_1 = require("../apiService");
|
|
6
|
+
const interface_1 = require("../shares/interface");
|
|
7
|
+
const uids_1 = require("../uids");
|
|
8
|
+
/**
|
|
9
|
+
* Provides API communication for fetching and manipulating photos and albums
|
|
10
|
+
* metadata.
|
|
11
|
+
*
|
|
12
|
+
* The service is responsible for transforming local objects to API payloads
|
|
13
|
+
* and vice versa. It should not contain any business logic.
|
|
14
|
+
*/
|
|
4
15
|
class PhotosAPIService {
|
|
5
16
|
apiService;
|
|
6
17
|
constructor(apiService) {
|
|
7
18
|
this.apiService = apiService;
|
|
8
19
|
this.apiService = apiService;
|
|
9
20
|
}
|
|
10
|
-
async
|
|
11
|
-
|
|
12
|
-
|
|
21
|
+
async getPhotoShare() {
|
|
22
|
+
// TODO: Switch to drive/v2/shares/photos once available.
|
|
23
|
+
const volumesResponse = await this.apiService.get('drive/volumes');
|
|
24
|
+
const photoVolume = volumesResponse.Volumes.find((volume) => volume.Type === 2);
|
|
25
|
+
if (!photoVolume) {
|
|
26
|
+
throw new apiService_1.NotFoundAPIError((0, ttag_1.c)('Error').t `Photo volume not found`);
|
|
27
|
+
}
|
|
28
|
+
const response = await this.apiService.get(`drive/shares/${photoVolume.Share.ShareID}`);
|
|
29
|
+
if (!response.AddressID) {
|
|
30
|
+
throw new Error('Photo root share has not address ID set');
|
|
31
|
+
}
|
|
32
|
+
return {
|
|
33
|
+
volumeId: response.VolumeID,
|
|
34
|
+
shareId: response.ShareID,
|
|
35
|
+
rootNodeId: response.LinkID,
|
|
36
|
+
creatorEmail: response.Creator,
|
|
37
|
+
encryptedCrypto: {
|
|
38
|
+
armoredKey: response.Key,
|
|
39
|
+
armoredPassphrase: response.Passphrase,
|
|
40
|
+
armoredPassphraseSignature: response.PassphraseSignature,
|
|
41
|
+
},
|
|
42
|
+
addressId: response.AddressID,
|
|
43
|
+
type: interface_1.ShareType.Photo,
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
async createPhotoVolume(share, node) {
|
|
47
|
+
const response = await this.apiService.post('drive/photos/volumes', {
|
|
48
|
+
Share: {
|
|
49
|
+
AddressID: share.addressId,
|
|
50
|
+
AddressKeyID: share.addressKeyId,
|
|
51
|
+
Key: share.armoredKey,
|
|
52
|
+
Passphrase: share.armoredPassphrase,
|
|
53
|
+
PassphraseSignature: share.armoredPassphraseSignature,
|
|
54
|
+
},
|
|
55
|
+
Link: {
|
|
56
|
+
Name: node.encryptedName,
|
|
57
|
+
NodeKey: node.armoredKey,
|
|
58
|
+
NodePassphrase: node.armoredPassphrase,
|
|
59
|
+
NodePassphraseSignature: node.armoredPassphraseSignature,
|
|
60
|
+
NodeHashKey: node.armoredHashKey,
|
|
61
|
+
},
|
|
62
|
+
});
|
|
63
|
+
return {
|
|
64
|
+
volumeId: response.Volume.VolumeID,
|
|
65
|
+
shareId: response.Volume.Share.ShareID,
|
|
66
|
+
rootNodeId: response.Volume.Share.LinkID,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
async *iterateTimeline(volumeId, signal) {
|
|
70
|
+
let anchor = '';
|
|
71
|
+
while (true) {
|
|
72
|
+
const response = await this.apiService.get(`drive/volumes/${volumeId}/photos?${anchor ? `PreviousPageLastLinkID=${anchor}` : ''}`, signal);
|
|
73
|
+
for (const photo of response.Photos) {
|
|
74
|
+
const nodeUid = (0, uids_1.makeNodeUid)(volumeId, photo.LinkID);
|
|
75
|
+
yield {
|
|
76
|
+
nodeUid,
|
|
77
|
+
captureTime: new Date(photo.CaptureTime * 1000),
|
|
78
|
+
tags: photo.Tags,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
if (!response.Photos.length) {
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
anchor = response.Photos[response.Photos.length - 1].LinkID;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
async *iterateAlbums(volumeId, signal) {
|
|
88
|
+
let anchor = '';
|
|
89
|
+
while (true) {
|
|
90
|
+
const response = await this.apiService.get(`drive/photos/volumes/${volumeId}/albums?${anchor ? `AnchorID=${anchor}` : ''}`, signal);
|
|
91
|
+
for (const album of response.Albums) {
|
|
92
|
+
const albumUid = (0, uids_1.makeNodeUid)(volumeId, album.LinkID);
|
|
93
|
+
yield {
|
|
94
|
+
albumUid,
|
|
95
|
+
coverNodeUid: album.CoverLinkID ? (0, uids_1.makeNodeUid)(volumeId, album.CoverLinkID) : undefined,
|
|
96
|
+
photoCount: album.PhotoCount,
|
|
97
|
+
lastActivityTime: new Date(album.LastActivityTime * 1000),
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
if (!response.More || !response.AnchorID) {
|
|
101
|
+
break;
|
|
102
|
+
}
|
|
103
|
+
anchor = response.AnchorID;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
13
106
|
}
|
|
14
107
|
exports.PhotosAPIService = PhotosAPIService;
|
|
15
108
|
//# sourceMappingURL=apiService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/photos/apiService.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/photos/apiService.ts"],"names":[],"mappings":"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"}
|