@protontech/drive-sdk 0.13.0 → 0.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/interface/events.d.ts +1 -1
- package/dist/interface/telemetry.d.ts +9 -4
- package/dist/interface/telemetry.js +1 -0
- package/dist/interface/telemetry.js.map +1 -1
- package/dist/internal/apiService/driveTypes.d.ts +52 -0
- package/dist/internal/download/telemetry.js +6 -1
- package/dist/internal/download/telemetry.js.map +1 -1
- package/dist/internal/download/telemetry.test.js +5 -0
- package/dist/internal/download/telemetry.test.js.map +1 -1
- package/dist/internal/events/index.js +2 -2
- package/dist/internal/events/index.js.map +1 -1
- package/dist/internal/events/interface.d.ts +1 -1
- package/dist/internal/nodes/cryptoReporter.js +2 -2
- package/dist/internal/nodes/cryptoReporter.js.map +1 -1
- package/dist/internal/photos/addToAlbum.d.ts +6 -0
- package/dist/internal/photos/addToAlbum.js +1 -0
- package/dist/internal/photos/addToAlbum.js.map +1 -1
- package/dist/internal/photos/albumsManager.d.ts +4 -1
- package/dist/internal/photos/albumsManager.js +22 -2
- package/dist/internal/photos/albumsManager.js.map +1 -1
- package/dist/internal/photos/albumsManager.test.js +41 -1
- package/dist/internal/photos/albumsManager.test.js.map +1 -1
- package/dist/internal/photos/apiService.d.ts +1 -0
- package/dist/internal/photos/apiService.js +59 -5
- package/dist/internal/photos/apiService.js.map +1 -1
- package/dist/internal/photos/apiService.test.js +137 -0
- package/dist/internal/photos/apiService.test.js.map +1 -1
- package/dist/internal/photos/errors.d.ts +5 -0
- package/dist/internal/photos/errors.js +10 -1
- package/dist/internal/photos/errors.js.map +1 -1
- package/dist/internal/photos/index.js +1 -1
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/photosManager.d.ts +1 -0
- package/dist/internal/photos/photosManager.js +42 -4
- package/dist/internal/photos/photosManager.js.map +1 -1
- package/dist/internal/photos/photosManager.test.js +35 -0
- package/dist/internal/photos/photosManager.test.js.map +1 -1
- package/dist/internal/photos/photosTransferPayloadBuilder.d.ts +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js.map +1 -1
- package/dist/internal/sharing/apiService.js +1 -1
- package/dist/internal/sharing/apiService.js.map +1 -1
- package/dist/internal/upload/manager.js +3 -2
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +1 -1
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/telemetry.js +4 -1
- package/dist/internal/upload/telemetry.js.map +1 -1
- package/dist/internal/upload/telemetry.test.js +6 -0
- package/dist/internal/upload/telemetry.test.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +4 -3
- package/dist/protonDrivePhotosClient.js +3 -3
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/telemetry.d.ts +1 -0
- package/dist/telemetry.js +21 -0
- package/dist/telemetry.js.map +1 -1
- package/dist/telemetry.test.d.ts +1 -0
- package/dist/telemetry.test.js +37 -0
- package/dist/telemetry.test.js.map +1 -0
- package/package.json +1 -1
- package/src/interface/events.ts +1 -1
- package/src/interface/telemetry.ts +9 -4
- package/src/internal/apiService/driveTypes.ts +52 -0
- package/src/internal/download/telemetry.test.ts +5 -0
- package/src/internal/download/telemetry.ts +7 -3
- package/src/internal/events/index.ts +2 -2
- package/src/internal/events/interface.ts +1 -1
- package/src/internal/nodes/cryptoReporter.ts +4 -2
- package/src/internal/photos/addToAlbum.ts +1 -1
- package/src/internal/photos/albumsManager.test.ts +61 -1
- package/src/internal/photos/albumsManager.ts +23 -3
- package/src/internal/photos/apiService.test.ts +155 -0
- package/src/internal/photos/apiService.ts +92 -3
- package/src/internal/photos/errors.ts +11 -0
- package/src/internal/photos/index.ts +1 -1
- package/src/internal/photos/photosManager.test.ts +43 -1
- package/src/internal/photos/photosManager.ts +61 -3
- package/src/internal/photos/photosTransferPayloadBuilder.ts +3 -1
- package/src/internal/sharing/apiService.ts +5 -5
- package/src/internal/upload/manager.test.ts +1 -1
- package/src/internal/upload/manager.ts +3 -2
- package/src/internal/upload/telemetry.test.ts +6 -0
- package/src/internal/upload/telemetry.ts +5 -3
- package/src/protonDrivePhotosClient.ts +4 -4
- package/src/telemetry.test.ts +40 -0
- package/src/telemetry.ts +22 -0
|
@@ -5,7 +5,7 @@ export declare enum SDKEvent {
|
|
|
5
5
|
RequestsUnthrottled = "requestsUnthrottled"
|
|
6
6
|
}
|
|
7
7
|
export interface LatestEventIdProvider {
|
|
8
|
-
getLatestEventId(treeEventScopeId: string): string | null
|
|
8
|
+
getLatestEventId(treeEventScopeId: string): Promise<string | null>;
|
|
9
9
|
}
|
|
10
10
|
/**
|
|
11
11
|
* Callback that accepts list of Drive events and flag whether no
|
|
@@ -20,25 +20,29 @@ export interface MetricDebounceLongWaitEvent {
|
|
|
20
20
|
}
|
|
21
21
|
export interface MetricUploadEvent {
|
|
22
22
|
eventName: 'upload';
|
|
23
|
-
volumeType
|
|
23
|
+
volumeType: MetricVolumeType;
|
|
24
24
|
uploadedSize: number;
|
|
25
|
+
approximateUploadedSize: number;
|
|
25
26
|
expectedSize: number;
|
|
27
|
+
approximateExpectedSize: number;
|
|
26
28
|
error?: MetricsUploadErrorType;
|
|
27
29
|
originalError?: unknown;
|
|
28
30
|
}
|
|
29
31
|
export type MetricsUploadErrorType = 'server_error' | 'network_error' | 'integrity_error' | 'rate_limited' | '4xx' | 'unknown';
|
|
30
32
|
export interface MetricDownloadEvent {
|
|
31
33
|
eventName: 'download';
|
|
32
|
-
volumeType
|
|
34
|
+
volumeType: MetricVolumeType;
|
|
33
35
|
downloadedSize: number;
|
|
36
|
+
approximateDownloadedSize: number;
|
|
34
37
|
claimedFileSize?: number;
|
|
38
|
+
approximateClaimedFileSize?: number;
|
|
35
39
|
error?: MetricsDownloadErrorType;
|
|
36
40
|
originalError?: unknown;
|
|
37
41
|
}
|
|
38
42
|
export type MetricsDownloadErrorType = 'server_error' | 'network_error' | 'decryption_error' | 'integrity_error' | 'rate_limited' | '4xx' | 'unknown';
|
|
39
43
|
export interface MetricDecryptionErrorEvent {
|
|
40
44
|
eventName: 'decryptionError';
|
|
41
|
-
volumeType
|
|
45
|
+
volumeType: MetricVolumeType;
|
|
42
46
|
field: MetricsDecryptionErrorField;
|
|
43
47
|
fromBefore2024?: boolean;
|
|
44
48
|
error?: unknown;
|
|
@@ -47,7 +51,7 @@ export interface MetricDecryptionErrorEvent {
|
|
|
47
51
|
export type MetricsDecryptionErrorField = 'shareKey' | 'shareUrlPassword' | 'nodeKey' | 'nodeName' | 'nodeHashKey' | 'nodeExtendedAttributes' | 'nodeContentKey' | 'content';
|
|
48
52
|
export interface MetricVerificationErrorEvent {
|
|
49
53
|
eventName: 'verificationError';
|
|
50
|
-
volumeType
|
|
54
|
+
volumeType: MetricVolumeType;
|
|
51
55
|
field: MetricVerificationErrorField;
|
|
52
56
|
addressMatchingDefaultShare?: boolean;
|
|
53
57
|
fromBefore2024?: boolean;
|
|
@@ -64,6 +68,7 @@ export interface MetricVolumeEventsSubscriptionsChangedEvent {
|
|
|
64
68
|
numberOfVolumeSubscriptions: number;
|
|
65
69
|
}
|
|
66
70
|
export declare enum MetricVolumeType {
|
|
71
|
+
Unknown = "unknown",
|
|
67
72
|
OwnVolume = "own_volume",
|
|
68
73
|
OwnPhotoVolume = "own_photo_volume",
|
|
69
74
|
Shared = "shared",
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MetricVolumeType = void 0;
|
|
4
4
|
var MetricVolumeType;
|
|
5
5
|
(function (MetricVolumeType) {
|
|
6
|
+
MetricVolumeType["Unknown"] = "unknown";
|
|
6
7
|
MetricVolumeType["OwnVolume"] = "own_volume";
|
|
7
8
|
MetricVolumeType["OwnPhotoVolume"] = "own_photo_volume";
|
|
8
9
|
MetricVolumeType["Shared"] = "shared";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/interface/telemetry.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/interface/telemetry.ts"],"names":[],"mappings":";;;AAuHA,IAAY,gBAMX;AAND,WAAY,gBAAgB;IACxB,uCAAmB,CAAA;IACnB,4CAAwB,CAAA;IACxB,uDAAmC,CAAA;IACnC,qCAAiB,CAAA;IACjB,kDAA8B,CAAA;AAClC,CAAC,EANW,gBAAgB,gCAAhB,gBAAgB,QAM3B"}
|
|
@@ -2643,6 +2643,26 @@ export interface paths {
|
|
|
2643
2643
|
patch?: never;
|
|
2644
2644
|
trace?: never;
|
|
2645
2645
|
};
|
|
2646
|
+
"/drive/shares/{shareID}/editors-can-share": {
|
|
2647
|
+
parameters: {
|
|
2648
|
+
query?: never;
|
|
2649
|
+
header?: never;
|
|
2650
|
+
path?: never;
|
|
2651
|
+
cookie?: never;
|
|
2652
|
+
};
|
|
2653
|
+
get?: never;
|
|
2654
|
+
/**
|
|
2655
|
+
* Update editorsCanShare property of a share
|
|
2656
|
+
* @description Only allowed to volume owners and members with Admin rights on the Parent
|
|
2657
|
+
*/
|
|
2658
|
+
put: operations["put_drive-shares-{shareID}-editors-can-share"];
|
|
2659
|
+
post?: never;
|
|
2660
|
+
delete?: never;
|
|
2661
|
+
options?: never;
|
|
2662
|
+
head?: never;
|
|
2663
|
+
patch?: never;
|
|
2664
|
+
trace?: never;
|
|
2665
|
+
};
|
|
2646
2666
|
"/drive/shares/{shareID}/owner": {
|
|
2647
2667
|
parameters: {
|
|
2648
2668
|
query?: never;
|
|
@@ -2675,6 +2695,7 @@ export interface paths {
|
|
|
2675
2695
|
put?: never;
|
|
2676
2696
|
/**
|
|
2677
2697
|
* Update properties of a share
|
|
2698
|
+
* @deprecated
|
|
2678
2699
|
* @description Update the values on one or more properties of the Share. For now, only allowed changing editorsCanShare attribute
|
|
2679
2700
|
*/
|
|
2680
2701
|
post: operations["post_drive-shares-{shareID}-property"];
|
|
@@ -6389,6 +6410,10 @@ export interface components {
|
|
|
6389
6410
|
*/
|
|
6390
6411
|
Code: 1000;
|
|
6391
6412
|
};
|
|
6413
|
+
UpdateShareEditorsCanShareRequestDto: {
|
|
6414
|
+
/** @description Indicates if editor members of this share could reshare it or not */
|
|
6415
|
+
Value: boolean;
|
|
6416
|
+
};
|
|
6392
6417
|
TransferInput: {
|
|
6393
6418
|
/** @description The ID of the new address */
|
|
6394
6419
|
AddressID: string;
|
|
@@ -12353,6 +12378,33 @@ export interface operations {
|
|
|
12353
12378
|
};
|
|
12354
12379
|
};
|
|
12355
12380
|
};
|
|
12381
|
+
"put_drive-shares-{shareID}-editors-can-share": {
|
|
12382
|
+
parameters: {
|
|
12383
|
+
query?: never;
|
|
12384
|
+
header?: never;
|
|
12385
|
+
path: {
|
|
12386
|
+
shareID: string;
|
|
12387
|
+
};
|
|
12388
|
+
cookie?: never;
|
|
12389
|
+
};
|
|
12390
|
+
requestBody?: {
|
|
12391
|
+
content: {
|
|
12392
|
+
"application/json": components["schemas"]["UpdateShareEditorsCanShareRequestDto"];
|
|
12393
|
+
};
|
|
12394
|
+
};
|
|
12395
|
+
responses: {
|
|
12396
|
+
/** @description Success */
|
|
12397
|
+
200: {
|
|
12398
|
+
headers: {
|
|
12399
|
+
"x-pm-code": 1000;
|
|
12400
|
+
[name: string]: unknown;
|
|
12401
|
+
};
|
|
12402
|
+
content: {
|
|
12403
|
+
"application/json": components["schemas"]["SuccessfulResponse"];
|
|
12404
|
+
};
|
|
12405
|
+
};
|
|
12406
|
+
};
|
|
12407
|
+
};
|
|
12356
12408
|
"post_drive-shares-{shareID}-owner": {
|
|
12357
12409
|
parameters: {
|
|
12358
12410
|
query?: never;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DownloadTelemetry = void 0;
|
|
4
4
|
const errors_1 = require("../../errors");
|
|
5
|
+
const interface_1 = require("../../interface");
|
|
5
6
|
const telemetry_1 = require("../../telemetry");
|
|
6
7
|
const apiService_1 = require("../apiService");
|
|
7
8
|
const uids_1 = require("../uids");
|
|
@@ -56,7 +57,7 @@ class DownloadTelemetry {
|
|
|
56
57
|
});
|
|
57
58
|
}
|
|
58
59
|
async sendTelemetry(volumeId, options) {
|
|
59
|
-
let volumeType;
|
|
60
|
+
let volumeType = interface_1.MetricVolumeType.Unknown;
|
|
60
61
|
try {
|
|
61
62
|
volumeType = await this.sharesService.getVolumeMetricContext(volumeId);
|
|
62
63
|
}
|
|
@@ -66,6 +67,10 @@ class DownloadTelemetry {
|
|
|
66
67
|
this.telemetry.recordMetric({
|
|
67
68
|
eventName: 'download',
|
|
68
69
|
volumeType,
|
|
70
|
+
approximateDownloadedSize: (0, telemetry_1.reduceSizePrecision)(options.downloadedSize),
|
|
71
|
+
approximateClaimedFileSize: options.claimedFileSize
|
|
72
|
+
? (0, telemetry_1.reduceSizePrecision)(options.claimedFileSize)
|
|
73
|
+
: undefined,
|
|
69
74
|
...options,
|
|
70
75
|
});
|
|
71
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/internal/download/telemetry.ts"],"names":[],"mappings":";;;AAAA,yCAAkG;
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/internal/download/telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ describe('DownloadTelemetry', () => {
|
|
|
31
31
|
eventName: 'download',
|
|
32
32
|
volumeType: 'own_volume',
|
|
33
33
|
downloadedSize: 0,
|
|
34
|
+
approximateDownloadedSize: 0,
|
|
34
35
|
error: 'unknown',
|
|
35
36
|
originalError: error,
|
|
36
37
|
});
|
|
@@ -42,7 +43,9 @@ describe('DownloadTelemetry', () => {
|
|
|
42
43
|
eventName: 'download',
|
|
43
44
|
volumeType: 'own_volume',
|
|
44
45
|
downloadedSize: 123,
|
|
46
|
+
approximateDownloadedSize: 4095,
|
|
45
47
|
claimedFileSize: 456,
|
|
48
|
+
approximateClaimedFileSize: 4095,
|
|
46
49
|
error: 'unknown',
|
|
47
50
|
originalError: error,
|
|
48
51
|
});
|
|
@@ -53,7 +56,9 @@ describe('DownloadTelemetry', () => {
|
|
|
53
56
|
eventName: 'download',
|
|
54
57
|
volumeType: 'own_volume',
|
|
55
58
|
downloadedSize: 500,
|
|
59
|
+
approximateDownloadedSize: 4095,
|
|
56
60
|
claimedFileSize: 500,
|
|
61
|
+
approximateClaimedFileSize: 4095,
|
|
57
62
|
});
|
|
58
63
|
});
|
|
59
64
|
describe('detect error category', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.test.js","sourceRoot":"","sources":["../../../src/internal/download/telemetry.test.ts"],"names":[],"mappings":";;AAAA,yCAAkG;AAElG,8CAA6C;AAE7C,2CAAgD;AAEhD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,IAAI,aAAgD,CAAC;IACrD,IAAI,aAAyC,CAAC;IAC9C,IAAI,iBAAoC,CAAC;IAEzC,MAAM,OAAO,GAAG,iBAAiB,CAAC;IAClC,MAAM,WAAW,GAAG,4BAA4B,CAAC;IAEjD,UAAU,CAAC,GAAG,EAAE;QACZ,aAAa,GAAG;YACZ,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;YACvB,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;gBACjC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;gBACf,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;gBACf,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;gBAChB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;aACnB,CAAC;SAC2C,CAAC;QAElD,aAAa,GAAG;YACZ,sBAAsB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC;SACpE,CAAC;QAEF,iBAAiB,GAAG,IAAI,6BAAiB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,MAAM,iBAAiB,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAE3D,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC;YACpD,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,YAAY;YACxB,cAAc,EAAE,CAAC;YACjB,KAAK,EAAE,SAAS;YAChB,aAAa,EAAE,KAAK;SACvB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,MAAM,iBAAiB,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAErE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC;YACpD,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,YAAY;YACxB,cAAc,EAAE,GAAG;YACnB,eAAe,EAAE,GAAG;YACpB,KAAK,EAAE,SAAS;YAChB,aAAa,EAAE,KAAK;SACvB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAE3D,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC;YACpD,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,YAAY;YACxB,cAAc,EAAE,GAAG;YACnB,eAAe,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"telemetry.test.js","sourceRoot":"","sources":["../../../src/internal/download/telemetry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ class DriveEventsService {
|
|
|
53
53
|
throw new Error('Cannot subscribe to events without passing a latestEventIdProvider in ProtonDriveClient initialization');
|
|
54
54
|
}
|
|
55
55
|
const coreEventManager = new coreEventManager_1.CoreEventManager(this.logger, this.apiService);
|
|
56
|
-
const latestEventId = this.latestEventIdProvider.getLatestEventId('core')
|
|
56
|
+
const latestEventId = await this.latestEventIdProvider.getLatestEventId('core');
|
|
57
57
|
const eventManager = new eventManager_1.EventManager(coreEventManager, CORE_POLLING_INTERVAL, latestEventId);
|
|
58
58
|
for (const listener of this.cacheEventListeners) {
|
|
59
59
|
eventManager.addListener(listener);
|
|
@@ -86,7 +86,7 @@ class DriveEventsService {
|
|
|
86
86
|
const volumeEventManager = new volumeEventManager_1.VolumeEventManager(this.logger, this.apiService, volumeId);
|
|
87
87
|
const isOwnVolume = await this.sharesService.isOwnVolume(volumeId);
|
|
88
88
|
const pollingInterval = this.getDefaultVolumePollingInterval(isOwnVolume);
|
|
89
|
-
const latestEventId = this.latestEventIdProvider.getLatestEventId(volumeId);
|
|
89
|
+
const latestEventId = await this.latestEventIdProvider.getLatestEventId(volumeId);
|
|
90
90
|
const eventManager = new eventManager_1.EventManager(volumeEventManager, pollingInterval, latestEventId);
|
|
91
91
|
for (const listener of this.cacheEventListeners) {
|
|
92
92
|
eventManager.addListener(listener);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/events/index.ts"],"names":[],"mappings":";;;AAGA,6CAAgD;AAChD,yDAAsD;AACtD,6DAA0D;AAC1D,iDAA8C;AAG9C,yCAA6C;AAApC,2GAAA,cAAc,OAAA;AAEvB,MAAM,2BAA2B,GAAG,EAAE,CAAC;AACvC,MAAM,6BAA6B,GAAG,EAAE,CAAC;AACzC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC;;;;GAIG;AACH,MAAa,kBAAkB;IAOf;IAEA;IACA;IACA;IAVJ,UAAU,CAAmB;IAC7B,gBAAgB,CAA4B;IAC5C,mBAAmB,CAAmD;IACtE,MAAM,CAAS;IAEvB,YACY,SAA+B,EACvC,UAA2B,EACnB,aAA4B,EAC5B,sBAAuC,EAAE,EACzC,qBAA6C;QAJ7C,cAAS,GAAT,SAAS,CAAsB;QAE/B,kBAAa,GAAb,aAAa,CAAe;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAsB;QACzC,0BAAqB,GAArB,qBAAqB,CAAwB;QAErD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,IAAI,6BAAgB,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;IAClC,CAAC;IAED,0EAA0E;IAC1E,KAAK,CAAC,qBAAqB,CAAC,QAAuB;QAC/C,IAAI,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACpC,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;QAE1B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9C,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QACpC,CAAC;QAED,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,sBAAsB;QAChC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CACX,wGAAwG,CAC3G,CAAC;QACN,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/events/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export interface EventSubscription {
|
|
|
14
14
|
dispose(): void;
|
|
15
15
|
}
|
|
16
16
|
export interface LatestEventIdProvider {
|
|
17
|
-
getLatestEventId(treeEventScopeId: string): string | null
|
|
17
|
+
getLatestEventId(treeEventScopeId: string): Promise<string | null>;
|
|
18
18
|
}
|
|
19
19
|
/**
|
|
20
20
|
* Generic internal event interface representing a list of events
|
|
@@ -31,7 +31,7 @@ class NodesCryptoReporter {
|
|
|
31
31
|
}
|
|
32
32
|
this.reportedVerificationErrors.add(node.uid);
|
|
33
33
|
const fromBefore2024 = node.creationTime < new Date('2024-01-01');
|
|
34
|
-
let addressMatchingDefaultShare, volumeType;
|
|
34
|
+
let addressMatchingDefaultShare, volumeType = interface_1.MetricVolumeType.Unknown;
|
|
35
35
|
try {
|
|
36
36
|
const { volumeId } = (0, uids_1.splitNodeUid)(node.uid);
|
|
37
37
|
const { email } = await this.shareService.getMyFilesShareMemberEmailKey();
|
|
@@ -60,7 +60,7 @@ class NodesCryptoReporter {
|
|
|
60
60
|
return;
|
|
61
61
|
}
|
|
62
62
|
const fromBefore2024 = node.creationTime < new Date('2024-01-01');
|
|
63
|
-
let volumeType;
|
|
63
|
+
let volumeType = interface_1.MetricVolumeType.Unknown;
|
|
64
64
|
try {
|
|
65
65
|
const { volumeId } = (0, uids_1.splitNodeUid)(node.uid);
|
|
66
66
|
volumeType = await this.shareService.getVolumeMetricContext(volumeId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoReporter.js","sourceRoot":"","sources":["../../../src/internal/nodes/cryptoReporter.ts"],"names":[],"mappings":";;;AAAA,yCAAmD;AACnD,+
|
|
1
|
+
{"version":3,"file":"cryptoReporter.js","sourceRoot":"","sources":["../../../src/internal/nodes/cryptoReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { Logger, NodeResultWithError } from '../../interface';
|
|
|
2
2
|
import { DecryptedNodeKeys, NodeSigningKeys } from '../nodes/interface';
|
|
3
3
|
import { AlbumsCryptoService } from './albumsCrypto';
|
|
4
4
|
import { PhotosAPIService } from './apiService';
|
|
5
|
+
import { TransferEncryptedPhotoPayload } from './photosTransferPayloadBuilder';
|
|
5
6
|
import { PhotosNodesAccess } from './nodes';
|
|
6
7
|
/**
|
|
7
8
|
* Manages the process of adding photos to an album.
|
|
@@ -40,3 +41,8 @@ export declare class AddToAlbumProcess {
|
|
|
40
41
|
*/
|
|
41
42
|
private createRetryQueueItem;
|
|
42
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Groups payloads into batches respecting the API limit.
|
|
46
|
+
* Each payload's size counts itself plus its related photos.
|
|
47
|
+
*/
|
|
48
|
+
export declare function createBatches(payloads: TransferEncryptedPhotoPayload[]): Generator<TransferEncryptedPhotoPayload[]>;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AddToAlbumProcess = void 0;
|
|
4
|
+
exports.createBatches = createBatches;
|
|
4
5
|
const ttag_1 = require("ttag");
|
|
5
6
|
const uids_1 = require("../uids");
|
|
6
7
|
const errors_1 = require("./errors");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addToAlbum.js","sourceRoot":"","sources":["../../../src/internal/photos/addToAlbum.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"addToAlbum.js","sourceRoot":"","sources":["../../../src/internal/photos/addToAlbum.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { AlbumsCryptoService } from './albumsCrypto';
|
|
|
4
4
|
import { PhotosAPIService } from './apiService';
|
|
5
5
|
import { AlbumItem, DecryptedPhotoNode } from './interface';
|
|
6
6
|
import { PhotosNodesAccess } from './nodes';
|
|
7
|
+
import { PhotosManager } from './photosManager';
|
|
7
8
|
import { PhotoSharesManager } from './shares';
|
|
8
9
|
/**
|
|
9
10
|
* Provides access and high-level actions for managing albums.
|
|
@@ -13,8 +14,9 @@ export declare class AlbumsManager {
|
|
|
13
14
|
private cryptoService;
|
|
14
15
|
private photoShares;
|
|
15
16
|
private nodesService;
|
|
17
|
+
private photos;
|
|
16
18
|
private logger;
|
|
17
|
-
constructor(telemetry: ProtonDriveTelemetry, apiService: PhotosAPIService, cryptoService: AlbumsCryptoService, photoShares: PhotoSharesManager, nodesService: PhotosNodesAccess);
|
|
19
|
+
constructor(telemetry: ProtonDriveTelemetry, apiService: PhotosAPIService, cryptoService: AlbumsCryptoService, photoShares: PhotoSharesManager, nodesService: PhotosNodesAccess, photos: PhotosManager);
|
|
18
20
|
iterateAlbums(signal?: AbortSignal): AsyncGenerator<DecryptedNode>;
|
|
19
21
|
iterateAlbum(albumNodeUid: string, signal?: AbortSignal): AsyncGenerator<AlbumItem>;
|
|
20
22
|
createAlbum(name: string): Promise<DecryptedPhotoNode>;
|
|
@@ -24,6 +26,7 @@ export declare class AlbumsManager {
|
|
|
24
26
|
}): Promise<DecryptedPhotoNode>;
|
|
25
27
|
deleteAlbum(nodeUid: string, options?: {
|
|
26
28
|
force?: boolean;
|
|
29
|
+
saveToTimeline?: boolean;
|
|
27
30
|
}): Promise<void>;
|
|
28
31
|
addPhotos(albumNodeUid: string, photoNodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
29
32
|
removePhotos(albumNodeUid: string, photoNodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
@@ -7,6 +7,7 @@ const mediaTypes_1 = require("../nodes/mediaTypes");
|
|
|
7
7
|
const validations_1 = require("../nodes/validations");
|
|
8
8
|
const uids_1 = require("../uids");
|
|
9
9
|
const addToAlbum_1 = require("./addToAlbum");
|
|
10
|
+
const errors_1 = require("./errors");
|
|
10
11
|
const BATCH_LOADING_SIZE = 10;
|
|
11
12
|
/**
|
|
12
13
|
* Provides access and high-level actions for managing albums.
|
|
@@ -16,12 +17,14 @@ class AlbumsManager {
|
|
|
16
17
|
cryptoService;
|
|
17
18
|
photoShares;
|
|
18
19
|
nodesService;
|
|
20
|
+
photos;
|
|
19
21
|
logger;
|
|
20
|
-
constructor(telemetry, apiService, cryptoService, photoShares, nodesService) {
|
|
22
|
+
constructor(telemetry, apiService, cryptoService, photoShares, nodesService, photos) {
|
|
21
23
|
this.apiService = apiService;
|
|
22
24
|
this.cryptoService = cryptoService;
|
|
23
25
|
this.photoShares = photoShares;
|
|
24
26
|
this.nodesService = nodesService;
|
|
27
|
+
this.photos = photos;
|
|
25
28
|
this.logger = telemetry.getLogger('albums');
|
|
26
29
|
this.apiService = apiService;
|
|
27
30
|
this.cryptoService = cryptoService;
|
|
@@ -112,7 +115,24 @@ class AlbumsManager {
|
|
|
112
115
|
return newNode;
|
|
113
116
|
}
|
|
114
117
|
async deleteAlbum(nodeUid, options = {}) {
|
|
115
|
-
|
|
118
|
+
try {
|
|
119
|
+
await this.apiService.deleteAlbum(nodeUid, options);
|
|
120
|
+
}
|
|
121
|
+
catch (error) {
|
|
122
|
+
if (options.saveToTimeline &&
|
|
123
|
+
error instanceof errors_1.AlbumContainsPhotosNotInTimelineError &&
|
|
124
|
+
error.photosOnlyInAlbumNodeUids.length > 0) {
|
|
125
|
+
for await (const result of this.photos.saveToTimeline(error.photosOnlyInAlbumNodeUids)) {
|
|
126
|
+
if (!result.ok) {
|
|
127
|
+
throw result.error;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
await this.apiService.deleteAlbum(nodeUid, options);
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
throw error;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
116
136
|
await this.nodesService.notifyNodeDeleted(nodeUid);
|
|
117
137
|
}
|
|
118
138
|
async *addPhotos(albumNodeUid, photoNodeUids, signal) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"albumsManager.js","sourceRoot":"","sources":["../../../src/internal/photos/albumsManager.ts"],"names":[],"mappings":";;;AAAA,+CAAoH;AACpH,kDAA+C;AAE/C,oDAAuD;AACvD,sDAAwD;AACxD,kCAAuC;AACvC,6CAAiD;
|
|
1
|
+
{"version":3,"file":"albumsManager.js","sourceRoot":"","sources":["../../../src/internal/photos/albumsManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,13 @@ const interface_1 = require("../../interface");
|
|
|
4
4
|
const errors_1 = require("../../errors");
|
|
5
5
|
const telemetry_1 = require("../../tests/telemetry");
|
|
6
6
|
const albumsManager_1 = require("./albumsManager");
|
|
7
|
+
const errors_2 = require("./errors");
|
|
7
8
|
describe('Albums', () => {
|
|
8
9
|
let apiService;
|
|
9
10
|
let cryptoService;
|
|
10
11
|
let photoShares;
|
|
11
12
|
let nodesService;
|
|
13
|
+
let photosService;
|
|
12
14
|
let albums;
|
|
13
15
|
let nodes;
|
|
14
16
|
beforeEach(() => {
|
|
@@ -86,7 +88,11 @@ describe('Albums', () => {
|
|
|
86
88
|
notifyNodeDeleted: jest.fn(),
|
|
87
89
|
notifyChildCreated: jest.fn(),
|
|
88
90
|
};
|
|
89
|
-
|
|
91
|
+
// @ts-expect-error No need to implement all methods for mocking
|
|
92
|
+
photosService = {
|
|
93
|
+
saveToTimeline: jest.fn(),
|
|
94
|
+
};
|
|
95
|
+
albums = new albumsManager_1.AlbumsManager((0, telemetry_1.getMockTelemetry)(), apiService, cryptoService, photoShares, nodesService, photosService);
|
|
90
96
|
});
|
|
91
97
|
describe('createAlbum', () => {
|
|
92
98
|
it('creates album and returns decrypted node', async () => {
|
|
@@ -190,6 +196,40 @@ describe('Albums', () => {
|
|
|
190
196
|
expect(apiService.deleteAlbum).toHaveBeenCalledWith('albumNodeUid', { force: true });
|
|
191
197
|
expect(nodesService.notifyNodeDeleted).toHaveBeenCalledWith('albumNodeUid');
|
|
192
198
|
});
|
|
199
|
+
it('when saveToTimeline is true, saves photos then retries delete', async () => {
|
|
200
|
+
const notInTimelineError = new errors_2.AlbumContainsPhotosNotInTimelineError('msg', 1, ['p1', 'p2']);
|
|
201
|
+
apiService.deleteAlbum
|
|
202
|
+
.mockRejectedValueOnce(notInTimelineError)
|
|
203
|
+
.mockResolvedValueOnce(undefined);
|
|
204
|
+
photosService.saveToTimeline = jest.fn().mockImplementation(async function* () {
|
|
205
|
+
yield { uid: 'p1', ok: true };
|
|
206
|
+
yield { uid: 'p2', ok: true };
|
|
207
|
+
});
|
|
208
|
+
await albums.deleteAlbum('albumNodeUid', { saveToTimeline: true });
|
|
209
|
+
expect(apiService.deleteAlbum).toHaveBeenCalledTimes(2);
|
|
210
|
+
expect(photosService.saveToTimeline).toHaveBeenCalledWith(['p1', 'p2']);
|
|
211
|
+
expect(nodesService.notifyNodeDeleted).toHaveBeenCalledTimes(1);
|
|
212
|
+
expect(nodesService.notifyNodeDeleted).toHaveBeenCalledWith('albumNodeUid');
|
|
213
|
+
});
|
|
214
|
+
it('throws AlbumContainsPhotosNotInTimelineError when saveToTimeline is false', async () => {
|
|
215
|
+
const notInTimelineError = new errors_2.AlbumContainsPhotosNotInTimelineError('msg', 1, ['p1']);
|
|
216
|
+
apiService.deleteAlbum.mockRejectedValueOnce(notInTimelineError);
|
|
217
|
+
await expect(albums.deleteAlbum('albumNodeUid')).rejects.toBe(notInTimelineError);
|
|
218
|
+
expect(apiService.deleteAlbum).toHaveBeenCalledTimes(1);
|
|
219
|
+
expect(photosService.saveToTimeline).not.toHaveBeenCalled();
|
|
220
|
+
expect(nodesService.notifyNodeDeleted).not.toHaveBeenCalled();
|
|
221
|
+
});
|
|
222
|
+
it('throws when saveToTimeline step fails with error', async () => {
|
|
223
|
+
const notInTimelineError = new errors_2.AlbumContainsPhotosNotInTimelineError('msg', 1, ['p1']);
|
|
224
|
+
apiService.deleteAlbum.mockRejectedValue(notInTimelineError);
|
|
225
|
+
const saveError = new Error('save failed');
|
|
226
|
+
photosService.saveToTimeline = jest.fn().mockImplementation(async function* () {
|
|
227
|
+
yield { uid: 'p1', ok: false, error: saveError };
|
|
228
|
+
});
|
|
229
|
+
await expect(albums.deleteAlbum('albumNodeUid', { saveToTimeline: true })).rejects.toBe(saveError);
|
|
230
|
+
expect(apiService.deleteAlbum).toHaveBeenCalledTimes(1);
|
|
231
|
+
expect(nodesService.notifyNodeDeleted).not.toHaveBeenCalled();
|
|
232
|
+
});
|
|
193
233
|
});
|
|
194
234
|
describe('removePhotos', () => {
|
|
195
235
|
it('notifies nodes service only for successfully removed photos', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"albumsManager.test.js","sourceRoot":"","sources":["../../../src/internal/photos/albumsManager.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"albumsManager.test.js","sourceRoot":"","sources":["../../../src/internal/photos/albumsManager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,4 +84,5 @@ export declare class PhotosAPIService {
|
|
|
84
84
|
addPhotoTags(nodeUid: string, tags: PhotoTag[]): Promise<void>;
|
|
85
85
|
removePhotoTags(nodeUid: string, tags: PhotoTag[]): Promise<void>;
|
|
86
86
|
setPhotoFavorite(nodeUid: string, payload?: TransferEncryptedPhotoPayload): Promise<void>;
|
|
87
|
+
transferPhotos(newParentNodeUid: string, photoPayloads: TransferEncryptedPhotoPayload[], signal?: AbortSignal): AsyncGenerator<NodeResultWithError>;
|
|
87
88
|
}
|