@super-protocol/sdk-js 2.2.0-beta.7 → 2.2.0-beta.71
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/analytics/eventProviders/BrowserEventProvider.d.ts +1 -0
- package/dist/cjs/analytics/eventProviders/BrowserEventProvider.js +3 -3
- package/dist/cjs/config.d.ts +0 -1
- package/dist/cjs/config.js +1 -2
- package/dist/cjs/constants.d.ts +3 -4
- package/dist/cjs/constants.js +5 -7
- package/dist/cjs/contracts/abi.d.ts +279 -26
- package/dist/cjs/contracts/abi.js +357 -33
- 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 +7 -1
- package/dist/cjs/index.js +14 -2
- package/dist/cjs/models/Offer.js +6 -4
- package/dist/cjs/models/TCB.js +13 -5
- package/dist/cjs/models/TeeOffer.d.ts +3 -3
- package/dist/cjs/models/TeeOffer.js +15 -12
- package/dist/cjs/providers/storage/S3StorageProvider.d.ts +7 -6
- package/dist/cjs/providers/storage/S3StorageProvider.js +35 -19
- 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 +86 -0
- package/dist/cjs/providers/storage/StorjStorageProvider.js +2 -2
- package/dist/cjs/providers/storage/fs-storage-provider.d.ts +19 -0
- package/dist/cjs/providers/storage/fs-storage-provider.js +139 -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/LoaderSecretsPublicKeys.d.ts +1 -1
- package/dist/cjs/staticModels/LoaderSecretsPublicKeys.js +9 -5
- package/dist/cjs/staticModels/LoaderSessions.d.ts +3 -3
- package/dist/cjs/staticModels/LoaderSessions.js +11 -7
- package/dist/cjs/staticModels/OfferResources.d.ts +2 -2
- package/dist/cjs/staticModels/OfferResources.js +20 -10
- package/dist/cjs/staticModels/OffersStorageAllocated.d.ts +2 -3
- package/dist/cjs/staticModels/OffersStorageAllocated.js +15 -11
- package/dist/cjs/staticModels/OffersStorageRequests.d.ts +1 -1
- package/dist/cjs/staticModels/OffersStorageRequests.js +10 -5
- package/dist/cjs/staticModels/SecretRequests.d.ts +2 -2
- package/dist/cjs/staticModels/SecretRequests.js +19 -10
- package/dist/cjs/staticModels/TeeOffers.d.ts +0 -2
- package/dist/cjs/staticModels/TeeOffers.js +1 -32
- package/dist/cjs/tee/QuoteParser.d.ts +61 -6
- package/dist/cjs/tee/QuoteParser.js +248 -29
- package/dist/cjs/tee/QuoteValidator.d.ts +1 -0
- package/dist/cjs/tee/QuoteValidator.js +53 -28
- package/dist/cjs/tee/TeeBlockVerifier.d.ts +4 -4
- package/dist/cjs/tee/TeeBlockVerifier.js +16 -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/Superpro.d.ts +2 -1
- package/dist/cjs/types/Superpro.js +2 -1
- package/dist/cjs/types/storage/StorageAccess.d.ts +3 -3
- package/dist/cjs/utils/CryptoKeysTransformer.d.ts +8 -1
- package/dist/cjs/utils/CryptoKeysTransformer.js +70 -7
- package/dist/cjs/utils/helper.d.ts +7 -1
- package/dist/cjs/utils/helper.js +85 -2
- package/dist/cjs/utils/helpers/OrderArgsHelper.d.ts +5 -0
- package/dist/cjs/utils/helpers/OrderArgsHelper.js +25 -0
- package/dist/cjs/utils/helpers/index.d.ts +1 -0
- package/dist/cjs/utils/helpers/index.js +2 -1
- package/dist/mjs/analytics/eventProviders/BrowserEventProvider.d.ts +1 -0
- package/dist/mjs/analytics/eventProviders/BrowserEventProvider.js +3 -3
- package/dist/mjs/config.d.ts +0 -1
- package/dist/mjs/config.js +1 -2
- package/dist/mjs/constants.d.ts +3 -4
- package/dist/mjs/constants.js +4 -6
- package/dist/mjs/contracts/abi.d.ts +279 -26
- package/dist/mjs/contracts/abi.js +357 -33
- 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 +7 -1
- package/dist/mjs/index.js +7 -2
- package/dist/mjs/models/Offer.js +6 -4
- package/dist/mjs/models/TCB.js +13 -5
- package/dist/mjs/models/TeeOffer.d.ts +3 -3
- package/dist/mjs/models/TeeOffer.js +16 -13
- package/dist/mjs/providers/storage/S3StorageProvider.d.ts +7 -6
- package/dist/mjs/providers/storage/S3StorageProvider.js +32 -19
- 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 +2 -2
- package/dist/mjs/providers/storage/fs-storage-provider.d.ts +19 -0
- package/dist/mjs/providers/storage/fs-storage-provider.js +112 -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/LoaderSecretsPublicKeys.d.ts +1 -1
- package/dist/mjs/staticModels/LoaderSecretsPublicKeys.js +10 -6
- package/dist/mjs/staticModels/LoaderSessions.d.ts +3 -3
- package/dist/mjs/staticModels/LoaderSessions.js +12 -8
- package/dist/mjs/staticModels/OfferResources.d.ts +2 -2
- package/dist/mjs/staticModels/OfferResources.js +21 -11
- package/dist/mjs/staticModels/OffersStorageAllocated.d.ts +2 -3
- package/dist/mjs/staticModels/OffersStorageAllocated.js +16 -12
- package/dist/mjs/staticModels/OffersStorageRequests.d.ts +1 -1
- package/dist/mjs/staticModels/OffersStorageRequests.js +11 -6
- package/dist/mjs/staticModels/SecretRequests.d.ts +2 -2
- package/dist/mjs/staticModels/SecretRequests.js +20 -11
- package/dist/mjs/staticModels/TeeOffers.d.ts +0 -2
- package/dist/mjs/staticModels/TeeOffers.js +1 -32
- package/dist/mjs/tee/QuoteParser.d.ts +61 -6
- package/dist/mjs/tee/QuoteParser.js +245 -28
- package/dist/mjs/tee/QuoteValidator.d.ts +1 -0
- package/dist/mjs/tee/QuoteValidator.js +54 -29
- package/dist/mjs/tee/TeeBlockVerifier.d.ts +4 -4
- package/dist/mjs/tee/TeeBlockVerifier.js +16 -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/Superpro.d.ts +2 -1
- package/dist/mjs/types/Superpro.js +2 -1
- package/dist/mjs/types/storage/StorageAccess.d.ts +3 -3
- package/dist/mjs/utils/CryptoKeysTransformer.d.ts +8 -1
- package/dist/mjs/utils/CryptoKeysTransformer.js +70 -7
- package/dist/mjs/utils/helper.d.ts +7 -1
- package/dist/mjs/utils/helper.js +78 -1
- package/dist/mjs/utils/helpers/OrderArgsHelper.d.ts +5 -0
- package/dist/mjs/utils/helpers/OrderArgsHelper.js +18 -0
- package/dist/mjs/utils/helpers/index.d.ts +1 -0
- package/dist/mjs/utils/helpers/index.js +2 -1
- package/package.json +4 -4
|
@@ -1,46 +1,58 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.S3StorageProvider = void 0;
|
|
4
7
|
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
5
8
|
const stream_1 = require("stream");
|
|
6
9
|
const getStreamChunks_js_1 = require("../../utils/helpers/getStreamChunks.js");
|
|
10
|
+
const path_1 = __importDefault(require("path"));
|
|
7
11
|
class S3StorageProvider {
|
|
8
12
|
s3Client;
|
|
9
13
|
bucket;
|
|
14
|
+
prefix;
|
|
10
15
|
multipartChunkSizeInBytes = 64 * 1024 * 1024; // 64MB
|
|
16
|
+
defaultRegion = 'us-east-1';
|
|
11
17
|
constructor(storageAccess) {
|
|
12
|
-
const { accessKeyId,
|
|
18
|
+
const { accessKeyId, secretKey, endpoint, bucket, region, prefix } = storageAccess;
|
|
13
19
|
if (!accessKeyId)
|
|
14
20
|
throw new Error('Access key id is undefined');
|
|
15
|
-
if (!
|
|
21
|
+
if (!secretKey)
|
|
16
22
|
throw new Error('Secret access is undefined');
|
|
17
23
|
if (!endpoint)
|
|
18
24
|
throw new Error('Endpoint is undefined');
|
|
19
25
|
if (!bucket)
|
|
20
26
|
throw new Error('Bucket is undefined');
|
|
21
|
-
if (!
|
|
22
|
-
throw new Error(
|
|
27
|
+
if (prefix && (prefix.startsWith('/') || !prefix.endsWith('/'))) {
|
|
28
|
+
throw new Error(`Prefix is invalid: it must not start with "/" and must end with "/" (prefix=${prefix})`);
|
|
29
|
+
}
|
|
23
30
|
this.bucket = bucket;
|
|
31
|
+
this.prefix = prefix || '';
|
|
24
32
|
this.s3Client = new client_s3_1.S3Client({
|
|
25
33
|
credentials: {
|
|
26
34
|
accessKeyId,
|
|
27
|
-
secretAccessKey,
|
|
35
|
+
secretAccessKey: secretKey,
|
|
28
36
|
},
|
|
29
|
-
region,
|
|
37
|
+
region: region || this.defaultRegion,
|
|
30
38
|
endpoint,
|
|
31
39
|
forcePathStyle: true,
|
|
32
40
|
});
|
|
33
41
|
}
|
|
42
|
+
applyPrefix(key) {
|
|
43
|
+
return path_1.default.join(this.prefix, '/', key);
|
|
44
|
+
}
|
|
34
45
|
async uploadFile(inputStream, remotePath, contentLength, progressListener) {
|
|
35
46
|
// For performance & cost optimization
|
|
36
47
|
// https://docs.storj.io/dcs/api-reference/s3-compatible-gateway/multipart-upload/multipart-part-size
|
|
48
|
+
const key = this.applyPrefix(remotePath);
|
|
37
49
|
if (contentLength >= this.multipartChunkSizeInBytes) {
|
|
38
|
-
return this.multipartUpload(inputStream,
|
|
50
|
+
return this.multipartUpload(inputStream, key, contentLength, progressListener);
|
|
39
51
|
}
|
|
40
52
|
const putObjectCommand = new client_s3_1.PutObjectCommand({
|
|
41
53
|
Body: inputStream,
|
|
42
54
|
Bucket: this.bucket,
|
|
43
|
-
Key:
|
|
55
|
+
Key: key,
|
|
44
56
|
ContentLength: contentLength,
|
|
45
57
|
});
|
|
46
58
|
progressListener?.(contentLength, 0);
|
|
@@ -48,9 +60,10 @@ class S3StorageProvider {
|
|
|
48
60
|
progressListener?.(contentLength, contentLength);
|
|
49
61
|
}
|
|
50
62
|
async multipartUpload(inputStream, remotePath, contentLength, progressListener) {
|
|
63
|
+
const key = this.applyPrefix(remotePath);
|
|
51
64
|
const createMultipartUploadCommand = new client_s3_1.CreateMultipartUploadCommand({
|
|
52
65
|
Bucket: this.bucket,
|
|
53
|
-
Key:
|
|
66
|
+
Key: key,
|
|
54
67
|
});
|
|
55
68
|
const multipart = await this.s3Client.send(createMultipartUploadCommand);
|
|
56
69
|
if (!multipart.UploadId) {
|
|
@@ -64,7 +77,7 @@ class S3StorageProvider {
|
|
|
64
77
|
const uploadPartCommand = new client_s3_1.UploadPartCommand({
|
|
65
78
|
Body: streamChunk.data,
|
|
66
79
|
Bucket: this.bucket,
|
|
67
|
-
Key:
|
|
80
|
+
Key: key,
|
|
68
81
|
UploadId: uploadId,
|
|
69
82
|
PartNumber: streamChunk.partNumber,
|
|
70
83
|
});
|
|
@@ -80,7 +93,7 @@ class S3StorageProvider {
|
|
|
80
93
|
}
|
|
81
94
|
const completeMultipartUploadCommand = new client_s3_1.CompleteMultipartUploadCommand({
|
|
82
95
|
Bucket: this.bucket,
|
|
83
|
-
Key:
|
|
96
|
+
Key: key,
|
|
84
97
|
UploadId: multipart.UploadId,
|
|
85
98
|
MultipartUpload: { Parts: parts },
|
|
86
99
|
});
|
|
@@ -89,7 +102,7 @@ class S3StorageProvider {
|
|
|
89
102
|
catch (uploadingError) {
|
|
90
103
|
const abortMultipartUploadCommand = new client_s3_1.AbortMultipartUploadCommand({
|
|
91
104
|
Bucket: this.bucket,
|
|
92
|
-
Key:
|
|
105
|
+
Key: key,
|
|
93
106
|
UploadId: multipart.UploadId,
|
|
94
107
|
});
|
|
95
108
|
await this.s3Client.send(abortMultipartUploadCommand);
|
|
@@ -97,16 +110,18 @@ class S3StorageProvider {
|
|
|
97
110
|
}
|
|
98
111
|
}
|
|
99
112
|
async deleteObject(remotePath) {
|
|
113
|
+
const key = this.applyPrefix(remotePath);
|
|
100
114
|
const deleteObjectCommand = new client_s3_1.DeleteObjectCommand({
|
|
101
115
|
Bucket: this.bucket,
|
|
102
|
-
Key:
|
|
116
|
+
Key: key,
|
|
103
117
|
});
|
|
104
118
|
await this.s3Client.send(deleteObjectCommand);
|
|
105
119
|
}
|
|
106
120
|
async downloadFile(remotePath, config, progressListener) {
|
|
121
|
+
const key = this.applyPrefix(remotePath);
|
|
107
122
|
const getObjectParams = {
|
|
108
123
|
Bucket: this.bucket,
|
|
109
|
-
Key:
|
|
124
|
+
Key: key,
|
|
110
125
|
};
|
|
111
126
|
if (config) {
|
|
112
127
|
const start = config.offset || 0;
|
|
@@ -129,16 +144,16 @@ class S3StorageProvider {
|
|
|
129
144
|
return getObjectResult.Body;
|
|
130
145
|
}
|
|
131
146
|
async listObjects(remotePath) {
|
|
132
|
-
const
|
|
147
|
+
const key = this.applyPrefix(remotePath.endsWith('/') || remotePath === '' ? remotePath : `${remotePath}/`);
|
|
133
148
|
const listObjectsCommand = new client_s3_1.ListObjectsV2Command({
|
|
134
149
|
Bucket: this.bucket,
|
|
135
|
-
Prefix:
|
|
150
|
+
Prefix: key,
|
|
136
151
|
});
|
|
137
152
|
const listObjects = await this.s3Client.send(listObjectsCommand);
|
|
138
153
|
let result = [];
|
|
139
154
|
if (listObjects.Contents) {
|
|
140
155
|
result = listObjects.Contents.map((object) => ({
|
|
141
|
-
name: object.Key || '',
|
|
156
|
+
name: object.Key?.substring(this.prefix.length) || '',
|
|
142
157
|
createdAt: object.LastModified || new Date(),
|
|
143
158
|
size: object.Size || 0,
|
|
144
159
|
}));
|
|
@@ -146,9 +161,10 @@ class S3StorageProvider {
|
|
|
146
161
|
return result;
|
|
147
162
|
}
|
|
148
163
|
async getMetadata(remotePath) {
|
|
164
|
+
const key = this.applyPrefix(remotePath);
|
|
149
165
|
const headObjectCommand = new client_s3_1.HeadObjectCommand({
|
|
150
166
|
Bucket: this.bucket,
|
|
151
|
-
Key:
|
|
167
|
+
Key: key,
|
|
152
168
|
});
|
|
153
169
|
return await this.s3Client.send(headObjectCommand);
|
|
154
170
|
}
|
|
@@ -168,4 +184,4 @@ class S3StorageProvider {
|
|
|
168
184
|
}
|
|
169
185
|
}
|
|
170
186
|
exports.S3StorageProvider = S3StorageProvider;
|
|
171
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
187
|
+
//# 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;
|
|
@@ -41,7 +41,7 @@ var CacheEvents;
|
|
|
41
41
|
CacheEvents["INSTANCES_CHANGED"] = "INSTANCES_CHANGED";
|
|
42
42
|
CacheEvents["KEY_DELETED"] = "KEY_DELETED";
|
|
43
43
|
})(CacheEvents || (exports.CacheEvents = CacheEvents = {}));
|
|
44
|
-
const
|
|
44
|
+
const DEFAULT_READ_METADATA_CONCURRENCY = 16;
|
|
45
45
|
class StorageAdapter {
|
|
46
46
|
logger;
|
|
47
47
|
storageKeyValueAdapter;
|
|
@@ -59,12 +59,15 @@ class StorageAdapter {
|
|
|
59
59
|
eventName = 'storage-adapter';
|
|
60
60
|
performance;
|
|
61
61
|
constructor(storageAccess, config) {
|
|
62
|
-
const { readInterval, writeInterval, lruCache, objectDeletedFlag, readMetadataConcurrency, performance, showLogs = true, } = config;
|
|
62
|
+
const { readInterval, writeInterval, lruCache, objectDeletedFlag, readMetadataConcurrency, performance, showLogs = true, hasEncryption = true, instanceId, } = config;
|
|
63
63
|
this.logger = showLogs ? logger_js_1.default.child({ class: StorageAdapter.name }) : null;
|
|
64
64
|
this.performance = performance;
|
|
65
|
-
this.instanceId = this.generateHash();
|
|
65
|
+
this.instanceId = instanceId ?? this.generateHash();
|
|
66
66
|
this.readInterval = readInterval;
|
|
67
|
-
this.storageKeyValueAdapter = new StorageKeyValueAdapter_js_1.default(storageAccess, {
|
|
67
|
+
this.storageKeyValueAdapter = new StorageKeyValueAdapter_js_1.default(storageAccess, {
|
|
68
|
+
showLogs,
|
|
69
|
+
hasEncryption,
|
|
70
|
+
});
|
|
68
71
|
this.cache = new lru_cache_1.LRUCache(lruCache);
|
|
69
72
|
this.metadataReader = new StorageMetadataReader_js_1.default({
|
|
70
73
|
storageKeyValueAdapter: this.storageKeyValueAdapter,
|
|
@@ -80,7 +83,7 @@ class StorageAdapter {
|
|
|
80
83
|
showLogs,
|
|
81
84
|
});
|
|
82
85
|
this.queueReadMetadata = new p_queue_1.default({
|
|
83
|
-
concurrency: readMetadataConcurrency ||
|
|
86
|
+
concurrency: readMetadataConcurrency || DEFAULT_READ_METADATA_CONCURRENCY,
|
|
84
87
|
});
|
|
85
88
|
}
|
|
86
89
|
generateHash(str) {
|
|
@@ -88,9 +91,9 @@ class StorageAdapter {
|
|
|
88
91
|
.update(str || uuid.v4())
|
|
89
92
|
.digest('hex');
|
|
90
93
|
}
|
|
91
|
-
|
|
94
|
+
subscribe(cb) {
|
|
92
95
|
this.pubSub.subscribe(this.eventName, cb);
|
|
93
|
-
return
|
|
96
|
+
return () => {
|
|
94
97
|
this.pubSub.unsubscribe(this.eventName, cb);
|
|
95
98
|
};
|
|
96
99
|
}
|
|
@@ -110,38 +113,37 @@ class StorageAdapter {
|
|
|
110
113
|
}
|
|
111
114
|
return this.cache.has(key);
|
|
112
115
|
}
|
|
113
|
-
|
|
116
|
+
getEncryptionKey(key, encryptionKeyBuffer) {
|
|
114
117
|
if (!this.encryptionKeys.has(key)) {
|
|
115
|
-
if (!encryptionKeyBuffer)
|
|
118
|
+
if (!encryptionKeyBuffer) {
|
|
116
119
|
return null;
|
|
120
|
+
}
|
|
117
121
|
const encryptionKey = encryptionKeyBuffer.toString('base64');
|
|
118
122
|
this.encryptionKeys.set(key, encryptionKey);
|
|
119
123
|
return encryptionKey;
|
|
120
124
|
}
|
|
121
125
|
return this.encryptionKeys.get(key) || null;
|
|
122
126
|
}
|
|
123
|
-
|
|
127
|
+
set(key, value, encryptionKeyBuffer) {
|
|
124
128
|
if (this.contentWriter.storageWrites.get(key)?.type === StorageContentWriter_js_1.ContentWriterType.NEEDS_DELETE) {
|
|
125
129
|
throw new Error('Object has been deleted');
|
|
126
130
|
}
|
|
127
|
-
const encryptionKey = this.
|
|
128
|
-
if (!encryptionKey)
|
|
129
|
-
throw new Error('Encryption key required');
|
|
131
|
+
const encryptionKey = this.getEncryptionKey(key, encryptionKeyBuffer);
|
|
130
132
|
this.setByInstance(key, this.instanceId, {
|
|
131
133
|
value,
|
|
132
134
|
modifiedTs: Number.MAX_SAFE_INTEGER,
|
|
133
135
|
});
|
|
134
|
-
this.contentWriter.set(key, StorageContentWriter_js_1.ContentWriterType.NEEDS_UPLOAD, encryptionKey);
|
|
136
|
+
this.contentWriter.set(key, StorageContentWriter_js_1.ContentWriterType.NEEDS_UPLOAD, encryptionKey || undefined);
|
|
135
137
|
}
|
|
136
138
|
setByInstance(key, instanceId, value) {
|
|
137
139
|
const instances = this.cache.get(key) || new Map();
|
|
138
140
|
instances.set(instanceId, value);
|
|
139
141
|
this.cache.set(key, instances);
|
|
140
142
|
}
|
|
141
|
-
|
|
143
|
+
delete(key) {
|
|
142
144
|
this.cache.delete(key);
|
|
143
145
|
this.isUpdating.delete(key);
|
|
144
|
-
const encryptionKey = this.
|
|
146
|
+
const encryptionKey = this.getEncryptionKey(key);
|
|
145
147
|
if (encryptionKey) {
|
|
146
148
|
this.contentWriter.set(key, StorageContentWriter_js_1.ContentWriterType.NEEDS_DELETE, encryptionKey);
|
|
147
149
|
this.encryptionKeys.delete(key);
|
|
@@ -153,19 +155,15 @@ class StorageAdapter {
|
|
|
153
155
|
}
|
|
154
156
|
// the first value is always the current instance, if key exists
|
|
155
157
|
async get(key, encryptionKeyBuffer) {
|
|
156
|
-
if (!encryptionKeyBuffer)
|
|
157
|
-
throw new Error('Encryption key required');
|
|
158
158
|
if (this.contentWriter.storageWrites.get(key)?.type === StorageContentWriter_js_1.ContentWriterType.NEEDS_DELETE ||
|
|
159
159
|
!(await this.has(key))) {
|
|
160
160
|
return null;
|
|
161
161
|
}
|
|
162
|
-
const encryptionKey = this.
|
|
163
|
-
if (!encryptionKey)
|
|
164
|
-
throw new Error('Encryption key required');
|
|
162
|
+
const encryptionKey = this.getEncryptionKey(key, encryptionKeyBuffer);
|
|
165
163
|
if (this.cacheHasNullInstances(key)) {
|
|
166
164
|
await this.getQueue(key).add(async () => {
|
|
167
165
|
if (this.cacheHasNullInstances(key)) {
|
|
168
|
-
await this.fetchNullValues(key, encryptionKey);
|
|
166
|
+
await this.fetchNullValues(key, encryptionKey || undefined);
|
|
169
167
|
}
|
|
170
168
|
});
|
|
171
169
|
}
|
|
@@ -196,9 +194,9 @@ class StorageAdapter {
|
|
|
196
194
|
}
|
|
197
195
|
async fetchNullValues(key, encryptionKey) {
|
|
198
196
|
const promises = [];
|
|
199
|
-
this.cache.get(key)?.forEach((instance,
|
|
197
|
+
this.cache.get(key)?.forEach((instance, instanceId) => {
|
|
200
198
|
if (instance.value === null) {
|
|
201
|
-
const fileName = `${key}/${
|
|
199
|
+
const fileName = `${key}/${instanceId}`;
|
|
202
200
|
const startDownload = this.performance?.now();
|
|
203
201
|
promises.push(this.storageKeyValueAdapter
|
|
204
202
|
.get(fileName, encryptionKey)
|
|
@@ -207,7 +205,7 @@ class StorageAdapter {
|
|
|
207
205
|
const finishDownload = this.performance.now();
|
|
208
206
|
logger_js_1.default.info(`Downloading took ${(finishDownload - startDownload).toFixed(1)} ms`);
|
|
209
207
|
}
|
|
210
|
-
this.setByInstance(key,
|
|
208
|
+
this.setByInstance(key, instanceId, {
|
|
211
209
|
...instance,
|
|
212
210
|
value: file,
|
|
213
211
|
});
|
|
@@ -241,7 +239,7 @@ class StorageAdapter {
|
|
|
241
239
|
const initialSize = cachedByKey.size;
|
|
242
240
|
const { updated, deleted } = await this.metadataReader.fetchInstancesUpdates(key, cachedByKey);
|
|
243
241
|
if (deleted.has(key)) {
|
|
244
|
-
|
|
242
|
+
this.delete(key);
|
|
245
243
|
this.publish(CacheEvents.KEY_DELETED, key);
|
|
246
244
|
return;
|
|
247
245
|
}
|
|
@@ -271,11 +269,11 @@ class StorageAdapter {
|
|
|
271
269
|
this.isUpdating.set(key, false);
|
|
272
270
|
}
|
|
273
271
|
}
|
|
274
|
-
|
|
272
|
+
startUpdatesChecking() {
|
|
275
273
|
this.stopUpdatesChecking();
|
|
276
274
|
this.timeout = setTimeout(async () => {
|
|
277
275
|
Array.from(this.cache.keys()).forEach((key) => {
|
|
278
|
-
this.queueReadMetadata.add(async () => {
|
|
276
|
+
void this.queueReadMetadata.add(async () => {
|
|
279
277
|
await this.getQueue(key).add(async () => {
|
|
280
278
|
await this.checkUpdates(key);
|
|
281
279
|
});
|
|
@@ -299,4 +297,4 @@ class StorageAdapter {
|
|
|
299
297
|
}
|
|
300
298
|
}
|
|
301
299
|
exports.default = StorageAdapter;
|
|
302
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"StorageAdapter.js","sourceRoot":"","sources":["../../../../src/providers/storage/StorageAdapter.ts"],"names":[],"mappings":"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"}
|
|
300
|
+
//# 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>;
|
|
@@ -45,7 +45,7 @@ class StorageContentWriter {
|
|
|
45
45
|
await this.storageKeyValueAdapter.set(`${key}/${this.objectDeletedFlag}`, null, encryptionKey);
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
|
-
async actualizeCacheUpload(key,
|
|
48
|
+
async actualizeCacheUpload(key, cache, encryptionKey) {
|
|
49
49
|
const instances = cache.get(key);
|
|
50
50
|
const instance = instances?.get(this.instanceId);
|
|
51
51
|
if (!instances || !instance) {
|
|
@@ -70,19 +70,19 @@ class StorageContentWriter {
|
|
|
70
70
|
const logger = this.logger?.child({ method: this.actualizeCache.name });
|
|
71
71
|
if (this.storageWrites.size) {
|
|
72
72
|
Array.from(this.storageWrites.entries()).forEach(([key, { type, index, encryptionKey }]) => {
|
|
73
|
-
this.queueWriteContent.add(async () => {
|
|
73
|
+
void this.queueWriteContent.add(async () => {
|
|
74
74
|
try {
|
|
75
75
|
switch (type) {
|
|
76
76
|
case ContentWriterType.NEEDS_DELETE:
|
|
77
77
|
await this.actualizeCacheDelete(key, encryptionKey);
|
|
78
78
|
break;
|
|
79
79
|
case ContentWriterType.NEEDS_UPLOAD:
|
|
80
|
-
await this.actualizeCacheUpload(key,
|
|
80
|
+
await this.actualizeCacheUpload(key, cache, encryptionKey);
|
|
81
81
|
break;
|
|
82
82
|
default:
|
|
83
83
|
break;
|
|
84
84
|
}
|
|
85
|
-
// delete only if the current index is up
|
|
85
|
+
// delete only if the current index is up-to-date
|
|
86
86
|
if (index === this.storageWrites.get(key)?.index) {
|
|
87
87
|
this.storageWrites.delete(key);
|
|
88
88
|
}
|
|
@@ -165,4 +165,4 @@ class StorageContentWriter {
|
|
|
165
165
|
}
|
|
166
166
|
}
|
|
167
167
|
exports.default = StorageContentWriter;
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"StorageContentWriter.js","sourceRoot":"","sources":["../../../../src/providers/storage/StorageContentWriter.ts"],"names":[],"mappings":";;;;;;AACA,sDAA4B;AAC5B,gEAAiD;AAejD,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,kDAA6B,CAAA;IAC7B,kDAA6B,CAAA;AAC/B,CAAC,EAHW,iBAAiB,iCAAjB,iBAAiB,QAG5B;AAED,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAC7C,MAAM,2BAA2B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAQlD,MAAqB,oBAAoB;IAC/B,OAAO,GAAyC,IAAI,CAAC;IAC5C,QAAQ,CAAS;IACjB,sBAAsB,CAA4B;IAClD,MAAM,CAAiB;IACvB,UAAU,CAAS;IACnB,iBAAiB,CAAS;IAC1B,iBAAiB,CAAS;IAC1B,iBAAiB,CAAQ;IACzB,WAAW,CAAe;IAC3B,aAAa,GAA+B,IAAI,GAAG,EAAE,CAAC;IAEtE,YAAY,MAAqC;QAC/C,MAAM,EACJ,uBAAuB,EACvB,QAAQ,EACR,sBAAsB,EACtB,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,QAAQ,GAAG,IAAI,GAChB,GAAG,MAAM,IAAI,EAAE,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,mBAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACnF,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,IAAI,2BAA2B,CAAC;QAC1E,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAE3C,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAK,CAAC;YACjC,WAAW,EAAE,uBAAuB,IAAI,iCAAiC;SAC1E,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,GAAM,EAAE,aAAsB;QAC/D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACjE,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CACpC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAC1D,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CACf,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CACjF,CAAC;QAEF,IAAI,eAAe,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;YAC9C,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,CACnC,GAAG,GAAG,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAClC,IAAI,EACJ,aAAa,CACd,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,GAAM,EACN,KAA+C,EAC/C,aAAsB;QAEtB,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,QAAQ,GAAG,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB;gBACE,GAAG;gBACH,aAAa,EAAE,SAAS,EAAE,IAAI;gBAC9B,KAAK,EAAE,QAAQ;aAChB,EACD,wCAAwC,CACzC,CAAC;YAEF,OAAO;QACT,CAAC;QACD,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACnB,MAAM,WAAW,GAAuB,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC;YAChE,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,CACnC,GAAG,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,EAC3B,QAAQ,CAAC,KAAK,EACd,aAAa,CACd,CAAC;YACF,IAAI,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAClD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;gBAC5C,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,YAAY,GAAG,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACpF,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAA+C;QAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;QAExE,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YAC5B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE;gBACzF,KAAK,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;oBACzC,IAAI,CAAC;wBACH,QAAQ,IAAI,EAAE,CAAC;4BACb,KAAK,iBAAiB,CAAC,YAAY;gCACjC,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;gCACpD,MAAM;4BACR,KAAK,iBAAiB,CAAC,YAAY;gCACjC,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;gCAC3D,MAAM;4BACR;gCACE,MAAM;wBACV,CAAC;wBACD,iDAAiD;wBACjD,IAAI,KAAK,KAAK,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;4BACjD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACjC,CAAC;oBACH,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,MAAM,EAAE,KAAK,CACX;4BACE,GAAG;4BACH,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;yBAC9B,EACD,yBAAyB,GAAG,EAAE,CAC/B,CAAC;oBACJ,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;YACtC,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,yBAAyB,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,uBAAuB,CACnC,GAAW,EACX,SAAsC;QAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAEtD,MAAM,iBAAiB,GAA+B,EAAE,CAAC;QAEzD,SAAS,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE;YAC1C,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC;YACnD,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAE1C,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,IAAI,SAAS,IAAI,UAAU,EAAE,CAAC;gBAC9D,iBAAiB,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,6DAA6D;QAC7D,IAAI,iBAAiB,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAClC,OAAO;QACT,CAAC;QAED,mDAAmD;QACnD,iBAAiB;aACd,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAC/C,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,GAAG,EAAE,CAAC;QAET,MAAM,OAAO,CAAC,UAAU,CACtB,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,CACrC,IAAI,CAAC,sBAAsB;aACxB,MAAM,CAAC,GAAG,GAAG,IAAI,UAAU,EAAE,CAAC;aAC9B,IAAI,CAAC,GAAG,EAAE;YACT,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,kCAAkC,CAAC,CAAC,CACnF,CACF,CAAC;IACJ,CAAC;IAEM,wBAAwB,CAAC,KAA+C;QAC7E,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,OAAO;gBAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;gBACnC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBACjC,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;YACvC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAEM,IAAI;QACT,IAAI,IAAI,CAAC,OAAO;YAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAEM,GAAG,CAAC,GAAM,EAAE,IAAuB,EAAE,aAAsB;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE;YAC1B,IAAI;YACJ,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/C,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAEM,GAAG,CAAC,GAAM;QACf,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC;IACnD,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,KAA+C;QACnE,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF;AAjND,uCAiNC"}
|
|
@@ -1,23 +1,26 @@
|
|
|
1
1
|
import { Encryption } from '@super-protocol/dto-js';
|
|
2
2
|
import StorageAccess from '../../types/storage/StorageAccess.js';
|
|
3
3
|
import StorageObject from '../../types/storage/StorageObject.js';
|
|
4
|
+
import { IStorageKeyValueAdapter } from './types.js';
|
|
4
5
|
export interface StorageKeyValueAdapterConfig {
|
|
5
6
|
showLogs?: boolean;
|
|
7
|
+
hasEncryption?: boolean;
|
|
6
8
|
}
|
|
7
|
-
export default class StorageKeyValueAdapter<V extends object> {
|
|
9
|
+
export default class StorageKeyValueAdapter<V extends object> implements IStorageKeyValueAdapter<V> {
|
|
10
|
+
private readonly hasEncryption;
|
|
8
11
|
private readonly storageProvider;
|
|
9
12
|
private readonly logger?;
|
|
10
13
|
constructor(storageAccess: StorageAccess, config?: StorageKeyValueAdapterConfig);
|
|
11
|
-
decrypt(encryption: Encryption, key: string): Promise<V | null>;
|
|
12
|
-
encrypt(data: V | null, key: string): Promise<Encryption>;
|
|
14
|
+
protected decrypt(encryption: Encryption, key: string): Promise<V | null>;
|
|
15
|
+
protected encrypt(data: V | null, key: string): Promise<Encryption>;
|
|
13
16
|
private downloadFromStorage;
|
|
14
17
|
private streamToString;
|
|
15
18
|
private storageUpload;
|
|
16
19
|
private storageDelete;
|
|
17
20
|
private storageDownload;
|
|
18
21
|
private storageListFiles;
|
|
19
|
-
set(key: string, value: V | null, privateKey
|
|
22
|
+
set(key: string, value: V | null, privateKey?: string): Promise<void>;
|
|
20
23
|
delete(key: string): Promise<void>;
|
|
21
|
-
get(key: string, privateKey
|
|
24
|
+
get(key: string, privateKey?: string): Promise<V | null>;
|
|
22
25
|
listFiles(key: string): Promise<StorageObject[]>;
|
|
23
26
|
}
|