@protontech/drive-sdk 0.0.12 → 0.1.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/cache/index.d.ts +1 -0
- package/dist/cache/index.js +3 -1
- package/dist/cache/index.js.map +1 -1
- package/dist/cache/memoryCache.d.ts +1 -1
- package/dist/cache/nullCache.d.ts +14 -0
- package/dist/cache/nullCache.js +37 -0
- package/dist/cache/nullCache.js.map +1 -0
- package/dist/config.d.ts +16 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/crypto/openPGPCrypto.js +2 -0
- package/dist/crypto/openPGPCrypto.js.map +1 -1
- package/dist/diagnostic/eventsGenerator.d.ts +14 -0
- package/dist/diagnostic/eventsGenerator.js +49 -0
- package/dist/diagnostic/eventsGenerator.js.map +1 -0
- package/dist/diagnostic/httpClient.d.ts +16 -0
- package/dist/diagnostic/httpClient.js +81 -0
- package/dist/diagnostic/httpClient.js.map +1 -0
- package/dist/diagnostic/index.d.ts +10 -0
- package/dist/diagnostic/index.js +35 -0
- package/dist/diagnostic/index.js.map +1 -0
- package/dist/diagnostic/integrityVerificationStream.d.ts +21 -0
- package/dist/diagnostic/integrityVerificationStream.js +56 -0
- package/dist/diagnostic/integrityVerificationStream.js.map +1 -0
- package/dist/diagnostic/interface.d.ts +102 -0
- package/dist/diagnostic/interface.js +3 -0
- package/dist/diagnostic/interface.js.map +1 -0
- package/dist/diagnostic/sdkDiagnostic.d.ts +22 -0
- package/dist/diagnostic/sdkDiagnostic.js +216 -0
- package/dist/diagnostic/sdkDiagnostic.js.map +1 -0
- package/dist/diagnostic/sdkDiagnosticFull.d.ts +18 -0
- package/dist/diagnostic/sdkDiagnosticFull.js +35 -0
- package/dist/diagnostic/sdkDiagnosticFull.js.map +1 -0
- package/dist/diagnostic/telemetry.d.ts +25 -0
- package/dist/diagnostic/telemetry.js +70 -0
- package/dist/diagnostic/telemetry.js.map +1 -0
- package/dist/diagnostic/zipGenerators.d.ts +9 -0
- package/dist/diagnostic/zipGenerators.js +64 -0
- package/dist/diagnostic/zipGenerators.js.map +1 -0
- package/dist/diagnostic/zipGenerators.test.js +144 -0
- package/dist/diagnostic/zipGenerators.test.js.map +1 -0
- package/dist/errors.d.ts +8 -3
- package/dist/errors.js +11 -4
- package/dist/errors.js.map +1 -1
- package/dist/interface/config.d.ts +26 -0
- package/dist/interface/config.js +3 -0
- package/dist/interface/config.js.map +1 -0
- package/dist/interface/download.d.ts +2 -2
- package/dist/interface/events.d.ts +60 -20
- package/dist/interface/events.js +11 -1
- package/dist/interface/events.js.map +1 -1
- package/dist/interface/httpClient.d.ts +0 -14
- package/dist/interface/index.d.ts +9 -5
- package/dist/interface/index.js +2 -1
- package/dist/interface/index.js.map +1 -1
- package/dist/interface/nodes.d.ts +21 -1
- package/dist/interface/nodes.js +11 -0
- package/dist/interface/nodes.js.map +1 -1
- package/dist/interface/sharing.d.ts +1 -0
- package/dist/interface/upload.d.ts +57 -3
- package/dist/internal/apiService/driveTypes.d.ts +1341 -465
- package/dist/internal/apiService/errors.js +2 -2
- package/dist/internal/apiService/errors.js.map +1 -1
- package/dist/internal/apiService/transformers.js +2 -0
- package/dist/internal/apiService/transformers.js.map +1 -1
- package/dist/internal/asyncIteratorMap.d.ts +15 -0
- package/dist/internal/asyncIteratorMap.js +59 -0
- package/dist/internal/asyncIteratorMap.js.map +1 -0
- package/dist/internal/asyncIteratorMap.test.js +120 -0
- package/dist/internal/asyncIteratorMap.test.js.map +1 -0
- package/dist/internal/download/apiService.js +32 -31
- package/dist/internal/download/apiService.js.map +1 -1
- package/dist/internal/download/fileDownloader.d.ts +2 -2
- package/dist/internal/download/fileDownloader.js.map +1 -1
- package/dist/internal/events/apiService.d.ts +4 -6
- package/dist/internal/events/apiService.js +15 -22
- package/dist/internal/events/apiService.js.map +1 -1
- package/dist/internal/events/coreEventManager.d.ts +7 -10
- package/dist/internal/events/coreEventManager.js +19 -36
- package/dist/internal/events/coreEventManager.js.map +1 -1
- package/dist/internal/events/coreEventManager.test.d.ts +1 -0
- package/dist/internal/events/coreEventManager.test.js +87 -0
- package/dist/internal/events/coreEventManager.test.js.map +1 -0
- package/dist/internal/events/eventManager.d.ts +11 -36
- package/dist/internal/events/eventManager.js +59 -105
- package/dist/internal/events/eventManager.js.map +1 -1
- package/dist/internal/events/eventManager.test.js +167 -82
- package/dist/internal/events/eventManager.test.js.map +1 -1
- package/dist/internal/events/index.d.ts +13 -33
- package/dist/internal/events/index.js +56 -72
- package/dist/internal/events/index.js.map +1 -1
- package/dist/internal/events/interface.d.ts +59 -14
- package/dist/internal/events/interface.js +13 -3
- package/dist/internal/events/interface.js.map +1 -1
- package/dist/internal/events/volumeEventManager.d.ts +7 -17
- package/dist/internal/events/volumeEventManager.js +58 -45
- package/dist/internal/events/volumeEventManager.js.map +1 -1
- package/dist/internal/events/volumeEventManager.test.d.ts +1 -0
- package/dist/internal/events/volumeEventManager.test.js +203 -0
- package/dist/internal/events/volumeEventManager.test.js.map +1 -0
- package/dist/internal/nodes/apiService.d.ts +2 -2
- package/dist/internal/nodes/apiService.js +16 -6
- package/dist/internal/nodes/apiService.js.map +1 -1
- package/dist/internal/nodes/apiService.test.js +30 -8
- package/dist/internal/nodes/apiService.test.js.map +1 -1
- package/dist/internal/nodes/cache.d.ts +10 -1
- package/dist/internal/nodes/cache.js +18 -0
- package/dist/internal/nodes/cache.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.map +1 -1
- package/dist/internal/nodes/cryptoService.test.js +34 -0
- package/dist/internal/nodes/cryptoService.test.js.map +1 -1
- package/dist/internal/nodes/events.d.ts +7 -83
- package/dist/internal/nodes/events.js +43 -217
- package/dist/internal/nodes/events.js.map +1 -1
- package/dist/internal/nodes/events.test.js +27 -277
- package/dist/internal/nodes/events.test.js.map +1 -1
- package/dist/internal/nodes/index.d.ts +3 -4
- package/dist/internal/nodes/index.js +5 -5
- package/dist/internal/nodes/index.js.map +1 -1
- package/dist/internal/nodes/interface.d.ts +3 -1
- package/dist/internal/nodes/nodesAccess.d.ts +15 -0
- package/dist/internal/nodes/nodesAccess.js +65 -7
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesAccess.test.js +132 -93
- package/dist/internal/nodes/nodesAccess.test.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.d.ts +1 -3
- package/dist/internal/nodes/nodesManagement.js +12 -26
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.test.js +35 -14
- package/dist/internal/nodes/nodesManagement.test.js.map +1 -1
- package/dist/internal/shares/cache.d.ts +2 -0
- package/dist/internal/shares/cache.js +2 -0
- package/dist/internal/shares/cache.js.map +1 -1
- package/dist/internal/shares/manager.d.ts +1 -0
- package/dist/internal/shares/manager.js +3 -0
- package/dist/internal/shares/manager.js.map +1 -1
- package/dist/internal/sharing/apiService.js +20 -2
- package/dist/internal/sharing/apiService.js.map +1 -1
- package/dist/internal/sharing/cryptoService.js +1 -0
- package/dist/internal/sharing/cryptoService.js.map +1 -1
- package/dist/internal/sharing/events.d.ts +23 -55
- package/dist/internal/sharing/events.js +46 -138
- package/dist/internal/sharing/events.js.map +1 -1
- package/dist/internal/sharing/events.test.js +77 -180
- package/dist/internal/sharing/events.test.js.map +1 -1
- package/dist/internal/sharing/index.d.ts +4 -5
- package/dist/internal/sharing/index.js +5 -5
- package/dist/internal/sharing/index.js.map +1 -1
- package/dist/internal/sharing/interface.d.ts +3 -0
- package/dist/internal/sharing/sharingManagement.d.ts +2 -3
- package/dist/internal/sharing/sharingManagement.js +7 -9
- package/dist/internal/sharing/sharingManagement.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.test.js +9 -39
- package/dist/internal/sharing/sharingManagement.test.js.map +1 -1
- package/dist/internal/upload/apiService.d.ts +2 -3
- package/dist/internal/upload/apiService.js +7 -4
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/fileUploader.d.ts +49 -53
- package/dist/internal/upload/fileUploader.js +91 -395
- package/dist/internal/upload/fileUploader.js.map +1 -1
- package/dist/internal/upload/fileUploader.test.js +38 -292
- package/dist/internal/upload/fileUploader.test.js.map +1 -1
- package/dist/internal/upload/index.d.ts +5 -5
- package/dist/internal/upload/index.js +23 -44
- package/dist/internal/upload/index.js.map +1 -1
- package/dist/internal/upload/interface.d.ts +2 -0
- package/dist/internal/upload/manager.d.ts +6 -6
- package/dist/internal/upload/manager.js +32 -66
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +100 -117
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/streamUploader.d.ts +62 -0
- package/dist/internal/upload/streamUploader.js +440 -0
- package/dist/internal/upload/streamUploader.js.map +1 -0
- package/dist/internal/upload/streamUploader.test.d.ts +1 -0
- package/dist/internal/upload/streamUploader.test.js +358 -0
- package/dist/internal/upload/streamUploader.test.js.map +1 -0
- package/dist/protonDriveClient.d.ts +22 -165
- package/dist/protonDriveClient.js +27 -191
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.js +3 -2
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/package.json +4 -4
- package/src/cache/index.ts +1 -0
- package/src/cache/memoryCache.ts +1 -1
- package/src/cache/nullCache.ts +38 -0
- package/src/config.ts +17 -2
- package/src/crypto/openPGPCrypto.ts +2 -0
- package/src/diagnostic/eventsGenerator.ts +48 -0
- package/src/diagnostic/httpClient.ts +80 -0
- package/src/diagnostic/index.ts +38 -0
- package/src/diagnostic/integrityVerificationStream.ts +56 -0
- package/src/diagnostic/interface.ts +158 -0
- package/src/diagnostic/sdkDiagnostic.ts +238 -0
- package/src/diagnostic/sdkDiagnosticFull.ts +40 -0
- package/src/diagnostic/telemetry.ts +71 -0
- package/src/diagnostic/zipGenerators.test.ts +177 -0
- package/src/diagnostic/zipGenerators.ts +70 -0
- package/src/errors.ts +13 -4
- package/src/interface/config.ts +28 -0
- package/src/interface/download.ts +2 -2
- package/src/interface/events.ts +66 -21
- package/src/interface/httpClient.ts +0 -16
- package/src/interface/index.ts +9 -5
- package/src/interface/nodes.ts +32 -12
- package/src/interface/sharing.ts +1 -0
- package/src/interface/upload.ts +59 -3
- package/src/internal/apiService/driveTypes.ts +1341 -465
- package/src/internal/apiService/errors.ts +3 -2
- package/src/internal/apiService/transformers.ts +2 -0
- package/src/internal/asyncIteratorMap.test.ts +150 -0
- package/src/internal/asyncIteratorMap.ts +64 -0
- package/src/internal/download/apiService.ts +11 -8
- package/src/internal/download/fileDownloader.ts +2 -2
- package/src/internal/events/apiService.ts +25 -28
- package/src/internal/events/coreEventManager.test.ts +101 -0
- package/src/internal/events/coreEventManager.ts +20 -45
- package/src/internal/events/eventManager.test.ts +201 -88
- package/src/internal/events/eventManager.ts +69 -115
- package/src/internal/events/index.ts +54 -84
- package/src/internal/events/interface.ts +70 -15
- package/src/internal/events/volumeEventManager.test.ts +243 -0
- package/src/internal/events/volumeEventManager.ts +55 -53
- package/src/internal/nodes/apiService.test.ts +36 -7
- package/src/internal/nodes/apiService.ts +19 -7
- package/src/internal/nodes/cache.test.ts +1 -0
- package/src/internal/nodes/cache.ts +21 -2
- package/src/internal/nodes/cryptoService.test.ts +38 -0
- package/src/internal/nodes/cryptoService.ts +1 -1
- package/src/internal/nodes/events.test.ts +29 -335
- package/src/internal/nodes/events.ts +45 -253
- package/src/internal/nodes/index.ts +6 -8
- package/src/internal/nodes/interface.ts +6 -3
- package/src/internal/nodes/nodesAccess.test.ts +133 -91
- package/src/internal/nodes/nodesAccess.ts +70 -8
- package/src/internal/nodes/nodesManagement.test.ts +39 -15
- package/src/internal/nodes/nodesManagement.ts +12 -30
- package/src/internal/shares/cache.ts +4 -2
- package/src/internal/shares/manager.ts +9 -5
- package/src/internal/sharing/apiService.ts +25 -2
- package/src/internal/sharing/cache.ts +1 -1
- package/src/internal/sharing/cryptoService.ts +1 -0
- package/src/internal/sharing/events.test.ts +89 -195
- package/src/internal/sharing/events.ts +42 -156
- package/src/internal/sharing/index.ts +6 -9
- package/src/internal/sharing/interface.ts +6 -2
- package/src/internal/sharing/sharingManagement.test.ts +10 -40
- package/src/internal/sharing/sharingManagement.ts +7 -11
- package/src/internal/upload/apiService.ts +5 -6
- package/src/internal/upload/fileUploader.test.ts +46 -376
- package/src/internal/upload/fileUploader.ts +114 -494
- package/src/internal/upload/index.ts +30 -54
- package/src/internal/upload/interface.ts +2 -0
- package/src/internal/upload/manager.test.ts +107 -124
- package/src/internal/upload/manager.ts +48 -80
- package/src/internal/upload/streamUploader.test.ts +468 -0
- package/src/internal/upload/streamUploader.ts +550 -0
- package/src/protonDriveClient.ts +80 -248
- package/src/protonDrivePhotosClient.ts +4 -3
- package/dist/internal/events/cache.d.ts +0 -28
- package/dist/internal/events/cache.js +0 -67
- package/dist/internal/events/cache.js.map +0 -1
- package/dist/internal/events/cache.test.js +0 -43
- package/dist/internal/events/cache.test.js.map +0 -1
- package/dist/internal/nodes/index.test.js +0 -112
- package/dist/internal/nodes/index.test.js.map +0 -1
- package/src/internal/events/cache.test.ts +0 -47
- package/src/internal/events/cache.ts +0 -80
- package/src/internal/nodes/index.test.ts +0 -135
- /package/dist/{internal/events/cache.test.d.ts → diagnostic/zipGenerators.test.d.ts} +0 -0
- /package/dist/internal/{nodes/index.test.d.ts → asyncIteratorMap.test.d.ts} +0 -0
|
@@ -12,7 +12,7 @@ function apiErrorFactory({ response, result }) {
|
|
|
12
12
|
return new APIHTTPError(response.statusText || (0, ttag_1.c)('Error').t `Unknown error`, response.status);
|
|
13
13
|
}
|
|
14
14
|
const typedResult = result;
|
|
15
|
-
const [code, message] = [typedResult.Code || 0, typedResult.Error || (0, ttag_1.c)('Error').t `Unknown error
|
|
15
|
+
const [code, message, details] = [typedResult.Code || 0, typedResult.Error || (0, ttag_1.c)('Error').t `Unknown error`, typedResult.Details];
|
|
16
16
|
const debug = typedResult.exception ? {
|
|
17
17
|
exception: typedResult.exception,
|
|
18
18
|
message: typedResult.message,
|
|
@@ -44,7 +44,7 @@ function apiErrorFactory({ response, result }) {
|
|
|
44
44
|
case 200601 /* ErrorCode.INSUFFICIENT_SHARE_QUOTA */:
|
|
45
45
|
case 200602 /* ErrorCode.INSUFFICIENT_SHARE_JOINED_QUOTA */:
|
|
46
46
|
case 200800 /* ErrorCode.INSUFFICIENT_BOOKMARKS_QUOTA */:
|
|
47
|
-
return new errors_1.ValidationError(message, code);
|
|
47
|
+
return new errors_1.ValidationError(message, code, details);
|
|
48
48
|
default:
|
|
49
49
|
return new APICodeError(message, code, debug);
|
|
50
50
|
}
|
|
@@ -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":";;;AAKA,0CAyDC;AA9DD,+BAAyB;AAEzB,yCAA4D;AAG5D,SAAgB,eAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,EAA4C;IAC1F,iEAAiE;IACjE,mEAAmE;IACnE,8BAA8B;IAC9B,IAAI,QAAQ,CAAC,MAAM,sCAA4B,IAAI,CAAC,MAAM,EAAE,CAAC;QACzD,OAAO,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,IAAI,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjG,CAAC;IAED,MAAM,WAAW,GAAG,MASnB,CAAC;IAEF,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,EAAE,WAAW,CAAC,KAAK,IAAI,IAAA,QAAC,EAAC,OAAO,CAAC,CAAC,CAAC,CAAA,eAAe,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAEhI,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;QAClC,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,KAAK,EAAE,WAAW,CAAC,KAAK;KAC3B,CAAC,CAAC,CAAC,SAAS,CAAC;IAEd,QAAQ,IAAI,EAAE,CAAC;QACX;YACI,OAAO,IAAI,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/C,sEAAsE;QACtE,sCAAsC;QACtC,qEAAqE;QACrE,gEAAgE;QAChE,cAAc;QACd,iDAAsC;QACtC,sEAA2D;QAC3D,yCAA8B;QAC9B,+CAAkC;QAClC,+CAAkC;QAClC,wDAA2C;QAC3C,+DAAkD;QAClD,sDAAyC;QACzC,sDAAyC;QACzC,mFAAsE;QACtE,8CAAiC;QACjC,6CAAgC;QAChC,0DAA6C;QAC7C,qDAAwC;QACxC,4DAA+C;QAC/C;YACI,OAAO,IAAI,wBAAe,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACvD;YACI,OAAO,IAAI,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;AACL,CAAC;AAED,MAAa,YAAa,SAAQ,oBAAW;IACzC,IAAI,GAAG,cAAc,CAAC;IAEN,UAAU,CAAS;IAEnC,YAAY,OAAe,EAAE,UAAkB;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;CACJ;AATD,oCASC;AAED,MAAa,YAAa,SAAQ,oBAAW;IACzC,IAAI,GAAG,cAAc,CAAC;IAEN,IAAI,CAAS;IAEb,KAAK,CAAU;IAE/B,YAAY,OAAe,EAAE,IAAY,EAAE,KAAc;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;CACJ;AAZD,oCAYC;AAED,MAAa,gBAAiB,SAAQ,YAAY;IAC9C,IAAI,GAAG,kBAAkB,CAAC;CAC7B;AAFD,4CAEC"}
|
|
@@ -10,6 +10,8 @@ function nodeTypeNumberToNodeType(logger, nodeTypeNumber) {
|
|
|
10
10
|
return interface_1.NodeType.Folder;
|
|
11
11
|
case 2:
|
|
12
12
|
return interface_1.NodeType.File;
|
|
13
|
+
case 3:
|
|
14
|
+
return interface_1.NodeType.Album;
|
|
13
15
|
default:
|
|
14
16
|
logger.warn(`Unknown node type: ${nodeTypeNumber}`);
|
|
15
17
|
return interface_1.NodeType.File;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../../../src/internal/apiService/transformers.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../../../src/internal/apiService/transformers.ts"],"names":[],"mappings":";;AAEA,4DAYC;AAED,sEAeC;AAED,wDAaC;AA9CD,+CAA+D;AAE/D,SAAgB,wBAAwB,CAAC,MAAc,EAAE,cAAsB;IAC3E,QAAQ,cAAc,EAAE,CAAC;QACrB,KAAK,CAAC;YACF,OAAO,oBAAQ,CAAC,MAAM,CAAC;QAC3B,KAAK,CAAC;YACF,OAAO,oBAAQ,CAAC,IAAI,CAAC;QACzB,KAAK,CAAC;YACF,OAAO,oBAAQ,CAAC,KAAK,CAAC;QAC1B;YACI,MAAM,CAAC,IAAI,CAAC,sBAAsB,cAAc,EAAE,CAAC,CAAC;YACpD,OAAO,oBAAQ,CAAC,IAAI,CAAC;IAC7B,CAAC;AACL,CAAC;AAED,SAAgB,6BAA6B,CAAC,MAAc,EAAE,iBAA0B;IACpF,QAAQ,iBAAiB,EAAE,CAAC;QACxB,KAAK,SAAS;YACV,OAAO,sBAAU,CAAC,SAAS,CAAC;QAChC,KAAK,CAAC;YACF,OAAO,sBAAU,CAAC,MAAM,CAAC;QAC7B,KAAK,CAAC;YACF,OAAO,sBAAU,CAAC,MAAM,CAAC;QAC7B,KAAK,EAAE;YACH,OAAO,sBAAU,CAAC,KAAK,CAAC;QAC5B;YACI,6DAA6D;YAC7D,MAAM,CAAC,IAAI,CAAC,gCAAgC,iBAAiB,EAAE,CAAC,CAAC;YACjE,OAAO,sBAAU,CAAC,MAAM,CAAC;IACjC,CAAC;AACL,CAAC;AAED,SAAgB,sBAAsB,CAAC,UAAsB;IACzD,IAAI,UAAU,KAAK,sBAAU,CAAC,SAAS,EAAE,CAAC;QACtC,2BAA2B;QAC3B,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC;IACD,QAAQ,UAAU,EAAE,CAAC;QACjB,KAAK,sBAAU,CAAC,MAAM;YAClB,OAAO,CAAC,CAAC;QACb,KAAK,sBAAU,CAAC,MAAM;YAClB,OAAO,CAAC,CAAC;QACb,KAAK,sBAAU,CAAC,KAAK;YACjB,OAAO,EAAE,CAAC;IAClB,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Maps values from an input iterator and produces a new iterator.
|
|
3
|
+
* The mapper function is not awaited immediately to allow for parallel
|
|
4
|
+
* execution. The order of the items in the output iterator is not the
|
|
5
|
+
* same as the order of the items in the input iterator.
|
|
6
|
+
*
|
|
7
|
+
* Any error from the input iterator or the mapper function is propagated
|
|
8
|
+
* to the output iterator.
|
|
9
|
+
*
|
|
10
|
+
* @param inputIterator - The input async iterator.
|
|
11
|
+
* @param mapper - The mapper function that maps the input values to output values.
|
|
12
|
+
* @param concurrency - The concurrency limit. How many parallel async mapper calls are allowed.
|
|
13
|
+
* @returns An async iterator that yields the mapped values.
|
|
14
|
+
*/
|
|
15
|
+
export declare function asyncIteratorMap<I, O>(inputIterator: AsyncGenerator<I>, mapper: (item: I) => Promise<O>, concurrency?: number): AsyncGenerator<O>;
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.asyncIteratorMap = asyncIteratorMap;
|
|
4
|
+
const DEFAULT_CONCURRENCY = 10;
|
|
5
|
+
/**
|
|
6
|
+
* Maps values from an input iterator and produces a new iterator.
|
|
7
|
+
* The mapper function is not awaited immediately to allow for parallel
|
|
8
|
+
* execution. The order of the items in the output iterator is not the
|
|
9
|
+
* same as the order of the items in the input iterator.
|
|
10
|
+
*
|
|
11
|
+
* Any error from the input iterator or the mapper function is propagated
|
|
12
|
+
* to the output iterator.
|
|
13
|
+
*
|
|
14
|
+
* @param inputIterator - The input async iterator.
|
|
15
|
+
* @param mapper - The mapper function that maps the input values to output values.
|
|
16
|
+
* @param concurrency - The concurrency limit. How many parallel async mapper calls are allowed.
|
|
17
|
+
* @returns An async iterator that yields the mapped values.
|
|
18
|
+
*/
|
|
19
|
+
async function* asyncIteratorMap(inputIterator, mapper, concurrency = DEFAULT_CONCURRENCY) {
|
|
20
|
+
let done = false;
|
|
21
|
+
const executing = new Set();
|
|
22
|
+
const results = [];
|
|
23
|
+
const pump = async () => {
|
|
24
|
+
let next;
|
|
25
|
+
try {
|
|
26
|
+
next = await inputIterator.next();
|
|
27
|
+
}
|
|
28
|
+
catch (error) {
|
|
29
|
+
results.push(Promise.reject(error));
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
if (next.done) {
|
|
33
|
+
done = true;
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const promise = mapper(next.value)
|
|
37
|
+
.then((result) => {
|
|
38
|
+
results.push(Promise.resolve(result));
|
|
39
|
+
})
|
|
40
|
+
.catch((error) => {
|
|
41
|
+
results.push(Promise.reject(error));
|
|
42
|
+
});
|
|
43
|
+
executing.add(promise);
|
|
44
|
+
void promise.finally(() => executing.delete(promise));
|
|
45
|
+
};
|
|
46
|
+
while (!done || executing.size > 0 || results.length > 0) {
|
|
47
|
+
while (!done && executing.size < concurrency) {
|
|
48
|
+
await pump();
|
|
49
|
+
}
|
|
50
|
+
if (results.length > 0) {
|
|
51
|
+
yield await results.shift();
|
|
52
|
+
}
|
|
53
|
+
else if (executing.size > 0) {
|
|
54
|
+
// Wait for at least one task to complete
|
|
55
|
+
await Promise.race(Array.from(executing));
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=asyncIteratorMap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"asyncIteratorMap.js","sourceRoot":"","sources":["../../src/internal/asyncIteratorMap.ts"],"names":[],"mappings":";;AAgBA,4CA+CC;AA/DD,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B;;;;;;;;;;;;;GAaG;AACI,KAAK,SAAS,CAAC,CAAC,gBAAgB,CACnC,aAAgC,EAChC,MAA+B,EAC/B,cAAsB,mBAAmB;IAEzC,IAAI,IAAI,GAAG,KAAK,CAAC;IAEjB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAiB,CAAC;IAC3C,MAAM,OAAO,GAAsB,EAAE,CAAC;IAEtC,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;QACpB,IAAI,IAAI,CAAC;QACT,IAAI,CAAC;YACD,IAAI,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACpC,OAAO;QACX,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,IAAI,GAAG,IAAI,CAAC;YACZ,OAAO;QACX,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aAC7B,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACP,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC;IAEF,OAAO,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvD,OAAO,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,GAAG,WAAW,EAAE,CAAC;YAC3C,MAAM,IAAI,EAAE,CAAC;QACjB,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,OAAO,CAAC,KAAK,EAAG,CAAC;QACjC,CAAC;aAAM,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAC5B,yCAAyC;YACzC,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const asyncIteratorMap_1 = require("./asyncIteratorMap");
|
|
4
|
+
// Helper function to create an async generator from array
|
|
5
|
+
async function* createAsyncGenerator(items) {
|
|
6
|
+
for (const item of items) {
|
|
7
|
+
yield item;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
// Helper function to collect all results from async generator
|
|
11
|
+
async function collectResults(asyncGen) {
|
|
12
|
+
const results = [];
|
|
13
|
+
for await (const item of asyncGen) {
|
|
14
|
+
results.push(item);
|
|
15
|
+
}
|
|
16
|
+
return results;
|
|
17
|
+
}
|
|
18
|
+
describe('asyncIteratorMap', () => {
|
|
19
|
+
test('works with empty input', async () => {
|
|
20
|
+
const inputGen = createAsyncGenerator([]);
|
|
21
|
+
const mapper = async (x) => x * 2;
|
|
22
|
+
const mappedGen = (0, asyncIteratorMap_1.asyncIteratorMap)(inputGen, mapper);
|
|
23
|
+
const results = await collectResults(mappedGen);
|
|
24
|
+
expect(results).toEqual([]);
|
|
25
|
+
});
|
|
26
|
+
test('works with single item', async () => {
|
|
27
|
+
const inputGen = createAsyncGenerator([42]);
|
|
28
|
+
const mapper = async (x) => x * 2;
|
|
29
|
+
const mappedGen = (0, asyncIteratorMap_1.asyncIteratorMap)(inputGen, mapper);
|
|
30
|
+
const results = await collectResults(mappedGen);
|
|
31
|
+
expect(results).toEqual([84]);
|
|
32
|
+
});
|
|
33
|
+
test('works with 5 values', async () => {
|
|
34
|
+
const inputGen = createAsyncGenerator([1, 2, 3, 4, 5]);
|
|
35
|
+
const mapper = async (x) => x * 2;
|
|
36
|
+
const mappedGen = (0, asyncIteratorMap_1.asyncIteratorMap)(inputGen, mapper);
|
|
37
|
+
const results = await collectResults(mappedGen);
|
|
38
|
+
expect(results).toEqual([2, 4, 6, 8, 10]);
|
|
39
|
+
});
|
|
40
|
+
test('works with slow mapper - finishes as fast as the longest delay', async () => {
|
|
41
|
+
const delays = { 1: 100, 2: 50, 3: 200, 4: 30, 5: 80 };
|
|
42
|
+
const inputGen = createAsyncGenerator(Object.keys(delays).map(Number));
|
|
43
|
+
const slowMapper = async (x) => {
|
|
44
|
+
await new Promise(resolve => setTimeout(resolve, delays[x]));
|
|
45
|
+
return x * 2;
|
|
46
|
+
};
|
|
47
|
+
const startTime = Date.now();
|
|
48
|
+
const mappedGen = (0, asyncIteratorMap_1.asyncIteratorMap)(inputGen, slowMapper, 5);
|
|
49
|
+
const results = await collectResults(mappedGen);
|
|
50
|
+
const endTime = Date.now();
|
|
51
|
+
// Should complete in roughly the time of the longest delay (200ms) plus some overhead
|
|
52
|
+
const executionTime = endTime - startTime;
|
|
53
|
+
expect(executionTime).toBeGreaterThanOrEqual(195); // We had failures with 199ms - JS is not precise.
|
|
54
|
+
expect(executionTime).toBeLessThan(250);
|
|
55
|
+
// Results should be in the order of the delays
|
|
56
|
+
expect(results).toEqual([8, 4, 10, 2, 6]);
|
|
57
|
+
});
|
|
58
|
+
test('handles errors from input iterator properly', async () => {
|
|
59
|
+
const throwingInputGen = async function* () {
|
|
60
|
+
yield 1;
|
|
61
|
+
yield 2;
|
|
62
|
+
throw new Error('Error providing value: 3');
|
|
63
|
+
};
|
|
64
|
+
const mapper = async (x) => x * 2;
|
|
65
|
+
const mappedGen = (0, asyncIteratorMap_1.asyncIteratorMap)(throwingInputGen(), mapper);
|
|
66
|
+
const results = [];
|
|
67
|
+
let caughtError = null;
|
|
68
|
+
try {
|
|
69
|
+
for await (const item of mappedGen) {
|
|
70
|
+
results.push(item);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
catch (error) {
|
|
74
|
+
caughtError = error;
|
|
75
|
+
}
|
|
76
|
+
expect(caughtError?.message).toBe('Error providing value: 3');
|
|
77
|
+
expect(results).toEqual([2, 4]);
|
|
78
|
+
});
|
|
79
|
+
test('handles errors from mapper properly', async () => {
|
|
80
|
+
const inputGen = createAsyncGenerator([1, 2, 3, 4, 5]);
|
|
81
|
+
const throwingMapper = async (x) => {
|
|
82
|
+
if (x === 3) {
|
|
83
|
+
throw new Error(`Error processing value: ${x}`);
|
|
84
|
+
}
|
|
85
|
+
return x * 2;
|
|
86
|
+
};
|
|
87
|
+
const mappedGen = (0, asyncIteratorMap_1.asyncIteratorMap)(inputGen, throwingMapper);
|
|
88
|
+
const results = [];
|
|
89
|
+
let caughtError = null;
|
|
90
|
+
try {
|
|
91
|
+
for await (const item of mappedGen) {
|
|
92
|
+
results.push(item);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
caughtError = error;
|
|
97
|
+
}
|
|
98
|
+
expect(caughtError?.message).toBe('Error processing value: 3');
|
|
99
|
+
expect(results).toEqual([2, 4]);
|
|
100
|
+
});
|
|
101
|
+
test('respects concurrency limit', async () => {
|
|
102
|
+
const inputGen = createAsyncGenerator([1, 2, 3, 4, 5, 6, 7, 8]);
|
|
103
|
+
let concurrentExecutions = 0;
|
|
104
|
+
let maxConcurrentExecutions = 0;
|
|
105
|
+
const mapper = async (x) => {
|
|
106
|
+
concurrentExecutions++;
|
|
107
|
+
maxConcurrentExecutions = Math.max(maxConcurrentExecutions, concurrentExecutions);
|
|
108
|
+
// Wait for 100ms to simulate work
|
|
109
|
+
await new Promise(resolve => setTimeout(resolve, 100));
|
|
110
|
+
concurrentExecutions--;
|
|
111
|
+
return x * 2;
|
|
112
|
+
};
|
|
113
|
+
const concurrencyLimit = 3;
|
|
114
|
+
const mappedGen = (0, asyncIteratorMap_1.asyncIteratorMap)(inputGen, mapper, concurrencyLimit);
|
|
115
|
+
const results = await collectResults(mappedGen);
|
|
116
|
+
expect(maxConcurrentExecutions).toBe(concurrencyLimit);
|
|
117
|
+
expect(results).toEqual([2, 4, 6, 8, 10, 12, 14, 16]);
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
//# sourceMappingURL=asyncIteratorMap.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"asyncIteratorMap.test.js","sourceRoot":"","sources":["../../src/internal/asyncIteratorMap.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DownloadAPIService = void 0;
|
|
4
|
-
const ttag_1 = require("ttag");
|
|
5
|
-
const errors_1 = require("../../errors");
|
|
6
4
|
const apiService_1 = require("../apiService");
|
|
7
5
|
const uids_1 = require("../uids");
|
|
8
6
|
const BLOCKS_PAGE_SIZE = 20;
|
|
@@ -60,39 +58,42 @@ class DownloadAPIService {
|
|
|
60
58
|
const encryptedBlock = new Uint8Array(await new Response(blockStream).arrayBuffer());
|
|
61
59
|
return encryptedBlock;
|
|
62
60
|
}
|
|
63
|
-
// Improvement requested: support multiple volumes.
|
|
64
61
|
async *iterateThumbnails(thumbnailUids, signal) {
|
|
65
|
-
const
|
|
66
|
-
const
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const volumeId = thumbnailIds[0].volumeId;
|
|
71
|
-
const result = await this.apiService.post(`drive/volumes/${volumeId}/thumbnails`, {
|
|
72
|
-
ThumbnailIDs: thumbnailIds.map(({ thumbnailId }) => thumbnailId),
|
|
73
|
-
}, signal);
|
|
74
|
-
for (const thumbnail of result.Thumbnails) {
|
|
75
|
-
const id = thumbnailIds.find(({ thumbnailId }) => thumbnailId === thumbnail.ThumbnailID);
|
|
76
|
-
if (!id) {
|
|
77
|
-
continue;
|
|
62
|
+
const splitedThumbnailsIds = thumbnailUids.map(uids_1.splitNodeThumbnailUid);
|
|
63
|
+
const thumbnailIdsByVolumeId = new Map();
|
|
64
|
+
for (const { volumeId, thumbnailId, nodeId } of splitedThumbnailsIds) {
|
|
65
|
+
if (!thumbnailIdsByVolumeId.has(volumeId)) {
|
|
66
|
+
thumbnailIdsByVolumeId.set(volumeId, []);
|
|
78
67
|
}
|
|
79
|
-
|
|
80
|
-
uid: (0, uids_1.makeNodeThumbnailUid)(id.volumeId, id.nodeId, thumbnail.ThumbnailID),
|
|
81
|
-
ok: true,
|
|
82
|
-
bareUrl: thumbnail.BareURL,
|
|
83
|
-
token: thumbnail.Token,
|
|
84
|
-
};
|
|
68
|
+
thumbnailIdsByVolumeId.get(volumeId)?.push({ volumeId, thumbnailId, nodeId });
|
|
85
69
|
}
|
|
86
|
-
for (const
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
|
|
70
|
+
for (const [volumeId, thumbnailIds] of thumbnailIdsByVolumeId.entries()) {
|
|
71
|
+
const result = await this.apiService.post(`drive/volumes/${volumeId}/thumbnails`, {
|
|
72
|
+
ThumbnailIDs: thumbnailIds.map(({ thumbnailId }) => thumbnailId),
|
|
73
|
+
}, signal);
|
|
74
|
+
for (const thumbnail of result.Thumbnails) {
|
|
75
|
+
const id = thumbnailIds.find(({ thumbnailId }) => thumbnailId === thumbnail.ThumbnailID);
|
|
76
|
+
if (!id) {
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
yield {
|
|
80
|
+
uid: (0, uids_1.makeNodeThumbnailUid)(id.volumeId, id.nodeId, thumbnail.ThumbnailID),
|
|
81
|
+
ok: true,
|
|
82
|
+
bareUrl: thumbnail.BareURL,
|
|
83
|
+
token: thumbnail.Token,
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
for (const error of result.Errors) {
|
|
87
|
+
const id = thumbnailIds.find(({ thumbnailId }) => thumbnailId === error.ThumbnailID);
|
|
88
|
+
if (!id) {
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
yield {
|
|
92
|
+
uid: (0, uids_1.makeNodeThumbnailUid)(id.volumeId, id.nodeId, error.ThumbnailID),
|
|
93
|
+
ok: false,
|
|
94
|
+
error: error.Error,
|
|
95
|
+
};
|
|
90
96
|
}
|
|
91
|
-
yield {
|
|
92
|
-
uid: (0, uids_1.makeNodeThumbnailUid)(id.volumeId, id.nodeId, error.ThumbnailID),
|
|
93
|
-
ok: false,
|
|
94
|
-
error: error.Error,
|
|
95
|
-
};
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/download/apiService.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/download/apiService.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,8 +21,8 @@ export declare class FileDownloader {
|
|
|
21
21
|
contentKeyPacketSessionKey: SessionKey;
|
|
22
22
|
}, revision: Revision, signal?: AbortSignal | undefined, onFinish?: (() => void) | undefined);
|
|
23
23
|
getClaimedSizeInBytes(): number | undefined;
|
|
24
|
-
writeToStream(stream: WritableStream, onProgress
|
|
25
|
-
unsafeWriteToStream(stream: WritableStream, onProgress
|
|
24
|
+
writeToStream(stream: WritableStream, onProgress?: (downloadedBytes: number) => void): DownloadController;
|
|
25
|
+
unsafeWriteToStream(stream: WritableStream, onProgress?: (downloadedBytes: number) => void): DownloadController;
|
|
26
26
|
private downloadToStream;
|
|
27
27
|
private downloadBlock;
|
|
28
28
|
private waitForDownloadCapacity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileDownloader.js","sourceRoot":"","sources":["../../../src/internal/download/fileDownloader.ts"],"names":[],"mappings":";;;AAAA,yCAAgF;AAEhF,+CAAmD;AACnD,8CAA4D;AAE5D,6CAAkD;AAKlD;;;;GAIG;AACH,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAEnC,MAAa,cAAc;IAWX;IACA;IACA;IACA;IACA;IACA;IACA;IAhBJ,MAAM,CAAS;IAEf,UAAU,CAAqB;IAC/B,cAAc,GAAG,CAAC,CAAC;IACnB,gBAAgB,GAAG,IAAI,GAAG,EAG9B,CAAC;IAEL,YACY,SAA4B,EAC5B,UAA8B,EAC9B,aAAoC,EACpC,OAAoE,EACpE,QAAkB,EAClB,MAAoB,EACpB,QAAqB;QANrB,cAAS,GAAT,SAAS,CAAmB;QAC5B,eAAU,GAAV,UAAU,CAAoB;QAC9B,kBAAa,GAAb,aAAa,CAAuB;QACpC,YAAO,GAAP,OAAO,CAA6D;QACpE,aAAQ,GAAR,QAAQ,CAAU;QAClB,WAAM,GAAN,MAAM,CAAc;QACpB,aAAQ,GAAR,QAAQ,CAAa;QAE7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,IAAI,+BAAkB,EAAE,CAAC;IAC/C,CAAC;IAED,qBAAqB;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IACrC,CAAC;IAED,aAAa,CAAC,MAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"fileDownloader.js","sourceRoot":"","sources":["../../../src/internal/download/fileDownloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { Logger } from "../../interface";
|
|
2
1
|
import { DriveAPIService } from "../apiService";
|
|
3
|
-
import {
|
|
2
|
+
import { DriveEventsListWithStatus } from "./interface";
|
|
4
3
|
/**
|
|
5
4
|
* Provides API communication for fetching events.
|
|
6
5
|
*
|
|
@@ -9,10 +8,9 @@ import { DriveEvents } from "./interface";
|
|
|
9
8
|
*/
|
|
10
9
|
export declare class EventsAPIService {
|
|
11
10
|
private apiService;
|
|
12
|
-
|
|
13
|
-
constructor(apiService: DriveAPIService, logger?: Logger | undefined);
|
|
11
|
+
constructor(apiService: DriveAPIService);
|
|
14
12
|
getCoreLatestEventId(): Promise<string>;
|
|
15
|
-
getCoreEvents(eventId: string): Promise<
|
|
13
|
+
getCoreEvents(eventId: string): Promise<DriveEventsListWithStatus>;
|
|
16
14
|
getVolumeLatestEventId(volumeId: string): Promise<string>;
|
|
17
|
-
getVolumeEvents(volumeId: string, eventId: string
|
|
15
|
+
getVolumeEvents(volumeId: string, eventId: string): Promise<DriveEventsListWithStatus>;
|
|
18
16
|
}
|
|
@@ -7,7 +7,7 @@ const VOLUME_EVENT_TYPE_MAP = {
|
|
|
7
7
|
0: interface_1.DriveEventType.NodeDeleted,
|
|
8
8
|
1: interface_1.DriveEventType.NodeCreated,
|
|
9
9
|
2: interface_1.DriveEventType.NodeUpdated,
|
|
10
|
-
3: interface_1.DriveEventType.
|
|
10
|
+
3: interface_1.DriveEventType.NodeUpdated,
|
|
11
11
|
};
|
|
12
12
|
/**
|
|
13
13
|
* Provides API communication for fetching events.
|
|
@@ -17,27 +17,26 @@ const VOLUME_EVENT_TYPE_MAP = {
|
|
|
17
17
|
*/
|
|
18
18
|
class EventsAPIService {
|
|
19
19
|
apiService;
|
|
20
|
-
|
|
21
|
-
constructor(apiService, logger) {
|
|
20
|
+
constructor(apiService) {
|
|
22
21
|
this.apiService = apiService;
|
|
23
|
-
this.logger = logger;
|
|
24
22
|
this.apiService = apiService;
|
|
25
|
-
this.logger = logger;
|
|
26
23
|
}
|
|
27
24
|
async getCoreLatestEventId() {
|
|
28
25
|
const result = await this.apiService.get(`core/v4/events/latest`);
|
|
29
26
|
return result.EventID;
|
|
30
27
|
}
|
|
31
28
|
async getCoreEvents(eventId) {
|
|
32
|
-
// TODO: Switch to v6 endpoint
|
|
29
|
+
// TODO: Switch to v6 endpoint?
|
|
33
30
|
const result = await this.apiService.get(`core/v5/events/${eventId}`);
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
31
|
+
// in core/v5/events, refresh is always all apps, value 255
|
|
32
|
+
const refresh = result.Refresh > 0;
|
|
33
|
+
const events = (refresh || result.DriveShareRefresh?.Action === 2) ? [{
|
|
34
|
+
type: interface_1.DriveEventType.SharedWithMeUpdated,
|
|
35
|
+
eventId: result.EventID,
|
|
36
|
+
treeEventScopeId: 'core',
|
|
37
|
+
}] : [];
|
|
39
38
|
return {
|
|
40
|
-
|
|
39
|
+
latestEventId: result.EventID,
|
|
41
40
|
more: result.More === 1,
|
|
42
41
|
refresh: result.Refresh === 1,
|
|
43
42
|
events,
|
|
@@ -47,10 +46,10 @@ class EventsAPIService {
|
|
|
47
46
|
const result = await this.apiService.get(`drive/volumes/${volumeId}/events/latest`);
|
|
48
47
|
return result.EventID;
|
|
49
48
|
}
|
|
50
|
-
async getVolumeEvents(volumeId, eventId
|
|
49
|
+
async getVolumeEvents(volumeId, eventId) {
|
|
51
50
|
const result = await this.apiService.get(`drive/v2/volumes/${volumeId}/events/${eventId}`);
|
|
52
51
|
return {
|
|
53
|
-
|
|
52
|
+
latestEventId: result.EventID,
|
|
54
53
|
more: result.More,
|
|
55
54
|
refresh: result.Refresh,
|
|
56
55
|
events: result.Events.map((event) => {
|
|
@@ -59,19 +58,13 @@ class EventsAPIService {
|
|
|
59
58
|
nodeUid: (0, uids_1.makeNodeUid)(volumeId, event.Link.LinkID),
|
|
60
59
|
parentNodeUid: (0, uids_1.makeNodeUid)(volumeId, event.Link.ParentLinkID),
|
|
61
60
|
};
|
|
62
|
-
// VOLUME_EVENT_TYPE_MAP will never return this event type.
|
|
63
|
-
// It is here to satisfy the type checker. It is safe to do.
|
|
64
|
-
if (type === interface_1.DriveEventType.ShareWithMeUpdated) {
|
|
65
|
-
return {
|
|
66
|
-
type,
|
|
67
|
-
};
|
|
68
|
-
}
|
|
69
61
|
return {
|
|
70
62
|
type,
|
|
71
63
|
...uids,
|
|
72
64
|
isTrashed: event.Link.IsTrashed,
|
|
73
65
|
isShared: event.Link.IsShared,
|
|
74
|
-
|
|
66
|
+
eventId: event.EventID,
|
|
67
|
+
treeEventScopeId: volumeId,
|
|
75
68
|
};
|
|
76
69
|
}),
|
|
77
70
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/events/apiService.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/events/apiService.ts"],"names":[],"mappings":";;;AACA,kCAAsC;AACtC,2CAA8G;AAW9G,MAAM,qBAAqB,GAAuB;IAC9C,CAAC,EAAE,0BAAc,CAAC,WAAW;IAC7B,CAAC,EAAE,0BAAc,CAAC,WAAW;IAC7B,CAAC,EAAE,0BAAc,CAAC,WAAW;IAC7B,CAAC,EAAE,0BAAc,CAAC,WAAW;CAChC,CAAA;AAED;;;;;GAKG;AACH,MAAa,gBAAgB;IACL;IAApB,YAAoB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAC3C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,oBAAoB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA6B,uBAAuB,CAAC,CAAC;QAC9F,OAAO,MAAM,CAAC,OAAiB,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAe;QAC/B,+BAA+B;QAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAuB,kBAAkB,OAAO,EAAE,CAAC,CAAC;QAC5F,2DAA2D;QAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC;QACnC,MAAM,MAAM,GAAiB,CAAC,OAAO,IAAI,MAAM,CAAC,iBAAiB,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChF,IAAI,EAAE,0BAAc,CAAC,mBAAmB;gBACxC,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,gBAAgB,EAAE,MAAM;aAC3B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAER,OAAO;YACH,aAAa,EAAE,MAAM,CAAC,OAAO;YAC7B,IAAI,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,CAAC;YAC7B,MAAM;SACT,CAAC;IACN,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,QAAgB;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA+B,iBAAiB,QAAQ,gBAAgB,CAAC,CAAC;QAClH,OAAO,MAAM,CAAC,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAgB,EAAE,OAAe;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAyB,oBAAoB,QAAQ,WAAW,OAAO,EAAE,CAAC,CAAC;QACnH,OAAO;YACH,aAAa,EAAE,MAAM,CAAC,OAAO;YAC7B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAa,EAAE;gBAC3C,MAAM,IAAI,GAAG,qBAAqB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACpD,MAAM,IAAI,GAAG;oBACT,OAAO,EAAE,IAAA,kBAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;oBACjD,aAAa,EAAE,IAAA,kBAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,YAAsB,CAAC;iBAC1E,CAAA;gBACD,OAAO;oBACH,IAAI;oBACJ,GAAG,IAAI;oBACP,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS;oBAC/B,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ;oBAC7B,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,gBAAgB,EAAE,QAAQ;iBAC7B,CAAC;YACN,CAAC,CAAC;SACL,CAAC;IACN,CAAC;CACJ;AAzDD,4CAyDC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Logger } from "../../interface";
|
|
2
2
|
import { EventsAPIService } from "./apiService";
|
|
3
|
-
import {
|
|
4
|
-
import { DriveEvent } from "./interface";
|
|
3
|
+
import { DriveEvent, EventManagerInterface } from "./interface";
|
|
5
4
|
/**
|
|
6
5
|
* Combines API and event manager to provide a service for listening to
|
|
7
6
|
* core events. Core events are events that are not specific to any volume.
|
|
@@ -13,13 +12,11 @@ import { DriveEvent } from "./interface";
|
|
|
13
12
|
* is here only in case the client is not connected to the Proton services
|
|
14
13
|
* with own implementation.
|
|
15
14
|
*/
|
|
16
|
-
export declare class CoreEventManager {
|
|
15
|
+
export declare class CoreEventManager implements EventManagerInterface<DriveEvent> {
|
|
16
|
+
private logger;
|
|
17
17
|
private apiService;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
startSubscription(): Promise<void>;
|
|
23
|
-
stopSubscription(): Promise<void>;
|
|
24
|
-
addListener(callback: (events: DriveEvent[]) => Promise<void>): void;
|
|
18
|
+
constructor(logger: Logger, apiService: EventsAPIService);
|
|
19
|
+
getLatestEventId(): Promise<string>;
|
|
20
|
+
getEvents(eventId: string): AsyncIterable<DriveEvent>;
|
|
21
|
+
getLogger(): Logger;
|
|
25
22
|
}
|