@protontech/drive-sdk 0.6.1 → 0.7.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/featureFlags.d.ts +7 -0
- package/dist/featureFlags.js +14 -0
- package/dist/featureFlags.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/interface/featureFlags.d.ts +7 -0
- package/dist/interface/featureFlags.js +3 -0
- package/dist/interface/featureFlags.js.map +1 -0
- package/dist/interface/index.d.ts +3 -0
- package/dist/interface/index.js.map +1 -1
- package/dist/internal/apiService/apiService.d.ts +2 -2
- package/dist/internal/apiService/apiService.js.map +1 -1
- package/dist/internal/apiService/errors.js +4 -3
- package/dist/internal/apiService/errors.js.map +1 -1
- package/dist/internal/download/cryptoService.js +8 -6
- package/dist/internal/download/cryptoService.js.map +1 -1
- package/dist/internal/download/fileDownloader.d.ts +2 -1
- package/dist/internal/download/fileDownloader.js +6 -3
- package/dist/internal/download/fileDownloader.js.map +1 -1
- package/dist/internal/download/index.d.ts +1 -1
- package/dist/internal/download/index.js +3 -3
- package/dist/internal/download/index.js.map +1 -1
- package/dist/internal/nodes/apiService.d.ts +9 -8
- package/dist/internal/nodes/apiService.js +14 -5
- package/dist/internal/nodes/apiService.js.map +1 -1
- package/dist/internal/nodes/apiService.test.js +5 -5
- package/dist/internal/nodes/apiService.test.js.map +1 -1
- package/dist/internal/nodes/cryptoReporter.d.ts +3 -3
- package/dist/internal/nodes/cryptoReporter.js.map +1 -1
- package/dist/internal/nodes/cryptoService.d.ts +12 -21
- package/dist/internal/nodes/cryptoService.js +45 -14
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.test.js +262 -17
- package/dist/internal/nodes/cryptoService.test.js.map +1 -1
- package/dist/internal/nodes/interface.d.ts +13 -3
- package/dist/internal/nodes/nodesAccess.d.ts +8 -1
- package/dist/internal/nodes/nodesAccess.js +13 -0
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.d.ts +4 -4
- package/dist/internal/nodes/nodesManagement.js +16 -20
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.test.js +21 -10
- package/dist/internal/nodes/nodesManagement.test.js.map +1 -1
- 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/sharingPublic/index.d.ts +6 -6
- package/dist/internal/sharingPublic/index.js +8 -7
- package/dist/internal/sharingPublic/index.js.map +1 -1
- package/dist/internal/sharingPublic/nodes.d.ts +16 -3
- package/dist/internal/sharingPublic/nodes.js +34 -2
- package/dist/internal/sharingPublic/nodes.js.map +1 -1
- package/dist/internal/sharingPublic/unauthApiService.d.ts +17 -0
- package/dist/internal/sharingPublic/unauthApiService.js +31 -0
- package/dist/internal/sharingPublic/unauthApiService.js.map +1 -0
- package/dist/internal/sharingPublic/unauthApiService.test.d.ts +1 -0
- package/dist/internal/sharingPublic/unauthApiService.test.js +27 -0
- package/dist/internal/sharingPublic/unauthApiService.test.js.map +1 -0
- package/dist/internal/upload/apiService.d.ts +4 -3
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/cryptoService.d.ts +8 -3
- package/dist/internal/upload/cryptoService.js +45 -9
- package/dist/internal/upload/cryptoService.js.map +1 -1
- package/dist/internal/upload/fileUploader.d.ts +5 -2
- package/dist/internal/upload/fileUploader.js +7 -4
- package/dist/internal/upload/fileUploader.js.map +1 -1
- package/dist/internal/upload/fileUploader.test.js +1 -1
- package/dist/internal/upload/fileUploader.test.js.map +1 -1
- package/dist/internal/upload/interface.d.ts +25 -13
- package/dist/internal/upload/manager.js +7 -4
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +5 -4
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/streamUploader.js +9 -4
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +8 -5
- package/dist/internal/upload/streamUploader.test.js.map +1 -1
- package/dist/protonDriveClient.d.ts +2 -2
- package/dist/protonDriveClient.js +7 -2
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePublicLinkClient.d.ts +2 -1
- package/dist/protonDrivePublicLinkClient.js +7 -5
- package/dist/protonDrivePublicLinkClient.js.map +1 -1
- package/package.json +1 -1
- package/src/featureFlags.ts +11 -0
- package/src/index.ts +1 -0
- package/src/interface/featureFlags.ts +7 -0
- package/src/interface/index.ts +3 -0
- package/src/internal/apiService/apiService.ts +2 -2
- package/src/internal/apiService/errors.ts +5 -4
- package/src/internal/download/cryptoService.ts +13 -6
- package/src/internal/download/fileDownloader.ts +4 -2
- package/src/internal/download/index.ts +3 -0
- package/src/internal/nodes/apiService.test.ts +5 -5
- package/src/internal/nodes/apiService.ts +23 -10
- package/src/internal/nodes/cryptoReporter.ts +3 -3
- package/src/internal/nodes/cryptoService.test.ts +370 -18
- package/src/internal/nodes/cryptoService.ts +73 -32
- package/src/internal/nodes/interface.ts +16 -2
- package/src/internal/nodes/nodesAccess.ts +17 -0
- package/src/internal/nodes/nodesManagement.test.ts +21 -10
- package/src/internal/nodes/nodesManagement.ts +20 -24
- package/src/internal/photos/upload.ts +3 -3
- package/src/internal/sharingPublic/index.ts +7 -3
- package/src/internal/sharingPublic/nodes.ts +43 -2
- package/src/internal/sharingPublic/unauthApiService.test.ts +29 -0
- package/src/internal/sharingPublic/unauthApiService.ts +32 -0
- package/src/internal/upload/apiService.ts +4 -3
- package/src/internal/upload/cryptoService.ts +73 -12
- package/src/internal/upload/fileUploader.test.ts +1 -1
- package/src/internal/upload/fileUploader.ts +18 -11
- package/src/internal/upload/interface.ts +24 -13
- package/src/internal/upload/manager.test.ts +5 -4
- package/src/internal/upload/manager.ts +7 -4
- package/src/internal/upload/streamUploader.test.ts +8 -5
- package/src/internal/upload/streamUploader.ts +10 -4
- package/src/protonDriveClient.ts +12 -2
- package/src/protonDrivePublicLinkClient.ts +8 -3
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { FeatureFlagProvider } from './interface/featureFlags';
|
|
2
|
+
/**
|
|
3
|
+
* Default feature flag provider that returns false for all flags.
|
|
4
|
+
*/
|
|
5
|
+
export declare class NullFeatureFlagProvider implements FeatureFlagProvider {
|
|
6
|
+
isEnabled(flagName: string, signal?: AbortSignal): Promise<boolean>;
|
|
7
|
+
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NullFeatureFlagProvider = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Default feature flag provider that returns false for all flags.
|
|
6
|
+
*/
|
|
7
|
+
class NullFeatureFlagProvider {
|
|
8
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
9
|
+
isEnabled(flagName, signal) {
|
|
10
|
+
return Promise.resolve(false);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
exports.NullFeatureFlagProvider = NullFeatureFlagProvider;
|
|
14
|
+
//# sourceMappingURL=featureFlags.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../src/featureFlags.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,uBAAuB;IAChC,6DAA6D;IAC7D,SAAS,CAAC,QAAgB,EAAE,MAAoB;QAC5C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;CACJ;AALD,0DAKC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export * from './cache';
|
|
|
6
6
|
export * from './errors';
|
|
7
7
|
export type { OpenPGPCrypto, OpenPGPCryptoProxy } from './crypto';
|
|
8
8
|
export { OpenPGPCryptoWithCryptoProxy } from './crypto';
|
|
9
|
+
export { NullFeatureFlagProvider } from './featureFlags';
|
|
9
10
|
export { ProtonDriveClient } from './protonDriveClient';
|
|
10
11
|
export { VERSION } from './version';
|
|
11
12
|
/**
|
package/dist/index.js
CHANGED
|
@@ -17,7 +17,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
17
17
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
18
18
|
};
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.VERSION = exports.ProtonDriveClient = exports.OpenPGPCryptoWithCryptoProxy = void 0;
|
|
20
|
+
exports.VERSION = exports.ProtonDriveClient = exports.NullFeatureFlagProvider = exports.OpenPGPCryptoWithCryptoProxy = void 0;
|
|
21
21
|
exports.generateNodeUid = generateNodeUid;
|
|
22
22
|
const uids_1 = require("./internal/uids");
|
|
23
23
|
__exportStar(require("./interface"), exports);
|
|
@@ -25,6 +25,8 @@ __exportStar(require("./cache"), exports);
|
|
|
25
25
|
__exportStar(require("./errors"), exports);
|
|
26
26
|
var crypto_1 = require("./crypto");
|
|
27
27
|
Object.defineProperty(exports, "OpenPGPCryptoWithCryptoProxy", { enumerable: true, get: function () { return crypto_1.OpenPGPCryptoWithCryptoProxy; } });
|
|
28
|
+
var featureFlags_1 = require("./featureFlags");
|
|
29
|
+
Object.defineProperty(exports, "NullFeatureFlagProvider", { enumerable: true, get: function () { return featureFlags_1.NullFeatureFlagProvider; } });
|
|
28
30
|
var protonDriveClient_1 = require("./protonDriveClient");
|
|
29
31
|
Object.defineProperty(exports, "ProtonDriveClient", { enumerable: true, get: function () { return protonDriveClient_1.ProtonDriveClient; } });
|
|
30
32
|
var version_1 = require("./version");
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;AA0BH,0CAEC;AA1BD,0CAA8C;AAE9C,8CAA4B;AAC5B,0CAAwB;AACxB,2CAAyB;AAEzB,mCAAwD;AAA/C,sHAAA,4BAA4B,OAAA;AACrC,+CAAyD;AAAhD,uHAAA,uBAAuB,OAAA;AAChC,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAEhB;;;;;;;;;;;;GAYG;AACH,SAAgB,eAAe,CAAC,QAAgB,EAAE,MAAc;IAC5D,OAAO,IAAA,kBAAW,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACzC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../src/interface/featureFlags.ts"],"names":[],"mappings":""}
|
|
@@ -3,6 +3,7 @@ import { OpenPGPCrypto, PrivateKey, SessionKey, SRPModule } from '../crypto';
|
|
|
3
3
|
import { LatestEventIdProvider } from '../internal/events/interface';
|
|
4
4
|
import { ProtonDriveAccount } from './account';
|
|
5
5
|
import { ProtonDriveConfig } from './config';
|
|
6
|
+
import { FeatureFlagProvider } from './featureFlags';
|
|
6
7
|
import { ProtonDriveHTTPClient } from './httpClient';
|
|
7
8
|
import { Telemetry, MetricEvent } from './telemetry';
|
|
8
9
|
export type { Result } from './result';
|
|
@@ -11,6 +12,7 @@ export type { ProtonDriveAccount, ProtonDriveAccountAddress } from './account';
|
|
|
11
12
|
export type { Author, UnverifiedAuthorError, AnonymousUser } from './author';
|
|
12
13
|
export type { ProtonDriveConfig } from './config';
|
|
13
14
|
export type { Device, DeviceOrUid } from './devices';
|
|
15
|
+
export type { FeatureFlagProvider } from './featureFlags';
|
|
14
16
|
export { DeviceType } from './devices';
|
|
15
17
|
export type { FileDownloader, DownloadController, SeekableReadableStream } from './download';
|
|
16
18
|
export type { DriveListener, LatestEventIdProvider, DriveEvent, NodeEvent, FastForwardEvent, TreeRefreshEvent, TreeRemovalEvent, SharedWithMeUpdated, } from './events';
|
|
@@ -53,5 +55,6 @@ export interface ProtonDriveClientContructorParameters {
|
|
|
53
55
|
srpModule: SRPModule;
|
|
54
56
|
config?: ProtonDriveConfig;
|
|
55
57
|
telemetry?: ProtonDriveTelemetry;
|
|
58
|
+
featureFlagProvider?: FeatureFlagProvider;
|
|
56
59
|
latestEventIdProvider?: LatestEventIdProvider;
|
|
57
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interface/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interface/index.ts"],"names":[],"mappings":";;;AAUA,mCAAiD;AAAxC,kGAAA,QAAQ,OAAA;AAAE,qGAAA,WAAW,OAAA;AAM9B,qCAAuC;AAA9B,qGAAA,UAAU,OAAA;AAYnB,mCAAoD;AAA3C,wGAAA,cAAc,OAAA;AAAE,kGAAA,QAAQ,OAAA;AAoBjC,iCAA8D;AAArD,iGAAA,QAAQ,OAAA;AAAE,mGAAA,UAAU,OAAA;AAAE,sGAAA,aAAa,OAAA;AAoB5C,qCAAqD;AAA5C,mHAAA,wBAAwB,OAAA;AAiBjC,yCAA+C;AAAtC,6GAAA,gBAAgB,OAAA;AAGzB,yCAA4C;AAAnC,0GAAA,aAAa,OAAA"}
|
|
@@ -38,10 +38,10 @@ export declare class DriveAPIService {
|
|
|
38
38
|
post<RequestPayload, ResponsePayload>(url: string, data?: RequestPayload, signal?: AbortSignal): Promise<ResponsePayload>;
|
|
39
39
|
put<RequestPayload, ResponsePayload>(url: string, data: RequestPayload, signal?: AbortSignal): Promise<ResponsePayload>;
|
|
40
40
|
delete<Response>(url: string, signal?: AbortSignal): Promise<Response>;
|
|
41
|
-
|
|
41
|
+
protected makeRequest<RequestPayload, ResponsePayload>(url: string, method?: string, data?: RequestPayload, signal?: AbortSignal): Promise<ResponsePayload>;
|
|
42
42
|
getBlockStream(baseUrl: string, token: string, signal?: AbortSignal): Promise<ReadableStream<Uint8Array>>;
|
|
43
43
|
postBlockStream(baseUrl: string, token: string, data: XMLHttpRequestBodyInit, onProgress?: (uploadedBytes: number) => void, signal?: AbortSignal): Promise<void>;
|
|
44
|
-
|
|
44
|
+
protected makeStorageRequest(method: 'GET' | 'POST', url: string, token: string, body?: XMLHttpRequestBodyInit, onProgress?: (uploadedBytes: number) => void, signal?: AbortSignal): Promise<Response>;
|
|
45
45
|
private fetch;
|
|
46
46
|
private get hasReachedTooManyRequestsErrorLimit();
|
|
47
47
|
private tooManyRequestsErrorHappened;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/apiService/apiService.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,2CAAwC;AAExC,yCAA2F;AAC3F,kCAAsC;AAEtC,6CAAsE;AACtE,qCAA2C;AAE3C;;GAEG;AACH,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAEjC;;GAEG;AACH,MAAM,0BAA0B,GAAG,KAAK,CAAC;AAEzC;;GAEG;AACH,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAE1C;;;GAGG;AACH,MAAM,iDAAiD,GAAG,EAAE,CAAC;AAE7D;;GAEG;AACH,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAE7C;;;GAGG;AACH,MAAM,oDAAoD,GAAG,EAAE,CAAC;AAEhE;;GAEG;AACH,MAAM,kCAAkC,GAAG,EAAE,CAAC;AAE9C;;GAEG;AACH,MAAM,gCAAgC,GAAG,CAAC,CAAC;AAE3C;;GAEG;AACH,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAEtC;;GAEG;AACH,MAAM,+BAA+B,GAAG,EAAE,CAAC;AAE3C;;GAEG;AACH,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAEtC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAa,eAAe;IAYZ;IACA;IACA;IACA;IACA;IAfJ,gCAAgC,GAAG,CAAC,CAAC;IACrC,0BAA0B,CAAU;IAEpC,6BAA6B,GAAG,CAAC,CAAC;IAClC,iBAAiB,CAAU;IAE3B,8BAA8B,GAAG,CAAC,CAAC;IAEnC,MAAM,CAAS;IAEvB,YACY,SAA+B,EAC/B,SAAoB,EACpB,UAAiC,EACjC,OAAe,EACf,QAAgB;QAJhB,cAAS,GAAT,SAAS,CAAsB;QAC/B,cAAS,GAAT,SAAS,CAAW;QACpB,eAAU,GAAV,UAAU,CAAuB;QACjC,YAAO,GAAP,OAAO,CAAQ;QACf,aAAQ,GAAR,QAAQ,CAAQ;QAExB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG,CAAkB,GAAW,EAAE,MAAoB;QACxD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,IAAI,CACN,GAAW,EACX,IAAqB,EACrB,MAAoB;QAEpB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,GAAG,CACL,GAAW,EACX,IAAoB,EACpB,MAAoB;QAEpB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,MAAM,CAAW,GAAW,EAAE,MAAoB;QACpD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/apiService/apiService.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,9 +23,10 @@ function apiErrorFactory({ response, result, error, }) {
|
|
|
23
23
|
typedResult.Error || (0, ttag_1.c)('Error').t `Unknown error`,
|
|
24
24
|
typedResult.Details,
|
|
25
25
|
];
|
|
26
|
-
const debug = typedResult.
|
|
26
|
+
const debug = typedResult.Exception
|
|
27
27
|
? {
|
|
28
|
-
|
|
28
|
+
details: typedResult.Details,
|
|
29
|
+
exception: typedResult.Exception,
|
|
29
30
|
message: typedResult.message,
|
|
30
31
|
file: typedResult.file,
|
|
31
32
|
line: typedResult.line,
|
|
@@ -61,7 +62,7 @@ function apiErrorFactory({ response, result, error, }) {
|
|
|
61
62
|
case 200800 /* ErrorCode.INSUFFICIENT_BOOKMARKS_QUOTA */:
|
|
62
63
|
return new errors_1.ValidationError(message, code, details);
|
|
63
64
|
default:
|
|
64
|
-
return new APICodeError(message, code, debug);
|
|
65
|
+
return new APICodeError(message, code, debug || details);
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
class APIHTTPError extends errors_1.ServerError {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/internal/apiService/errors.ts"],"names":[],"mappings":";;;AAKA,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/internal/apiService/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ class DownloadCryptoService {
|
|
|
16
16
|
this.driveCrypto = driveCrypto;
|
|
17
17
|
}
|
|
18
18
|
async getRevisionKeys(nodeKey, revision) {
|
|
19
|
-
const verificationKeys = await this.getRevisionVerificationKeys(revision);
|
|
19
|
+
const verificationKeys = await this.getRevisionVerificationKeys(revision, nodeKey.key);
|
|
20
20
|
return {
|
|
21
21
|
...nodeKey,
|
|
22
22
|
verificationKeys,
|
|
@@ -62,21 +62,23 @@ class DownloadCryptoService {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
async verifyManifest(revision, nodeKey, allBlockHashes, armoredManifestSignature) {
|
|
65
|
-
const verificationKeys =
|
|
65
|
+
const verificationKeys = await this.getRevisionVerificationKeys(revision, nodeKey);
|
|
66
66
|
const hash = (0, utils_1.mergeUint8Arrays)(allBlockHashes);
|
|
67
67
|
if (!armoredManifestSignature) {
|
|
68
68
|
throw new errors_1.IntegrityError((0, ttag_1.c)('Error').t `Missing integrity signature`);
|
|
69
69
|
}
|
|
70
|
-
const { verified } = await this.driveCrypto.verifyManifest(hash, armoredManifestSignature, verificationKeys);
|
|
70
|
+
const { verified, verificationErrors } = await this.driveCrypto.verifyManifest(hash, armoredManifestSignature, verificationKeys);
|
|
71
71
|
if (verified !== crypto_1.VERIFICATION_STATUS.SIGNED_AND_VALID) {
|
|
72
|
-
throw new errors_1.IntegrityError((0, ttag_1.c)('Error').t `Data integrity check failed
|
|
72
|
+
throw new errors_1.IntegrityError((0, ttag_1.c)('Error').t `Data integrity check failed`, {
|
|
73
|
+
verificationErrors,
|
|
74
|
+
});
|
|
73
75
|
}
|
|
74
76
|
}
|
|
75
|
-
async getRevisionVerificationKeys(revision) {
|
|
77
|
+
async getRevisionVerificationKeys(revision, nodeKey) {
|
|
76
78
|
const signatureEmail = revision.contentAuthor.ok
|
|
77
79
|
? revision.contentAuthor.value
|
|
78
80
|
: revision.contentAuthor.error.claimedAuthor;
|
|
79
|
-
return signatureEmail ? await this.account.getPublicKeys(signatureEmail) :
|
|
81
|
+
return signatureEmail ? await this.account.getPublicKeys(signatureEmail) : [nodeKey];
|
|
80
82
|
}
|
|
81
83
|
}
|
|
82
84
|
exports.DownloadCryptoService = DownloadCryptoService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/download/cryptoService.ts"],"names":[],"mappings":";;;AAAA,+BAAyB;AAEzB,yCAOsB;AAEtB,yCAA+D;AAC/D,sCAA4C;AAC5C,oCAA4C;AAG5C,MAAa,qBAAqB;IAElB;IACA;IAFZ,YACY,WAAwB,EACxB,OAA2B;QAD3B,gBAAW,GAAX,WAAW,CAAa;QACxB,YAAO,GAAP,OAAO,CAAoB;QAEnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,OAAoE,EACpE,QAAkB;QAElB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/download/cryptoService.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export declare class FileDownloader {
|
|
|
13
13
|
private revision;
|
|
14
14
|
private signal?;
|
|
15
15
|
private onFinish?;
|
|
16
|
+
private ignoreManifestVerification;
|
|
16
17
|
private logger;
|
|
17
18
|
private controller;
|
|
18
19
|
private nextBlockIndex;
|
|
@@ -20,7 +21,7 @@ export declare class FileDownloader {
|
|
|
20
21
|
constructor(telemetry: DownloadTelemetry, apiService: DownloadAPIService, cryptoService: DownloadCryptoService, nodeKey: {
|
|
21
22
|
key: PrivateKey;
|
|
22
23
|
contentKeyPacketSessionKey: SessionKey;
|
|
23
|
-
}, revision: DecryptedRevision, signal?: AbortSignal | undefined, onFinish?: (() => void) | undefined);
|
|
24
|
+
}, revision: DecryptedRevision, signal?: AbortSignal | undefined, onFinish?: (() => void) | undefined, ignoreManifestVerification?: boolean);
|
|
24
25
|
getClaimedSizeInBytes(): number | undefined;
|
|
25
26
|
getSeekableStream(): BufferedSeekableStream;
|
|
26
27
|
private downloadDataFromPosition;
|
|
@@ -23,11 +23,12 @@ class FileDownloader {
|
|
|
23
23
|
revision;
|
|
24
24
|
signal;
|
|
25
25
|
onFinish;
|
|
26
|
+
ignoreManifestVerification;
|
|
26
27
|
logger;
|
|
27
28
|
controller;
|
|
28
29
|
nextBlockIndex = 1;
|
|
29
30
|
ongoingDownloads = new Map();
|
|
30
|
-
constructor(telemetry, apiService, cryptoService, nodeKey, revision, signal, onFinish) {
|
|
31
|
+
constructor(telemetry, apiService, cryptoService, nodeKey, revision, signal, onFinish, ignoreManifestVerification = false) {
|
|
31
32
|
this.telemetry = telemetry;
|
|
32
33
|
this.apiService = apiService;
|
|
33
34
|
this.cryptoService = cryptoService;
|
|
@@ -35,6 +36,7 @@ class FileDownloader {
|
|
|
35
36
|
this.revision = revision;
|
|
36
37
|
this.signal = signal;
|
|
37
38
|
this.onFinish = onFinish;
|
|
39
|
+
this.ignoreManifestVerification = ignoreManifestVerification;
|
|
38
40
|
this.telemetry = telemetry;
|
|
39
41
|
this.logger = telemetry.getLoggerForRevision(revision.uid);
|
|
40
42
|
this.apiService = apiService;
|
|
@@ -43,6 +45,7 @@ class FileDownloader {
|
|
|
43
45
|
this.revision = revision;
|
|
44
46
|
this.signal = signal;
|
|
45
47
|
this.onFinish = onFinish;
|
|
48
|
+
this.ignoreManifestVerification = ignoreManifestVerification;
|
|
46
49
|
this.controller = new controller_1.DownloadController(this.signal);
|
|
47
50
|
}
|
|
48
51
|
getClaimedSizeInBytes() {
|
|
@@ -172,7 +175,7 @@ class FileDownloader {
|
|
|
172
175
|
// This is a bug in the algorithm.
|
|
173
176
|
throw new Error(`Some blocks were not downloaded`);
|
|
174
177
|
}
|
|
175
|
-
if (ignoreIntegrityErrors) {
|
|
178
|
+
if (ignoreIntegrityErrors || this.ignoreManifestVerification) {
|
|
176
179
|
this.logger.warn('Skipping manifest check');
|
|
177
180
|
}
|
|
178
181
|
else {
|
|
@@ -186,7 +189,7 @@ class FileDownloader {
|
|
|
186
189
|
catch (error) {
|
|
187
190
|
this.logger.error(`Download failed`, error);
|
|
188
191
|
void this.telemetry.downloadFailed(this.revision.uid, error, fileProgress, this.getClaimedSizeInBytes());
|
|
189
|
-
await writer.abort();
|
|
192
|
+
await writer.abort?.();
|
|
190
193
|
throw error;
|
|
191
194
|
}
|
|
192
195
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileDownloader.js","sourceRoot":"","sources":["../../../src/internal/download/fileDownloader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"fileDownloader.js","sourceRoot":"","sources":["../../../src/internal/download/fileDownloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { ProtonDriveAccount, ProtonDriveTelemetry, ThumbnailType, ThumbnailResul
|
|
|
3
3
|
import { DriveAPIService } from '../apiService';
|
|
4
4
|
import { NodesService, RevisionsService, SharesService } from './interface';
|
|
5
5
|
import { FileDownloader } from './fileDownloader';
|
|
6
|
-
export declare function initDownloadModule(telemetry: ProtonDriveTelemetry, apiService: DriveAPIService, driveCrypto: DriveCrypto, account: ProtonDriveAccount, sharesService: SharesService, nodesService: NodesService, revisionsService: RevisionsService): {
|
|
6
|
+
export declare function initDownloadModule(telemetry: ProtonDriveTelemetry, apiService: DriveAPIService, driveCrypto: DriveCrypto, account: ProtonDriveAccount, sharesService: SharesService, nodesService: NodesService, revisionsService: RevisionsService, ignoreManifestVerification?: boolean): {
|
|
7
7
|
getFileDownloader: (nodeUid: string, signal?: AbortSignal) => Promise<FileDownloader>;
|
|
8
8
|
getFileRevisionDownloader: (nodeRevisionUid: string, signal?: AbortSignal) => Promise<FileDownloader>;
|
|
9
9
|
iterateThumbnails: (nodeUids: string[], thumbnailType?: ThumbnailType, signal?: AbortSignal) => AsyncGenerator<ThumbnailResult>;
|
|
@@ -11,7 +11,7 @@ const queue_1 = require("./queue");
|
|
|
11
11
|
const telemetry_1 = require("./telemetry");
|
|
12
12
|
const uids_1 = require("../uids");
|
|
13
13
|
const thumbnailDownloader_1 = require("./thumbnailDownloader");
|
|
14
|
-
function initDownloadModule(telemetry, apiService, driveCrypto, account, sharesService, nodesService, revisionsService) {
|
|
14
|
+
function initDownloadModule(telemetry, apiService, driveCrypto, account, sharesService, nodesService, revisionsService, ignoreManifestVerification = false) {
|
|
15
15
|
const queue = new queue_1.DownloadQueue();
|
|
16
16
|
const api = new apiService_1.DownloadAPIService(apiService);
|
|
17
17
|
const cryptoService = new cryptoService_1.DownloadCryptoService(driveCrypto, account);
|
|
@@ -41,7 +41,7 @@ function initDownloadModule(telemetry, apiService, driveCrypto, account, sharesS
|
|
|
41
41
|
return new fileDownloader_1.FileDownloader(downloadTelemetry, api, cryptoService, {
|
|
42
42
|
key: nodeKey.key,
|
|
43
43
|
contentKeyPacketSessionKey: nodeKey.contentKeyPacketSessionKey,
|
|
44
|
-
}, node.activeRevision.value, signal, onFinish);
|
|
44
|
+
}, node.activeRevision.value, signal, onFinish, ignoreManifestVerification);
|
|
45
45
|
}
|
|
46
46
|
async function getFileRevisionDownloader(nodeRevisionUid, signal) {
|
|
47
47
|
await queue.waitForCapacity(signal);
|
|
@@ -67,7 +67,7 @@ function initDownloadModule(telemetry, apiService, driveCrypto, account, sharesS
|
|
|
67
67
|
return new fileDownloader_1.FileDownloader(downloadTelemetry, api, cryptoService, {
|
|
68
68
|
key: nodeKey.key,
|
|
69
69
|
contentKeyPacketSessionKey: nodeKey.contentKeyPacketSessionKey,
|
|
70
|
-
}, revision, signal, onFinish);
|
|
70
|
+
}, revision, signal, onFinish, ignoreManifestVerification);
|
|
71
71
|
}
|
|
72
72
|
async function* iterateThumbnails(nodeUids, thumbnailType, signal) {
|
|
73
73
|
const thumbnailDownloader = new thumbnailDownloader_1.ThumbnailDownloader(telemetry, nodesService, api, cryptoService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/download/index.ts"],"names":[],"mappings":";;AAeA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/download/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logger, NodeResult } from '../../interface';
|
|
1
|
+
import { Logger, NodeResult, AnonymousUser } from '../../interface';
|
|
2
2
|
import { DriveAPIService } from '../apiService';
|
|
3
3
|
import { EncryptedNode, EncryptedRevision, FilterOptions } from './interface';
|
|
4
4
|
/**
|
|
@@ -21,7 +21,7 @@ export declare class NodeAPIService {
|
|
|
21
21
|
hash?: string;
|
|
22
22
|
}, newNode: {
|
|
23
23
|
encryptedName: string;
|
|
24
|
-
nameSignatureEmail: string;
|
|
24
|
+
nameSignatureEmail: string | AnonymousUser;
|
|
25
25
|
hash?: string;
|
|
26
26
|
}, signal?: AbortSignal): Promise<void>;
|
|
27
27
|
moveNode(nodeUid: string, oldNode: {
|
|
@@ -30,9 +30,9 @@ export declare class NodeAPIService {
|
|
|
30
30
|
parentUid: string;
|
|
31
31
|
armoredNodePassphrase: string;
|
|
32
32
|
armoredNodePassphraseSignature?: string;
|
|
33
|
-
signatureEmail?: string;
|
|
33
|
+
signatureEmail?: string | AnonymousUser;
|
|
34
34
|
encryptedName: string;
|
|
35
|
-
nameSignatureEmail?: string;
|
|
35
|
+
nameSignatureEmail?: string | AnonymousUser;
|
|
36
36
|
hash: string;
|
|
37
37
|
contentHash?: string;
|
|
38
38
|
}, signal?: AbortSignal): Promise<void>;
|
|
@@ -40,20 +40,21 @@ export declare class NodeAPIService {
|
|
|
40
40
|
parentUid: string;
|
|
41
41
|
armoredNodePassphrase: string;
|
|
42
42
|
armoredNodePassphraseSignature?: string;
|
|
43
|
-
signatureEmail?: string;
|
|
43
|
+
signatureEmail?: string | AnonymousUser;
|
|
44
44
|
encryptedName: string;
|
|
45
|
-
nameSignatureEmail?: string;
|
|
45
|
+
nameSignatureEmail?: string | AnonymousUser;
|
|
46
46
|
hash: string;
|
|
47
47
|
}, signal?: AbortSignal): Promise<string>;
|
|
48
48
|
trashNodes(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResult>;
|
|
49
49
|
restoreNodes(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResult>;
|
|
50
|
-
|
|
50
|
+
deleteTrashedNodes(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResult>;
|
|
51
|
+
deleteExistingNodes(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<NodeResult>;
|
|
51
52
|
createFolder(parentUid: string, newNode: {
|
|
52
53
|
armoredKey: string;
|
|
53
54
|
armoredHashKey: string;
|
|
54
55
|
armoredNodePassphrase: string;
|
|
55
56
|
armoredNodePassphraseSignature: string;
|
|
56
|
-
signatureEmail: string;
|
|
57
|
+
signatureEmail: string | AnonymousUser;
|
|
57
58
|
encryptedName: string;
|
|
58
59
|
hash: string;
|
|
59
60
|
armoredExtendedAttributes?: string;
|
|
@@ -4,7 +4,7 @@ exports.NodeAPIService = void 0;
|
|
|
4
4
|
exports.groupNodeUidsByVolumeAndIteratePerBatch = groupNodeUidsByVolumeAndIteratePerBatch;
|
|
5
5
|
const ttag_1 = require("ttag");
|
|
6
6
|
const errors_1 = require("../../errors");
|
|
7
|
-
const
|
|
7
|
+
const interface_1 = require("../../interface");
|
|
8
8
|
const apiService_1 = require("../apiService");
|
|
9
9
|
const asyncIteratorRace_1 = require("../asyncIteratorRace");
|
|
10
10
|
const batch_1 = require("../batch");
|
|
@@ -219,7 +219,7 @@ class NodeAPIService {
|
|
|
219
219
|
yield* handleResponseErrors(batchNodeUids, volumeId, response.Responses);
|
|
220
220
|
}
|
|
221
221
|
}
|
|
222
|
-
async *
|
|
222
|
+
async *deleteTrashedNodes(nodeUids, signal) {
|
|
223
223
|
for (const { volumeId, batchNodeIds, batchNodeUids } of groupNodeUidsByVolumeAndIteratePerBatch(nodeUids)) {
|
|
224
224
|
const response = await this.apiService.post(`drive/v2/volumes/${volumeId}/trash/delete_multiple`, {
|
|
225
225
|
LinkIDs: batchNodeIds,
|
|
@@ -228,6 +228,15 @@ class NodeAPIService {
|
|
|
228
228
|
yield* handleResponseErrors(batchNodeUids, volumeId, response.Responses);
|
|
229
229
|
}
|
|
230
230
|
}
|
|
231
|
+
async *deleteExistingNodes(nodeUids, signal) {
|
|
232
|
+
for (const { volumeId, batchNodeIds, batchNodeUids } of groupNodeUidsByVolumeAndIteratePerBatch(nodeUids)) {
|
|
233
|
+
const response = await this.apiService.post(`drive/v2/volumes/${volumeId}/delete_multiple`, {
|
|
234
|
+
LinkIDs: batchNodeIds,
|
|
235
|
+
}, signal);
|
|
236
|
+
// TODO: remove `as` when backend fixes OpenAPI schema.
|
|
237
|
+
yield* handleResponseErrors(batchNodeUids, volumeId, response.Responses);
|
|
238
|
+
}
|
|
239
|
+
}
|
|
231
240
|
async createFolder(parentUid, newNode) {
|
|
232
241
|
const { volumeId, nodeId: parentId } = (0, uids_1.splitNodeUid)(parentUid);
|
|
233
242
|
let response;
|
|
@@ -329,7 +338,7 @@ function linkToEncryptedNode(logger, volumeId, link, isAdmin) {
|
|
|
329
338
|
shareId: link.Sharing?.ShareID || undefined,
|
|
330
339
|
isShared: !!link.Sharing,
|
|
331
340
|
isSharedPublicly: !!link.Sharing?.ShareURLID,
|
|
332
|
-
directRole: isAdmin ?
|
|
341
|
+
directRole: isAdmin ? interface_1.MemberRole.Admin : membershipRole,
|
|
333
342
|
membership: link.Membership
|
|
334
343
|
? {
|
|
335
344
|
role: membershipRole,
|
|
@@ -377,7 +386,7 @@ function linkToEncryptedNode(logger, volumeId, link, isAdmin) {
|
|
|
377
386
|
},
|
|
378
387
|
activeRevision: {
|
|
379
388
|
uid: (0, uids_1.makeNodeRevisionUid)(volumeId, link.Link.LinkID, link.File.ActiveRevision.RevisionID),
|
|
380
|
-
state:
|
|
389
|
+
state: interface_1.RevisionState.Active,
|
|
381
390
|
creationTime: new Date(link.File.ActiveRevision.CreateTime * 1000),
|
|
382
391
|
storageSize: link.File.ActiveRevision.EncryptedSize,
|
|
383
392
|
signatureEmail: link.File.ActiveRevision.SignatureEmail || undefined,
|
|
@@ -422,7 +431,7 @@ function* groupNodeUidsByVolumeAndIteratePerBatch(nodeUids) {
|
|
|
422
431
|
function transformRevisionResponse(volumeId, nodeId, revision) {
|
|
423
432
|
return {
|
|
424
433
|
uid: (0, uids_1.makeNodeRevisionUid)(volumeId, nodeId, revision.ID),
|
|
425
|
-
state: revision.State === APIRevisionState.Active ?
|
|
434
|
+
state: revision.State === APIRevisionState.Active ? interface_1.RevisionState.Active : interface_1.RevisionState.Superseded,
|
|
426
435
|
// @ts-expect-error: API doc is wrong, CreateTime is not optional.
|
|
427
436
|
creationTime: new Date(revision.CreateTime * 1000),
|
|
428
437
|
storageSize: revision.Size,
|