@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
|
@@ -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":"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"}
|
|
@@ -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
|
}
|
|
@@ -9,28 +9,35 @@ const getStorageProvider_js_1 = __importDefault(require("./getStorageProvider.js
|
|
|
9
9
|
const logger_js_1 = __importDefault(require("../../logger.js"));
|
|
10
10
|
const Crypto_js_1 = __importDefault(require("../../crypto/Crypto.js"));
|
|
11
11
|
class StorageKeyValueAdapter {
|
|
12
|
+
hasEncryption;
|
|
12
13
|
storageProvider;
|
|
13
14
|
logger;
|
|
14
15
|
constructor(storageAccess, config) {
|
|
15
|
-
if (!storageAccess?.credentials)
|
|
16
|
+
if (!storageAccess?.credentials) {
|
|
16
17
|
throw new Error('Credentials is empty');
|
|
17
|
-
|
|
18
|
+
}
|
|
19
|
+
const { showLogs = true, hasEncryption = true } = config || {};
|
|
20
|
+
this.hasEncryption = hasEncryption;
|
|
18
21
|
this.logger = showLogs ? logger_js_1.default.child({ class: StorageKeyValueAdapter.name }) : null;
|
|
19
22
|
this.storageProvider = (0, getStorageProvider_js_1.default)(storageAccess);
|
|
20
23
|
}
|
|
21
24
|
async decrypt(encryption, key) {
|
|
22
|
-
if (!encryption)
|
|
25
|
+
if (!encryption) {
|
|
23
26
|
return null;
|
|
24
|
-
|
|
27
|
+
}
|
|
28
|
+
if (!key) {
|
|
25
29
|
throw new Error('Key cannot be empty!');
|
|
30
|
+
}
|
|
26
31
|
encryption.key = key;
|
|
27
32
|
return JSON.parse(await Crypto_js_1.default.decrypt(encryption));
|
|
28
33
|
}
|
|
29
|
-
|
|
30
|
-
if (data === undefined)
|
|
34
|
+
encrypt(data, key) {
|
|
35
|
+
if (data === undefined) {
|
|
31
36
|
throw new Error('Data cannot be empty!');
|
|
32
|
-
|
|
37
|
+
}
|
|
38
|
+
if (!key) {
|
|
33
39
|
throw new Error('Private cannot be empty!');
|
|
40
|
+
}
|
|
34
41
|
return Crypto_js_1.default.encrypt(JSON.stringify(data), {
|
|
35
42
|
algo: dto_js_1.CryptoAlgorithm.AES,
|
|
36
43
|
encoding: dto_js_1.Encoding.base64,
|
|
@@ -53,8 +60,11 @@ class StorageKeyValueAdapter {
|
|
|
53
60
|
});
|
|
54
61
|
}
|
|
55
62
|
async storageUpload(key, value, privateKey) {
|
|
63
|
+
if (this.hasEncryption && !privateKey) {
|
|
64
|
+
throw new Error('Invalid private key');
|
|
65
|
+
}
|
|
56
66
|
try {
|
|
57
|
-
const encryptedValue = await this.encrypt(value, privateKey);
|
|
67
|
+
const encryptedValue = this.hasEncryption && privateKey ? await this.encrypt(value, privateKey) : value;
|
|
58
68
|
const buffer = Buffer.from(JSON.stringify(encryptedValue));
|
|
59
69
|
await this.storageProvider.uploadFile(stream_1.Readable.from(buffer), key, buffer.byteLength);
|
|
60
70
|
this.logger?.info({ data: key }, 'Success uploading to storage');
|
|
@@ -75,13 +85,17 @@ class StorageKeyValueAdapter {
|
|
|
75
85
|
}
|
|
76
86
|
}
|
|
77
87
|
async storageDownload(key, privateKey) {
|
|
88
|
+
if (this.hasEncryption && !privateKey) {
|
|
89
|
+
throw new Error('Invalid private key');
|
|
90
|
+
}
|
|
78
91
|
try {
|
|
79
92
|
const downloaded = await this.downloadFromStorage(key);
|
|
80
93
|
this.logger?.info({ key }, 'Success download data from storage');
|
|
81
|
-
if (!downloaded)
|
|
94
|
+
if (!downloaded) {
|
|
82
95
|
return null;
|
|
83
|
-
|
|
84
|
-
|
|
96
|
+
}
|
|
97
|
+
const value = JSON.parse(downloaded);
|
|
98
|
+
return this.hasEncryption && privateKey ? await this.decrypt(value, privateKey) : value;
|
|
85
99
|
}
|
|
86
100
|
catch (err) {
|
|
87
101
|
this.logger?.info({
|
|
@@ -108,18 +122,18 @@ class StorageKeyValueAdapter {
|
|
|
108
122
|
throw err;
|
|
109
123
|
}
|
|
110
124
|
}
|
|
111
|
-
|
|
125
|
+
set(key, value, privateKey) {
|
|
112
126
|
return this.storageUpload(key, value, privateKey);
|
|
113
127
|
}
|
|
114
|
-
|
|
128
|
+
delete(key) {
|
|
115
129
|
return this.storageDelete(key);
|
|
116
130
|
}
|
|
117
|
-
|
|
131
|
+
get(key, privateKey) {
|
|
118
132
|
return this.storageDownload(key, privateKey);
|
|
119
133
|
}
|
|
120
|
-
|
|
134
|
+
listFiles(key) {
|
|
121
135
|
return this.storageListFiles(key);
|
|
122
136
|
}
|
|
123
137
|
}
|
|
124
138
|
exports.default = StorageKeyValueAdapter;
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RvcmFnZUtleVZhbHVlQWRhcHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvc3RvcmFnZS9TdG9yYWdlS2V5VmFsdWVBZGFwdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsbUNBQWtDO0FBQ2xDLG1EQUF1RjtBQUd2RixvRkFBeUQ7QUFFekQsZ0VBQWlEO0FBQ2pELHVFQUE0QztBQVE1QyxNQUFxQixzQkFBc0I7SUFHeEIsYUFBYSxDQUFVO0lBQ3ZCLGVBQWUsQ0FBbUI7SUFDbEMsTUFBTSxDQUFpQjtJQUV4QyxZQUFZLGFBQTRCLEVBQUUsTUFBcUM7UUFDN0UsSUFBSSxDQUFDLGFBQWEsRUFBRSxXQUFXLEVBQUUsQ0FBQztZQUNoQyxNQUFNLElBQUksS0FBSyxDQUFDLHNCQUFzQixDQUFDLENBQUM7UUFDMUMsQ0FBQztRQUNELE1BQU0sRUFBRSxRQUFRLEdBQUcsSUFBSSxFQUFFLGFBQWEsR0FBRyxJQUFJLEVBQUUsR0FBRyxNQUFNLElBQUksRUFBRSxDQUFDO1FBQy9ELElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO1FBQ25DLElBQUksQ0FBQyxNQUFNLEdBQUcsUUFBUSxDQUFDLENBQUMsQ0FBQyxtQkFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLEtBQUssRUFBRSxzQkFBc0IsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7UUFDckYsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFBLCtCQUFrQixFQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzNELENBQUM7SUFFUyxLQUFLLENBQUMsT0FBTyxDQUFDLFVBQXNCLEVBQUUsR0FBVztRQUN6RCxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDaEIsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBQ0QsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ1QsTUFBTSxJQUFJLEtBQUssQ0FBQyxz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
|
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import StorageAccess from '../../types/storage/StorageAccess.js';
|
|
3
3
|
import { StorageAdapterConfig, CacheEvents } from './StorageAdapter.js';
|
|
4
|
+
import { StorjCredentials } from '@super-protocol/dto-js';
|
|
4
5
|
export type StorjConfig = StorageAdapterConfig;
|
|
5
6
|
export default class StorjAdapter<V extends object> {
|
|
6
7
|
private storageAdapter;
|
|
7
8
|
private readonly logger?;
|
|
8
|
-
constructor(storageAccess: StorageAccess
|
|
9
|
+
constructor(storageAccess: StorageAccess<StorjCredentials>, config: StorjConfig);
|
|
9
10
|
subscribe(cb: (props: {
|
|
10
11
|
type: CacheEvents;
|
|
11
12
|
message: unknown;
|
|
12
|
-
}) => void):
|
|
13
|
+
}) => void): () => void;
|
|
13
14
|
get(key: string, encryptionKey: Buffer): Promise<(V | null)[] | null>;
|
|
14
15
|
has(key: string): Promise<boolean>;
|
|
15
|
-
set(key: string, value: V, encryptionKey: Buffer):
|
|
16
|
-
del(key: string):
|
|
16
|
+
set(key: string, value: V, encryptionKey: Buffer): void;
|
|
17
|
+
del(key: string): void;
|
|
17
18
|
stop(): void;
|
|
18
19
|
shutdown(): Promise<void>;
|
|
19
20
|
}
|
|
@@ -18,30 +18,36 @@ class StorjAdapter {
|
|
|
18
18
|
return this.storageAdapter?.subscribe(cb);
|
|
19
19
|
}
|
|
20
20
|
async get(key, encryptionKey) {
|
|
21
|
-
|
|
21
|
+
try {
|
|
22
|
+
return await this.storageAdapter.get(key, encryptionKey);
|
|
23
|
+
}
|
|
24
|
+
catch (err) {
|
|
22
25
|
const message = err.message?.toLowerCase() || '';
|
|
23
26
|
if (message.includes('object not found') || message.includes('object has been deleted')) {
|
|
24
27
|
this.logger?.info({ key }, 'Object not found');
|
|
25
28
|
return null;
|
|
26
29
|
}
|
|
27
30
|
throw err;
|
|
28
|
-
}
|
|
31
|
+
}
|
|
29
32
|
}
|
|
30
|
-
|
|
33
|
+
has(key) {
|
|
31
34
|
return this.storageAdapter.has(key);
|
|
32
35
|
}
|
|
33
|
-
|
|
34
|
-
|
|
36
|
+
set(key, value, encryptionKey) {
|
|
37
|
+
try {
|
|
38
|
+
this.storageAdapter.set(key, value, encryptionKey);
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
35
41
|
const message = err.message?.toLowerCase() || '';
|
|
36
42
|
if (message.includes('object has been deleted')) {
|
|
37
43
|
this.logger?.info({ key }, 'Object has been deleted');
|
|
38
44
|
return;
|
|
39
45
|
}
|
|
40
46
|
throw err;
|
|
41
|
-
}
|
|
47
|
+
}
|
|
42
48
|
}
|
|
43
|
-
|
|
44
|
-
|
|
49
|
+
del(key) {
|
|
50
|
+
this.storageAdapter.delete(key);
|
|
45
51
|
}
|
|
46
52
|
stop() {
|
|
47
53
|
this.storageAdapter.stop();
|
|
@@ -51,4 +57,4 @@ class StorjAdapter {
|
|
|
51
57
|
}
|
|
52
58
|
}
|
|
53
59
|
exports.default = StorjAdapter;
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RvcmpBZGFwdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy9zdG9yYWdlL1N0b3JqQWRhcHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUNBLGdFQUFpRDtBQUNqRCw0RUFBd0Y7QUFLeEYsTUFBcUIsWUFBWTtJQUN2QixjQUFjLENBQW9CO0lBQ3pCLE1BQU0sQ0FBaUI7SUFFeEMsWUFBWSxhQUE4QyxFQUFFLE1BQW1CO1FBQzdFLE1BQU0sRUFBRSxRQUFRLEdBQUcsSUFBSSxFQUFFLEdBQUcsTUFBTSxJQUFJLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsTUFBTSxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsbUJBQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxLQUFLLEVBQUUsWUFBWSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUMzRSxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksMkJBQWMsQ0FBQyxhQUFhLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDaEUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUM1QixDQUFDO0lBRUQsU0FBUyxDQUFDLEVBQTREO1FBQ3BFLE9BQU8sSUFBSSxDQUFDLGNBQWMsRUFBRSxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDNUMsQ0FBQztJQUVELEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBVyxFQUFFLGFBQXFCO1FBQzFDLElBQUksQ0FBQztZQUNILE9BQU8sTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFDM0QsQ0FBQztRQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDYixNQUFNLE9BQU8sR0FBSSxHQUFhLENBQUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsQ0FBQztZQUM1RCxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsa0JBQWtCLENBQUMsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLHlCQUF5QixDQUFDLEVBQUUsQ0FBQztnQkFDeEYsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO2dCQUUvQyxPQUFPLElBQUksQ0FBQztZQUNkLENBQUM7WUFDRCxNQUFNLEdBQUcsQ0FBQztRQUNaLENBQUM7SUFDSCxDQUFDO0lBRUQsR0FBRyxDQUFDLEdBQVc7UUFDYixPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3RDLENBQUM7SUFFRCxHQUFHLENBQUMsR0FBVyxFQUFFLEtBQVEsRUFBRSxhQUFxQjtRQUM5QyxJQUFJLENBQUM7WUFDSCxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBQ3JELENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsTUFBTSxPQUFPLEdBQUksR0FBYSxDQUFDLE9BQU8sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLENBQUM7WUFDNUQsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLHlCQUF5QixDQUFDLEVBQUUsQ0FBQztnQkFDaEQsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDO2dCQUV0RCxPQUFPO1lBQ1QsQ0FBQztZQUNELE1BQU0sR0FBRyxDQUFDO1FBQ1osQ0FBQztJQUNILENBQUM7SUFFRCxHQUFHLENBQUMsR0FBVztRQUNiLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFFRCxJQUFJO1FBQ0YsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVE7UUFDWixNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDdkMsQ0FBQztDQUNGO0FBMURELCtCQTBEQyJ9
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { S3Credentials, StorjCredentials, StringifiedCredentials } from '@super-protocol/dto-js';
|
|
2
|
+
export declare enum CredentialsPermissions {
|
|
3
|
+
read = 0,
|
|
4
|
+
write = 1,
|
|
5
|
+
list = 2,
|
|
6
|
+
delete = 3
|
|
7
|
+
}
|
|
8
|
+
export declare class StorjCredentialsManager {
|
|
9
|
+
private accessToken;
|
|
10
|
+
private bucket;
|
|
11
|
+
private access?;
|
|
12
|
+
private project?;
|
|
13
|
+
constructor(storageConfig: Pick<StorjCredentials, 'token' | 'bucket'>);
|
|
14
|
+
getStorageId(entity: string, entityId: string): string;
|
|
15
|
+
create(): Promise<void>;
|
|
16
|
+
acquireCredentials(permissions: CredentialsPermissions[], prefix: string): Promise<StringifiedCredentials<StorjCredentials>>;
|
|
17
|
+
acquireS3Credentials(permissions: CredentialsPermissions[], prefix: string): Promise<S3Credentials>;
|
|
18
|
+
getS3Credentials(stringifiedCredentials: StringifiedCredentials): Promise<S3Credentials>;
|
|
19
|
+
getS3Credentials(storjCredentials: StorjCredentials): Promise<S3Credentials>;
|
|
20
|
+
revokeCredentials(credentialString: StringifiedCredentials<StorjCredentials>): Promise<void>;
|
|
21
|
+
private lazyStorj;
|
|
22
|
+
private lazyAccess;
|
|
23
|
+
private lazyProject;
|
|
24
|
+
}
|