@super-protocol/sdk-js 2.2.0-beta.12 → 2.2.0-beta.120
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/cjs/RIGenerator.d.ts +2 -0
- package/dist/cjs/RIGenerator.js +6 -4
- package/dist/cjs/TIIGenerator.d.ts +2 -1
- package/dist/cjs/TIIGenerator.js +13 -3
- package/dist/cjs/TeeInputGeneratorBase.d.ts +1 -1
- package/dist/cjs/TeeInputGeneratorBase.js +20 -32
- package/dist/cjs/analytics/eventProviders/BrowserEventProvider.d.ts +1 -0
- package/dist/cjs/analytics/eventProviders/BrowserEventProvider.js +3 -3
- package/dist/cjs/analytics/transports/AxiosTransport.js +1 -1
- package/dist/cjs/config.d.ts +0 -1
- package/dist/cjs/config.js +1 -2
- package/dist/cjs/constants.d.ts +5 -4
- package/dist/cjs/constants.js +31 -7
- package/dist/cjs/contracts/abi.d.ts +929 -122
- package/dist/cjs/contracts/abi.js +1168 -134
- package/dist/cjs/crypto/index.d.ts +1 -0
- package/dist/cjs/crypto/index.js +16 -1
- package/dist/cjs/errors/base.error.d.ts +3 -0
- package/dist/cjs/errors/base.error.js +19 -0
- package/dist/cjs/errors/index.d.ts +2 -0
- package/dist/cjs/errors/index.js +8 -0
- package/dist/cjs/errors/not-found.error.d.ts +3 -0
- package/dist/cjs/errors/not-found.error.js +8 -0
- package/dist/cjs/errors/utils.d.ts +1 -0
- package/dist/cjs/errors/utils.js +25 -0
- package/dist/cjs/index.d.ts +11 -1
- package/dist/cjs/index.js +19 -2
- package/dist/cjs/models/Offer.d.ts +48 -6
- package/dist/cjs/models/Offer.js +159 -16
- package/dist/cjs/models/Order.d.ts +2 -90
- package/dist/cjs/models/Order.js +20 -91
- package/dist/cjs/models/Provider.js +1 -1
- package/dist/cjs/models/TCB.js +13 -5
- package/dist/cjs/models/TeeOffer.d.ts +35 -13
- package/dist/cjs/models/TeeOffer.js +119 -44
- package/dist/cjs/proto/Compression.d.ts +1 -1
- package/dist/cjs/proto/TRI.d.ts +41 -6
- package/dist/cjs/proto/TRI.js +18 -1
- package/dist/cjs/proto/TeeProperties.d.ts +5 -5
- package/dist/cjs/providers/storage/IStorageProvider.d.ts +1 -1
- package/dist/cjs/providers/storage/S3StorageProvider.d.ts +8 -7
- package/dist/cjs/providers/storage/S3StorageProvider.js +77 -38
- package/dist/cjs/providers/storage/StorageAdapter.d.ts +9 -7
- package/dist/cjs/providers/storage/StorageAdapter.js +27 -29
- package/dist/cjs/providers/storage/StorageContentWriter.d.ts +2 -2
- package/dist/cjs/providers/storage/StorageContentWriter.js +5 -5
- package/dist/cjs/providers/storage/StorageKeyValueAdapter.d.ts +8 -5
- package/dist/cjs/providers/storage/StorageKeyValueAdapter.js +30 -16
- package/dist/cjs/providers/storage/StorjAdapter.d.ts +5 -4
- package/dist/cjs/providers/storage/StorjAdapter.js +15 -9
- package/dist/cjs/providers/storage/StorjCredentialsManager.d.ts +24 -0
- package/dist/cjs/providers/storage/StorjCredentialsManager.js +109 -0
- package/dist/cjs/providers/storage/StorjStorageProvider.js +26 -3
- package/dist/cjs/providers/storage/fs-storage-provider.d.ts +19 -0
- package/dist/cjs/providers/storage/fs-storage-provider.js +143 -0
- package/dist/cjs/providers/storage/getStorageProvider.js +4 -1
- package/dist/cjs/providers/storage/parseStorageCredentials.d.ts +5 -0
- package/dist/cjs/providers/storage/parseStorageCredentials.js +21 -0
- package/dist/cjs/providers/storage/types.d.ts +22 -0
- package/dist/cjs/staticModels/Consensus.d.ts +3 -2
- package/dist/cjs/staticModels/Consensus.js +22 -11
- package/dist/cjs/staticModels/LoaderSecretsPublicKeys.js +3 -3
- package/dist/cjs/staticModels/LoaderSessions.d.ts +2 -2
- package/dist/cjs/staticModels/LoaderSessions.js +5 -5
- package/dist/cjs/staticModels/OfferResources.d.ts +3 -1
- package/dist/cjs/staticModels/OfferResources.js +33 -8
- package/dist/cjs/staticModels/Offers.js +10 -2
- package/dist/cjs/staticModels/OffersStorageAllocated.d.ts +1 -2
- package/dist/cjs/staticModels/OffersStorageAllocated.js +10 -10
- package/dist/cjs/staticModels/OffersStorageRequests.js +4 -3
- package/dist/cjs/staticModels/Orders.d.ts +5 -4
- package/dist/cjs/staticModels/Orders.js +7 -6
- package/dist/cjs/staticModels/SecretRequests.d.ts +1 -1
- package/dist/cjs/staticModels/SecretRequests.js +14 -7
- package/dist/cjs/staticModels/TeeOffers.d.ts +0 -2
- package/dist/cjs/staticModels/TeeOffers.js +5 -38
- package/dist/cjs/tee/QuoteParser.d.ts +61 -6
- package/dist/cjs/tee/QuoteParser.js +251 -30
- package/dist/cjs/tee/QuoteValidator.d.ts +13 -0
- package/dist/cjs/tee/QuoteValidator.js +149 -35
- package/dist/cjs/tee/TcbSerializer.d.ts +20 -0
- package/dist/cjs/tee/TcbSerializer.js +27 -0
- package/dist/cjs/tee/TeeBlockVerifier.d.ts +1 -6
- package/dist/cjs/tee/TeeBlockVerifier.js +5 -52
- package/dist/cjs/tee/TeeCertificateService.d.ts +13 -0
- package/dist/cjs/tee/TeeCertificateService.js +42 -0
- package/dist/cjs/tee/errors.d.ts +6 -3
- package/dist/cjs/tee/errors.js +9 -5
- package/dist/cjs/tee/helpers.d.ts +1 -1
- package/dist/cjs/tee/helpers.js +2 -7
- package/dist/cjs/tee/types.d.ts +50 -9
- package/dist/cjs/tee/types.js +32 -1
- package/dist/cjs/types/DistributedSecretStorage.d.ts +7 -0
- package/dist/cjs/types/Offer.d.ts +33 -7
- package/dist/cjs/types/Offer.js +17 -2
- package/dist/cjs/types/OfferVersion.d.ts +13 -0
- package/dist/cjs/types/OfferVersion.js +9 -0
- package/dist/cjs/types/Order.d.ts +8 -2
- package/dist/cjs/types/Order.js +3 -1
- package/dist/cjs/types/SlotInfo.d.ts +1 -0
- package/dist/cjs/types/Superpro.d.ts +2 -1
- package/dist/cjs/types/Superpro.js +2 -1
- package/dist/cjs/types/TeeOfferInfo.d.ts +2 -1
- package/dist/cjs/types/index.d.ts +1 -0
- package/dist/cjs/types/index.js +2 -1
- package/dist/cjs/types/storage/StorageAccess.d.ts +3 -3
- package/dist/cjs/utils/CryptoKeysTransformer.d.ts +6 -1
- package/dist/cjs/utils/CryptoKeysTransformer.js +48 -3
- package/dist/cjs/utils/NonceTracker.js +1 -1
- package/dist/cjs/utils/helper.d.ts +7 -1
- package/dist/cjs/utils/helper.js +87 -2
- package/dist/cjs/utils/helpers/OrderArgsHelper.d.ts +17 -0
- package/dist/cjs/utils/helpers/OrderArgsHelper.js +87 -0
- package/dist/cjs/utils/helpers/index.d.ts +2 -0
- package/dist/cjs/utils/helpers/index.js +3 -1
- package/dist/cjs/utils/helpers/uploadObjectToStorage.d.ts +13 -0
- package/dist/cjs/utils/helpers/uploadObjectToStorage.js +55 -0
- package/dist/cjs/utils/schema-validators/index.d.ts +1 -0
- package/dist/cjs/utils/schema-validators/index.js +6 -0
- package/dist/cjs/utils/schema-validators/validator.d.ts +7 -0
- package/dist/cjs/utils/schema-validators/validator.js +49 -0
- package/dist/mjs/RIGenerator.d.ts +2 -0
- package/dist/mjs/RIGenerator.js +6 -4
- package/dist/mjs/TIIGenerator.d.ts +2 -1
- package/dist/mjs/TIIGenerator.js +13 -3
- package/dist/mjs/TeeInputGeneratorBase.d.ts +1 -1
- package/dist/mjs/TeeInputGeneratorBase.js +20 -32
- package/dist/mjs/analytics/eventProviders/BrowserEventProvider.d.ts +1 -0
- package/dist/mjs/analytics/eventProviders/BrowserEventProvider.js +3 -3
- package/dist/mjs/analytics/transports/AxiosTransport.js +1 -1
- package/dist/mjs/config.d.ts +0 -1
- package/dist/mjs/config.js +1 -2
- package/dist/mjs/constants.d.ts +5 -4
- package/dist/mjs/constants.js +30 -6
- package/dist/mjs/contracts/abi.d.ts +929 -122
- package/dist/mjs/contracts/abi.js +1166 -132
- package/dist/mjs/crypto/index.d.ts +1 -0
- package/dist/mjs/crypto/index.js +2 -1
- package/dist/mjs/errors/base.error.d.ts +3 -0
- package/dist/mjs/errors/base.error.js +15 -0
- package/dist/mjs/errors/index.d.ts +2 -0
- package/dist/mjs/errors/index.js +3 -0
- package/dist/mjs/errors/not-found.error.d.ts +3 -0
- package/dist/mjs/errors/not-found.error.js +4 -0
- package/dist/mjs/errors/utils.d.ts +1 -0
- package/dist/mjs/errors/utils.js +18 -0
- package/dist/mjs/index.d.ts +11 -1
- package/dist/mjs/index.js +11 -2
- package/dist/mjs/models/Offer.d.ts +48 -6
- package/dist/mjs/models/Offer.js +161 -18
- package/dist/mjs/models/Order.d.ts +2 -90
- package/dist/mjs/models/Order.js +20 -91
- package/dist/mjs/models/Provider.js +1 -1
- package/dist/mjs/models/TCB.js +13 -5
- package/dist/mjs/models/TeeOffer.d.ts +35 -13
- package/dist/mjs/models/TeeOffer.js +115 -40
- package/dist/mjs/proto/Compression.d.ts +1 -1
- package/dist/mjs/proto/TRI.d.ts +41 -6
- package/dist/mjs/proto/TRI.js +18 -1
- package/dist/mjs/proto/TeeProperties.d.ts +5 -5
- package/dist/mjs/providers/storage/IStorageProvider.d.ts +1 -1
- package/dist/mjs/providers/storage/S3StorageProvider.d.ts +8 -7
- package/dist/mjs/providers/storage/S3StorageProvider.js +74 -38
- package/dist/mjs/providers/storage/StorageAdapter.d.ts +9 -7
- package/dist/mjs/providers/storage/StorageAdapter.js +27 -29
- package/dist/mjs/providers/storage/StorageContentWriter.d.ts +2 -2
- package/dist/mjs/providers/storage/StorageContentWriter.js +5 -5
- package/dist/mjs/providers/storage/StorageKeyValueAdapter.d.ts +8 -5
- package/dist/mjs/providers/storage/StorageKeyValueAdapter.js +30 -16
- package/dist/mjs/providers/storage/StorjAdapter.d.ts +5 -4
- package/dist/mjs/providers/storage/StorjAdapter.js +15 -9
- package/dist/mjs/providers/storage/StorjCredentialsManager.d.ts +24 -0
- package/dist/mjs/providers/storage/StorjCredentialsManager.js +82 -0
- package/dist/mjs/providers/storage/StorjStorageProvider.js +3 -3
- package/dist/mjs/providers/storage/fs-storage-provider.d.ts +19 -0
- package/dist/mjs/providers/storage/fs-storage-provider.js +113 -0
- package/dist/mjs/providers/storage/getStorageProvider.js +4 -1
- package/dist/mjs/providers/storage/parseStorageCredentials.d.ts +5 -0
- package/dist/mjs/providers/storage/parseStorageCredentials.js +17 -0
- package/dist/mjs/providers/storage/types.d.ts +22 -0
- package/dist/mjs/staticModels/Consensus.d.ts +3 -2
- package/dist/mjs/staticModels/Consensus.js +22 -11
- package/dist/mjs/staticModels/LoaderSecretsPublicKeys.js +4 -4
- package/dist/mjs/staticModels/LoaderSessions.d.ts +2 -2
- package/dist/mjs/staticModels/LoaderSessions.js +6 -6
- package/dist/mjs/staticModels/OfferResources.d.ts +3 -1
- package/dist/mjs/staticModels/OfferResources.js +34 -9
- package/dist/mjs/staticModels/Offers.js +10 -2
- package/dist/mjs/staticModels/OffersStorageAllocated.d.ts +1 -2
- package/dist/mjs/staticModels/OffersStorageAllocated.js +11 -11
- package/dist/mjs/staticModels/OffersStorageRequests.js +5 -4
- package/dist/mjs/staticModels/Orders.d.ts +5 -4
- package/dist/mjs/staticModels/Orders.js +7 -6
- package/dist/mjs/staticModels/SecretRequests.d.ts +1 -1
- package/dist/mjs/staticModels/SecretRequests.js +15 -8
- package/dist/mjs/staticModels/TeeOffers.d.ts +0 -2
- package/dist/mjs/staticModels/TeeOffers.js +5 -38
- package/dist/mjs/store.js +2 -2
- package/dist/mjs/tee/QuoteParser.d.ts +61 -6
- package/dist/mjs/tee/QuoteParser.js +248 -29
- package/dist/mjs/tee/QuoteValidator.d.ts +13 -0
- package/dist/mjs/tee/QuoteValidator.js +149 -35
- package/dist/mjs/tee/TcbSerializer.d.ts +20 -0
- package/dist/mjs/tee/TcbSerializer.js +23 -0
- package/dist/mjs/tee/TeeBlockVerifier.d.ts +1 -6
- package/dist/mjs/tee/TeeBlockVerifier.js +5 -52
- package/dist/mjs/tee/TeeCertificateService.d.ts +13 -0
- package/dist/mjs/tee/TeeCertificateService.js +35 -0
- package/dist/mjs/tee/errors.d.ts +6 -3
- package/dist/mjs/tee/errors.js +7 -4
- package/dist/mjs/tee/helpers.d.ts +1 -1
- package/dist/mjs/tee/helpers.js +2 -7
- package/dist/mjs/tee/types.d.ts +50 -9
- package/dist/mjs/tee/types.js +28 -2
- package/dist/mjs/types/DistributedSecretStorage.d.ts +7 -0
- package/dist/mjs/types/Offer.d.ts +33 -7
- package/dist/mjs/types/Offer.js +16 -1
- package/dist/mjs/types/OfferVersion.d.ts +13 -0
- package/dist/mjs/types/OfferVersion.js +6 -0
- package/dist/mjs/types/Order.d.ts +8 -2
- package/dist/mjs/types/Order.js +3 -1
- package/dist/mjs/types/SlotInfo.d.ts +1 -0
- package/dist/mjs/types/Superpro.d.ts +2 -1
- package/dist/mjs/types/Superpro.js +2 -1
- package/dist/mjs/types/TeeOfferInfo.d.ts +2 -1
- package/dist/mjs/types/index.d.ts +1 -0
- package/dist/mjs/types/index.js +2 -1
- package/dist/mjs/types/storage/StorageAccess.d.ts +3 -3
- package/dist/mjs/utils/CryptoKeysTransformer.d.ts +6 -1
- package/dist/mjs/utils/CryptoKeysTransformer.js +48 -3
- package/dist/mjs/utils/NonceTracker.js +1 -1
- package/dist/mjs/utils/helper.d.ts +7 -1
- package/dist/mjs/utils/helper.js +80 -1
- package/dist/mjs/utils/helpers/OrderArgsHelper.d.ts +17 -0
- package/dist/mjs/utils/helpers/OrderArgsHelper.js +80 -0
- package/dist/mjs/utils/helpers/index.d.ts +2 -0
- package/dist/mjs/utils/helpers/index.js +3 -1
- package/dist/mjs/utils/helpers/uploadObjectToStorage.d.ts +13 -0
- package/dist/mjs/utils/helpers/uploadObjectToStorage.js +48 -0
- package/dist/mjs/utils/schema-validators/index.d.ts +1 -0
- package/dist/mjs/utils/schema-validators/index.js +2 -0
- package/dist/mjs/utils/schema-validators/validator.d.ts +7 -0
- package/dist/mjs/utils/schema-validators/validator.js +45 -0
- package/package.json +7 -6
|
@@ -133,7 +133,7 @@ export declare const TeeProperties: {
|
|
|
133
133
|
memBandwidth?: number | undefined;
|
|
134
134
|
memConfirmedSize?: number | undefined;
|
|
135
135
|
} & { [K_4 in Exclude<keyof I["teeRunMemoryBenchmark"], keyof TeeRunMemoryBenchmark>]: never; }) | undefined;
|
|
136
|
-
} & { [K_5 in Exclude<keyof I, keyof TeeProperties>]: never; }>(base?: I): TeeProperties;
|
|
136
|
+
} & { [K_5 in Exclude<keyof I, keyof TeeProperties>]: never; }>(base?: I | undefined): TeeProperties;
|
|
137
137
|
fromPartial<I_1 extends {
|
|
138
138
|
teeDeviceInfo?: {
|
|
139
139
|
cpus?: {
|
|
@@ -294,7 +294,7 @@ export declare const TeeDeviceInfo: {
|
|
|
294
294
|
memSize?: number | undefined;
|
|
295
295
|
totalPhysicalCores?: number | undefined;
|
|
296
296
|
totalLogicalCores?: number | undefined;
|
|
297
|
-
} & { [K_2 in Exclude<keyof I, keyof TeeDeviceInfo>]: never; }>(base?: I): TeeDeviceInfo;
|
|
297
|
+
} & { [K_2 in Exclude<keyof I, keyof TeeDeviceInfo>]: never; }>(base?: I | undefined): TeeDeviceInfo;
|
|
298
298
|
fromPartial<I_1 extends {
|
|
299
299
|
cpus?: {
|
|
300
300
|
vendorId?: string | undefined;
|
|
@@ -375,7 +375,7 @@ export declare const Cpus: {
|
|
|
375
375
|
logicalCores?: number | undefined;
|
|
376
376
|
baseFreq?: number | undefined;
|
|
377
377
|
maxFreq?: number | undefined;
|
|
378
|
-
} & { [K in Exclude<keyof I, keyof Cpus>]: never; }>(base?: I): Cpus;
|
|
378
|
+
} & { [K in Exclude<keyof I, keyof Cpus>]: never; }>(base?: I | undefined): Cpus;
|
|
379
379
|
fromPartial<I_1 extends {
|
|
380
380
|
vendorId?: string | undefined;
|
|
381
381
|
cpuFamily?: number | undefined;
|
|
@@ -409,7 +409,7 @@ export declare const TeeRunCpuBenchmark: {
|
|
|
409
409
|
cpuScore?: number | undefined;
|
|
410
410
|
cpuBenchmark?: string | undefined;
|
|
411
411
|
cpuCoresCount?: number | undefined;
|
|
412
|
-
} & { [K in Exclude<keyof I, keyof TeeRunCpuBenchmark>]: never; }>(base?: I): TeeRunCpuBenchmark;
|
|
412
|
+
} & { [K in Exclude<keyof I, keyof TeeRunCpuBenchmark>]: never; }>(base?: I | undefined): TeeRunCpuBenchmark;
|
|
413
413
|
fromPartial<I_1 extends {
|
|
414
414
|
cpuScore?: number | undefined;
|
|
415
415
|
cpuBenchmark?: string | undefined;
|
|
@@ -431,7 +431,7 @@ export declare const TeeRunMemoryBenchmark: {
|
|
|
431
431
|
} & {
|
|
432
432
|
memBandwidth?: number | undefined;
|
|
433
433
|
memConfirmedSize?: number | undefined;
|
|
434
|
-
} & { [K in Exclude<keyof I, keyof TeeRunMemoryBenchmark>]: never; }>(base?: I): TeeRunMemoryBenchmark;
|
|
434
|
+
} & { [K in Exclude<keyof I, keyof TeeRunMemoryBenchmark>]: never; }>(base?: I | undefined): TeeRunMemoryBenchmark;
|
|
435
435
|
fromPartial<I_1 extends {
|
|
436
436
|
memBandwidth?: number | undefined;
|
|
437
437
|
memConfirmedSize?: number | undefined;
|
|
@@ -6,7 +6,7 @@ export type DownloadConfig = {
|
|
|
6
6
|
length?: number;
|
|
7
7
|
};
|
|
8
8
|
export default interface IStorageProvider {
|
|
9
|
-
uploadFile(inputStream: stream.Readable, remotePath: string, contentLength: number, progressListener?: (total: number, current: number) => void): Promise<void>;
|
|
9
|
+
uploadFile(inputStream: stream.Readable | Blob, remotePath: string, contentLength: number, progressListener?: (total: number, current: number) => void): Promise<void>;
|
|
10
10
|
downloadFile(remotePath: string, config: DownloadConfig, progressListener?: (total: number, current: number) => void): Promise<stream.Readable>;
|
|
11
11
|
deleteObject(remotePath: string): Promise<void>;
|
|
12
12
|
listObjects(remotePath: string): Promise<StorageObject[]>;
|
|
@@ -2,19 +2,20 @@
|
|
|
2
2
|
import IStorageProvider, { DownloadConfig } from './IStorageProvider.js';
|
|
3
3
|
import { Readable } from 'stream';
|
|
4
4
|
import StorageObject from '../../types/storage/StorageObject.js';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
bucket: string;
|
|
10
|
-
region: string;
|
|
5
|
+
import { S3Credentials } from '@super-protocol/dto-js';
|
|
6
|
+
export type S3ClientConfig = Omit<S3Credentials, 'prefix'> & {
|
|
7
|
+
region?: string;
|
|
8
|
+
prefix?: string;
|
|
11
9
|
};
|
|
12
10
|
export declare class S3StorageProvider implements IStorageProvider {
|
|
13
11
|
private readonly s3Client;
|
|
14
12
|
private readonly bucket;
|
|
13
|
+
private readonly prefix;
|
|
15
14
|
private readonly multipartChunkSizeInBytes;
|
|
15
|
+
private readonly defaultRegion;
|
|
16
16
|
constructor(storageAccess: S3ClientConfig);
|
|
17
|
-
|
|
17
|
+
private applyPrefix;
|
|
18
|
+
uploadFile(inputStream: Readable | Blob, remotePath: string, contentLength: number, progressListener?: ((total: number, current: number) => void) | undefined): Promise<void>;
|
|
18
19
|
private multipartUpload;
|
|
19
20
|
deleteObject(remotePath: string): Promise<void>;
|
|
20
21
|
downloadFile(remotePath: string, config: DownloadConfig, progressListener?: ((total: number, current: number) => void) | undefined): Promise<Readable>;
|
|
@@ -1,43 +1,56 @@
|
|
|
1
1
|
import { AbortMultipartUploadCommand, CompleteMultipartUploadCommand, CreateMultipartUploadCommand, PutObjectCommand, DeleteObjectCommand, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, S3Client, UploadPartCommand, } from '@aws-sdk/client-s3';
|
|
2
2
|
import { Readable } from 'stream';
|
|
3
3
|
import { getStreamChunks } from '../../utils/helpers/getStreamChunks.js';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import { isNodeJS } from '../../utils/helper.js';
|
|
4
6
|
export class S3StorageProvider {
|
|
5
7
|
s3Client;
|
|
6
8
|
bucket;
|
|
9
|
+
prefix;
|
|
7
10
|
multipartChunkSizeInBytes = 64 * 1024 * 1024; // 64MB
|
|
11
|
+
defaultRegion = 'us-east-1';
|
|
8
12
|
constructor(storageAccess) {
|
|
9
|
-
const { accessKeyId,
|
|
13
|
+
const { accessKeyId, secretKey, endpoint, bucket, region, prefix } = storageAccess;
|
|
10
14
|
if (!accessKeyId)
|
|
11
15
|
throw new Error('Access key id is undefined');
|
|
12
|
-
if (!
|
|
16
|
+
if (!secretKey)
|
|
13
17
|
throw new Error('Secret access is undefined');
|
|
14
18
|
if (!endpoint)
|
|
15
19
|
throw new Error('Endpoint is undefined');
|
|
16
20
|
if (!bucket)
|
|
17
21
|
throw new Error('Bucket is undefined');
|
|
18
|
-
if (!
|
|
19
|
-
throw new Error(
|
|
22
|
+
if (prefix && (prefix.startsWith('/') || !prefix.endsWith('/'))) {
|
|
23
|
+
throw new Error(`Prefix is invalid: it must not start with "/" and must end with "/" (prefix=${prefix})`);
|
|
24
|
+
}
|
|
20
25
|
this.bucket = bucket;
|
|
26
|
+
this.prefix = prefix || '';
|
|
21
27
|
this.s3Client = new S3Client({
|
|
22
28
|
credentials: {
|
|
23
29
|
accessKeyId,
|
|
24
|
-
secretAccessKey,
|
|
30
|
+
secretAccessKey: secretKey,
|
|
25
31
|
},
|
|
26
|
-
region,
|
|
32
|
+
region: region || this.defaultRegion,
|
|
27
33
|
endpoint,
|
|
28
34
|
forcePathStyle: true,
|
|
29
35
|
});
|
|
30
36
|
}
|
|
37
|
+
applyPrefix(key) {
|
|
38
|
+
return path.join(this.prefix, '/', key);
|
|
39
|
+
}
|
|
31
40
|
async uploadFile(inputStream, remotePath, contentLength, progressListener) {
|
|
32
41
|
// For performance & cost optimization
|
|
33
42
|
// https://docs.storj.io/dcs/api-reference/s3-compatible-gateway/multipart-upload/multipart-part-size
|
|
43
|
+
const key = this.applyPrefix(remotePath);
|
|
44
|
+
const body = isNodeJS()
|
|
45
|
+
? inputStream
|
|
46
|
+
: new Uint8Array(await inputStream.arrayBuffer());
|
|
34
47
|
if (contentLength >= this.multipartChunkSizeInBytes) {
|
|
35
|
-
return this.multipartUpload(inputStream,
|
|
48
|
+
return this.multipartUpload(inputStream, key, contentLength, progressListener);
|
|
36
49
|
}
|
|
37
50
|
const putObjectCommand = new PutObjectCommand({
|
|
38
|
-
Body:
|
|
51
|
+
Body: body,
|
|
39
52
|
Bucket: this.bucket,
|
|
40
|
-
Key:
|
|
53
|
+
Key: key,
|
|
41
54
|
ContentLength: contentLength,
|
|
42
55
|
});
|
|
43
56
|
progressListener?.(contentLength, 0);
|
|
@@ -45,39 +58,59 @@ export class S3StorageProvider {
|
|
|
45
58
|
progressListener?.(contentLength, contentLength);
|
|
46
59
|
}
|
|
47
60
|
async multipartUpload(inputStream, remotePath, contentLength, progressListener) {
|
|
61
|
+
const key = this.applyPrefix(remotePath);
|
|
62
|
+
let transformedStream;
|
|
63
|
+
if (inputStream instanceof Blob) {
|
|
64
|
+
transformedStream = new Uint8Array(await inputStream.arrayBuffer());
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
transformedStream = inputStream;
|
|
68
|
+
}
|
|
48
69
|
const createMultipartUploadCommand = new CreateMultipartUploadCommand({
|
|
49
70
|
Bucket: this.bucket,
|
|
50
|
-
Key:
|
|
71
|
+
Key: key,
|
|
51
72
|
});
|
|
52
73
|
const multipart = await this.s3Client.send(createMultipartUploadCommand);
|
|
53
74
|
if (!multipart.UploadId) {
|
|
54
75
|
throw new Error('UploadId property is empty');
|
|
55
76
|
}
|
|
77
|
+
let totalWritten = 0;
|
|
78
|
+
const uploadId = multipart.UploadId;
|
|
79
|
+
const parts = [];
|
|
80
|
+
const uploadPart = async (chunk, partNumber) => {
|
|
81
|
+
const uploadPartCommand = new UploadPartCommand({
|
|
82
|
+
Body: chunk,
|
|
83
|
+
Bucket: this.bucket,
|
|
84
|
+
Key: key,
|
|
85
|
+
UploadId: uploadId,
|
|
86
|
+
PartNumber: partNumber,
|
|
87
|
+
});
|
|
88
|
+
const response = await this.s3Client.send(uploadPartCommand);
|
|
89
|
+
parts.push({
|
|
90
|
+
ETag: response.ETag,
|
|
91
|
+
PartNumber: partNumber,
|
|
92
|
+
});
|
|
93
|
+
totalWritten += chunk.length;
|
|
94
|
+
progressListener?.(contentLength, totalWritten);
|
|
95
|
+
};
|
|
56
96
|
try {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
parts.push({
|
|
70
|
-
ETag: response.ETag,
|
|
71
|
-
PartNumber: streamChunk.partNumber,
|
|
72
|
-
});
|
|
73
|
-
totalWritten += streamChunk.data.length;
|
|
74
|
-
if (!!progressListener) {
|
|
75
|
-
progressListener(contentLength, totalWritten);
|
|
97
|
+
if (transformedStream instanceof Readable) {
|
|
98
|
+
for await (const streamChunk of getStreamChunks(transformedStream, this.multipartChunkSizeInBytes)) {
|
|
99
|
+
await uploadPart(streamChunk.data, streamChunk.partNumber);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
const chunkSize = this.multipartChunkSizeInBytes;
|
|
104
|
+
let partNumber = 1;
|
|
105
|
+
for (let offset = 0; offset < transformedStream.length; offset += chunkSize) {
|
|
106
|
+
const chunk = transformedStream.slice(offset, offset + chunkSize);
|
|
107
|
+
await uploadPart(chunk, partNumber);
|
|
108
|
+
partNumber++;
|
|
76
109
|
}
|
|
77
110
|
}
|
|
78
111
|
const completeMultipartUploadCommand = new CompleteMultipartUploadCommand({
|
|
79
112
|
Bucket: this.bucket,
|
|
80
|
-
Key:
|
|
113
|
+
Key: key,
|
|
81
114
|
UploadId: multipart.UploadId,
|
|
82
115
|
MultipartUpload: { Parts: parts },
|
|
83
116
|
});
|
|
@@ -86,7 +119,7 @@ export class S3StorageProvider {
|
|
|
86
119
|
catch (uploadingError) {
|
|
87
120
|
const abortMultipartUploadCommand = new AbortMultipartUploadCommand({
|
|
88
121
|
Bucket: this.bucket,
|
|
89
|
-
Key:
|
|
122
|
+
Key: key,
|
|
90
123
|
UploadId: multipart.UploadId,
|
|
91
124
|
});
|
|
92
125
|
await this.s3Client.send(abortMultipartUploadCommand);
|
|
@@ -94,16 +127,18 @@ export class S3StorageProvider {
|
|
|
94
127
|
}
|
|
95
128
|
}
|
|
96
129
|
async deleteObject(remotePath) {
|
|
130
|
+
const key = this.applyPrefix(remotePath);
|
|
97
131
|
const deleteObjectCommand = new DeleteObjectCommand({
|
|
98
132
|
Bucket: this.bucket,
|
|
99
|
-
Key:
|
|
133
|
+
Key: key,
|
|
100
134
|
});
|
|
101
135
|
await this.s3Client.send(deleteObjectCommand);
|
|
102
136
|
}
|
|
103
137
|
async downloadFile(remotePath, config, progressListener) {
|
|
138
|
+
const key = this.applyPrefix(remotePath);
|
|
104
139
|
const getObjectParams = {
|
|
105
140
|
Bucket: this.bucket,
|
|
106
|
-
Key:
|
|
141
|
+
Key: key,
|
|
107
142
|
};
|
|
108
143
|
if (config) {
|
|
109
144
|
const start = config.offset || 0;
|
|
@@ -126,16 +161,16 @@ export class S3StorageProvider {
|
|
|
126
161
|
return getObjectResult.Body;
|
|
127
162
|
}
|
|
128
163
|
async listObjects(remotePath) {
|
|
129
|
-
const
|
|
164
|
+
const key = this.applyPrefix(remotePath.endsWith('/') || remotePath === '' ? remotePath : `${remotePath}/`);
|
|
130
165
|
const listObjectsCommand = new ListObjectsV2Command({
|
|
131
166
|
Bucket: this.bucket,
|
|
132
|
-
Prefix:
|
|
167
|
+
Prefix: key,
|
|
133
168
|
});
|
|
134
169
|
const listObjects = await this.s3Client.send(listObjectsCommand);
|
|
135
170
|
let result = [];
|
|
136
171
|
if (listObjects.Contents) {
|
|
137
172
|
result = listObjects.Contents.map((object) => ({
|
|
138
|
-
name: object.Key || '',
|
|
173
|
+
name: object.Key?.substring(this.prefix.length) || '',
|
|
139
174
|
createdAt: object.LastModified || new Date(),
|
|
140
175
|
size: object.Size || 0,
|
|
141
176
|
}));
|
|
@@ -143,9 +178,10 @@ export class S3StorageProvider {
|
|
|
143
178
|
return result;
|
|
144
179
|
}
|
|
145
180
|
async getMetadata(remotePath) {
|
|
181
|
+
const key = this.applyPrefix(remotePath);
|
|
146
182
|
const headObjectCommand = new HeadObjectCommand({
|
|
147
183
|
Bucket: this.bucket,
|
|
148
|
-
Key:
|
|
184
|
+
Key: key,
|
|
149
185
|
});
|
|
150
186
|
return await this.s3Client.send(headObjectCommand);
|
|
151
187
|
}
|
|
@@ -164,4 +200,4 @@ export class S3StorageProvider {
|
|
|
164
200
|
return metadata.LastModified;
|
|
165
201
|
}
|
|
166
202
|
}
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
203
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"S3StorageProvider.js","sourceRoot":"","sources":["../../../../src/providers/storage/S3StorageProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import StorageAccess from '../../types/storage/StorageAccess.js';
|
|
3
|
-
import { Performance } from './types.js';
|
|
3
|
+
import { IStorageAdapter, Performance } from './types.js';
|
|
4
4
|
export interface LRUCacheConfig {
|
|
5
5
|
max: number;
|
|
6
6
|
}
|
|
@@ -12,12 +12,14 @@ export interface StorageAdapterConfig {
|
|
|
12
12
|
readMetadataConcurrency?: number;
|
|
13
13
|
performance?: Performance;
|
|
14
14
|
showLogs?: boolean;
|
|
15
|
+
hasEncryption?: boolean;
|
|
16
|
+
instanceId?: string;
|
|
15
17
|
}
|
|
16
18
|
export declare enum CacheEvents {
|
|
17
19
|
INSTANCES_CHANGED = "INSTANCES_CHANGED",
|
|
18
20
|
KEY_DELETED = "KEY_DELETED"
|
|
19
21
|
}
|
|
20
|
-
export default class StorageAdapter<V extends object> {
|
|
22
|
+
export default class StorageAdapter<V extends object> implements IStorageAdapter<V> {
|
|
21
23
|
private readonly logger?;
|
|
22
24
|
private readonly storageKeyValueAdapter;
|
|
23
25
|
private readonly cache;
|
|
@@ -38,14 +40,14 @@ export default class StorageAdapter<V extends object> {
|
|
|
38
40
|
subscribe(cb: (props: {
|
|
39
41
|
type: CacheEvents;
|
|
40
42
|
message: unknown;
|
|
41
|
-
}) => void):
|
|
43
|
+
}) => void): () => void;
|
|
42
44
|
private publish;
|
|
43
45
|
has(key: string): Promise<boolean>;
|
|
44
|
-
private
|
|
45
|
-
set(key: string, value: V, encryptionKeyBuffer
|
|
46
|
+
private getEncryptionKey;
|
|
47
|
+
set(key: string, value: V, encryptionKeyBuffer?: Buffer): void;
|
|
46
48
|
private setByInstance;
|
|
47
|
-
delete(key: string):
|
|
48
|
-
get(key: string, encryptionKeyBuffer
|
|
49
|
+
delete(key: string): void;
|
|
50
|
+
get(key: string, encryptionKeyBuffer?: Buffer): Promise<(V | null)[] | null>;
|
|
49
51
|
private getQueue;
|
|
50
52
|
private clearQueue;
|
|
51
53
|
private cacheHasNullInstances;
|
|
@@ -12,7 +12,7 @@ export var CacheEvents;
|
|
|
12
12
|
CacheEvents["INSTANCES_CHANGED"] = "INSTANCES_CHANGED";
|
|
13
13
|
CacheEvents["KEY_DELETED"] = "KEY_DELETED";
|
|
14
14
|
})(CacheEvents || (CacheEvents = {}));
|
|
15
|
-
const
|
|
15
|
+
const DEFAULT_READ_METADATA_CONCURRENCY = 16;
|
|
16
16
|
export default class StorageAdapter {
|
|
17
17
|
logger;
|
|
18
18
|
storageKeyValueAdapter;
|
|
@@ -30,12 +30,15 @@ export default class StorageAdapter {
|
|
|
30
30
|
eventName = 'storage-adapter';
|
|
31
31
|
performance;
|
|
32
32
|
constructor(storageAccess, config) {
|
|
33
|
-
const { readInterval, writeInterval, lruCache, objectDeletedFlag, readMetadataConcurrency, performance, showLogs = true, } = config;
|
|
33
|
+
const { readInterval, writeInterval, lruCache, objectDeletedFlag, readMetadataConcurrency, performance, showLogs = true, hasEncryption = true, instanceId, } = config;
|
|
34
34
|
this.logger = showLogs ? logger.child({ class: StorageAdapter.name }) : null;
|
|
35
35
|
this.performance = performance;
|
|
36
|
-
this.instanceId = this.generateHash();
|
|
36
|
+
this.instanceId = instanceId ?? this.generateHash();
|
|
37
37
|
this.readInterval = readInterval;
|
|
38
|
-
this.storageKeyValueAdapter = new StorageKeyValueAdapter(storageAccess, {
|
|
38
|
+
this.storageKeyValueAdapter = new StorageKeyValueAdapter(storageAccess, {
|
|
39
|
+
showLogs,
|
|
40
|
+
hasEncryption,
|
|
41
|
+
});
|
|
39
42
|
this.cache = new LRUCache(lruCache);
|
|
40
43
|
this.metadataReader = new StorageMetadataReader({
|
|
41
44
|
storageKeyValueAdapter: this.storageKeyValueAdapter,
|
|
@@ -51,7 +54,7 @@ export default class StorageAdapter {
|
|
|
51
54
|
showLogs,
|
|
52
55
|
});
|
|
53
56
|
this.queueReadMetadata = new Queue({
|
|
54
|
-
concurrency: readMetadataConcurrency ||
|
|
57
|
+
concurrency: readMetadataConcurrency || DEFAULT_READ_METADATA_CONCURRENCY,
|
|
55
58
|
});
|
|
56
59
|
}
|
|
57
60
|
generateHash(str) {
|
|
@@ -59,9 +62,9 @@ export default class StorageAdapter {
|
|
|
59
62
|
.update(str || uuid.v4())
|
|
60
63
|
.digest('hex');
|
|
61
64
|
}
|
|
62
|
-
|
|
65
|
+
subscribe(cb) {
|
|
63
66
|
this.pubSub.subscribe(this.eventName, cb);
|
|
64
|
-
return
|
|
67
|
+
return () => {
|
|
65
68
|
this.pubSub.unsubscribe(this.eventName, cb);
|
|
66
69
|
};
|
|
67
70
|
}
|
|
@@ -81,38 +84,37 @@ export default class StorageAdapter {
|
|
|
81
84
|
}
|
|
82
85
|
return this.cache.has(key);
|
|
83
86
|
}
|
|
84
|
-
|
|
87
|
+
getEncryptionKey(key, encryptionKeyBuffer) {
|
|
85
88
|
if (!this.encryptionKeys.has(key)) {
|
|
86
|
-
if (!encryptionKeyBuffer)
|
|
89
|
+
if (!encryptionKeyBuffer) {
|
|
87
90
|
return null;
|
|
91
|
+
}
|
|
88
92
|
const encryptionKey = encryptionKeyBuffer.toString('base64');
|
|
89
93
|
this.encryptionKeys.set(key, encryptionKey);
|
|
90
94
|
return encryptionKey;
|
|
91
95
|
}
|
|
92
96
|
return this.encryptionKeys.get(key) || null;
|
|
93
97
|
}
|
|
94
|
-
|
|
98
|
+
set(key, value, encryptionKeyBuffer) {
|
|
95
99
|
if (this.contentWriter.storageWrites.get(key)?.type === ContentWriterType.NEEDS_DELETE) {
|
|
96
100
|
throw new Error('Object has been deleted');
|
|
97
101
|
}
|
|
98
|
-
const encryptionKey = this.
|
|
99
|
-
if (!encryptionKey)
|
|
100
|
-
throw new Error('Encryption key required');
|
|
102
|
+
const encryptionKey = this.getEncryptionKey(key, encryptionKeyBuffer);
|
|
101
103
|
this.setByInstance(key, this.instanceId, {
|
|
102
104
|
value,
|
|
103
105
|
modifiedTs: Number.MAX_SAFE_INTEGER,
|
|
104
106
|
});
|
|
105
|
-
this.contentWriter.set(key, ContentWriterType.NEEDS_UPLOAD, encryptionKey);
|
|
107
|
+
this.contentWriter.set(key, ContentWriterType.NEEDS_UPLOAD, encryptionKey || undefined);
|
|
106
108
|
}
|
|
107
109
|
setByInstance(key, instanceId, value) {
|
|
108
110
|
const instances = this.cache.get(key) || new Map();
|
|
109
111
|
instances.set(instanceId, value);
|
|
110
112
|
this.cache.set(key, instances);
|
|
111
113
|
}
|
|
112
|
-
|
|
114
|
+
delete(key) {
|
|
113
115
|
this.cache.delete(key);
|
|
114
116
|
this.isUpdating.delete(key);
|
|
115
|
-
const encryptionKey = this.
|
|
117
|
+
const encryptionKey = this.getEncryptionKey(key);
|
|
116
118
|
if (encryptionKey) {
|
|
117
119
|
this.contentWriter.set(key, ContentWriterType.NEEDS_DELETE, encryptionKey);
|
|
118
120
|
this.encryptionKeys.delete(key);
|
|
@@ -124,19 +126,15 @@ export default class StorageAdapter {
|
|
|
124
126
|
}
|
|
125
127
|
// the first value is always the current instance, if key exists
|
|
126
128
|
async get(key, encryptionKeyBuffer) {
|
|
127
|
-
if (!encryptionKeyBuffer)
|
|
128
|
-
throw new Error('Encryption key required');
|
|
129
129
|
if (this.contentWriter.storageWrites.get(key)?.type === ContentWriterType.NEEDS_DELETE ||
|
|
130
130
|
!(await this.has(key))) {
|
|
131
131
|
return null;
|
|
132
132
|
}
|
|
133
|
-
const encryptionKey = this.
|
|
134
|
-
if (!encryptionKey)
|
|
135
|
-
throw new Error('Encryption key required');
|
|
133
|
+
const encryptionKey = this.getEncryptionKey(key, encryptionKeyBuffer);
|
|
136
134
|
if (this.cacheHasNullInstances(key)) {
|
|
137
135
|
await this.getQueue(key).add(async () => {
|
|
138
136
|
if (this.cacheHasNullInstances(key)) {
|
|
139
|
-
await this.fetchNullValues(key, encryptionKey);
|
|
137
|
+
await this.fetchNullValues(key, encryptionKey || undefined);
|
|
140
138
|
}
|
|
141
139
|
});
|
|
142
140
|
}
|
|
@@ -167,9 +165,9 @@ export default class StorageAdapter {
|
|
|
167
165
|
}
|
|
168
166
|
async fetchNullValues(key, encryptionKey) {
|
|
169
167
|
const promises = [];
|
|
170
|
-
this.cache.get(key)?.forEach((instance,
|
|
168
|
+
this.cache.get(key)?.forEach((instance, instanceId) => {
|
|
171
169
|
if (instance.value === null) {
|
|
172
|
-
const fileName = `${key}/${
|
|
170
|
+
const fileName = `${key}/${instanceId}`;
|
|
173
171
|
const startDownload = this.performance?.now();
|
|
174
172
|
promises.push(this.storageKeyValueAdapter
|
|
175
173
|
.get(fileName, encryptionKey)
|
|
@@ -178,7 +176,7 @@ export default class StorageAdapter {
|
|
|
178
176
|
const finishDownload = this.performance.now();
|
|
179
177
|
logger.info(`Downloading took ${(finishDownload - startDownload).toFixed(1)} ms`);
|
|
180
178
|
}
|
|
181
|
-
this.setByInstance(key,
|
|
179
|
+
this.setByInstance(key, instanceId, {
|
|
182
180
|
...instance,
|
|
183
181
|
value: file,
|
|
184
182
|
});
|
|
@@ -212,7 +210,7 @@ export default class StorageAdapter {
|
|
|
212
210
|
const initialSize = cachedByKey.size;
|
|
213
211
|
const { updated, deleted } = await this.metadataReader.fetchInstancesUpdates(key, cachedByKey);
|
|
214
212
|
if (deleted.has(key)) {
|
|
215
|
-
|
|
213
|
+
this.delete(key);
|
|
216
214
|
this.publish(CacheEvents.KEY_DELETED, key);
|
|
217
215
|
return;
|
|
218
216
|
}
|
|
@@ -242,11 +240,11 @@ export default class StorageAdapter {
|
|
|
242
240
|
this.isUpdating.set(key, false);
|
|
243
241
|
}
|
|
244
242
|
}
|
|
245
|
-
|
|
243
|
+
startUpdatesChecking() {
|
|
246
244
|
this.stopUpdatesChecking();
|
|
247
245
|
this.timeout = setTimeout(async () => {
|
|
248
246
|
Array.from(this.cache.keys()).forEach((key) => {
|
|
249
|
-
this.queueReadMetadata.add(async () => {
|
|
247
|
+
void this.queueReadMetadata.add(async () => {
|
|
250
248
|
await this.getQueue(key).add(async () => {
|
|
251
249
|
await this.checkUpdates(key);
|
|
252
250
|
});
|
|
@@ -269,4 +267,4 @@ export default class StorageAdapter {
|
|
|
269
267
|
await this.contentWriter.shutdown(this.cache);
|
|
270
268
|
}
|
|
271
269
|
}
|
|
272
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"StorageAdapter.js","sourceRoot":"","sources":["../../../../src/providers/storage/StorageAdapter.ts"],"names":[],"mappings":"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"}
|
|
270
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"StorageAdapter.js","sourceRoot":"","sources":["../../../../src/providers/storage/StorageAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export declare enum ContentWriterType {
|
|
|
18
18
|
interface StorageWriteRecord {
|
|
19
19
|
type: ContentWriterType;
|
|
20
20
|
index: number;
|
|
21
|
-
encryptionKey
|
|
21
|
+
encryptionKey?: string;
|
|
22
22
|
}
|
|
23
23
|
export default class StorageContentWriter<K extends string, V extends object> {
|
|
24
24
|
private timeout;
|
|
@@ -38,7 +38,7 @@ export default class StorageContentWriter<K extends string, V extends object> {
|
|
|
38
38
|
private deleteOutdatedInstances;
|
|
39
39
|
startActualizeCacheTimer(cache: LRUCache<K, Map<string, CacheRecord<V>>>): void;
|
|
40
40
|
stop(): void;
|
|
41
|
-
set(key: K, type: ContentWriterType, encryptionKey
|
|
41
|
+
set(key: K, type: ContentWriterType, encryptionKey?: string): void;
|
|
42
42
|
get(key: K): ContentWriterType | null;
|
|
43
43
|
clear(): void;
|
|
44
44
|
shutdown(cache: LRUCache<K, Map<string, CacheRecord<V>>>): Promise<void>;
|