@sonarwatch/portfolio-core 0.2.9 → 0.4.0
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/CHANGELOG.md +8 -0
- package/package.json +1 -1
- package/src/Cache.d.ts +38 -3
- package/src/Cache.js +57 -31
- package/src/Cache.js.map +1 -1
- package/src/Fetcher.d.ts +2 -1
- package/src/Fetcher.js +5 -1
- package/src/Fetcher.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
# [0.4.0](https://github.com/sonarwatch/portfolio/compare/core-0.3.0...core-0.4.0) (2023-07-07)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
# [0.3.0](https://github.com/sonarwatch/portfolio/compare/core-0.2.9...core-0.3.0) (2023-07-07)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
5
13
|
## [0.2.9](https://github.com/sonarwatch/portfolio/compare/core-0.2.8...core-0.2.9) (2023-07-07)
|
|
6
14
|
|
|
7
15
|
|
package/package.json
CHANGED
package/src/Cache.d.ts
CHANGED
|
@@ -1,14 +1,49 @@
|
|
|
1
|
-
import { Storage, StorageValue
|
|
1
|
+
import { Storage, StorageValue } from 'unstorage';
|
|
2
2
|
import { NetworkIdType } from './Network';
|
|
3
3
|
import { TokenPrice, TokenPriceSource } from './TokenPrice';
|
|
4
4
|
export type TransactionOptions = {
|
|
5
5
|
prefix: string;
|
|
6
6
|
networkId?: NetworkIdType;
|
|
7
7
|
};
|
|
8
|
+
export type CacheConfig = CacheConfigRedis | CacheConfigFilesystem | CacheConfigHttp;
|
|
9
|
+
export type CacheConfigHttp = {
|
|
10
|
+
type: 'http';
|
|
11
|
+
params: CacheConfigHttpParams;
|
|
12
|
+
};
|
|
13
|
+
export type CacheConfigHttpParams = {
|
|
14
|
+
base: string;
|
|
15
|
+
headers?: Record<string, string>;
|
|
16
|
+
};
|
|
17
|
+
export type CacheConfigRedis = {
|
|
18
|
+
type: 'redis';
|
|
19
|
+
params: CacheConfigRedisParams;
|
|
20
|
+
};
|
|
21
|
+
export type CacheConfigRedisParams = {
|
|
22
|
+
url: string;
|
|
23
|
+
tls: boolean;
|
|
24
|
+
db: number;
|
|
25
|
+
};
|
|
26
|
+
export type CacheConfigFilesystem = {
|
|
27
|
+
type: 'filesystem';
|
|
28
|
+
params: CacheConfigFilesystemParams;
|
|
29
|
+
};
|
|
30
|
+
export type CacheConfigFilesystemParams = {
|
|
31
|
+
base: string;
|
|
32
|
+
};
|
|
33
|
+
export type CacheConfigParams = {
|
|
34
|
+
filesystem: {
|
|
35
|
+
endpoint: string;
|
|
36
|
+
};
|
|
37
|
+
redis: {
|
|
38
|
+
url: string;
|
|
39
|
+
tls: boolean;
|
|
40
|
+
db: number;
|
|
41
|
+
};
|
|
42
|
+
};
|
|
8
43
|
export declare class Cache {
|
|
9
44
|
readonly storage: Storage;
|
|
10
45
|
private tokenPricesCache;
|
|
11
|
-
constructor(
|
|
46
|
+
constructor(cacheConfig: CacheConfig);
|
|
12
47
|
hasItem(key: string, opts: TransactionOptions): Promise<boolean>;
|
|
13
48
|
hasTokenPrice(address: string, networkId: NetworkIdType): Promise<boolean>;
|
|
14
49
|
getItem<K extends StorageValue>(key: string, opts: TransactionOptions): Promise<K | undefined>;
|
|
@@ -25,5 +60,5 @@ export declare class Cache {
|
|
|
25
60
|
getTokenPriceAddresses(networkId: NetworkIdType): Promise<string[]>;
|
|
26
61
|
dispose(): Promise<void>;
|
|
27
62
|
}
|
|
28
|
-
export declare function
|
|
63
|
+
export declare function getCacheConfig(): CacheConfig;
|
|
29
64
|
export declare function getCache(): Cache;
|
package/src/Cache.js
CHANGED
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.getCache = exports.
|
|
15
|
+
exports.getCache = exports.getCacheConfig = exports.Cache = void 0;
|
|
16
16
|
const unstorage_1 = require("unstorage");
|
|
17
17
|
const fs_1 = __importDefault(require("unstorage/drivers/fs"));
|
|
18
18
|
const redis_1 = __importDefault(require("unstorage/drivers/redis"));
|
|
@@ -22,8 +22,9 @@ const ttlPrefix = 'ttl';
|
|
|
22
22
|
const tokenPriceSourcePrefix = 'tokenpricesource';
|
|
23
23
|
const tokenPricesCacheTtl = 10 * 1000;
|
|
24
24
|
class Cache {
|
|
25
|
-
constructor(
|
|
25
|
+
constructor(cacheConfig) {
|
|
26
26
|
this.tokenPricesCache = new Map();
|
|
27
|
+
const driver = getDriverFromCacheConfig(cacheConfig);
|
|
27
28
|
this.storage = (0, unstorage_1.createStorage)({
|
|
28
29
|
driver,
|
|
29
30
|
});
|
|
@@ -213,45 +214,70 @@ function getFullBase(opts) {
|
|
|
213
214
|
const fullBase = `${prefix}:${networkIdBasePrefix}`;
|
|
214
215
|
return fullBase;
|
|
215
216
|
}
|
|
216
|
-
function
|
|
217
|
-
switch (
|
|
217
|
+
function getDriverFromCacheConfig(cacheConfig) {
|
|
218
|
+
switch (cacheConfig.type) {
|
|
218
219
|
case 'filesystem':
|
|
219
220
|
return (0, fs_1.default)({
|
|
220
|
-
base:
|
|
221
|
+
base: cacheConfig.params.base,
|
|
221
222
|
});
|
|
222
|
-
// case 'mongodb':
|
|
223
|
-
// return mongodbDriver({
|
|
224
|
-
// connectionString:
|
|
225
|
-
// process.env['CACHE_DRIVER_MONGODB_CONNECTION'] ||
|
|
226
|
-
// 'mongodb://localhost:27017/',
|
|
227
|
-
// databaseName:
|
|
228
|
-
// process.env['CACHE_DRIVER_MONGODB_DATABASE'] || 'portfolio',
|
|
229
|
-
// collectionName: 'cache',
|
|
230
|
-
// });
|
|
231
223
|
case 'redis':
|
|
232
224
|
return (0, redis_1.default)({
|
|
233
|
-
url:
|
|
234
|
-
tls:
|
|
235
|
-
db:
|
|
225
|
+
url: cacheConfig.params.url,
|
|
226
|
+
tls: cacheConfig.params.tls ? {} : undefined,
|
|
227
|
+
db: cacheConfig.params.db,
|
|
228
|
+
});
|
|
229
|
+
case 'http':
|
|
230
|
+
return (0, http_1.default)({
|
|
231
|
+
base: cacheConfig.params.base,
|
|
232
|
+
headers: cacheConfig.params.headers,
|
|
236
233
|
});
|
|
237
234
|
default:
|
|
238
|
-
|
|
235
|
+
throw new Error('CacheConfig type is not valid');
|
|
239
236
|
}
|
|
240
237
|
}
|
|
241
|
-
|
|
238
|
+
function getCacheConfig() {
|
|
239
|
+
switch (process.env['CACHE_CONFIG_TYPE']) {
|
|
240
|
+
case 'filesystem':
|
|
241
|
+
return {
|
|
242
|
+
type: 'filesystem',
|
|
243
|
+
params: {
|
|
244
|
+
base: process.env['CACHE_CONFIG_FILESYSTEM_BASE'] || './cache',
|
|
245
|
+
},
|
|
246
|
+
};
|
|
247
|
+
case 'redis':
|
|
248
|
+
return {
|
|
249
|
+
type: 'redis',
|
|
250
|
+
params: {
|
|
251
|
+
url: process.env['CACHE_CONFIG_REDIS_URL'] || '127.0.0.1:6379',
|
|
252
|
+
tls: process.env['CACHE_CONFIG_REDIS_TLS'] === 'true',
|
|
253
|
+
db: parseInt(process.env['CACHE_CONFIG_REDIS_DB'] || '0', 10),
|
|
254
|
+
},
|
|
255
|
+
};
|
|
256
|
+
case 'http':
|
|
257
|
+
return {
|
|
258
|
+
type: 'http',
|
|
259
|
+
params: {
|
|
260
|
+
base: process.env['CACHE_CONFIG_HTTP_BASE'] || 'http://localhost:3000/',
|
|
261
|
+
headers: process.env['CACHE_CONFIG_HTTP_BEARER']
|
|
262
|
+
? {
|
|
263
|
+
Authorization: `Bearer ${process.env['CACHE_CONFIG_HTTP_BEARER']}`,
|
|
264
|
+
}
|
|
265
|
+
: undefined,
|
|
266
|
+
},
|
|
267
|
+
};
|
|
268
|
+
default:
|
|
269
|
+
return {
|
|
270
|
+
type: 'filesystem',
|
|
271
|
+
params: {
|
|
272
|
+
base: process.env['CACHE_CONFIG_FILESYSTEM_BASE'] || './cache',
|
|
273
|
+
},
|
|
274
|
+
};
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
exports.getCacheConfig = getCacheConfig;
|
|
242
278
|
function getCache() {
|
|
243
|
-
const
|
|
244
|
-
|
|
245
|
-
const headers = bearerToken
|
|
246
|
-
? {
|
|
247
|
-
Authorization: `Bearer ${bearerToken}`,
|
|
248
|
-
}
|
|
249
|
-
: undefined;
|
|
250
|
-
const driver = (0, http_1.default)({
|
|
251
|
-
base,
|
|
252
|
-
headers,
|
|
253
|
-
});
|
|
254
|
-
return new Cache(driver);
|
|
279
|
+
const cacheConfig = getCacheConfig();
|
|
280
|
+
return new Cache(cacheConfig);
|
|
255
281
|
}
|
|
256
282
|
exports.getCache = getCache;
|
|
257
283
|
//# sourceMappingURL=Cache.js.map
|
package/src/Cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../../../../packages/core/src/Cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAAyE;AACzE,8DAA4C;AAC5C,oEAAkD;AAClD,kEAAgD;AAGhD,6CAKsB;AAMtB,MAAM,SAAS,GAAG,KAAK,CAAC;AACxB,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AAClD,MAAM,mBAAmB,GAAG,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../../../../packages/core/src/Cache.ts"],"names":[],"mappings":"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"}
|
package/src/Fetcher.d.ts
CHANGED
|
@@ -15,7 +15,8 @@ export type FetcherResult = {
|
|
|
15
15
|
succeededFetcherIds: string[];
|
|
16
16
|
failedFetcherIds: string[];
|
|
17
17
|
elements: PortfolioElement[];
|
|
18
|
+
errors: Error[];
|
|
18
19
|
};
|
|
19
20
|
export declare function runFetchers(owner: string, addressSystem: AddressSystemType, fetchers: Fetcher[], cache: Cache): Promise<FetcherResult>;
|
|
20
21
|
export declare function runFetchersByNetworkId(owner: string, networkId: NetworkIdType, fetchers: Fetcher[], cache: Cache): Promise<FetcherResult>;
|
|
21
|
-
export declare function runFetcher(owner: string, fetcher: Fetcher, cache: Cache): Promise<
|
|
22
|
+
export declare function runFetcher(owner: string, fetcher: Fetcher, cache: Cache): Promise<PortfolioElement[]>;
|
package/src/Fetcher.js
CHANGED
|
@@ -22,10 +22,12 @@ function runFetchers(owner, addressSystem, fetchers, cache) {
|
|
|
22
22
|
const result = yield Promise.allSettled(promises);
|
|
23
23
|
const failedFetcherIds = [];
|
|
24
24
|
const succeededFetcherIds = [];
|
|
25
|
+
const errors = [];
|
|
25
26
|
const elements = result.flatMap((r, index) => {
|
|
26
27
|
const fetcherId = fetchers[index].id;
|
|
27
28
|
if (r.status === 'rejected') {
|
|
28
29
|
failedFetcherIds.push(fetcherId);
|
|
30
|
+
errors.push(r.reason);
|
|
29
31
|
return [];
|
|
30
32
|
}
|
|
31
33
|
succeededFetcherIds.push(fetcherId);
|
|
@@ -39,6 +41,7 @@ function runFetchers(owner, addressSystem, fetchers, cache) {
|
|
|
39
41
|
succeededFetcherIds,
|
|
40
42
|
failedFetcherIds,
|
|
41
43
|
elements,
|
|
44
|
+
errors,
|
|
42
45
|
};
|
|
43
46
|
});
|
|
44
47
|
}
|
|
@@ -54,7 +57,8 @@ function runFetchersByNetworkId(owner, networkId, fetchers, cache) {
|
|
|
54
57
|
}
|
|
55
58
|
exports.runFetchersByNetworkId = runFetchersByNetworkId;
|
|
56
59
|
function runFetcher(owner, fetcher, cache) {
|
|
57
|
-
|
|
60
|
+
const fOwner = (0, utils_1.formatAddressByNetworkId)(owner, fetcher.networkId);
|
|
61
|
+
return fetcher.executor(fOwner, cache);
|
|
58
62
|
}
|
|
59
63
|
exports.runFetcher = runFetcher;
|
|
60
64
|
//# sourceMappingURL=Fetcher.js.map
|
package/src/Fetcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Fetcher.js","sourceRoot":"","sources":["../../../../packages/core/src/Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,2CAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"Fetcher.js","sourceRoot":"","sources":["../../../../packages/core/src/Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,2CAAuC;AACvC,mCAAkE;AAuBlE,SAAsB,WAAW,CAC/B,KAAa,EACb,aAAgC,EAChC,QAAmB,EACnB,KAAY;;QAEZ,MAAM,MAAM,GAAG,IAAA,qBAAa,EAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACnD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa,KAAK,aAAa,CAC7D,CAAC;QACF,IAAI,CAAC,gBAAgB;YACnB,MAAM,IAAI,KAAK,CACb,mDAAmD,aAAa,EAAE,CACnE,CAAC;QAEJ,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAElD,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,mBAAmB,GAAa,EAAE,CAAC;QACzC,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC3C,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU,EAAE;gBAC3B,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACjC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBACtB,OAAO,EAAE,CAAC;aACX;YACD,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,OAAO,CAAC,CAAC,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAChE,OAAO;YACL,KAAK,EAAE,MAAM;YACb,aAAa;YACb,UAAU;YACV,mBAAmB;YACnB,gBAAgB;YAChB,QAAQ;YACR,MAAM;SACP,CAAC;IACJ,CAAC;CAAA;AAzCD,kCAyCC;AAED,SAAsB,sBAAsB,CAC1C,KAAa,EACb,SAAwB,EACxB,QAAmB,EACnB,KAAY;;QAEZ,MAAM,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;QAC1E,IAAI,CAAC,gBAAgB;YACnB,MAAM,IAAI,KAAK,CAAC,+CAA+C,SAAS,EAAE,CAAC,CAAC;QAE9E,MAAM,EAAE,aAAa,EAAE,GAAG,oBAAQ,CAAC,SAAS,CAAC,CAAC;QAC9C,OAAO,WAAW,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;CAAA;AAZD,wDAYC;AAED,SAAgB,UAAU,CAAC,KAAa,EAAE,OAAgB,EAAE,KAAY;IACtE,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAClE,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACzC,CAAC;AAHD,gCAGC"}
|