@protontech/drive-sdk 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cache/memoryCache.js +0 -1
- package/dist/cache/memoryCache.js.map +1 -1
- package/dist/cache/memoryCache.test.js +2 -4
- package/dist/cache/memoryCache.test.js.map +1 -1
- package/dist/cache/nullCache.js +0 -1
- package/dist/cache/nullCache.js.map +1 -1
- package/dist/crypto/driveCrypto.d.ts +2 -5
- package/dist/crypto/driveCrypto.js +7 -12
- package/dist/crypto/driveCrypto.js.map +1 -1
- package/dist/crypto/driveCrypto.test.js +14 -14
- package/dist/crypto/openPGPCrypto.js +3 -3
- package/dist/crypto/openPGPCrypto.js.map +1 -1
- package/dist/diagnostic/eventsGenerator.js +1 -1
- package/dist/diagnostic/eventsGenerator.js.map +1 -1
- package/dist/diagnostic/httpClient.d.ts +1 -1
- package/dist/diagnostic/httpClient.js.map +1 -1
- package/dist/diagnostic/index.d.ts +3 -3
- package/dist/diagnostic/index.js.map +1 -1
- package/dist/diagnostic/integrityVerificationStream.js +1 -1
- package/dist/diagnostic/integrityVerificationStream.js.map +1 -1
- package/dist/diagnostic/interface.d.ts +2 -2
- package/dist/diagnostic/sdkDiagnostic.d.ts +3 -3
- package/dist/diagnostic/sdkDiagnostic.js +8 -2
- package/dist/diagnostic/sdkDiagnostic.js.map +1 -1
- package/dist/diagnostic/sdkDiagnosticFull.d.ts +4 -4
- package/dist/diagnostic/sdkDiagnosticFull.js.map +1 -1
- package/dist/diagnostic/telemetry.js.map +1 -1
- package/dist/diagnostic/zipGenerators.js +2 -2
- package/dist/diagnostic/zipGenerators.js.map +1 -1
- package/dist/diagnostic/zipGenerators.test.js +1 -1
- package/dist/diagnostic/zipGenerators.test.js.map +1 -1
- package/dist/interface/events.d.ts +2 -4
- package/dist/interface/events.js.map +1 -1
- package/dist/interface/index.d.ts +5 -5
- package/dist/interface/index.js +0 -1
- package/dist/interface/index.js.map +1 -1
- package/dist/interface/result.js.map +1 -1
- package/dist/interface/sharing.d.ts +1 -0
- package/dist/interface/sharing.js.map +1 -1
- package/dist/interface/telemetry.js +0 -8
- package/dist/interface/telemetry.js.map +1 -1
- package/dist/interface/thumbnail.js.map +1 -1
- package/dist/interface/upload.d.ts +1 -1
- package/dist/internal/apiService/apiService.d.ts +1 -1
- package/dist/internal/apiService/apiService.js +7 -11
- package/dist/internal/apiService/apiService.js.map +1 -1
- package/dist/internal/apiService/apiService.test.js +55 -48
- package/dist/internal/apiService/apiService.test.js.map +1 -1
- package/dist/internal/apiService/coreTypes.d.ts +2356 -2356
- package/dist/internal/apiService/driveTypes.d.ts +1680 -1680
- package/dist/internal/apiService/errors.js +14 -8
- package/dist/internal/apiService/errors.js.map +1 -1
- package/dist/internal/apiService/errors.test.js +17 -12
- package/dist/internal/apiService/errors.test.js.map +1 -1
- package/dist/internal/apiService/transformers.d.ts +1 -1
- package/dist/internal/apiService/transformers.js +1 -1
- package/dist/internal/asyncIteratorMap.test.js +2 -2
- package/dist/internal/asyncIteratorMap.test.js.map +1 -1
- package/dist/internal/asyncIteratorRace.d.ts +13 -0
- package/dist/internal/asyncIteratorRace.js +59 -0
- package/dist/internal/asyncIteratorRace.js.map +1 -0
- package/dist/internal/asyncIteratorRace.test.d.ts +1 -0
- package/dist/internal/asyncIteratorRace.test.js +119 -0
- package/dist/internal/asyncIteratorRace.test.js.map +1 -0
- package/dist/internal/batch.d.ts +1 -0
- package/dist/internal/batch.js +12 -0
- package/dist/internal/batch.js.map +1 -0
- package/dist/internal/batch.test.d.ts +1 -0
- package/dist/internal/batch.test.js +41 -0
- package/dist/internal/batch.test.js.map +1 -0
- package/dist/internal/batchLoading.js.map +1 -1
- package/dist/internal/batchLoading.test.js +13 -13
- package/dist/internal/batchLoading.test.js.map +1 -1
- package/dist/internal/devices/apiService.d.ts +3 -3
- package/dist/internal/devices/apiService.js +2 -2
- package/dist/internal/devices/apiService.js.map +1 -1
- package/dist/internal/devices/cryptoService.js +1 -2
- package/dist/internal/devices/cryptoService.js.map +1 -1
- package/dist/internal/devices/index.d.ts +5 -5
- package/dist/internal/devices/index.js.map +1 -1
- package/dist/internal/devices/interface.d.ts +3 -3
- package/dist/internal/devices/manager.js +2 -2
- package/dist/internal/devices/manager.js.map +1 -1
- package/dist/internal/devices/manager.test.js +38 -7
- package/dist/internal/devices/manager.test.js.map +1 -1
- package/dist/internal/download/apiService.d.ts +4 -4
- package/dist/internal/download/apiService.js +0 -1
- package/dist/internal/download/apiService.js.map +1 -1
- package/dist/internal/download/cryptoService.d.ts +4 -4
- package/dist/internal/download/cryptoService.js +6 -5
- package/dist/internal/download/cryptoService.js.map +1 -1
- package/dist/internal/download/fileDownloader.d.ts +4 -4
- package/dist/internal/download/fileDownloader.js +3 -2
- package/dist/internal/download/fileDownloader.js.map +1 -1
- package/dist/internal/download/fileDownloader.test.js +1 -1
- package/dist/internal/download/fileDownloader.test.js.map +1 -1
- package/dist/internal/download/index.d.ts +5 -5
- package/dist/internal/download/index.js +5 -5
- package/dist/internal/download/index.js.map +1 -1
- package/dist/internal/download/interface.d.ts +3 -4
- package/dist/internal/download/telemetry.d.ts +3 -3
- package/dist/internal/download/telemetry.js +4 -2
- package/dist/internal/download/telemetry.js.map +1 -1
- package/dist/internal/download/telemetry.test.js +8 -8
- package/dist/internal/download/telemetry.test.js.map +1 -1
- package/dist/internal/download/thumbnailDownloader.d.ts +4 -4
- package/dist/internal/download/thumbnailDownloader.js +6 -6
- package/dist/internal/download/thumbnailDownloader.js.map +1 -1
- package/dist/internal/download/thumbnailDownloader.test.js.map +1 -1
- package/dist/internal/errors.d.ts +1 -1
- package/dist/internal/errors.js +1 -3
- package/dist/internal/errors.js.map +1 -1
- package/dist/internal/events/apiService.d.ts +2 -2
- package/dist/internal/events/apiService.js +9 -5
- package/dist/internal/events/apiService.js.map +1 -1
- package/dist/internal/events/coreEventManager.d.ts +3 -3
- package/dist/internal/events/coreEventManager.js.map +1 -1
- package/dist/internal/events/coreEventManager.test.js +14 -14
- package/dist/internal/events/eventManager.d.ts +1 -1
- package/dist/internal/events/eventManager.js +0 -1
- package/dist/internal/events/eventManager.js.map +1 -1
- package/dist/internal/events/eventManager.test.js +34 -25
- package/dist/internal/events/eventManager.test.js.map +1 -1
- package/dist/internal/events/index.d.ts +6 -6
- package/dist/internal/events/index.js.map +1 -1
- package/dist/internal/events/interface.d.ts +1 -1
- package/dist/internal/events/interface.js +0 -1
- package/dist/internal/events/interface.js.map +1 -1
- package/dist/internal/events/volumeEventManager.d.ts +3 -3
- package/dist/internal/events/volumeEventManager.js.map +1 -1
- package/dist/internal/events/volumeEventManager.test.js +55 -55
- package/dist/internal/events/volumeEventManager.test.js.map +1 -1
- package/dist/internal/nodes/apiService.d.ts +4 -3
- package/dist/internal/nodes/apiService.js +36 -15
- package/dist/internal/nodes/apiService.js.map +1 -1
- package/dist/internal/nodes/apiService.test.js +60 -41
- package/dist/internal/nodes/apiService.test.js.map +1 -1
- package/dist/internal/nodes/cache.d.ts +5 -5
- package/dist/internal/nodes/cache.js +14 -7
- package/dist/internal/nodes/cache.js.map +1 -1
- package/dist/internal/nodes/cache.test.js +31 -9
- package/dist/internal/nodes/cache.test.js.map +1 -1
- package/dist/internal/nodes/cryptoCache.d.ts +2 -2
- package/dist/internal/nodes/cryptoCache.js.map +1 -1
- package/dist/internal/nodes/cryptoCache.test.js +24 -4
- package/dist/internal/nodes/cryptoCache.test.js.map +1 -1
- package/dist/internal/nodes/cryptoService.d.ts +3 -3
- package/dist/internal/nodes/cryptoService.js +11 -17
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.test.js +320 -241
- package/dist/internal/nodes/cryptoService.test.js.map +1 -1
- package/dist/internal/nodes/events.d.ts +3 -3
- package/dist/internal/nodes/events.js.map +1 -1
- package/dist/internal/nodes/events.test.js +27 -21
- package/dist/internal/nodes/events.test.js.map +1 -1
- package/dist/internal/nodes/extendedAttributes.d.ts +1 -1
- package/dist/internal/nodes/extendedAttributes.js +3 -1
- package/dist/internal/nodes/extendedAttributes.js.map +1 -1
- package/dist/internal/nodes/extendedAttributes.test.js +7 -10
- package/dist/internal/nodes/extendedAttributes.test.js.map +1 -1
- package/dist/internal/nodes/index.d.ts +10 -10
- package/dist/internal/nodes/index.js.map +1 -1
- package/dist/internal/nodes/index.test.d.ts +1 -0
- package/dist/internal/nodes/index.test.js +106 -0
- package/dist/internal/nodes/index.test.js.map +1 -0
- package/dist/internal/nodes/interface.d.ts +2 -2
- package/dist/internal/nodes/nodesAccess.d.ts +7 -7
- package/dist/internal/nodes/nodesAccess.js +28 -16
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesAccess.test.js +39 -13
- package/dist/internal/nodes/nodesAccess.test.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.d.ts +6 -6
- package/dist/internal/nodes/nodesManagement.js +9 -7
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.test.js +9 -9
- package/dist/internal/nodes/nodesManagement.test.js.map +1 -1
- package/dist/internal/nodes/nodesRevisions.d.ts +4 -4
- package/dist/internal/nodes/nodesRevisions.js.map +1 -1
- package/dist/internal/photos/albums.d.ts +3 -3
- package/dist/internal/photos/albums.js.map +1 -1
- package/dist/internal/photos/apiService.d.ts +1 -1
- package/dist/internal/photos/apiService.js +3 -6
- package/dist/internal/photos/apiService.js.map +1 -1
- package/dist/internal/photos/cache.d.ts +1 -1
- package/dist/internal/photos/index.d.ts +5 -5
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +2 -2
- package/dist/internal/photos/photosTimeline.d.ts +3 -3
- package/dist/internal/photos/photosTimeline.js +1 -2
- package/dist/internal/photos/photosTimeline.js.map +1 -1
- package/dist/internal/sdkEvents.d.ts +1 -1
- package/dist/internal/sdkEvents.js +2 -7
- package/dist/internal/sdkEvents.js.map +1 -1
- package/dist/internal/sdkEvents.test.js +8 -8
- package/dist/internal/shares/apiService.d.ts +2 -2
- package/dist/internal/shares/apiService.js +5 -3
- package/dist/internal/shares/apiService.js.map +1 -1
- package/dist/internal/shares/cache.d.ts +2 -2
- package/dist/internal/shares/cache.js +12 -6
- package/dist/internal/shares/cache.js.map +1 -1
- package/dist/internal/shares/cache.test.js.map +1 -1
- package/dist/internal/shares/cryptoCache.d.ts +2 -2
- package/dist/internal/shares/cryptoCache.test.js +8 -2
- package/dist/internal/shares/cryptoCache.test.js.map +1 -1
- package/dist/internal/shares/cryptoService.d.ts +3 -3
- package/dist/internal/shares/cryptoService.js.map +1 -1
- package/dist/internal/shares/cryptoService.test.js +42 -42
- package/dist/internal/shares/cryptoService.test.js.map +1 -1
- package/dist/internal/shares/index.d.ts +4 -4
- package/dist/internal/shares/index.js.map +1 -1
- package/dist/internal/shares/interface.d.ts +2 -2
- package/dist/internal/shares/manager.d.ts +7 -7
- package/dist/internal/shares/manager.js.map +1 -1
- package/dist/internal/shares/manager.test.js +71 -63
- package/dist/internal/shares/manager.test.js.map +1 -1
- package/dist/internal/sharing/apiService.d.ts +4 -4
- package/dist/internal/sharing/apiService.js +4 -3
- package/dist/internal/sharing/apiService.js.map +1 -1
- package/dist/internal/sharing/cache.d.ts +1 -1
- package/dist/internal/sharing/cache.test.js +33 -33
- package/dist/internal/sharing/cryptoService.d.ts +3 -3
- package/dist/internal/sharing/cryptoService.js +3 -5
- package/dist/internal/sharing/cryptoService.js.map +1 -1
- package/dist/internal/sharing/cryptoService.test.js +39 -39
- package/dist/internal/sharing/cryptoService.test.js.map +1 -1
- package/dist/internal/sharing/events.d.ts +4 -4
- package/dist/internal/sharing/events.js +0 -1
- package/dist/internal/sharing/events.js.map +1 -1
- package/dist/internal/sharing/events.test.js +39 -40
- package/dist/internal/sharing/events.test.js.map +1 -1
- package/dist/internal/sharing/index.d.ts +6 -6
- package/dist/internal/sharing/index.js.map +1 -1
- package/dist/internal/sharing/interface.d.ts +5 -4
- package/dist/internal/sharing/sharingAccess.d.ts +6 -6
- package/dist/internal/sharing/sharingAccess.js +8 -4
- package/dist/internal/sharing/sharingAccess.js.map +1 -1
- package/dist/internal/sharing/sharingAccess.test.js +45 -39
- package/dist/internal/sharing/sharingAccess.test.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.d.ts +4 -4
- package/dist/internal/sharing/sharingManagement.js +5 -7
- package/dist/internal/sharing/sharingManagement.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.test.js +297 -248
- package/dist/internal/sharing/sharingManagement.test.js.map +1 -1
- package/dist/internal/uids.js.map +1 -1
- package/dist/internal/upload/apiService.d.ts +3 -3
- package/dist/internal/upload/apiService.js +1 -1
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/blockVerifier.d.ts +3 -3
- package/dist/internal/upload/blockVerifier.js +1 -1
- package/dist/internal/upload/blockVerifier.js.map +1 -1
- package/dist/internal/upload/chunkStreamReader.test.js +6 -6
- package/dist/internal/upload/cryptoService.d.ts +4 -4
- package/dist/internal/upload/cryptoService.js +4 -4
- package/dist/internal/upload/cryptoService.js.map +1 -1
- package/dist/internal/upload/digests.js.map +1 -1
- package/dist/internal/upload/fileUploader.d.ts +6 -6
- package/dist/internal/upload/fileUploader.js.map +1 -1
- 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.map +1 -1
- package/dist/internal/upload/interface.d.ts +3 -3
- package/dist/internal/upload/manager.d.ts +4 -4
- package/dist/internal/upload/manager.js +7 -5
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +137 -123
- package/dist/internal/upload/manager.test.js.map +1 -1
- package/dist/internal/upload/streamUploader.d.ts +6 -6
- package/dist/internal/upload/streamUploader.js +8 -6
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +16 -11
- package/dist/internal/upload/streamUploader.test.js.map +1 -1
- package/dist/internal/upload/telemetry.d.ts +3 -3
- package/dist/internal/upload/telemetry.js +5 -3
- package/dist/internal/upload/telemetry.js.map +1 -1
- package/dist/internal/upload/telemetry.test.js +8 -8
- package/dist/internal/upload/telemetry.test.js.map +1 -1
- package/dist/protonDriveClient.d.ts +8 -8
- package/dist/protonDriveClient.js +12 -9
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/telemetry.js +18 -15
- package/dist/telemetry.js.map +1 -1
- package/dist/tests/logger.js.map +1 -1
- package/dist/tests/telemetry.d.ts +1 -1
- package/dist/transformers.js +4 -2
- package/dist/transformers.js.map +1 -1
- package/package.json +1 -1
- package/src/cache/interface.ts +22 -22
- package/src/cache/memoryCache.test.ts +7 -7
- package/src/cache/memoryCache.ts +4 -4
- package/src/cache/nullCache.ts +1 -1
- package/src/config.ts +5 -5
- package/src/crypto/driveCrypto.test.ts +15 -15
- package/src/crypto/driveCrypto.ts +120 -156
- package/src/crypto/hmac.ts +1 -1
- package/src/crypto/interface.ts +63 -72
- package/src/crypto/openPGPCrypto.ts +74 -94
- package/src/crypto/utils.ts +1 -1
- package/src/diagnostic/eventsGenerator.ts +2 -2
- package/src/diagnostic/httpClient.ts +6 -2
- package/src/diagnostic/index.ts +12 -10
- package/src/diagnostic/integrityVerificationStream.ts +3 -4
- package/src/diagnostic/interface.ts +81 -81
- package/src/diagnostic/sdkDiagnostic.ts +35 -24
- package/src/diagnostic/sdkDiagnosticFull.ts +16 -19
- package/src/diagnostic/telemetry.ts +4 -1
- package/src/diagnostic/zipGenerators.test.ts +1 -1
- package/src/diagnostic/zipGenerators.ts +3 -3
- package/src/errors.ts +21 -21
- package/src/index.ts +3 -3
- package/src/interface/account.ts +10 -10
- package/src/interface/author.ts +6 -6
- package/src/interface/config.ts +4 -4
- package/src/interface/devices.ts +6 -6
- package/src/interface/download.ts +12 -9
- package/src/interface/events.ts +45 -39
- package/src/interface/httpClient.ts +11 -11
- package/src/interface/index.ts +76 -19
- package/src/interface/nodes.ts +47 -49
- package/src/interface/result.ts +1 -3
- package/src/interface/sharing.ts +60 -57
- package/src/interface/telemetry.ts +74 -74
- package/src/interface/thumbnail.ts +5 -6
- package/src/interface/upload.ts +20 -12
- package/src/internal/apiService/apiService.test.ts +109 -76
- package/src/internal/apiService/apiService.ts +40 -26
- package/src/internal/apiService/coreTypes.ts +2474 -2463
- package/src/internal/apiService/driveTypes.ts +1868 -1822
- package/src/internal/apiService/errorCodes.ts +4 -4
- package/src/internal/apiService/errors.test.ts +25 -23
- package/src/internal/apiService/errors.ts +15 -9
- package/src/internal/apiService/index.ts +1 -1
- package/src/internal/apiService/transformers.ts +2 -2
- package/src/internal/asyncIteratorMap.test.ts +4 -4
- package/src/internal/asyncIteratorMap.ts +1 -1
- package/src/internal/asyncIteratorRace.test.ts +149 -0
- package/src/internal/asyncIteratorRace.ts +79 -0
- package/src/internal/batch.test.ts +50 -0
- package/src/internal/batch.ts +9 -0
- package/src/internal/batchLoading.test.ts +13 -14
- package/src/internal/batchLoading.ts +8 -8
- package/src/internal/devices/apiService.ts +58 -51
- package/src/internal/devices/cryptoService.ts +22 -17
- package/src/internal/devices/index.ts +17 -10
- package/src/internal/devices/interface.ts +21 -12
- package/src/internal/devices/manager.test.ts +40 -9
- package/src/internal/devices/manager.ts +3 -3
- package/src/internal/download/apiService.ts +66 -49
- package/src/internal/download/cryptoService.ts +34 -18
- package/src/internal/download/fileDownloader.test.ts +25 -9
- package/src/internal/download/fileDownloader.ts +36 -18
- package/src/internal/download/index.ts +19 -19
- package/src/internal/download/interface.ts +19 -20
- package/src/internal/download/queue.ts +3 -3
- package/src/internal/download/telemetry.test.ts +11 -11
- package/src/internal/download/telemetry.ts +24 -14
- package/src/internal/download/thumbnailDownloader.test.ts +11 -6
- package/src/internal/download/thumbnailDownloader.ts +43 -32
- package/src/internal/errors.ts +7 -5
- package/src/internal/events/apiService.ts +30 -17
- package/src/internal/events/coreEventManager.test.ts +18 -18
- package/src/internal/events/coreEventManager.ts +9 -6
- package/src/internal/events/eventManager.test.ts +51 -46
- package/src/internal/events/eventManager.ts +6 -5
- package/src/internal/events/index.ts +24 -14
- package/src/internal/events/interface.ts +47 -39
- package/src/internal/events/volumeEventManager.test.ts +61 -65
- package/src/internal/events/volumeEventManager.ts +18 -9
- package/src/internal/nodes/apiService.test.ts +197 -147
- package/src/internal/nodes/apiService.ts +288 -174
- package/src/internal/nodes/cache.test.ts +48 -20
- package/src/internal/nodes/cache.ts +60 -44
- package/src/internal/nodes/cryptoCache.test.ts +34 -14
- package/src/internal/nodes/cryptoCache.ts +10 -5
- package/src/internal/nodes/cryptoService.test.ts +492 -351
- package/src/internal/nodes/cryptoService.ts +170 -88
- package/src/internal/nodes/events.test.ts +38 -28
- package/src/internal/nodes/events.ts +7 -5
- package/src/internal/nodes/extendedAttributes.test.ts +28 -24
- package/src/internal/nodes/extendedAttributes.ts +20 -15
- package/src/internal/nodes/index.test.ts +133 -0
- package/src/internal/nodes/index.ts +27 -15
- package/src/internal/nodes/interface.ts +42 -29
- package/src/internal/nodes/nodesAccess.test.ts +124 -58
- package/src/internal/nodes/nodesAccess.ts +73 -49
- package/src/internal/nodes/nodesManagement.test.ts +32 -31
- package/src/internal/nodes/nodesManagement.ts +39 -32
- package/src/internal/nodes/nodesRevisions.ts +7 -7
- package/src/internal/nodes/validations.ts +2 -2
- package/src/internal/photos/albums.ts +5 -5
- package/src/internal/photos/apiService.ts +4 -7
- package/src/internal/photos/cache.ts +1 -1
- package/src/internal/photos/index.ts +8 -8
- package/src/internal/photos/interface.ts +2 -2
- package/src/internal/photos/photosTimeline.ts +4 -5
- package/src/internal/sdkEvents.test.ts +10 -10
- package/src/internal/sdkEvents.ts +5 -13
- package/src/internal/shares/apiService.ts +44 -33
- package/src/internal/shares/cache.test.ts +6 -4
- package/src/internal/shares/cache.ts +21 -12
- package/src/internal/shares/cryptoCache.test.ts +17 -11
- package/src/internal/shares/cryptoCache.ts +4 -4
- package/src/internal/shares/cryptoService.test.ts +72 -74
- package/src/internal/shares/cryptoService.ts +48 -23
- package/src/internal/shares/index.ts +23 -11
- package/src/internal/shares/interface.ts +8 -8
- package/src/internal/shares/manager.test.ts +88 -80
- package/src/internal/shares/manager.ts +19 -19
- package/src/internal/sharing/apiService.ts +282 -175
- package/src/internal/sharing/cache.test.ts +35 -35
- package/src/internal/sharing/cache.ts +2 -2
- package/src/internal/sharing/cryptoService.test.ts +58 -46
- package/src/internal/sharing/cryptoService.ts +121 -84
- package/src/internal/sharing/events.test.ts +45 -49
- package/src/internal/sharing/events.ts +9 -6
- package/src/internal/sharing/index.ts +22 -11
- package/src/internal/sharing/interface.ts +40 -40
- package/src/internal/sharing/sharingAccess.test.ts +71 -65
- package/src/internal/sharing/sharingAccess.ts +39 -21
- package/src/internal/sharing/sharingManagement.test.ts +398 -298
- package/src/internal/sharing/sharingManagement.ts +138 -65
- package/src/internal/uids.ts +1 -1
- package/src/internal/upload/apiService.ts +167 -117
- package/src/internal/upload/blockVerifier.ts +8 -6
- package/src/internal/upload/chunkStreamReader.test.ts +7 -7
- package/src/internal/upload/cryptoService.ts +42 -36
- package/src/internal/upload/digests.ts +2 -2
- package/src/internal/upload/fileUploader.test.ts +15 -3
- package/src/internal/upload/fileUploader.ts +39 -17
- package/src/internal/upload/index.ts +13 -14
- package/src/internal/upload/interface.ts +78 -78
- package/src/internal/upload/manager.test.ts +170 -153
- package/src/internal/upload/manager.ts +59 -35
- package/src/internal/upload/queue.ts +3 -3
- package/src/internal/upload/streamUploader.test.ts +40 -26
- package/src/internal/upload/streamUploader.ts +87 -69
- package/src/internal/upload/telemetry.test.ts +11 -11
- package/src/internal/upload/telemetry.ts +25 -15
- package/src/internal/wait.test.ts +1 -1
- package/src/internal/wait.ts +3 -3
- package/src/protonDriveClient.ts +121 -39
- package/src/protonDrivePhotosClient.ts +16 -10
- package/src/telemetry.ts +60 -52
- package/src/tests/logger.ts +1 -1
- package/src/tests/telemetry.ts +2 -2
- package/src/transformers.ts +27 -21
- package/src/version.ts +0 -1
|
@@ -1,19 +1,26 @@
|
|
|
1
|
-
import { DeviceType } from
|
|
2
|
-
import { DriveAPIService, drivePaths } from
|
|
3
|
-
import { makeDeviceUid, makeNodeUid, splitDeviceUid } from
|
|
4
|
-
import { DeviceMetadata } from
|
|
1
|
+
import { DeviceType } from '../../interface';
|
|
2
|
+
import { DriveAPIService, drivePaths } from '../apiService';
|
|
3
|
+
import { makeDeviceUid, makeNodeUid, splitDeviceUid } from '../uids';
|
|
4
|
+
import { DeviceMetadata } from './interface';
|
|
5
5
|
|
|
6
6
|
type GetDevicesResponse = drivePaths['/drive/devices']['get']['responses']['200']['content']['application/json'];
|
|
7
7
|
|
|
8
|
-
type PostCreateDeviceRequest = Extract<
|
|
8
|
+
type PostCreateDeviceRequest = Extract<
|
|
9
|
+
drivePaths['/drive/devices']['post']['requestBody'],
|
|
10
|
+
{ content: object }
|
|
11
|
+
>['content']['application/json'];
|
|
9
12
|
type PostCreateDeviceResponse = drivePaths['/drive/devices']['post']['responses']['200']['content']['application/json'];
|
|
10
13
|
|
|
11
|
-
type PutUpdateDeviceRequest = Extract<
|
|
12
|
-
|
|
14
|
+
type PutUpdateDeviceRequest = Extract<
|
|
15
|
+
drivePaths['/drive/devices/{deviceID}']['put']['requestBody'],
|
|
16
|
+
{ content: object }
|
|
17
|
+
>['content']['application/json'];
|
|
18
|
+
type PutUpdateDeviceResponse =
|
|
19
|
+
drivePaths['/drive/devices/{deviceID}']['put']['responses']['200']['content']['application/json'];
|
|
13
20
|
|
|
14
21
|
/**
|
|
15
22
|
* Provides API communication for managing devices.
|
|
16
|
-
*
|
|
23
|
+
*
|
|
17
24
|
* The service is responsible for transforming local objects to API payloads
|
|
18
25
|
* and vice versa. It should not contain any business logic.
|
|
19
26
|
*/
|
|
@@ -28,8 +35,8 @@ export class DevicesAPIService {
|
|
|
28
35
|
uid: makeDeviceUid(device.Device.VolumeID, device.Device.DeviceID),
|
|
29
36
|
type: deviceTypeNumberToEnum(device.Device.Type),
|
|
30
37
|
rootFolderUid: makeNodeUid(device.Device.VolumeID, device.Share.LinkID),
|
|
31
|
-
creationTime: new Date(device.Device.CreateTime*1000),
|
|
32
|
-
lastSyncTime: device.Device.LastSyncTime ? new Date(device.Device.LastSyncTime*1000) : undefined,
|
|
38
|
+
creationTime: new Date(device.Device.CreateTime * 1000),
|
|
39
|
+
lastSyncTime: device.Device.LastSyncTime ? new Date(device.Device.LastSyncTime * 1000) : undefined,
|
|
33
40
|
hasDeprecatedName: !!device.Share.Name,
|
|
34
41
|
/** @deprecated to be removed once Volume-based navigation is implemented in web */
|
|
35
42
|
shareId: device.Share.ShareID,
|
|
@@ -48,56 +55,56 @@ export class DevicesAPIService {
|
|
|
48
55
|
// Web clients do not update Device fields, that is only for desktop clients.
|
|
49
56
|
Omit<PutUpdateDeviceRequest, 'Device'>,
|
|
50
57
|
PutUpdateDeviceResponse
|
|
51
|
-
>(
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
Share: { Name: "" },
|
|
55
|
-
},
|
|
56
|
-
);
|
|
58
|
+
>(`drive/devices/${deviceId}`, {
|
|
59
|
+
Share: { Name: '' },
|
|
60
|
+
});
|
|
57
61
|
}
|
|
58
62
|
|
|
59
63
|
async createDevice(
|
|
60
64
|
device: {
|
|
61
|
-
volumeId: string
|
|
62
|
-
type: DeviceType
|
|
65
|
+
volumeId: string;
|
|
66
|
+
type: DeviceType;
|
|
63
67
|
},
|
|
64
68
|
share: {
|
|
65
|
-
addressId: string
|
|
66
|
-
addressKeyId: string
|
|
67
|
-
armoredKey: string
|
|
68
|
-
armoredSharePassphrase: string
|
|
69
|
-
armoredSharePassphraseSignature: string
|
|
69
|
+
addressId: string;
|
|
70
|
+
addressKeyId: string;
|
|
71
|
+
armoredKey: string;
|
|
72
|
+
armoredSharePassphrase: string;
|
|
73
|
+
armoredSharePassphraseSignature: string;
|
|
70
74
|
},
|
|
71
75
|
node: {
|
|
72
|
-
encryptedName: string
|
|
73
|
-
armoredKey: string
|
|
74
|
-
armoredNodePassphrase: string
|
|
75
|
-
armoredNodePassphraseSignature: string
|
|
76
|
-
armoredHashKey: string
|
|
77
|
-
}
|
|
76
|
+
encryptedName: string;
|
|
77
|
+
armoredKey: string;
|
|
78
|
+
armoredNodePassphrase: string;
|
|
79
|
+
armoredNodePassphraseSignature: string;
|
|
80
|
+
armoredHashKey: string;
|
|
81
|
+
},
|
|
78
82
|
): Promise<DeviceMetadata> {
|
|
79
|
-
const response = await this.apiService.post<PostCreateDeviceRequest, PostCreateDeviceResponse>(
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
83
|
+
const response = await this.apiService.post<PostCreateDeviceRequest, PostCreateDeviceResponse>(
|
|
84
|
+
'drive/devices',
|
|
85
|
+
{
|
|
86
|
+
// @ts-expect-error VolumeID is deprecated.
|
|
87
|
+
Device: {
|
|
88
|
+
Type: deviceTypeEnumToNumber(device.type),
|
|
89
|
+
SyncState: 0,
|
|
90
|
+
},
|
|
91
|
+
// @ts-expect-error Name is deprecated.
|
|
92
|
+
Share: {
|
|
93
|
+
AddressID: share.addressId,
|
|
94
|
+
AddressKeyID: share.addressKeyId,
|
|
95
|
+
Key: share.armoredKey,
|
|
96
|
+
Passphrase: share.armoredSharePassphrase,
|
|
97
|
+
PassphraseSignature: share.armoredSharePassphraseSignature,
|
|
98
|
+
},
|
|
99
|
+
Link: {
|
|
100
|
+
Name: node.encryptedName,
|
|
101
|
+
NodeKey: node.armoredKey,
|
|
102
|
+
NodePassphrase: node.armoredNodePassphrase,
|
|
103
|
+
NodePassphraseSignature: node.armoredNodePassphraseSignature,
|
|
104
|
+
NodeHashKey: node.armoredHashKey,
|
|
105
|
+
},
|
|
92
106
|
},
|
|
93
|
-
|
|
94
|
-
Name: node.encryptedName,
|
|
95
|
-
NodeKey: node.armoredKey,
|
|
96
|
-
NodePassphrase: node.armoredNodePassphrase,
|
|
97
|
-
NodePassphraseSignature: node.armoredNodePassphraseSignature,
|
|
98
|
-
NodeHashKey: node.armoredHashKey,
|
|
99
|
-
}
|
|
100
|
-
});
|
|
107
|
+
);
|
|
101
108
|
|
|
102
109
|
return {
|
|
103
110
|
uid: makeDeviceUid(device.volumeId, response.Device.DeviceID),
|
|
@@ -106,7 +113,7 @@ export class DevicesAPIService {
|
|
|
106
113
|
creationTime: new Date(),
|
|
107
114
|
hasDeprecatedName: false,
|
|
108
115
|
shareId: response.Device.ShareID,
|
|
109
|
-
}
|
|
116
|
+
};
|
|
110
117
|
}
|
|
111
118
|
|
|
112
119
|
async deleteDevice(deviceUid: string): Promise<void> {
|
|
@@ -15,30 +15,35 @@ export class DevicesCryptoService {
|
|
|
15
15
|
|
|
16
16
|
async createDevice(deviceName: string): Promise<{
|
|
17
17
|
address: {
|
|
18
|
-
addressId: string
|
|
19
|
-
addressKeyId: string
|
|
20
|
-
}
|
|
18
|
+
addressId: string;
|
|
19
|
+
addressKeyId: string;
|
|
20
|
+
};
|
|
21
21
|
shareKey: {
|
|
22
|
-
armoredKey: string
|
|
23
|
-
armoredPassphrase: string
|
|
24
|
-
armoredPassphraseSignature: string
|
|
25
|
-
}
|
|
22
|
+
armoredKey: string;
|
|
23
|
+
armoredPassphrase: string;
|
|
24
|
+
armoredPassphraseSignature: string;
|
|
25
|
+
};
|
|
26
26
|
node: {
|
|
27
27
|
key: {
|
|
28
|
-
armoredKey: string
|
|
29
|
-
armoredPassphrase: string
|
|
30
|
-
armoredPassphraseSignature: string
|
|
31
|
-
}
|
|
32
|
-
encryptedName: string
|
|
33
|
-
armoredHashKey: string
|
|
34
|
-
}
|
|
28
|
+
armoredKey: string;
|
|
29
|
+
armoredPassphrase: string;
|
|
30
|
+
armoredPassphraseSignature: string;
|
|
31
|
+
};
|
|
32
|
+
encryptedName: string;
|
|
33
|
+
armoredHashKey: string;
|
|
34
|
+
};
|
|
35
35
|
}> {
|
|
36
36
|
const address = await this.sharesService.getMyFilesShareMemberEmailKey();
|
|
37
37
|
const addressKey = address.addressKey;
|
|
38
38
|
|
|
39
39
|
const shareKey = await this.driveCrypto.generateKey([addressKey], addressKey);
|
|
40
40
|
const rootNodeKey = await this.driveCrypto.generateKey([shareKey.decrypted.key], addressKey);
|
|
41
|
-
const { armoredNodeName } = await this.driveCrypto.encryptNodeName(
|
|
41
|
+
const { armoredNodeName } = await this.driveCrypto.encryptNodeName(
|
|
42
|
+
deviceName,
|
|
43
|
+
undefined,
|
|
44
|
+
shareKey.decrypted.key,
|
|
45
|
+
addressKey,
|
|
46
|
+
);
|
|
42
47
|
const { armoredHashKey } = await this.driveCrypto.generateHashKey(rootNodeKey.decrypted.key);
|
|
43
48
|
|
|
44
49
|
return {
|
|
@@ -59,7 +64,7 @@ export class DevicesCryptoService {
|
|
|
59
64
|
},
|
|
60
65
|
encryptedName: armoredNodeName,
|
|
61
66
|
armoredHashKey,
|
|
62
|
-
}
|
|
67
|
+
},
|
|
63
68
|
};
|
|
64
|
-
}
|
|
69
|
+
}
|
|
65
70
|
}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { DriveCrypto } from
|
|
2
|
-
import { ProtonDriveTelemetry } from
|
|
3
|
-
import { DriveAPIService } from
|
|
4
|
-
import { DevicesAPIService } from
|
|
5
|
-
import { DevicesCryptoService } from
|
|
6
|
-
import { SharesService, NodesService, NodesManagementService } from
|
|
7
|
-
import { DevicesManager } from
|
|
1
|
+
import { DriveCrypto } from '../../crypto';
|
|
2
|
+
import { ProtonDriveTelemetry } from '../../interface';
|
|
3
|
+
import { DriveAPIService } from '../apiService';
|
|
4
|
+
import { DevicesAPIService } from './apiService';
|
|
5
|
+
import { DevicesCryptoService } from './cryptoService';
|
|
6
|
+
import { SharesService, NodesService, NodesManagementService } from './interface';
|
|
7
|
+
import { DevicesManager } from './manager';
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
10
|
* Provides facade for the whole devices module.
|
|
11
|
-
*
|
|
11
|
+
*
|
|
12
12
|
* The devices module is responsible for handling devices metadata, including
|
|
13
13
|
* API communication, encryption, decryption, caching, and event handling.
|
|
14
|
-
*
|
|
14
|
+
*
|
|
15
15
|
* This facade provides internal interface that other modules can use to
|
|
16
16
|
* interact with the devices.
|
|
17
17
|
*/
|
|
@@ -25,7 +25,14 @@ export function initDevicesModule(
|
|
|
25
25
|
) {
|
|
26
26
|
const api = new DevicesAPIService(apiService);
|
|
27
27
|
const cryptoService = new DevicesCryptoService(driveCrypto, sharesService);
|
|
28
|
-
const manager = new DevicesManager(
|
|
28
|
+
const manager = new DevicesManager(
|
|
29
|
+
telemetry.getLogger('devices'),
|
|
30
|
+
api,
|
|
31
|
+
cryptoService,
|
|
32
|
+
sharesService,
|
|
33
|
+
nodesService,
|
|
34
|
+
nodesManagementService,
|
|
35
|
+
);
|
|
29
36
|
|
|
30
37
|
return manager;
|
|
31
38
|
}
|
|
@@ -1,20 +1,25 @@
|
|
|
1
|
-
import { PrivateKey } from
|
|
2
|
-
import { DeviceType, MissingNode } from
|
|
3
|
-
import { DecryptedNode } from
|
|
1
|
+
import { PrivateKey } from '../../crypto';
|
|
2
|
+
import { DeviceType, MissingNode } from '../../interface';
|
|
3
|
+
import { DecryptedNode } from '../nodes';
|
|
4
4
|
|
|
5
5
|
export type DeviceMetadata = {
|
|
6
|
-
uid: string
|
|
7
|
-
type: DeviceType
|
|
8
|
-
rootFolderUid: string
|
|
9
|
-
creationTime: Date
|
|
6
|
+
uid: string;
|
|
7
|
+
type: DeviceType;
|
|
8
|
+
rootFolderUid: string;
|
|
9
|
+
creationTime: Date;
|
|
10
10
|
lastSyncTime?: Date;
|
|
11
11
|
hasDeprecatedName: boolean;
|
|
12
12
|
shareId: string;
|
|
13
|
-
}
|
|
13
|
+
};
|
|
14
14
|
|
|
15
15
|
export interface SharesService {
|
|
16
16
|
getMyFilesIDs(): Promise<{ volumeId: string }>;
|
|
17
|
-
getMyFilesShareMemberEmailKey(): Promise<{
|
|
17
|
+
getMyFilesShareMemberEmailKey(): Promise<{
|
|
18
|
+
addressId: string;
|
|
19
|
+
email: string;
|
|
20
|
+
addressKey: PrivateKey;
|
|
21
|
+
addressKeyId: string;
|
|
22
|
+
}>;
|
|
18
23
|
}
|
|
19
24
|
|
|
20
25
|
export interface NodesService {
|
|
@@ -22,7 +27,11 @@ export interface NodesService {
|
|
|
22
27
|
}
|
|
23
28
|
|
|
24
29
|
export interface NodesManagementService {
|
|
25
|
-
renameNode(
|
|
26
|
-
|
|
27
|
-
|
|
30
|
+
renameNode(
|
|
31
|
+
nodeUid: string,
|
|
32
|
+
newName: string,
|
|
33
|
+
options: {
|
|
34
|
+
allowRenameRootNode: boolean;
|
|
35
|
+
},
|
|
36
|
+
): Promise<DecryptedNode>;
|
|
28
37
|
}
|
|
@@ -53,9 +53,26 @@ describe('DevicesManager', () => {
|
|
|
53
53
|
const name = 'Test Device';
|
|
54
54
|
const deviceType = DeviceType.Linux;
|
|
55
55
|
const address = { addressId: 'address123', addressKeyId: 'key123' };
|
|
56
|
-
const shareKey = {
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
const shareKey = {
|
|
57
|
+
armoredKey: 'armoredKey',
|
|
58
|
+
armoredPassphrase: 'passphrase',
|
|
59
|
+
armoredPassphraseSignature: 'signature',
|
|
60
|
+
};
|
|
61
|
+
const node = {
|
|
62
|
+
encryptedName: 'encryptedName',
|
|
63
|
+
key: {
|
|
64
|
+
armoredKey: 'nodeKey',
|
|
65
|
+
armoredPassphrase: 'nodePassphrase',
|
|
66
|
+
armoredPassphraseSignature: 'nodeSignature',
|
|
67
|
+
},
|
|
68
|
+
armoredHashKey: 'hashKey',
|
|
69
|
+
};
|
|
70
|
+
const createdDevice = {
|
|
71
|
+
uid: 'device123',
|
|
72
|
+
rootFolderUid: 'rootFolder123',
|
|
73
|
+
type: deviceType,
|
|
74
|
+
shareId: 'shareid',
|
|
75
|
+
} as DeviceMetadata;
|
|
59
76
|
|
|
60
77
|
sharesService.getMyFilesIDs.mockResolvedValue({ volumeId });
|
|
61
78
|
cryptoService.createDevice.mockResolvedValue({ address, shareKey, node });
|
|
@@ -80,7 +97,7 @@ describe('DevicesManager', () => {
|
|
|
80
97
|
armoredNodePassphrase: node.key.armoredPassphrase,
|
|
81
98
|
armoredNodePassphraseSignature: node.key.armoredPassphraseSignature,
|
|
82
99
|
armoredHashKey: node.armoredHashKey,
|
|
83
|
-
}
|
|
100
|
+
},
|
|
84
101
|
);
|
|
85
102
|
expect(result).toEqual({ ...createdDevice, name: { ok: true, value: name } });
|
|
86
103
|
});
|
|
@@ -88,7 +105,12 @@ describe('DevicesManager', () => {
|
|
|
88
105
|
it('renames device with deprecated name', async () => {
|
|
89
106
|
const deviceUid = 'device123';
|
|
90
107
|
const name = 'New Device Name';
|
|
91
|
-
const device = {
|
|
108
|
+
const device = {
|
|
109
|
+
uid: deviceUid,
|
|
110
|
+
rootFolderUid: 'rootFolder123',
|
|
111
|
+
hasDeprecatedName: true,
|
|
112
|
+
shareId: 'shareid',
|
|
113
|
+
} as DeviceMetadata;
|
|
92
114
|
|
|
93
115
|
apiService.getDevices.mockResolvedValue([device]);
|
|
94
116
|
|
|
@@ -96,14 +118,21 @@ describe('DevicesManager', () => {
|
|
|
96
118
|
|
|
97
119
|
expect(apiService.getDevices).toHaveBeenCalled();
|
|
98
120
|
expect(apiService.removeNameFromDevice).toHaveBeenCalledWith(deviceUid);
|
|
99
|
-
expect(nodesManagementService.renameNode).toHaveBeenCalledWith(device.rootFolderUid, name, {
|
|
121
|
+
expect(nodesManagementService.renameNode).toHaveBeenCalledWith(device.rootFolderUid, name, {
|
|
122
|
+
allowRenameRootNode: true,
|
|
123
|
+
});
|
|
100
124
|
expect(result).toEqual({ ...device, name: { ok: true, value: name } });
|
|
101
125
|
});
|
|
102
126
|
|
|
103
127
|
it('renames device without deprecated name', async () => {
|
|
104
128
|
const deviceUid = 'device123';
|
|
105
129
|
const name = 'New Device Name';
|
|
106
|
-
const device = {
|
|
130
|
+
const device = {
|
|
131
|
+
uid: deviceUid,
|
|
132
|
+
rootFolderUid: 'rootFolder123',
|
|
133
|
+
hasDeprecatedName: false,
|
|
134
|
+
shareId: 'shareid',
|
|
135
|
+
} as DeviceMetadata;
|
|
107
136
|
|
|
108
137
|
apiService.getDevices.mockResolvedValue([device]);
|
|
109
138
|
|
|
@@ -111,7 +140,9 @@ describe('DevicesManager', () => {
|
|
|
111
140
|
|
|
112
141
|
expect(apiService.getDevices).toHaveBeenCalled();
|
|
113
142
|
expect(apiService.removeNameFromDevice).not.toHaveBeenCalled();
|
|
114
|
-
expect(nodesManagementService.renameNode).toHaveBeenCalledWith(device.rootFolderUid, name, {
|
|
143
|
+
expect(nodesManagementService.renameNode).toHaveBeenCalledWith(device.rootFolderUid, name, {
|
|
144
|
+
allowRenameRootNode: true,
|
|
145
|
+
});
|
|
115
146
|
expect(result).toEqual({ ...device, name: { ok: true, value: name } });
|
|
116
147
|
});
|
|
117
148
|
|
|
@@ -126,4 +157,4 @@ describe('DevicesManager', () => {
|
|
|
126
157
|
expect(apiService.removeNameFromDevice).not.toHaveBeenCalled();
|
|
127
158
|
expect(nodesManagementService.renameNode).not.toHaveBeenCalled();
|
|
128
159
|
});
|
|
129
|
-
});
|
|
160
|
+
});
|
|
@@ -80,7 +80,7 @@ export class DevicesManager {
|
|
|
80
80
|
const device = await this.getDeviceMetadata(deviceUid);
|
|
81
81
|
|
|
82
82
|
if (device.hasDeprecatedName) {
|
|
83
|
-
this.logger.info(
|
|
83
|
+
this.logger.info('Removing deprecated name from device');
|
|
84
84
|
try {
|
|
85
85
|
await this.apiService.removeNameFromDevice(deviceUid);
|
|
86
86
|
} catch (error: unknown) {
|
|
@@ -95,12 +95,12 @@ export class DevicesManager {
|
|
|
95
95
|
return {
|
|
96
96
|
...device,
|
|
97
97
|
name: resultOk(name),
|
|
98
|
-
}
|
|
98
|
+
};
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
private async getDeviceMetadata(deviceUid: string): Promise<DeviceMetadata> {
|
|
102
102
|
const devices = await this.apiService.getDevices();
|
|
103
|
-
const device = devices.find(device => device.uid === deviceUid);
|
|
103
|
+
const device = devices.find((device) => device.uid === deviceUid);
|
|
104
104
|
if (!device) {
|
|
105
105
|
throw new ValidationError(c('Error').t`Device not found`);
|
|
106
106
|
}
|
|
@@ -1,23 +1,32 @@
|
|
|
1
|
-
import { DriveAPIService, drivePaths, ObserverStream } from
|
|
2
|
-
import { makeNodeThumbnailUid, splitNodeRevisionUid, splitNodeThumbnailUid } from
|
|
3
|
-
import { BlockMetadata } from
|
|
1
|
+
import { DriveAPIService, drivePaths, ObserverStream } from '../apiService';
|
|
2
|
+
import { makeNodeThumbnailUid, splitNodeRevisionUid, splitNodeThumbnailUid } from '../uids';
|
|
3
|
+
import { BlockMetadata } from './interface';
|
|
4
4
|
|
|
5
5
|
const BLOCKS_PAGE_SIZE = 20;
|
|
6
6
|
|
|
7
|
-
type GetRevisionResponse =
|
|
7
|
+
type GetRevisionResponse =
|
|
8
|
+
drivePaths['/drive/v2/volumes/{volumeID}/files/{linkID}/revisions/{revisionID}']['get']['responses']['200']['content']['application/json'];
|
|
8
9
|
|
|
9
|
-
type PostGetThumbnailsRequest = Extract<
|
|
10
|
-
|
|
10
|
+
type PostGetThumbnailsRequest = Extract<
|
|
11
|
+
drivePaths['/drive/volumes/{volumeID}/thumbnails']['post']['requestBody'],
|
|
12
|
+
{ content: object }
|
|
13
|
+
>['content']['application/json'];
|
|
14
|
+
type PostGetThumbnailsResponse =
|
|
15
|
+
drivePaths['/drive/volumes/{volumeID}/thumbnails']['post']['responses']['200']['content']['application/json'];
|
|
11
16
|
|
|
12
17
|
export class DownloadAPIService {
|
|
13
18
|
constructor(private apiService: DriveAPIService) {
|
|
14
19
|
this.apiService = apiService;
|
|
15
20
|
}
|
|
16
21
|
|
|
17
|
-
async*
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
22
|
+
async *iterateRevisionBlocks(
|
|
23
|
+
nodeRevisionUid: string,
|
|
24
|
+
signal?: AbortSignal,
|
|
25
|
+
fromBlockIndex = 1,
|
|
26
|
+
): AsyncGenerator<
|
|
27
|
+
| { type: 'manifestSignature'; armoredManifestSignature?: string }
|
|
28
|
+
| { type: 'thumbnail'; base64sha256Hash: string }
|
|
29
|
+
| ({ type: 'block' } & BlockMetadata)
|
|
21
30
|
> {
|
|
22
31
|
const { volumeId, nodeId, revisionId } = splitNodeRevisionUid(nodeRevisionUid);
|
|
23
32
|
|
|
@@ -42,7 +51,7 @@ export class DownloadAPIService {
|
|
|
42
51
|
yield {
|
|
43
52
|
type: 'thumbnail',
|
|
44
53
|
base64sha256Hash: block.Hash,
|
|
45
|
-
}
|
|
54
|
+
};
|
|
46
55
|
}
|
|
47
56
|
}
|
|
48
57
|
}
|
|
@@ -61,7 +70,11 @@ export class DownloadAPIService {
|
|
|
61
70
|
}
|
|
62
71
|
}
|
|
63
72
|
|
|
64
|
-
async getRevisionBlockToken(
|
|
73
|
+
async getRevisionBlockToken(
|
|
74
|
+
nodeRevisionUid: string,
|
|
75
|
+
blockIndex: number,
|
|
76
|
+
signal?: AbortSignal,
|
|
77
|
+
): Promise<BlockMetadata> {
|
|
65
78
|
const { volumeId, nodeId, revisionId } = splitNodeRevisionUid(nodeRevisionUid);
|
|
66
79
|
|
|
67
80
|
const result = await this.apiService.get<GetRevisionResponse>(
|
|
@@ -73,7 +86,12 @@ export class DownloadAPIService {
|
|
|
73
86
|
return transformBlock(block);
|
|
74
87
|
}
|
|
75
88
|
|
|
76
|
-
async downloadBlock(
|
|
89
|
+
async downloadBlock(
|
|
90
|
+
baseUrl: string,
|
|
91
|
+
token: string,
|
|
92
|
+
onProgress?: (downloadedBytes: number) => void,
|
|
93
|
+
signal?: AbortSignal,
|
|
94
|
+
): Promise<Uint8Array> {
|
|
77
95
|
const rawBlockStream = await this.apiService.getBlockStream(baseUrl, token, signal);
|
|
78
96
|
const progressStream = new ObserverStream((value) => {
|
|
79
97
|
onProgress?.(value.length);
|
|
@@ -83,13 +101,15 @@ export class DownloadAPIService {
|
|
|
83
101
|
return encryptedBlock;
|
|
84
102
|
}
|
|
85
103
|
|
|
86
|
-
async*
|
|
87
|
-
|
|
88
|
-
|
|
104
|
+
async *iterateThumbnails(
|
|
105
|
+
thumbnailUids: string[],
|
|
106
|
+
signal?: AbortSignal,
|
|
107
|
+
): AsyncGenerator<
|
|
108
|
+
{ uid: string; ok: true; bareUrl: string; token: string } | { uid: string; ok: false; error: string }
|
|
89
109
|
> {
|
|
90
110
|
const splitedThumbnailsIds = thumbnailUids.map(splitNodeThumbnailUid);
|
|
91
111
|
|
|
92
|
-
const thumbnailIdsByVolumeId = new Map<string, { volumeId: string
|
|
112
|
+
const thumbnailIdsByVolumeId = new Map<string, { volumeId: string; thumbnailId: string; nodeId: string }[]>();
|
|
93
113
|
for (const { volumeId, thumbnailId, nodeId } of splitedThumbnailsIds) {
|
|
94
114
|
if (!thumbnailIdsByVolumeId.has(volumeId)) {
|
|
95
115
|
thumbnailIdsByVolumeId.set(volumeId, []);
|
|
@@ -97,42 +117,40 @@ export class DownloadAPIService {
|
|
|
97
117
|
thumbnailIdsByVolumeId.get(volumeId)?.push({ volumeId, thumbnailId, nodeId });
|
|
98
118
|
}
|
|
99
119
|
|
|
120
|
+
for (const [volumeId, thumbnailIds] of thumbnailIdsByVolumeId.entries()) {
|
|
121
|
+
const result = await this.apiService.post<PostGetThumbnailsRequest, PostGetThumbnailsResponse>(
|
|
122
|
+
`drive/volumes/${volumeId}/thumbnails`,
|
|
123
|
+
{
|
|
124
|
+
ThumbnailIDs: thumbnailIds.map(({ thumbnailId }) => thumbnailId),
|
|
125
|
+
},
|
|
126
|
+
signal,
|
|
127
|
+
);
|
|
100
128
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
if (!id) {
|
|
113
|
-
continue;
|
|
129
|
+
for (const thumbnail of result.Thumbnails) {
|
|
130
|
+
const id = thumbnailIds.find(({ thumbnailId }) => thumbnailId === thumbnail.ThumbnailID);
|
|
131
|
+
if (!id) {
|
|
132
|
+
continue;
|
|
133
|
+
}
|
|
134
|
+
yield {
|
|
135
|
+
uid: makeNodeThumbnailUid(id.volumeId, id.nodeId, thumbnail.ThumbnailID),
|
|
136
|
+
ok: true,
|
|
137
|
+
bareUrl: thumbnail.BareURL,
|
|
138
|
+
token: thumbnail.Token,
|
|
139
|
+
};
|
|
114
140
|
}
|
|
115
|
-
yield {
|
|
116
|
-
uid: makeNodeThumbnailUid(id.volumeId, id.nodeId, thumbnail.ThumbnailID),
|
|
117
|
-
ok: true,
|
|
118
|
-
bareUrl: thumbnail.BareURL,
|
|
119
|
-
token: thumbnail.Token,
|
|
120
|
-
};
|
|
121
|
-
}
|
|
122
141
|
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
142
|
+
for (const error of result.Errors) {
|
|
143
|
+
const id = thumbnailIds.find(({ thumbnailId }) => thumbnailId === error.ThumbnailID);
|
|
144
|
+
if (!id) {
|
|
145
|
+
continue;
|
|
146
|
+
}
|
|
147
|
+
yield {
|
|
148
|
+
uid: makeNodeThumbnailUid(id.volumeId, id.nodeId, error.ThumbnailID),
|
|
149
|
+
ok: false,
|
|
150
|
+
error: error.Error,
|
|
151
|
+
};
|
|
127
152
|
}
|
|
128
|
-
yield {
|
|
129
|
-
uid: makeNodeThumbnailUid(id.volumeId, id.nodeId, error.ThumbnailID),
|
|
130
|
-
ok: false,
|
|
131
|
-
error: error.Error,
|
|
132
|
-
};
|
|
133
153
|
}
|
|
134
|
-
|
|
135
|
-
}
|
|
136
154
|
}
|
|
137
155
|
}
|
|
138
156
|
|
|
@@ -143,6 +161,5 @@ function transformBlock(block: GetRevisionResponse['Revision']['Blocks'][0]): Bl
|
|
|
143
161
|
token: block.Token as string,
|
|
144
162
|
base64sha256Hash: block.Hash,
|
|
145
163
|
signatureEmail: block.SignatureEmail || undefined,
|
|
146
|
-
armoredSignature: block.EncSignature || undefined,
|
|
147
164
|
};
|
|
148
165
|
}
|