@protontech/drive-sdk 0.14.5 → 0.14.6
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/internal/batchLoading.js +3 -0
- package/dist/internal/batchLoading.js.map +1 -1
- package/dist/internal/batchLoading.test.js +27 -0
- package/dist/internal/batchLoading.test.js.map +1 -1
- package/dist/internal/photos/nodes.js +14 -1
- package/dist/internal/photos/nodes.js.map +1 -1
- package/dist/internal/photos/nodes.test.js +44 -0
- package/dist/internal/photos/nodes.test.js.map +1 -1
- package/package.json +1 -1
- package/src/internal/batchLoading.test.ts +31 -1
- package/src/internal/batchLoading.ts +4 -1
- package/src/internal/photos/nodes.test.ts +63 -1
- package/src/internal/photos/nodes.ts +16 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batchLoading.js","sourceRoot":"","sources":["../../src/internal/batchLoading.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,
|
|
1
|
+
{"version":3,"file":"batchLoading.js","sourceRoot":"","sources":["../../src/internal/batchLoading.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,sCAAyD;AAEzD,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAa,YAAY;IACb,SAAS,GAAG,qBAAqB,CAAC;IAClC,YAAY,CAAsC;IAElD,YAAY,CAAO;IAEnB,MAAM,GAAc,EAAE,CAAC;IAE/B,YAAY,OAIX;QACG,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QAEvB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YACpC,IAAI,CAAC,YAAY,GAAG,KAAK,SAAS,CAAC,EAAE,GAAS;gBAC1C,KAAK,MAAM,IAAI,IAAI,MAAM,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtC,MAAM,IAAI,CAAC;gBACf,CAAC;YACL,CAAC,CAAC;QACN,CAAC;aAAM,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YAC9B,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QAC7C,CAAC;aAAM,CAAC;YACJ,2BAA2B;YAC3B,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACvC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,CAAC,IAAI,CAAC,OAAW;QACnB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEhC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC7C,KAAK,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7D,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QAC3B,CAAC;IACL,CAAC;IAED,KAAK,CAAC,CAAC,QAAQ;QACX,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,KAAK,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7D,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QAC3B,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,yBAAgB,CAAC,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,2BAA2B,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAChG,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,CAAC,6BAA6B,CAAC,KAAW;QACpD,IAAI,CAAC;YACD,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,YAAY,mBAAU,EAAE,CAAC;gBAC9B,MAAM,KAAK,CAAC;YAChB,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACL,CAAC;CACJ;AAhED,oCAgEC"}
|
|
@@ -107,6 +107,33 @@ describe('BatchLoading', () => {
|
|
|
107
107
|
expect(thrown).toBeInstanceOf(errors_1.ProtonDriveError);
|
|
108
108
|
expect(thrown.cause).toEqual([expect.objectContaining({ message: 'iterator failed' })]);
|
|
109
109
|
});
|
|
110
|
+
it('should rethrow AbortError immediately without accumulating', async () => {
|
|
111
|
+
const abortError = new errors_1.AbortError();
|
|
112
|
+
const result = [];
|
|
113
|
+
const iterateItems = jest.fn(async function* (items) {
|
|
114
|
+
if (items.includes('a')) {
|
|
115
|
+
throw abortError;
|
|
116
|
+
}
|
|
117
|
+
for (const item of items) {
|
|
118
|
+
yield `loaded:${item}`;
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
batchLoading = new batchLoading_1.BatchLoading({ iterateItems, batchSize: 2 });
|
|
122
|
+
let thrown;
|
|
123
|
+
try {
|
|
124
|
+
for (const item of ['a', 'b', 'c', 'd']) {
|
|
125
|
+
for await (const loadedItem of batchLoading.load(item)) {
|
|
126
|
+
result.push(loadedItem);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
catch (e) {
|
|
131
|
+
thrown = e;
|
|
132
|
+
}
|
|
133
|
+
expect(result).toEqual([]);
|
|
134
|
+
expect(thrown).toBe(abortError);
|
|
135
|
+
expect(iterateItems).toHaveBeenCalledTimes(1);
|
|
136
|
+
});
|
|
110
137
|
it('should throw ProtonDriveError with causes when multiple batches fail', async () => {
|
|
111
138
|
const loadItems = jest.fn((items) => {
|
|
112
139
|
if (items.includes('a') || items.includes('e')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batchLoading.test.js","sourceRoot":"","sources":["../../src/internal/batchLoading.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"batchLoading.test.js","sourceRoot":"","sources":["../../src/internal/batchLoading.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,7 +107,17 @@ class PhotosNodesCache extends cache_1.NodesCacheBase {
|
|
|
107
107
|
exports.PhotosNodesCache = PhotosNodesCache;
|
|
108
108
|
class PhotosNodesAccess extends nodesAccess_1.NodesAccessBase {
|
|
109
109
|
async getParentKeys(node) {
|
|
110
|
-
|
|
110
|
+
// In regular case, the parent should be used first as it is guaranteed that
|
|
111
|
+
// the root node without parent will have a share with direct membership for
|
|
112
|
+
// the user that can be used to decrypt the node.
|
|
113
|
+
// For photos, the parent might be missing but then an album (or more) plays
|
|
114
|
+
// the role of the parent. It must be used first before fallbacking to share
|
|
115
|
+
// because the node might be shared but user is not directly invited and thus
|
|
116
|
+
// cannot decrypt via the share (user's address cannot decrypt).
|
|
117
|
+
// Using parent path first should stay as if present, it will be fastest way
|
|
118
|
+
// to decrypt for the owner - all photos in the timeline can use already
|
|
119
|
+
// cached key without the need to load albums as well.
|
|
120
|
+
if (node.parentUid) {
|
|
111
121
|
return super.getParentKeys(node);
|
|
112
122
|
}
|
|
113
123
|
if (node.photo?.albums.length) {
|
|
@@ -130,6 +140,9 @@ class PhotosNodesAccess extends nodesAccess_1.NodesAccessBase {
|
|
|
130
140
|
const albumNodeUid = node.photo.albums[0].nodeUid;
|
|
131
141
|
return this.getNodeKeys(albumNodeUid);
|
|
132
142
|
}
|
|
143
|
+
if (node.shareId) {
|
|
144
|
+
return super.getParentKeys(node);
|
|
145
|
+
}
|
|
133
146
|
// This is bug that should not happen.
|
|
134
147
|
// API cannot provide node without parent or share or album.
|
|
135
148
|
throw new Error(`Node has neither parent node nor share nor album: ${node.uid}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/internal/photos/nodes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/internal/photos/nodes.ts"],"names":[],"mappings":"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"}
|
|
@@ -184,6 +184,50 @@ describe('PhotosNodesCache', () => {
|
|
|
184
184
|
});
|
|
185
185
|
});
|
|
186
186
|
describe('PhotosNodesAccess', () => {
|
|
187
|
+
describe('getParentKeys', () => {
|
|
188
|
+
let access;
|
|
189
|
+
let getNodeKeysMock;
|
|
190
|
+
let getSharePrivateKeyMock;
|
|
191
|
+
beforeEach(() => {
|
|
192
|
+
getNodeKeysMock = jest.fn().mockResolvedValue({ key: 'key', hashKey: 'hashKey' });
|
|
193
|
+
getSharePrivateKeyMock = jest.fn().mockResolvedValue('shareKey');
|
|
194
|
+
access = new nodes_1.PhotosNodesAccess((0, telemetry_1.getMockTelemetry)(),
|
|
195
|
+
// @ts-expect-error No need to implement for this test
|
|
196
|
+
{}, {}, { getNodeKeys: jest.fn().mockRejectedValue(new Error()) }, {}, { getSharePrivateKey: getSharePrivateKeyMock });
|
|
197
|
+
jest.spyOn(access, 'getNodeKeys').mockImplementation(getNodeKeysMock);
|
|
198
|
+
});
|
|
199
|
+
it('should use parentUid path when set, ignoring shareId', async () => {
|
|
200
|
+
await access.getParentKeys({
|
|
201
|
+
uid: 'v~node',
|
|
202
|
+
parentUid: 'v~parent',
|
|
203
|
+
shareId: 'publicLinkShareId',
|
|
204
|
+
photo: undefined,
|
|
205
|
+
});
|
|
206
|
+
expect(getNodeKeysMock).toHaveBeenCalledWith('v~parent');
|
|
207
|
+
expect(getSharePrivateKeyMock).not.toHaveBeenCalled();
|
|
208
|
+
});
|
|
209
|
+
it('should use album key when no parentUid but has albums, even when shareId is set', async () => {
|
|
210
|
+
await access.getParentKeys({
|
|
211
|
+
uid: 'v~node',
|
|
212
|
+
parentUid: undefined,
|
|
213
|
+
shareId: 'publicLinkShareId',
|
|
214
|
+
// @ts-expect-error No need to implement for this test
|
|
215
|
+
photo: { albums: [{ nodeUid: 'v~album' }] },
|
|
216
|
+
});
|
|
217
|
+
expect(getNodeKeysMock).toHaveBeenCalledWith('v~album');
|
|
218
|
+
expect(getSharePrivateKeyMock).not.toHaveBeenCalled();
|
|
219
|
+
});
|
|
220
|
+
it('should fall back to shareId when no parentUid and no albums', async () => {
|
|
221
|
+
await access.getParentKeys({
|
|
222
|
+
uid: 'v~node',
|
|
223
|
+
parentUid: undefined,
|
|
224
|
+
shareId: 'rootShareId',
|
|
225
|
+
// @ts-expect-error No need to implement for this test
|
|
226
|
+
photo: { albums: [] },
|
|
227
|
+
});
|
|
228
|
+
expect(getSharePrivateKeyMock).toHaveBeenCalledWith('rootShareId');
|
|
229
|
+
});
|
|
230
|
+
});
|
|
187
231
|
describe('parseNode', () => {
|
|
188
232
|
it('should keep photo type and add photo object', async () => {
|
|
189
233
|
const telemetry = (0, telemetry_1.getMockTelemetry)();
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
1
|
+
{"version":3,"file":"nodes.test.js","sourceRoot":"","sources":["../../../src/internal/photos/nodes.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ProtonDriveError } from '../errors';
|
|
1
|
+
import { AbortError, ProtonDriveError } from '../errors';
|
|
2
2
|
import { BatchLoading } from './batchLoading';
|
|
3
3
|
|
|
4
4
|
describe('BatchLoading', () => {
|
|
@@ -124,6 +124,36 @@ describe('BatchLoading', () => {
|
|
|
124
124
|
expect((thrown as ProtonDriveError).cause).toEqual([expect.objectContaining({ message: 'iterator failed' })]);
|
|
125
125
|
});
|
|
126
126
|
|
|
127
|
+
it('should rethrow AbortError immediately without accumulating', async () => {
|
|
128
|
+
const abortError = new AbortError();
|
|
129
|
+
const result: string[] = [];
|
|
130
|
+
const iterateItems = jest.fn(async function* (items: string[]) {
|
|
131
|
+
if (items.includes('a')) {
|
|
132
|
+
throw abortError;
|
|
133
|
+
}
|
|
134
|
+
for (const item of items) {
|
|
135
|
+
yield `loaded:${item}`;
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
|
|
139
|
+
batchLoading = new BatchLoading<string, string>({ iterateItems, batchSize: 2 });
|
|
140
|
+
|
|
141
|
+
let thrown: unknown;
|
|
142
|
+
try {
|
|
143
|
+
for (const item of ['a', 'b', 'c', 'd']) {
|
|
144
|
+
for await (const loadedItem of batchLoading.load(item)) {
|
|
145
|
+
result.push(loadedItem);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
} catch (e) {
|
|
149
|
+
thrown = e;
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
expect(result).toEqual([]);
|
|
153
|
+
expect(thrown).toBe(abortError);
|
|
154
|
+
expect(iterateItems).toHaveBeenCalledTimes(1);
|
|
155
|
+
});
|
|
156
|
+
|
|
127
157
|
it('should throw ProtonDriveError with causes when multiple batches fail', async () => {
|
|
128
158
|
const loadItems = jest.fn((items: string[]) => {
|
|
129
159
|
if (items.includes('a') || items.includes('e')) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { c } from 'ttag';
|
|
2
2
|
|
|
3
|
-
import { ProtonDriveError } from '../errors';
|
|
3
|
+
import { AbortError, ProtonDriveError } from '../errors';
|
|
4
4
|
|
|
5
5
|
const DEFAULT_BATCH_LOADING = 10;
|
|
6
6
|
|
|
@@ -84,6 +84,9 @@ export class BatchLoading<ID, ITEM> {
|
|
|
84
84
|
try {
|
|
85
85
|
yield* this.iterateItems(items);
|
|
86
86
|
} catch (error) {
|
|
87
|
+
if (error instanceof AbortError) {
|
|
88
|
+
throw error;
|
|
89
|
+
}
|
|
87
90
|
this.errors.push(error);
|
|
88
91
|
}
|
|
89
92
|
}
|
|
@@ -206,6 +206,61 @@ describe('PhotosNodesCache', () => {
|
|
|
206
206
|
});
|
|
207
207
|
|
|
208
208
|
describe('PhotosNodesAccess', () => {
|
|
209
|
+
describe('getParentKeys', () => {
|
|
210
|
+
let access: PhotosNodesAccess;
|
|
211
|
+
let getNodeKeysMock: jest.Mock;
|
|
212
|
+
let getSharePrivateKeyMock: jest.Mock;
|
|
213
|
+
|
|
214
|
+
beforeEach(() => {
|
|
215
|
+
getNodeKeysMock = jest.fn().mockResolvedValue({ key: 'key', hashKey: 'hashKey' });
|
|
216
|
+
getSharePrivateKeyMock = jest.fn().mockResolvedValue('shareKey');
|
|
217
|
+
access = new PhotosNodesAccess(
|
|
218
|
+
getMockTelemetry(),
|
|
219
|
+
// @ts-expect-error No need to implement for this test
|
|
220
|
+
{},
|
|
221
|
+
{},
|
|
222
|
+
{ getNodeKeys: jest.fn().mockRejectedValue(new Error()) },
|
|
223
|
+
{},
|
|
224
|
+
{ getSharePrivateKey: getSharePrivateKeyMock },
|
|
225
|
+
);
|
|
226
|
+
jest.spyOn(access, 'getNodeKeys').mockImplementation(getNodeKeysMock);
|
|
227
|
+
});
|
|
228
|
+
|
|
229
|
+
it('should use parentUid path when set, ignoring shareId', async () => {
|
|
230
|
+
await access.getParentKeys({
|
|
231
|
+
uid: 'v~node',
|
|
232
|
+
parentUid: 'v~parent',
|
|
233
|
+
shareId: 'publicLinkShareId',
|
|
234
|
+
photo: undefined,
|
|
235
|
+
});
|
|
236
|
+
expect(getNodeKeysMock).toHaveBeenCalledWith('v~parent');
|
|
237
|
+
expect(getSharePrivateKeyMock).not.toHaveBeenCalled();
|
|
238
|
+
});
|
|
239
|
+
|
|
240
|
+
it('should use album key when no parentUid but has albums, even when shareId is set', async () => {
|
|
241
|
+
await access.getParentKeys({
|
|
242
|
+
uid: 'v~node',
|
|
243
|
+
parentUid: undefined,
|
|
244
|
+
shareId: 'publicLinkShareId',
|
|
245
|
+
// @ts-expect-error No need to implement for this test
|
|
246
|
+
photo: { albums: [{ nodeUid: 'v~album' }] },
|
|
247
|
+
});
|
|
248
|
+
expect(getNodeKeysMock).toHaveBeenCalledWith('v~album');
|
|
249
|
+
expect(getSharePrivateKeyMock).not.toHaveBeenCalled();
|
|
250
|
+
});
|
|
251
|
+
|
|
252
|
+
it('should fall back to shareId when no parentUid and no albums', async () => {
|
|
253
|
+
await access.getParentKeys({
|
|
254
|
+
uid: 'v~node',
|
|
255
|
+
parentUid: undefined,
|
|
256
|
+
shareId: 'rootShareId',
|
|
257
|
+
// @ts-expect-error No need to implement for this test
|
|
258
|
+
photo: { albums: [] },
|
|
259
|
+
});
|
|
260
|
+
expect(getSharePrivateKeyMock).toHaveBeenCalledWith('rootShareId');
|
|
261
|
+
});
|
|
262
|
+
});
|
|
263
|
+
|
|
209
264
|
describe('parseNode', () => {
|
|
210
265
|
it('should keep photo type and add photo object', async () => {
|
|
211
266
|
const telemetry = getMockTelemetry();
|
|
@@ -222,7 +277,14 @@ describe('PhotosNodesAccess', () => {
|
|
|
222
277
|
const sharesService: SharesService = {};
|
|
223
278
|
|
|
224
279
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
225
|
-
const nodesAccess = new PhotosNodesAccess(
|
|
280
|
+
const nodesAccess = new PhotosNodesAccess(
|
|
281
|
+
telemetry,
|
|
282
|
+
apiService,
|
|
283
|
+
cacheService,
|
|
284
|
+
cryptoCache,
|
|
285
|
+
cryptoService,
|
|
286
|
+
sharesService,
|
|
287
|
+
);
|
|
226
288
|
|
|
227
289
|
const unparsedNode = {
|
|
228
290
|
uid: 'volumeId~linkId',
|
|
@@ -151,7 +151,18 @@ export class PhotosNodesAccess extends NodesAccessBase<EncryptedPhotoNode, Decry
|
|
|
151
151
|
async getParentKeys(
|
|
152
152
|
node: Pick<EncryptedPhotoNode, 'uid' | 'parentUid' | 'shareId' | 'photo'>,
|
|
153
153
|
): Promise<Pick<DecryptedNodeKeys, 'key' | 'hashKey'>> {
|
|
154
|
-
|
|
154
|
+
// In regular case, the parent should be used first as it is guaranteed that
|
|
155
|
+
// the root node without parent will have a share with direct membership for
|
|
156
|
+
// the user that can be used to decrypt the node.
|
|
157
|
+
// For photos, the parent might be missing but then an album (or more) plays
|
|
158
|
+
// the role of the parent. It must be used first before fallbacking to share
|
|
159
|
+
// because the node might be shared but user is not directly invited and thus
|
|
160
|
+
// cannot decrypt via the share (user's address cannot decrypt).
|
|
161
|
+
// Using parent path first should stay as if present, it will be fastest way
|
|
162
|
+
// to decrypt for the owner - all photos in the timeline can use already
|
|
163
|
+
// cached key without the need to load albums as well.
|
|
164
|
+
|
|
165
|
+
if (node.parentUid) {
|
|
155
166
|
return super.getParentKeys(node);
|
|
156
167
|
}
|
|
157
168
|
|
|
@@ -176,6 +187,10 @@ export class PhotosNodesAccess extends NodesAccessBase<EncryptedPhotoNode, Decry
|
|
|
176
187
|
return this.getNodeKeys(albumNodeUid);
|
|
177
188
|
}
|
|
178
189
|
|
|
190
|
+
if (node.shareId) {
|
|
191
|
+
return super.getParentKeys(node);
|
|
192
|
+
}
|
|
193
|
+
|
|
179
194
|
// This is bug that should not happen.
|
|
180
195
|
// API cannot provide node without parent or share or album.
|
|
181
196
|
throw new Error(`Node has neither parent node nor share nor album: ${node.uid}`);
|