@protontech/drive-sdk 0.1.0 → 0.1.2
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 +2 -1
- package/dist/internal/events/eventManager.js +9 -1
- package/dist/internal/events/eventManager.js.map +1 -1
- package/dist/internal/events/eventManager.test.js +84 -60
- package/dist/internal/events/eventManager.test.js.map +1 -1
- package/dist/internal/events/index.d.ts +10 -9
- package/dist/internal/events/index.js +38 -32
- 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 +7 -7
- 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 +2 -1
- package/dist/internal/sharing/cache.js +9 -0
- package/dist/internal/sharing/cache.js.map +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 +5 -4
- package/dist/internal/sharing/events.js +28 -19
- package/dist/internal/sharing/events.js.map +1 -1
- package/dist/internal/sharing/events.test.js +101 -88
- 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 +4 -3
- package/dist/internal/upload/manager.d.ts +5 -5
- package/dist/internal/upload/manager.js +15 -9
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/manager.test.js +139 -128
- 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 +9 -7
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +17 -12
- 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.d.ts +1 -1
- package/dist/transformers.js +5 -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 +108 -82
- package/src/internal/events/eventManager.ts +16 -5
- package/src/internal/events/index.ts +75 -47
- 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 +13 -12
- 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 +11 -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 +113 -102
- package/src/internal/sharing/events.ts +42 -24
- 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 +79 -78
- package/src/internal/upload/manager.test.ts +170 -156
- package/src/internal/upload/manager.ts +66 -39
- 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 +29 -21
- package/src/version.ts +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodesRevisions.js","sourceRoot":"","sources":["../../../src/internal/nodes/nodesRevisions.ts"],"names":[],"mappings":";;;AACA,kCAAqD;AAIrD,6DAAmE;AAEnE;;GAEG;AACH,MAAa,aAAa;IAEV;IACA;IACA;IACA;IAJZ,YACY,MAAc,EACd,UAA0B,EAC1B,aAAiC,EACjC,WAAwB;QAHxB,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAgB;QAC1B,kBAAa,GAAb,aAAa,CAAoB;QACjC,gBAAW,GAAX,WAAW,CAAa;QAEhC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,eAAuB;QACrC,MAAM,OAAO,GAAG,IAAA,iCAA0B,EAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE5D,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC;QAC3F,MAAM,kBAAkB,GAAG,IAAA,gDAA2B,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACjG,OAAO;YACH,GAAG,QAAQ;YACX,GAAG,kBAAkB;SACxB,CAAC;IACN,CAAC;IAED,KAAK,
|
|
1
|
+
{"version":3,"file":"nodesRevisions.js","sourceRoot":"","sources":["../../../src/internal/nodes/nodesRevisions.ts"],"names":[],"mappings":";;;AACA,kCAAqD;AAIrD,6DAAmE;AAEnE;;GAEG;AACH,MAAa,aAAa;IAEV;IACA;IACA;IACA;IAJZ,YACY,MAAc,EACd,UAA0B,EAC1B,aAAiC,EACjC,WAAwB;QAHxB,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAgB;QAC1B,kBAAa,GAAb,aAAa,CAAoB;QACjC,gBAAW,GAAX,WAAW,CAAa;QAEhC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,eAAuB;QACrC,MAAM,OAAO,GAAG,IAAA,iCAA0B,EAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE5D,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC;QAC3F,MAAM,kBAAkB,GAAG,IAAA,gDAA2B,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACjG,OAAO;YACH,GAAG,QAAQ;YACX,GAAG,kBAAkB;SACxB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,CAAC,gBAAgB,CAAC,OAAe,EAAE,MAAoB;QACzD,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE5D,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC/E,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;YACjD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC;YAC3F,MAAM,kBAAkB,GAAG,IAAA,gDAA2B,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;YACjG,MAAM;gBACF,GAAG,QAAQ;gBACX,GAAG,kBAAkB;aACxB,CAAC;QACN,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,eAAuB;QACzC,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,eAAuB;QACxC,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAC1D,CAAC;CACJ;AA/CD,sCA+CC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { PhotosAPIService } from
|
|
2
|
-
import { PhotosCache } from
|
|
3
|
-
import { NodesService } from
|
|
1
|
+
import { PhotosAPIService } from './apiService';
|
|
2
|
+
import { PhotosCache } from './cache';
|
|
3
|
+
import { NodesService } from './interface';
|
|
4
4
|
export declare class Albums {
|
|
5
5
|
private apiService;
|
|
6
6
|
private cache;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"albums.js","sourceRoot":"","sources":["../../../src/internal/photos/albums.ts"],"names":[],"mappings":";;;AAIA,MAAa,MAAM;IAEH;IACA;IACA;IAHZ,YACY,UAA4B,EAC5B,KAAkB,EAClB,YAA0B;QAF1B,eAAU,GAAV,UAAU,CAAkB;QAC5B,UAAK,GAAL,KAAK,CAAa;QAClB,iBAAY,GAAZ,YAAY,CAAc;QAElC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,KAAK,
|
|
1
|
+
{"version":3,"file":"albums.js","sourceRoot":"","sources":["../../../src/internal/photos/albums.ts"],"names":[],"mappings":";;;AAIA,MAAa,MAAM;IAEH;IACA;IACA;IAHZ,YACY,UAA4B,EAC5B,KAAkB,EAClB,YAA0B;QAF1B,eAAU,GAAV,UAAU,CAAkB;QAC5B,UAAK,GAAL,KAAK,CAAa;QAClB,iBAAY,GAAZ,YAAY,CAAc;QAElC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,CAAC,aAAa;QAChB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC;YACxD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxD,MAAM;gBACF,IAAI;aACP,CAAC;QACN,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,SAAiB;QAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;CACJ;AAxBD,wBAwBC"}
|
|
@@ -7,12 +7,9 @@ class PhotosAPIService {
|
|
|
7
7
|
this.apiService = apiService;
|
|
8
8
|
this.apiService = apiService;
|
|
9
9
|
}
|
|
10
|
-
async *iterateTimeline() {
|
|
11
|
-
}
|
|
12
|
-
async
|
|
13
|
-
}
|
|
14
|
-
async createAlbum(object) {
|
|
15
|
-
}
|
|
10
|
+
async *iterateTimeline() { }
|
|
11
|
+
async *iterateAlbums() { }
|
|
12
|
+
async createAlbum(object) { }
|
|
16
13
|
}
|
|
17
14
|
exports.PhotosAPIService = PhotosAPIService;
|
|
18
15
|
//# sourceMappingURL=apiService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/photos/apiService.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IACL;IAApB,YAAoB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAC3C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/photos/apiService.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IACL;IAApB,YAAoB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAC3C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,CAAC,eAAe,KAAyB,CAAC;IAEhD,KAAK,CAAC,CAAC,aAAa,KAAyB,CAAC;IAE9C,KAAK,CAAC,WAAW,CAAC,MAAW,IAAiB,CAAC;CAClD;AAVD,4CAUC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { DriveAPIService } from
|
|
2
|
-
import { ProtonDriveEntitiesCache } from
|
|
3
|
-
import { PhotosTimeline } from
|
|
4
|
-
import { Albums } from
|
|
5
|
-
import { NodesService } from
|
|
1
|
+
import { DriveAPIService } from '../apiService';
|
|
2
|
+
import { ProtonDriveEntitiesCache } from '../../interface';
|
|
3
|
+
import { PhotosTimeline } from './photosTimeline';
|
|
4
|
+
import { Albums } from './albums';
|
|
5
|
+
import { NodesService } from './interface';
|
|
6
6
|
export declare function initPhotosModule(apiService: DriveAPIService, driveEntitiesCache: ProtonDriveEntitiesCache, nodesService: NodesService): {
|
|
7
7
|
timeline: PhotosTimeline;
|
|
8
8
|
albums: Albums;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/photos/index.ts"],"names":[],"mappings":";;AAQA,4CAcC;AApBD,6CAAgD;AAChD,mCAAsC;AACtC,qDAAkD;AAClD,qCAAkC;AAGlC,SAAgB,gBAAgB,CAC5B,UAA2B,EAC3B,kBAA4C,EAC5C,YAA0B;IAE1B,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,mBAAW,CAAC,kBAAkB,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAI,+BAAc,CAAC,GAAG,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,GAAG,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IAEpD,OAAO;QACH,QAAQ;QACR,MAAM;KACT,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/photos/index.ts"],"names":[],"mappings":";;AAQA,4CAcC;AApBD,6CAAgD;AAChD,mCAAsC;AACtC,qDAAkD;AAClD,qCAAkC;AAGlC,SAAgB,gBAAgB,CAC5B,UAA2B,EAC3B,kBAA4C,EAC5C,YAA0B;IAE1B,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,mBAAW,CAAC,kBAAkB,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAI,+BAAc,CAAC,GAAG,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,GAAG,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IAEpD,OAAO;QACH,QAAQ;QACR,MAAM;KACT,CAAC;AACN,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { MissingNode } from
|
|
2
|
-
import { DecryptedNode } from
|
|
1
|
+
import { MissingNode } from '../../interface';
|
|
2
|
+
import { DecryptedNode } from '../nodes';
|
|
3
3
|
export interface NodesService {
|
|
4
4
|
getNode(nodeUid: string): Promise<DecryptedNode>;
|
|
5
5
|
iterateNodes(nodeUids: string[], signal?: AbortSignal): AsyncGenerator<DecryptedNode | MissingNode>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { PhotosAPIService } from
|
|
2
|
-
import { PhotosCache } from
|
|
3
|
-
import { NodesService } from
|
|
1
|
+
import { PhotosAPIService } from './apiService';
|
|
2
|
+
import { PhotosCache } from './cache';
|
|
3
|
+
import { NodesService } from './interface';
|
|
4
4
|
export declare class PhotosTimeline {
|
|
5
5
|
private apiService;
|
|
6
6
|
private cache;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"photosTimeline.js","sourceRoot":"","sources":["../../../src/internal/photos/photosTimeline.ts"],"names":[],"mappings":";;;AAIA,MAAa,cAAc;IAEX;IACA;IACA;IAHZ,YACY,UAA4B,EAC5B,KAAkB,EAClB,YAA0B;QAF1B,eAAU,GAAV,UAAU,CAAkB;QAC5B,UAAK,GAAL,KAAK,CAAa;QAClB,iBAAY,GAAZ,YAAY,CAAc;QAElC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,oBAAoB
|
|
1
|
+
{"version":3,"file":"photosTimeline.js","sourceRoot":"","sources":["../../../src/internal/photos/photosTimeline.ts"],"names":[],"mappings":";;;AAIA,MAAa,cAAc;IAEX;IACA;IACA;IAHZ,YACY,UAA4B,EAC5B,KAAkB,EAClB,YAA0B;QAF1B,eAAU,GAAV,UAAU,CAAkB;QAC5B,UAAK,GAAL,KAAK,CAAa;QAClB,iBAAY,GAAZ,YAAY,CAAc;QAElC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,oBAAoB,KAAI,CAAC;CAClC;AAZD,wCAYC"}
|
|
@@ -9,10 +9,7 @@ class SDKEvents {
|
|
|
9
9
|
this.logger = telemetry.getLogger('sdk-events');
|
|
10
10
|
}
|
|
11
11
|
addListener(eventName, callback) {
|
|
12
|
-
this.listeners.set(eventName, [
|
|
13
|
-
...(this.listeners.get(eventName) || []),
|
|
14
|
-
callback,
|
|
15
|
-
]);
|
|
12
|
+
this.listeners.set(eventName, [...(this.listeners.get(eventName) || []), callback]);
|
|
16
13
|
return () => {
|
|
17
14
|
this.listeners.set(eventName, this.listeners.get(eventName)?.filter((cb) => cb !== callback) || []);
|
|
18
15
|
};
|
|
@@ -35,9 +32,7 @@ class SDKEvents {
|
|
|
35
32
|
return;
|
|
36
33
|
}
|
|
37
34
|
this.logger.debug(`Emitting event: ${eventName}`);
|
|
38
|
-
this.listeners
|
|
39
|
-
.get(eventName)
|
|
40
|
-
?.forEach((callback) => callback());
|
|
35
|
+
this.listeners.get(eventName)?.forEach((callback) => callback());
|
|
41
36
|
}
|
|
42
37
|
}
|
|
43
38
|
exports.SDKEvents = SDKEvents;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdkEvents.js","sourceRoot":"","sources":["../../src/internal/sdkEvents.ts"],"names":[],"mappings":";;;AAAA,4CAAsE;AAEtE,MAAa,SAAS;IACV,MAAM,CAAS;IACf,SAAS,GAAkC,IAAI,GAAG,EAAE,CAAC;IAE7D,YAAY,SAA+B;QACvC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;IAED,WAAW,CAAC,SAAmB,EAAE,QAAoB;QACjD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE
|
|
1
|
+
{"version":3,"file":"sdkEvents.js","sourceRoot":"","sources":["../../src/internal/sdkEvents.ts"],"names":[],"mappings":";;;AAAA,4CAAsE;AAEtE,MAAa,SAAS;IACV,MAAM,CAAS;IACf,SAAS,GAAkC,IAAI,GAAG,EAAE,CAAC;IAE7D,YAAY,SAA+B;QACvC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;IAED,WAAW,CAAC,SAAmB,EAAE,QAAoB;QACjD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEpF,OAAO,GAAG,EAAE;YACR,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QACxG,CAAC,CAAC;IACN,CAAC;IAED,eAAe;QACX,IAAI,CAAC,IAAI,CAAC,oBAAQ,CAAC,eAAe,CAAC,CAAC;IACxC,CAAC;IAED,gBAAgB;QACZ,IAAI,CAAC,IAAI,CAAC,oBAAQ,CAAC,gBAAgB,CAAC,CAAC;IACzC,CAAC;IAED,iBAAiB;QACb,IAAI,CAAC,IAAI,CAAC,oBAAQ,CAAC,iBAAiB,CAAC,CAAC;IAC1C,CAAC;IAED,mBAAmB;QACf,IAAI,CAAC,IAAI,CAAC,oBAAQ,CAAC,mBAAmB,CAAC,CAAC;IAC5C,CAAC;IAEO,IAAI,CAAC,SAAmB;QAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC;YAC1D,OAAO;QACX,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC;CACJ;AAzCD,8BAyCC"}
|
|
@@ -2,18 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const interface_1 = require("../interface");
|
|
4
4
|
const sdkEvents_1 = require("./sdkEvents");
|
|
5
|
-
describe(
|
|
5
|
+
describe('SDKEvents', () => {
|
|
6
6
|
let sdkEvents;
|
|
7
7
|
let logger;
|
|
8
8
|
beforeEach(() => {
|
|
9
9
|
logger = { debug: jest.fn() };
|
|
10
10
|
sdkEvents = new sdkEvents_1.SDKEvents({ getLogger: () => logger });
|
|
11
11
|
});
|
|
12
|
-
it(
|
|
12
|
+
it('should log when no listeners are present for an event', () => {
|
|
13
13
|
sdkEvents.requestsThrottled();
|
|
14
|
-
expect(logger.debug).toHaveBeenCalledWith(
|
|
14
|
+
expect(logger.debug).toHaveBeenCalledWith('No listeners for event: requestsThrottled');
|
|
15
15
|
});
|
|
16
|
-
it(
|
|
16
|
+
it('should emit an event to its listeners', () => {
|
|
17
17
|
const requestsThrottledListener = jest.fn();
|
|
18
18
|
sdkEvents.addListener(interface_1.SDKEvent.RequestsThrottled, requestsThrottledListener);
|
|
19
19
|
const requestsUnthrottledListener = jest.fn();
|
|
@@ -21,9 +21,9 @@ describe("SDKEvents", () => {
|
|
|
21
21
|
sdkEvents.requestsThrottled();
|
|
22
22
|
expect(requestsThrottledListener).toHaveBeenCalled();
|
|
23
23
|
expect(requestsUnthrottledListener).not.toHaveBeenCalled();
|
|
24
|
-
expect(logger.debug).toHaveBeenCalledWith(
|
|
24
|
+
expect(logger.debug).toHaveBeenCalledWith('Emitting event: requestsThrottled');
|
|
25
25
|
});
|
|
26
|
-
it(
|
|
26
|
+
it('should emit an event to multiple listeners', () => {
|
|
27
27
|
const requestsThrottledListener1 = jest.fn();
|
|
28
28
|
const requestsThrottledListener2 = jest.fn();
|
|
29
29
|
sdkEvents.addListener(interface_1.SDKEvent.RequestsThrottled, requestsThrottledListener1);
|
|
@@ -31,9 +31,9 @@ describe("SDKEvents", () => {
|
|
|
31
31
|
sdkEvents.requestsThrottled();
|
|
32
32
|
expect(requestsThrottledListener1).toHaveBeenCalled();
|
|
33
33
|
expect(requestsThrottledListener2).toHaveBeenCalled();
|
|
34
|
-
expect(logger.debug).toHaveBeenCalledWith(
|
|
34
|
+
expect(logger.debug).toHaveBeenCalledWith('Emitting event: requestsThrottled');
|
|
35
35
|
});
|
|
36
|
-
it(
|
|
36
|
+
it('should not emit after unsubsribe', () => {
|
|
37
37
|
const callback = jest.fn();
|
|
38
38
|
const unsubscribe = sdkEvents.addListener(interface_1.SDKEvent.RequestsThrottled, callback);
|
|
39
39
|
sdkEvents.requestsThrottled();
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { DriveAPIService } from
|
|
2
|
-
import { EncryptedShare, EncryptedRootShare, EncryptedShareCrypto } from
|
|
1
|
+
import { DriveAPIService } from '../apiService';
|
|
2
|
+
import { EncryptedShare, EncryptedRootShare, EncryptedShareCrypto } from './interface';
|
|
3
3
|
/**
|
|
4
4
|
* Provides API communication for fetching shares and creating volumes.
|
|
5
5
|
*
|
|
@@ -107,9 +107,11 @@ function convertSharePayload(response) {
|
|
|
107
107
|
armoredPassphrase: response.Passphrase,
|
|
108
108
|
armoredPassphraseSignature: response.PassphraseSignature,
|
|
109
109
|
},
|
|
110
|
-
membership: response.Memberships?.[0]
|
|
111
|
-
|
|
112
|
-
|
|
110
|
+
membership: response.Memberships?.[0]
|
|
111
|
+
? {
|
|
112
|
+
memberUid: (0, uids_1.makeMemberUid)(response.ShareID, response.Memberships[0].MemberID),
|
|
113
|
+
}
|
|
114
|
+
: undefined,
|
|
113
115
|
type: convertShareTypeNumberToEnum(response.Type),
|
|
114
116
|
};
|
|
115
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/shares/apiService.ts"],"names":[],"mappings":";;;AACA,kCAAwC;AACxC,2CAAkG;
|
|
1
|
+
{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/shares/apiService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ProtonDriveEntitiesCache, Logger } from
|
|
2
|
-
import { Volume } from
|
|
1
|
+
import { ProtonDriveEntitiesCache, Logger } from '../../interface';
|
|
2
|
+
import { Volume } from './interface';
|
|
3
3
|
/**
|
|
4
4
|
* Provides caching for shares and volume metadata.
|
|
5
5
|
*
|
|
@@ -52,12 +52,18 @@ function serializeVolume(volume) {
|
|
|
52
52
|
}
|
|
53
53
|
function deserializeVolume(shareData) {
|
|
54
54
|
const volume = JSON.parse(shareData);
|
|
55
|
-
if (!volume ||
|
|
56
|
-
|
|
57
|
-
!volume.
|
|
58
|
-
|
|
59
|
-
!volume.
|
|
60
|
-
|
|
55
|
+
if (!volume ||
|
|
56
|
+
typeof volume !== 'object' ||
|
|
57
|
+
!volume.volumeId ||
|
|
58
|
+
typeof volume.volumeId !== 'string' ||
|
|
59
|
+
!volume.shareId ||
|
|
60
|
+
typeof volume.shareId !== 'string' ||
|
|
61
|
+
!volume.rootNodeId ||
|
|
62
|
+
typeof volume.rootNodeId !== 'string' ||
|
|
63
|
+
!volume.creatorEmail ||
|
|
64
|
+
typeof volume.creatorEmail !== 'string' ||
|
|
65
|
+
!volume.addressId ||
|
|
66
|
+
typeof volume.addressId !== 'string') {
|
|
61
67
|
throw new Error('Invalid volume data');
|
|
62
68
|
}
|
|
63
69
|
return volume;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../src/internal/shares/cache.ts"],"names":[],"mappings":";;;AACA,sCAA4C;AAG5C;;;;;;GAMG;AACH,MAAa,WAAW;IACA;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../src/internal/shares/cache.ts"],"names":[],"mappings":";;;AACA,sCAA4C;AAG5C;;;;;;GAMG;AACH,MAAa,WAAW;IAER;IACA;IAFZ,YACY,MAAc,EACd,UAAoC;QADpC,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAA0B;QAE5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAc;QAC1B,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,QAAgB;QAC5B,MAAM,GAAG,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAExD,IAAI,CAAC;YACD,OAAO,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,aAAsB,EAAE,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE,aAAa,CAAC,CAAC;YACnF,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAA,wBAAe,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAgB;QAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC;CACJ;AAlCD,kCAkCC;AAED,SAAS,WAAW,CAAC,QAAgB;IACjC,OAAO,UAAU,QAAQ,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,eAAe,CAAC,MAAc;IACnC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,iBAAiB,CAAC,SAAiB;IACxC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACrC,IACI,CAAC,MAAM;QACP,OAAO,MAAM,KAAK,QAAQ;QAC1B,CAAC,MAAM,CAAC,QAAQ;QAChB,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ;QACnC,CAAC,MAAM,CAAC,OAAO;QACf,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;QAClC,CAAC,MAAM,CAAC,UAAU;QAClB,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ;QACrC,CAAC,MAAM,CAAC,YAAY;QACpB,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ;QACvC,CAAC,MAAM,CAAC,SAAS;QACjB,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,EACtC,CAAC;QACC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.test.js","sourceRoot":"","sources":["../../../src/internal/shares/cache.test.ts"],"names":[],"mappings":";;AAAA,uCAA0C;AAC1C,+CAAmD;AACnD,mCAAsC;AAEtC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,IAAI,WAAgC,CAAC;IACrC,IAAI,KAAkB,CAAC;IAEvB,UAAU,CAAC,KAAK,IAAI,EAAE;QAClB,WAAW,GAAG,IAAI,mBAAW,EAAE,CAAC;QAChC,MAAM,WAAW,CAAC,SAAS,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;QAEvD,KAAK,GAAG,IAAI,mBAAW,CAAC,IAAA,sBAAa,GAAE,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,QAAQ,GAAG,SAAS,CAAC;QAC3B,MAAM,MAAM,GAAG;YACX,QAAQ;YACR,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,OAAO;YACnB,YAAY,EAAE,OAAO;YACrB,SAAS,EAAE,UAAU;SACxB,CAAC;QAEF,MAAM,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE/C,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,QAAQ,GAAG,aAAa,CAAC;QAE/B,IAAI,CAAC;YACD,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACvD,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;QACjF,IAAI,CAAC;YACD,MAAM,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACnC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"cache.test.js","sourceRoot":"","sources":["../../../src/internal/shares/cache.test.ts"],"names":[],"mappings":";;AAAA,uCAA0C;AAC1C,+CAAmD;AACnD,mCAAsC;AAEtC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,IAAI,WAAgC,CAAC;IACrC,IAAI,KAAkB,CAAC;IAEvB,UAAU,CAAC,KAAK,IAAI,EAAE;QAClB,WAAW,GAAG,IAAI,mBAAW,EAAE,CAAC;QAChC,MAAM,WAAW,CAAC,SAAS,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;QAEvD,KAAK,GAAG,IAAI,mBAAW,CAAC,IAAA,sBAAa,GAAE,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,QAAQ,GAAG,SAAS,CAAC;QAC3B,MAAM,MAAM,GAAG;YACX,QAAQ;YACR,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,OAAO;YACnB,YAAY,EAAE,OAAO;YACrB,SAAS,EAAE,UAAU;SACxB,CAAC;QAEF,MAAM,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE/C,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,QAAQ,GAAG,aAAa,CAAC;QAE/B,IAAI,CAAC;YACD,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACvD,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;QACjF,IAAI,CAAC;YACD,MAAM,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACnC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,IAAI,CACnB,wFAAwF,CAC3F,CAAC;QACN,CAAC;QAED,IAAI,CAAC;YACD,MAAM,WAAW,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;YACjD,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACvD,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ProtonDriveCryptoCache } from
|
|
2
|
-
import { DecryptedShareKey } from
|
|
1
|
+
import { ProtonDriveCryptoCache } from '../../interface';
|
|
2
|
+
import { DecryptedShareKey } from './interface';
|
|
3
3
|
/**
|
|
4
4
|
* Provides caching for share crypto material.
|
|
5
5
|
*
|
|
@@ -24,8 +24,14 @@ describe('sharesCryptoCache', () => {
|
|
|
24
24
|
});
|
|
25
25
|
it('should replace and retrieve new keys', async () => {
|
|
26
26
|
const shareId = 'newShareId';
|
|
27
|
-
const keys1 = {
|
|
28
|
-
|
|
27
|
+
const keys1 = {
|
|
28
|
+
key: generatePrivateKey('privateKey1'),
|
|
29
|
+
passphraseSessionKey: generateSessionKey('sessionKey1'),
|
|
30
|
+
};
|
|
31
|
+
const keys2 = {
|
|
32
|
+
key: generatePrivateKey('privateKey2'),
|
|
33
|
+
passphraseSessionKey: generateSessionKey('sessionKey2'),
|
|
34
|
+
};
|
|
29
35
|
await cache.setShareKey(shareId, keys1);
|
|
30
36
|
await cache.setShareKey(shareId, keys2);
|
|
31
37
|
const result = await cache.getShareKey(shareId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoCache.test.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoCache.test.ts"],"names":[],"mappings":";;AACA,uCAA0C;AAE1C,+CAAkD;AAElD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,IAAI,WAA8C,CAAC;IACnD,IAAI,KAAwB,CAAC;IAE7B,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE;QACxC,OAAO,IAA6B,
|
|
1
|
+
{"version":3,"file":"cryptoCache.test.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoCache.test.ts"],"names":[],"mappings":";;AACA,uCAA0C;AAE1C,+CAAkD;AAElD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,IAAI,WAA8C,CAAC;IACnD,IAAI,KAAwB,CAAC;IAE7B,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE;QACxC,OAAO,IAA6B,CAAC;IACzC,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE;QACxC,OAAO,IAA6B,CAAC;IACzC,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACZ,WAAW,GAAG,IAAI,mBAAW,EAAE,CAAC;QAChC,KAAK,GAAG,IAAI,+BAAiB,CAAC,WAAW,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,OAAO,GAAG,YAAY,CAAC;QAC7B,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,YAAY,CAAC,EAAE,oBAAoB,EAAE,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;QAE/G,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,OAAO,GAAG,YAAY,CAAC;QAC7B,MAAM,KAAK,GAAG;YACV,GAAG,EAAE,kBAAkB,CAAC,aAAa,CAAC;YACtC,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,CAAC;SAC1D,CAAC;QACF,MAAM,KAAK,GAAG;YACV,GAAG,EAAE,kBAAkB,CAAC,aAAa,CAAC;YACtC,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,CAAC;SAC1D,CAAC;QAEF,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACxC,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,OAAO,GAAG,YAAY,CAAC;QAC7B,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,YAAY,CAAC,EAAE,oBAAoB,EAAE,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;QAE/G,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACvC,MAAM,KAAK,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAEtC,IAAI,CAAC;YACD,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACvD,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,OAAO,GAAG,YAAY,CAAC;QAE7B,IAAI,CAAC;YACD,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACvD,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ProtonDriveAccount, ProtonDriveTelemetry } from
|
|
2
|
-
import { DriveCrypto, PrivateKey } from
|
|
3
|
-
import { EncryptedRootShare, DecryptedRootShare, EncryptedShareCrypto, DecryptedShareKey } from
|
|
1
|
+
import { ProtonDriveAccount, ProtonDriveTelemetry } from '../../interface';
|
|
2
|
+
import { DriveCrypto, PrivateKey } from '../../crypto';
|
|
3
|
+
import { EncryptedRootShare, DecryptedRootShare, EncryptedShareCrypto, DecryptedShareKey } from './interface';
|
|
4
4
|
/**
|
|
5
5
|
* Provides crypto operations for share keys.
|
|
6
6
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoService.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"cryptoService.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoService.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ const crypto_1 = require("../../crypto");
|
|
|
4
4
|
const telemetry_1 = require("../../tests/telemetry");
|
|
5
5
|
const interface_1 = require("./interface");
|
|
6
6
|
const cryptoService_1 = require("./cryptoService");
|
|
7
|
-
describe(
|
|
7
|
+
describe('SharesCryptoService', () => {
|
|
8
8
|
let telemetry;
|
|
9
9
|
let driveCrypto;
|
|
10
10
|
let account;
|
|
@@ -14,77 +14,77 @@ describe("SharesCryptoService", () => {
|
|
|
14
14
|
// @ts-expect-error No need to implement all methods for mocking
|
|
15
15
|
driveCrypto = {
|
|
16
16
|
decryptKey: jest.fn(async () => Promise.resolve({
|
|
17
|
-
passphrase:
|
|
18
|
-
key:
|
|
19
|
-
passphraseSessionKey:
|
|
17
|
+
passphrase: 'pass',
|
|
18
|
+
key: 'decryptedKey',
|
|
19
|
+
passphraseSessionKey: 'sessionKey',
|
|
20
20
|
verified: crypto_1.VERIFICATION_STATUS.SIGNED_AND_VALID,
|
|
21
21
|
})),
|
|
22
22
|
};
|
|
23
23
|
account = {
|
|
24
24
|
// @ts-expect-error No need to implement full response for mocking
|
|
25
25
|
getOwnAddress: jest.fn(async () => ({
|
|
26
|
-
keys: [{ key:
|
|
26
|
+
keys: [{ key: 'addressKey' }],
|
|
27
27
|
})),
|
|
28
28
|
getPublicKeys: jest.fn(async () => []),
|
|
29
29
|
};
|
|
30
30
|
cryptoService = new cryptoService_1.SharesCryptoService(telemetry, driveCrypto, account);
|
|
31
31
|
});
|
|
32
|
-
it(
|
|
32
|
+
it('should decrypt root share', async () => {
|
|
33
33
|
const result = await cryptoService.decryptRootShare({
|
|
34
|
-
shareId:
|
|
35
|
-
addressId:
|
|
36
|
-
creatorEmail:
|
|
34
|
+
shareId: 'shareId',
|
|
35
|
+
addressId: 'addressId',
|
|
36
|
+
creatorEmail: 'signatureEmail',
|
|
37
37
|
encryptedCrypto: {
|
|
38
|
-
armoredKey:
|
|
39
|
-
armoredPassphrase:
|
|
40
|
-
armoredPassphraseSignature:
|
|
38
|
+
armoredKey: 'armoredKey',
|
|
39
|
+
armoredPassphrase: 'armoredPassphrase',
|
|
40
|
+
armoredPassphraseSignature: 'armoredPassphraseSignature',
|
|
41
41
|
},
|
|
42
42
|
type: interface_1.ShareType.Main,
|
|
43
43
|
});
|
|
44
44
|
expect(result).toMatchObject({
|
|
45
45
|
share: {
|
|
46
|
-
shareId:
|
|
47
|
-
author: { ok: true, value:
|
|
46
|
+
shareId: 'shareId',
|
|
47
|
+
author: { ok: true, value: 'signatureEmail' },
|
|
48
48
|
},
|
|
49
49
|
key: {
|
|
50
|
-
key:
|
|
51
|
-
passphraseSessionKey:
|
|
50
|
+
key: 'decryptedKey',
|
|
51
|
+
passphraseSessionKey: 'sessionKey',
|
|
52
52
|
},
|
|
53
53
|
});
|
|
54
|
-
expect(account.getOwnAddress).toHaveBeenCalledWith(
|
|
55
|
-
expect(account.getPublicKeys).toHaveBeenCalledWith(
|
|
54
|
+
expect(account.getOwnAddress).toHaveBeenCalledWith('addressId');
|
|
55
|
+
expect(account.getPublicKeys).toHaveBeenCalledWith('signatureEmail');
|
|
56
56
|
expect(telemetry.logEvent).not.toHaveBeenCalled();
|
|
57
57
|
});
|
|
58
|
-
it(
|
|
58
|
+
it('should decrypt root share with signiture verification error', async () => {
|
|
59
59
|
driveCrypto.decryptKey = jest.fn(async () => Promise.resolve({
|
|
60
|
-
passphrase:
|
|
61
|
-
key:
|
|
62
|
-
passphraseSessionKey:
|
|
60
|
+
passphrase: 'pass',
|
|
61
|
+
key: 'decryptedKey',
|
|
62
|
+
passphraseSessionKey: 'sessionKey',
|
|
63
63
|
verified: crypto_1.VERIFICATION_STATUS.NOT_SIGNED,
|
|
64
64
|
}));
|
|
65
65
|
const result = await cryptoService.decryptRootShare({
|
|
66
|
-
shareId:
|
|
67
|
-
addressId:
|
|
68
|
-
creatorEmail:
|
|
66
|
+
shareId: 'shareId',
|
|
67
|
+
addressId: 'addressId',
|
|
68
|
+
creatorEmail: 'signatureEmail',
|
|
69
69
|
encryptedCrypto: {
|
|
70
|
-
armoredKey:
|
|
71
|
-
armoredPassphrase:
|
|
72
|
-
armoredPassphraseSignature:
|
|
70
|
+
armoredKey: 'armoredKey',
|
|
71
|
+
armoredPassphrase: 'armoredPassphrase',
|
|
72
|
+
armoredPassphraseSignature: 'armoredPassphraseSignature',
|
|
73
73
|
},
|
|
74
74
|
type: interface_1.ShareType.Main,
|
|
75
75
|
});
|
|
76
76
|
expect(result).toMatchObject({
|
|
77
77
|
share: {
|
|
78
|
-
shareId:
|
|
79
|
-
author: { ok: false, error: { claimedAuthor:
|
|
78
|
+
shareId: 'shareId',
|
|
79
|
+
author: { ok: false, error: { claimedAuthor: 'signatureEmail', error: 'Missing signature' } },
|
|
80
80
|
},
|
|
81
81
|
key: {
|
|
82
|
-
key:
|
|
83
|
-
passphraseSessionKey:
|
|
82
|
+
key: 'decryptedKey',
|
|
83
|
+
passphraseSessionKey: 'sessionKey',
|
|
84
84
|
},
|
|
85
85
|
});
|
|
86
|
-
expect(account.getOwnAddress).toHaveBeenCalledWith(
|
|
87
|
-
expect(account.getPublicKeys).toHaveBeenCalledWith(
|
|
86
|
+
expect(account.getOwnAddress).toHaveBeenCalledWith('addressId');
|
|
87
|
+
expect(account.getPublicKeys).toHaveBeenCalledWith('signatureEmail');
|
|
88
88
|
expect(telemetry.logEvent).toHaveBeenCalledWith({
|
|
89
89
|
eventName: 'verificationError',
|
|
90
90
|
volumeType: 'own_volume',
|
|
@@ -93,17 +93,17 @@ describe("SharesCryptoService", () => {
|
|
|
93
93
|
fromBefore2024: undefined,
|
|
94
94
|
});
|
|
95
95
|
});
|
|
96
|
-
it(
|
|
97
|
-
const error = new Error(
|
|
96
|
+
it('should handle decrypt issue of root share', async () => {
|
|
97
|
+
const error = new Error('Decryption error');
|
|
98
98
|
driveCrypto.decryptKey = jest.fn(async () => Promise.reject(error));
|
|
99
99
|
const result = cryptoService.decryptRootShare({
|
|
100
|
-
shareId:
|
|
101
|
-
addressId:
|
|
102
|
-
creatorEmail:
|
|
100
|
+
shareId: 'shareId',
|
|
101
|
+
addressId: 'addressId',
|
|
102
|
+
creatorEmail: 'signatureEmail',
|
|
103
103
|
encryptedCrypto: {
|
|
104
|
-
armoredKey:
|
|
105
|
-
armoredPassphrase:
|
|
106
|
-
armoredPassphraseSignature:
|
|
104
|
+
armoredKey: 'armoredKey',
|
|
105
|
+
armoredPassphrase: 'armoredPassphrase',
|
|
106
|
+
armoredPassphraseSignature: 'armoredPassphraseSignature',
|
|
107
107
|
},
|
|
108
108
|
type: interface_1.ShareType.Main,
|
|
109
109
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoService.test.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoService.test.ts"],"names":[],"mappings":";;AAAA,yCAAwF;AAExF,qDAAyD;AACzD,2CAA4D;AAC5D,mDAAsD;AAEtD,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACjC,IAAI,SAA+B,CAAC;IACpC,IAAI,WAAwB,CAAC;IAC7B,IAAI,OAA2B,CAAC;IAChC,IAAI,aAAkC,CAAC;IAEvC,UAAU,CAAC,GAAG,EAAE;QACZ,SAAS,GAAG,IAAA,4BAAgB,GAAE,CAAC;QAC/B,gEAAgE;QAChE,WAAW,GAAG;YACV,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"cryptoService.test.js","sourceRoot":"","sources":["../../../src/internal/shares/cryptoService.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { ProtonDriveEntitiesCache, ProtonDriveCryptoCache, ProtonDriveAccount, ProtonDriveTelemetry } from
|
|
1
|
+
import { ProtonDriveEntitiesCache, ProtonDriveCryptoCache, ProtonDriveAccount, ProtonDriveTelemetry } from '../../interface';
|
|
2
2
|
import { DriveCrypto } from '../../crypto';
|
|
3
|
-
import { DriveAPIService } from
|
|
4
|
-
import { SharesManager } from
|
|
5
|
-
export type { EncryptedShare } from
|
|
3
|
+
import { DriveAPIService } from '../apiService';
|
|
4
|
+
import { SharesManager } from './manager';
|
|
5
|
+
export type { EncryptedShare } from './interface';
|
|
6
6
|
/**
|
|
7
7
|
* Provides facade for the whole shares module.
|
|
8
8
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/shares/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/shares/index.ts"],"names":[],"mappings":";;AAyBA,4CAqBC;AAtCD,6CAAgD;AAChD,+CAAkD;AAClD,mCAAsC;AACtC,mDAAsD;AACtD,uCAA0C;AAI1C;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAC5B,SAA+B,EAC/B,UAA2B,EAC3B,kBAA4C,EAC5C,gBAAwC,EACxC,OAA2B,EAC3B,MAAmB;IAEnB,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,mBAAW,CAAC,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACvF,MAAM,WAAW,GAAG,IAAI,+BAAiB,CAAC,gBAAgB,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,IAAI,mCAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1E,MAAM,aAAa,GAAG,IAAI,uBAAa,CACnC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,EAC7B,GAAG,EACH,KAAK,EACL,WAAW,EACX,aAAa,EACb,OAAO,CACV,CAAC;IACF,OAAO,aAAa,CAAC;AACzB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PrivateKey, SessionKey } from
|
|
2
|
-
import { Result, UnverifiedAuthorError } from
|
|
1
|
+
import { PrivateKey, SessionKey } from '../../crypto';
|
|
2
|
+
import { Result, UnverifiedAuthorError } from '../../interface';
|
|
3
3
|
/**
|
|
4
4
|
* Internal interface providing basic identification of volume and its root
|
|
5
5
|
* share and node.
|