@chainlink/external-adapter-framework 0.29.9 → 0.29.11
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/README.md +1 -1
- package/adapter/basic.js +5 -1
- package/adapter/basic.js.map +1 -1
- package/background-executor.js +1 -1
- package/background-executor.js.map +1 -1
- package/cache/index.js +2 -2
- package/cache/index.js.map +1 -1
- package/cache/local.js +6 -6
- package/cache/local.js.map +1 -1
- package/cache/redis.js +4 -4
- package/cache/redis.js.map +1 -1
- package/cache/response.js +2 -2
- package/cache/response.js.map +1 -1
- package/config/index.d.ts +10 -0
- package/config/index.js +10 -0
- package/config/index.js.map +1 -1
- package/index.d.ts +6 -6
- package/index.js +26 -22
- package/index.js.map +1 -1
- package/metrics/index.js +2 -2
- package/metrics/index.js.map +1 -1
- package/package.json +3 -3
- package/transports/abstract/streaming.js +2 -2
- package/transports/abstract/streaming.js.map +1 -1
- package/transports/abstract/subscription.js +1 -1
- package/transports/abstract/subscription.js.map +1 -1
- package/transports/http.js +3 -3
- package/transports/http.js.map +1 -1
- package/transports/websocket.js +4 -4
- package/transports/websocket.js.map +1 -1
- package/util/logger.d.ts +1 -0
- package/util/logger.js +8 -1
- package/util/logger.js.map +1 -1
- package/util/requester.js +8 -8
- package/util/requester.js.map +1 -1
- package/util/testing-utils.d.ts +119 -0
- package/util/testing-utils.js +345 -0
- package/util/testing-utils.js.map +1 -0
- package/validation/index.js +6 -6
- package/validation/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@chainlink/external-adapter-framework",
|
|
3
|
-
"version": "0.29.
|
|
3
|
+
"version": "0.29.11",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"dependencies": {
|
|
@@ -12,7 +12,8 @@
|
|
|
12
12
|
"pino": "8.6.1",
|
|
13
13
|
"pino-pretty": "9.1.0",
|
|
14
14
|
"prom-client": "13.2.0",
|
|
15
|
-
"ws": "8.9.0"
|
|
15
|
+
"ws": "8.9.0",
|
|
16
|
+
"mock-socket": "9.1.5"
|
|
16
17
|
},
|
|
17
18
|
"scripts": {
|
|
18
19
|
"build": "mkdir -p ./dist/src && cp package.json dist/src && cp README.md dist/src && tsc",
|
|
@@ -42,7 +43,6 @@
|
|
|
42
43
|
"eslint": "8.39.0",
|
|
43
44
|
"eslint-config-prettier": "8.8.0",
|
|
44
45
|
"eslint-plugin-tsdoc": "0.2.17",
|
|
45
|
-
"mock-socket": "9.1.5",
|
|
46
46
|
"mocksse": "1.0.4",
|
|
47
47
|
"prettier": "2.8.7",
|
|
48
48
|
"ts-node": "10.9.1",
|
|
@@ -31,10 +31,10 @@ class StreamingTransport extends subscription_1.SubscriptionTransport {
|
|
|
31
31
|
};
|
|
32
32
|
logger.debug(`${subscriptions.new.length} new subscriptions; ${subscriptions.stale.length} to unsubscribe`);
|
|
33
33
|
if (subscriptions.new.length) {
|
|
34
|
-
logger.trace(`Will subscribe to: ${JSON.stringify(subscriptions.new)}`);
|
|
34
|
+
(0, util_1.censorLogs)(() => logger.trace(`Will subscribe to: ${JSON.stringify(subscriptions.new)}`));
|
|
35
35
|
}
|
|
36
36
|
if (subscriptions.stale.length) {
|
|
37
|
-
logger.trace(`Will unsubscribe to: ${JSON.stringify(subscriptions.stale)}`);
|
|
37
|
+
(0, util_1.censorLogs)(() => logger.trace(`Will unsubscribe to: ${JSON.stringify(subscriptions.stale)}`));
|
|
38
38
|
}
|
|
39
39
|
await this.streamHandler(context, subscriptions);
|
|
40
40
|
logger.debug('Setting local state to subscription set value');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../../../src/transports/abstract/streaming.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../../../src/transports/abstract/streaming.ts"],"names":[],"mappings":";;;AAEA,qCAAmD;AAEnD,iDAAsD;AAEtD,MAAM,MAAM,GAAG,IAAA,iBAAU,EAAC,oBAAoB,CAAC,CAAA;AAgB/C;;;;;;GAMG;AACH,MAAsB,kBAEpB,SAAQ,oCAAwB;IAFlC;;QAGE,+FAA+F;QAC/F,iDAAiD;QACjD,uBAAkB,GAA0C,EAAE,CAAA;QAE9D,gGAAgG;QAChG,kCAA6B,GAAG,CAAC,CAAA;IA8CnC,CAAC;IA5CU,KAAK,CAAC,iBAAiB,CAC9B,OAA2B,EAC3B,WAAkD;QAElD,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAA;QAE5D,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACzE,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAE5F,MAAM,aAAa,GAAG;YACpB,OAAO,EAAE,WAAW;YACpB,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7E,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SACrF,CAAA;QAED,MAAM,CAAC,KAAK,CACV,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,uBAAuB,aAAa,CAAC,KAAK,CAAC,MAAM,iBAAiB,CAC9F,CAAA;QACD,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE;YAC5B,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;SAC1F;QACD,IAAI,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE;YAC9B,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;SAC9F;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;QAEhD,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAC7D,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAA;QAErC,OAAM;IACR,CAAC;CAaF;AAtDD,gDAsDC"}
|
|
@@ -18,7 +18,7 @@ class SubscriptionTransport {
|
|
|
18
18
|
this.name = name;
|
|
19
19
|
}
|
|
20
20
|
async registerRequest(req, _) {
|
|
21
|
-
logger.debug(`Adding entry to subscription set (ttl ${this.subscriptionTtl}): [${req.requestContext.cacheKey}] = ${req.requestContext.data}`);
|
|
21
|
+
(0, util_1.censorLogs)(() => logger.debug(`Adding entry to subscription set (ttl ${this.subscriptionTtl}): [${req.requestContext.cacheKey}] = ${req.requestContext.data}`));
|
|
22
22
|
// This might need coalescing to avoid too frequent ttl updates
|
|
23
23
|
await this.subscriptionSet.add(req.requestContext.data, this.subscriptionTtl, req.requestContext.cacheKey);
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription.js","sourceRoot":"","sources":["../../../../src/transports/abstract/subscription.ts"],"names":[],"mappings":";;;AAGA,2CAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"subscription.js","sourceRoot":"","sources":["../../../../src/transports/abstract/subscription.ts"],"names":[],"mappings":";;;AAGA,2CAAuC;AACvC,qCAAoE;AAIpE,MAAM,MAAM,GAAG,IAAA,iBAAU,EAAC,uBAAuB,CAAC,CAAA;AAElD;;;;;GAKG;AACH,MAAsB,qBAAqB;IAQzC,KAAK,CAAC,UAAU,CACd,YAAsC,EACtC,eAA8B,EAC9B,YAAoB,EACpB,IAAY;QAEZ,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAA;QAC/C,IAAI,CAAC,eAAe,GAAG,YAAY,CAAC,sBAAsB,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;QACvF,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAA,CAAC,oCAAoC;QAC9G,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,GAAwD,EACxD,CAAgB;QAEhB,IAAA,iBAAU,EAAC,GAAG,EAAE,CACd,MAAM,CAAC,KAAK,CACV,yCAAyC,IAAI,CAAC,eAAe,OAAO,GAAG,CAAC,cAAc,CAAC,QAAQ,OAAO,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAChI,CACF,CAAA;QAED,+DAA+D;QAC/D,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAC5B,GAAG,CAAC,cAAc,CAAC,IAAI,EACvB,IAAI,CAAC,eAAe,EACpB,GAAG,CAAC,cAAc,CAAC,QAAQ,CAC5B,CAAA;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA2B;QACjD,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAA;QAEnD,4DAA4D;QAC5D,gFAAgF;QAChF,2HAA2H;QAC3H,iBAAO;aACJ,GAAG,CAAC,+BAA+B,CAAC;aACpC,MAAM,CAAC;YACN,gBAAgB,EAAE,OAAO,CAAC,YAAY;YACtC,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;YACrC,SAAS,EAAE,IAAI,CAAC,IAAI;SACrB,CAAC;aACD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAEtB,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAChD,CAAC;CAmBF;AA1ED,sDA0EC"}
|
package/transports/http.js
CHANGED
|
@@ -135,7 +135,7 @@ class HttpTransport extends subscription_1.SubscriptionTransport {
|
|
|
135
135
|
const err = e;
|
|
136
136
|
const cause = err.cause;
|
|
137
137
|
const errorMessage = `Provider request failed with status ${cause.status}: "${cause.response?.data}"`;
|
|
138
|
-
logger.info(errorMessage);
|
|
138
|
+
(0, util_1.censorLogs)(() => logger.info(errorMessage));
|
|
139
139
|
return {
|
|
140
140
|
results: requestConfig.params.map((entry) => ({
|
|
141
141
|
params: entry,
|
|
@@ -149,7 +149,7 @@ class HttpTransport extends subscription_1.SubscriptionTransport {
|
|
|
149
149
|
}
|
|
150
150
|
else if (e instanceof error_1.AdapterRateLimitError) {
|
|
151
151
|
const err = e;
|
|
152
|
-
logger.info(err.message);
|
|
152
|
+
(0, util_1.censorLogs)(() => logger.info(err.message));
|
|
153
153
|
return {
|
|
154
154
|
results: requestConfig.params.map((entry) => ({
|
|
155
155
|
params: entry,
|
|
@@ -167,7 +167,7 @@ class HttpTransport extends subscription_1.SubscriptionTransport {
|
|
|
167
167
|
};
|
|
168
168
|
}
|
|
169
169
|
else {
|
|
170
|
-
logger.error(e);
|
|
170
|
+
(0, util_1.censorLogs)(() => logger.error(e));
|
|
171
171
|
return { results: [] };
|
|
172
172
|
}
|
|
173
173
|
}
|
package/transports/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/transports/http.ts"],"names":[],"mappings":";;;AAAA,iCAAqE;AAGrE,oCAAkD;AAClD,wCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/transports/http.ts"],"names":[],"mappings":"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"}
|
package/transports/websocket.js
CHANGED
|
@@ -61,7 +61,7 @@ class WebSocketTransport extends streaming_1.StreamingTransport {
|
|
|
61
61
|
// Called when any message is received by the open connection
|
|
62
62
|
message: async (event) => {
|
|
63
63
|
const parsed = this.deserializeMessage(event.data);
|
|
64
|
-
logger.trace(`Got ws message: ${event.data}`);
|
|
64
|
+
(0, util_1.censorLogs)(() => logger.trace(`Got ws message: ${event.data}`));
|
|
65
65
|
const providerDataReceived = Date.now();
|
|
66
66
|
const results = this.config.handlers.message(parsed, context)?.map((r) => {
|
|
67
67
|
const result = r;
|
|
@@ -86,7 +86,7 @@ class WebSocketTransport extends streaming_1.StreamingTransport {
|
|
|
86
86
|
},
|
|
87
87
|
// Called when an error is thrown by the connection
|
|
88
88
|
error: async (event) => {
|
|
89
|
-
logger.debug(`Error occurred in web socket connection. Error: ${event.error} ; Message: ${event.message}`);
|
|
89
|
+
(0, util_1.censorLogs)(() => logger.debug(`Error occurred in web socket connection. Error: ${event.error} ; Message: ${event.message}`));
|
|
90
90
|
// Record connection error count
|
|
91
91
|
metrics_1.metrics.get('wsConnectionErrors').labels((0, metrics_2.connectionErrorLabels)(event.message)).inc();
|
|
92
92
|
},
|
|
@@ -177,7 +177,7 @@ class WebSocketTransport extends streaming_1.StreamingTransport {
|
|
|
177
177
|
const reason = urlChanged
|
|
178
178
|
? `Websocket url has changed from ${this.currentUrl} to ${urlFromConfig}, closing connection...`
|
|
179
179
|
: `Last message was received ${timeSinceLastMessage} ago, exceeding the threshold of ${context.adapterSettings.WS_SUBSCRIPTION_UNRESPONSIVE_TTL}ms, closing connection...`;
|
|
180
|
-
logger.info(reason);
|
|
180
|
+
(0, util_1.censorLogs)(() => logger.info(reason));
|
|
181
181
|
// Check if connection was opened very recently; if so, wait a bit before continuing.
|
|
182
182
|
// This is so if we just opened the connection and are waiting to receive some messages,
|
|
183
183
|
// we don't close is immediately after and miss the chance to receive them
|
|
@@ -188,7 +188,7 @@ class WebSocketTransport extends streaming_1.StreamingTransport {
|
|
|
188
188
|
this.wsConnection?.close(1000);
|
|
189
189
|
connectionClosed = true;
|
|
190
190
|
if (subscriptions.desired.length) {
|
|
191
|
-
logger.trace(`Connection will be reopened and will subscribe to new and resubscribe to existing: ${JSON.stringify(subscriptions.desired)}`);
|
|
191
|
+
(0, util_1.censorLogs)(() => logger.trace(`Connection will be reopened and will subscribe to new and resubscribe to existing: ${JSON.stringify(subscriptions.desired)}`));
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
194
|
// Check if we need to open a new connection
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/transports/websocket.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAsD;AAW7C,oBAXF,YAAS,CAWE;AATlB,wCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/transports/websocket.ts"],"names":[],"mappings":"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"}
|
package/util/logger.d.ts
CHANGED
|
@@ -55,3 +55,4 @@ export declare const makeLogger: (layer: string) => pino.Logger<{
|
|
|
55
55
|
} & pino.ChildLoggerOptions>;
|
|
56
56
|
export declare const loggingContextMiddleware: (rawReq: FastifyRequest, res: FastifyReply, done: HookHandlerDoneFunction) => void;
|
|
57
57
|
export declare function censor(obj: any, censorList: CensorKeyValue[], throwOnError?: boolean): any;
|
|
58
|
+
export declare const censorLogs: (logFunc: () => void) => void;
|
package/util/logger.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.censor = exports.loggingContextMiddleware = exports.makeLogger = exports.colorFactory = exports.COLORS = exports.asyncLocalStorage = void 0;
|
|
6
|
+
exports.censorLogs = exports.censor = exports.loggingContextMiddleware = exports.makeLogger = exports.colorFactory = exports.COLORS = exports.asyncLocalStorage = void 0;
|
|
7
7
|
const crypto_1 = require("crypto");
|
|
8
8
|
const node_async_hooks_1 = require("node:async_hooks");
|
|
9
9
|
const pino_1 = __importDefault(require("pino"));
|
|
@@ -139,4 +139,11 @@ function censor(obj, censorList, throwOnError = false) {
|
|
|
139
139
|
return JSON.parse(result);
|
|
140
140
|
}
|
|
141
141
|
exports.censor = censor;
|
|
142
|
+
const censorLogs = (logFunc) => {
|
|
143
|
+
if (process.env['CENSOR_SENSITIVE_LOGS'] === 'true') {
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
logFunc();
|
|
147
|
+
};
|
|
148
|
+
exports.censorLogs = censorLogs;
|
|
142
149
|
//# sourceMappingURL=logger.js.map
|
package/util/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/util/logger.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/util/logger.ts"],"names":[],"mappings":"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"}
|
package/util/requester.js
CHANGED
|
@@ -77,7 +77,7 @@ class Requester {
|
|
|
77
77
|
const overflowedRequest = this.queue.add(queuedRequest);
|
|
78
78
|
if (overflowedRequest) {
|
|
79
79
|
// If we have overflow, it means the oldest request needs to be rejected because the queue is at its limits
|
|
80
|
-
logger.debug(`Request (Key: ${overflowedRequest.key}, Retry #: ${overflowedRequest.retries}) was removed from the queue to make room for a newer one (Size: ${this.queue.length})`);
|
|
80
|
+
(0, _1.censorLogs)(() => logger.debug(`Request (Key: ${overflowedRequest.key}, Retry #: ${overflowedRequest.retries}) was removed from the queue to make room for a newer one (Size: ${this.queue.length})`));
|
|
81
81
|
metrics_1.metrics.get('requesterQueueOverflow').inc();
|
|
82
82
|
overflowedRequest.reject(new error_1.AdapterRateLimitError({
|
|
83
83
|
message: 'The EA was unable to execute the request to fetch the requested data from the DP because the request queue overflowed. This likely indicates that a higher API tier is needed.',
|
|
@@ -89,7 +89,7 @@ class Requester {
|
|
|
89
89
|
}
|
|
90
90
|
// The item was successfully added to the queue, so we can also add it to our map
|
|
91
91
|
// If the request is being re-added because it will be retried, this will have no practical effect
|
|
92
|
-
logger.trace(`Added request (Key: ${queuedRequest.key}, Retry #: ${queuedRequest.retries}) to the queue (Size: ${this.queue.length})`);
|
|
92
|
+
(0, _1.censorLogs)(() => logger.trace(`Added request (Key: ${queuedRequest.key}, Retry #: ${queuedRequest.retries}) to the queue (Size: ${this.queue.length})`));
|
|
93
93
|
this.map[queuedRequest.key] = queuedRequest;
|
|
94
94
|
// Finally, we start the queue processing
|
|
95
95
|
if (!this.processing) {
|
|
@@ -111,7 +111,7 @@ class Requester {
|
|
|
111
111
|
// If there's already a queued request, reuse it's existing promise
|
|
112
112
|
const existingQueuedRequest = this.map[key];
|
|
113
113
|
if (existingQueuedRequest) {
|
|
114
|
-
logger.trace(`Request already exists, returning queued promise (Key: ${key})`);
|
|
114
|
+
(0, _1.censorLogs)(() => logger.trace(`Request already exists, returning queued promise (Key: ${key})`));
|
|
115
115
|
return existingQueuedRequest.promise;
|
|
116
116
|
}
|
|
117
117
|
const queuedRequest = {
|
|
@@ -141,7 +141,7 @@ class Requester {
|
|
|
141
141
|
this.processing = false;
|
|
142
142
|
return;
|
|
143
143
|
}
|
|
144
|
-
logger.trace(`Popped next request (Key: ${next.key}, Retry #: ${next.retries}) from the queue (Size: ${this.queue.length})`);
|
|
144
|
+
(0, _1.censorLogs)(() => logger.trace(`Popped next request (Key: ${next.key}, Retry #: ${next.retries}) from the queue (Size: ${this.queue.length})`));
|
|
145
145
|
// Wait until the rate limiter allows the request to be executed
|
|
146
146
|
await this.rateLimiter.waitForRateLimit();
|
|
147
147
|
// Fire off to complete in the background. We don't wait here to be able to fire off multiple requests concurrently
|
|
@@ -156,9 +156,9 @@ class Requester {
|
|
|
156
156
|
// Set configured timeout for all requests unless manually specified
|
|
157
157
|
config.timeout = config.timeout || this.timeout;
|
|
158
158
|
try {
|
|
159
|
-
logger.trace(`Sending request (Key: ${key}) to data provider`);
|
|
159
|
+
(0, _1.censorLogs)(() => logger.trace(`Sending request (Key: ${key}) to data provider`));
|
|
160
160
|
const response = await axios_1.default.request(config);
|
|
161
|
-
logger.trace(`Request (Key: ${key}) was successful `);
|
|
161
|
+
(0, _1.censorLogs)(() => logger.trace(`Request (Key: ${key}) was successful `));
|
|
162
162
|
resolve({
|
|
163
163
|
response,
|
|
164
164
|
timestamps: {
|
|
@@ -176,14 +176,14 @@ class Requester {
|
|
|
176
176
|
}
|
|
177
177
|
catch (e) {
|
|
178
178
|
const err = e;
|
|
179
|
-
logger.info({
|
|
179
|
+
(0, _1.censorLogs)(() => logger.info({
|
|
180
180
|
msg: 'Request failed',
|
|
181
181
|
response: {
|
|
182
182
|
statusCode: err.response?.status,
|
|
183
183
|
data: err.response?.data,
|
|
184
184
|
text: err.response?.statusText,
|
|
185
185
|
},
|
|
186
|
-
});
|
|
186
|
+
}));
|
|
187
187
|
// Record count of failed data provider request
|
|
188
188
|
metrics_1.metrics
|
|
189
189
|
.get('dataProviderRequests')
|
package/util/requester.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requester.js","sourceRoot":"","sources":["../../../src/util/requester.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"requester.js","sourceRoot":"","sources":["../../../src/util/requester.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
3
|
+
import { InstalledClock } from '@sinonjs/fake-timers';
|
|
4
|
+
import { ExecutionContext } from 'ava';
|
|
5
|
+
import { FastifyInstance } from 'fastify';
|
|
6
|
+
import { Adapter, AdapterDependencies } from '../adapter';
|
|
7
|
+
import { Cache, LocalCache } from '../cache';
|
|
8
|
+
import { ResponseCache } from '../cache/response';
|
|
9
|
+
import { EmptyCustomSettings, SettingsDefinitionMap } from '../config';
|
|
10
|
+
import { Transport, TransportDependencies, TransportGenerics, WebSocketClassProvider } from '../transports';
|
|
11
|
+
import { AdapterRequest, AdapterResponse, PartialAdapterResponse } from './index';
|
|
12
|
+
import { EmptyInputParameters, TypeFromDefinition } from '../validation/input-params';
|
|
13
|
+
export { WebSocket as MockWebsocket, Server as MockWebsocketServer } from 'mock-socket';
|
|
14
|
+
export type NopTransportTypes = {
|
|
15
|
+
Parameters: EmptyInputParameters;
|
|
16
|
+
Response: {
|
|
17
|
+
Data: null;
|
|
18
|
+
Result: null;
|
|
19
|
+
};
|
|
20
|
+
Settings: EmptyCustomSettings;
|
|
21
|
+
};
|
|
22
|
+
export declare class NopTransport<T extends TransportGenerics = NopTransportTypes> implements Transport<T> {
|
|
23
|
+
name: string;
|
|
24
|
+
responseCache: ResponseCache<T>;
|
|
25
|
+
initialize(dependencies: TransportDependencies<T>, adapterSettings: T['Settings'], endpointName: string, transportName: string): Promise<void>;
|
|
26
|
+
foregroundExecute(_: AdapterRequest<TypeFromDefinition<T['Parameters']>>): Promise<void | AdapterResponse<T['Response']>>;
|
|
27
|
+
}
|
|
28
|
+
export declare class MockCache extends LocalCache {
|
|
29
|
+
constructor(maxItems: number);
|
|
30
|
+
private awaitingPromiseResolve?;
|
|
31
|
+
waitForNextSet(): Promise<unknown>;
|
|
32
|
+
set(key: string, value: Readonly<unknown>, ttl: number): Promise<void>;
|
|
33
|
+
}
|
|
34
|
+
export declare function runPeriodicAsyncBackgroundExecution(clock: InstalledClock, { interval, times, stepValidation, }: {
|
|
35
|
+
interval: number;
|
|
36
|
+
times: number;
|
|
37
|
+
stepValidation: (iteration: number) => boolean;
|
|
38
|
+
}): Promise<void>;
|
|
39
|
+
export declare function runAllUntil(clock: InstalledClock, isComplete: () => boolean): Promise<void>;
|
|
40
|
+
export declare function runAllUntilTime(clock: InstalledClock, time: number): Promise<void>;
|
|
41
|
+
export declare class RedisMock {
|
|
42
|
+
store: LocalCache<string>;
|
|
43
|
+
get(key: string): Promise<string | undefined>;
|
|
44
|
+
del(key: string): Promise<void>;
|
|
45
|
+
set(key: string, value: string, px: 'PX', ttl: number): Promise<void>;
|
|
46
|
+
multi(): CommandChainMock;
|
|
47
|
+
defineCommand(_name: 'setExternalAdapterResponse', _options: {
|
|
48
|
+
lua: string;
|
|
49
|
+
numberOfKeys: number;
|
|
50
|
+
}): void;
|
|
51
|
+
setExternalAdapterResponse(key: string, value: string, ttl: number): Promise<void>;
|
|
52
|
+
}
|
|
53
|
+
declare class CommandChainMock {
|
|
54
|
+
private redisMock;
|
|
55
|
+
promises: Promise<unknown>[];
|
|
56
|
+
constructor(redisMock: RedisMock);
|
|
57
|
+
set(key: string, value: string, px: 'PX', ttl: number): this;
|
|
58
|
+
setExternalAdapterResponse(key: string, value: string, ttl: number): this;
|
|
59
|
+
exec(): Promise<unknown[]>;
|
|
60
|
+
}
|
|
61
|
+
export declare function assertEqualResponses(t: ExecutionContext, actual: AdapterResponse, expected: PartialAdapterResponse & {
|
|
62
|
+
statusCode: number;
|
|
63
|
+
}): void;
|
|
64
|
+
declare class TestMetrics {
|
|
65
|
+
map: Map<string, number>;
|
|
66
|
+
private replaceQuotes;
|
|
67
|
+
constructor(data: string);
|
|
68
|
+
private get;
|
|
69
|
+
assert(t: ExecutionContext, params: {
|
|
70
|
+
name: string;
|
|
71
|
+
labels?: Record<string, string>;
|
|
72
|
+
expectedValue: number;
|
|
73
|
+
}): void;
|
|
74
|
+
assertPositiveNumber(t: ExecutionContext, params: {
|
|
75
|
+
name: string;
|
|
76
|
+
labels?: Record<string, string>;
|
|
77
|
+
}): void;
|
|
78
|
+
}
|
|
79
|
+
export declare class TestAdapter<T extends SettingsDefinitionMap = SettingsDefinitionMap> {
|
|
80
|
+
api: FastifyInstance;
|
|
81
|
+
adapter: Adapter<T>;
|
|
82
|
+
metricsApi?: FastifyInstance<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> | undefined;
|
|
83
|
+
clock?: InstalledClock | undefined;
|
|
84
|
+
mockCache?: MockCache;
|
|
85
|
+
constructor(api: FastifyInstance, adapter: Adapter<T>, metricsApi?: FastifyInstance<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> | undefined, clock?: InstalledClock | undefined, cache?: Cache);
|
|
86
|
+
static startWithMockedCache<T extends SettingsDefinitionMap = SettingsDefinitionMap>(adapter: Adapter<T>, context: ExecutionContext<{
|
|
87
|
+
clock?: InstalledClock;
|
|
88
|
+
testAdapter: TestAdapter<T>;
|
|
89
|
+
}>['context'], dependencies?: Partial<AdapterDependencies>): Promise<TestAdapter<T> & {
|
|
90
|
+
mockCache: MockCache;
|
|
91
|
+
}>;
|
|
92
|
+
static start<T extends SettingsDefinitionMap = SettingsDefinitionMap>(adapter: Adapter<T>, context: ExecutionContext<{
|
|
93
|
+
clock?: InstalledClock;
|
|
94
|
+
testAdapter: TestAdapter<T>;
|
|
95
|
+
}>['context'], dependencies?: Partial<AdapterDependencies>): Promise<TestAdapter<T>>;
|
|
96
|
+
request(data?: object, headers?: Record<string, string>): Promise<import("light-my-request").Response>;
|
|
97
|
+
startBackgroundExecuteThenGetResponse(t: ExecutionContext, params: {
|
|
98
|
+
requestData: object;
|
|
99
|
+
expectedResponse?: PartialAdapterResponse & {
|
|
100
|
+
statusCode: number;
|
|
101
|
+
};
|
|
102
|
+
expectedCacheSize?: number;
|
|
103
|
+
}): Promise<import("light-my-request").Response>;
|
|
104
|
+
waitForCache(expectedSize?: number): Promise<void>;
|
|
105
|
+
getMetrics(): Promise<TestMetrics>;
|
|
106
|
+
getHealth(): Promise<import("light-my-request").Response>;
|
|
107
|
+
}
|
|
108
|
+
export declare function waitUntilResolved<T>(clock: InstalledClock, fn: () => Promise<T>): Promise<T>;
|
|
109
|
+
export declare function setEnvVariables(envVariables: NodeJS.ProcessEnv): void;
|
|
110
|
+
/**
|
|
111
|
+
* Sets the mocked websocket instance in the provided provider class.
|
|
112
|
+
* We need this here, because the tests will connect using their instance of WebSocketClassProvider;
|
|
113
|
+
* fetching from this library to the \@chainlink/ea-bootstrap package would access _another_ instance
|
|
114
|
+
* of the same constructor. Although it should be a singleton, dependencies are different so that
|
|
115
|
+
* means that the static classes themselves are also different.
|
|
116
|
+
*
|
|
117
|
+
* @param provider - singleton WebSocketClassProvider
|
|
118
|
+
*/
|
|
119
|
+
export declare const mockWebSocketProvider: (provider: typeof WebSocketClassProvider) => void;
|