@chainlink/external-adapter-framework 0.0.58 → 0.0.60

package/adapter.d.ts

@@ -100,7 +100,7 @@ export declare class AdapterEndpoint<Params, Result, CustomSettings extends Sett
     transport: Transport<Params, Result, CustomSettings>;
     inputParameters: InputParameters;
     rateLimiting?: EndpointRateLimitingConfig | undefined;
-    validator?: InputValidator;
+    validator: InputValidator;
     constructor(params: AdapterEndpointParams<Params, Result, CustomSettings>);
 }
 declare type CustomAdapterSettings = SettingsMap & NegatedAdapterSettings;

package/adapter.js

@@ -35,7 +35,13 @@ const util_1 = require("./util");
 const censor_list_1 = __importDefault(require("./util/censor/censor-list"));
 const cacheMetrics = __importStar(require("./cache/metrics"));
 const input_validator_1 = require("./validation/input-validator");
+const client = __importStar(require("prom-client"));
 const logger = (0, util_1.makeLogger)('Adapter');
+/**
+ * `prom-client` is shared between v2 and v3 when both are dependencies, resulting in metric collision errors
+ * Clearing metrics on import will wipe v2's existing register so we can replace them with v3's metrics
+ **/
+client.register.clear();
 class AdapterEndpoint {
     constructor(params) {
         this.name = params.name;

package/cache/metrics.js

@@ -73,9 +73,6 @@ const baseLabels = [
 //   labelNames: [...baseLabels, 'cache_hit'] as const,
 //   buckets: [0.01, 0.1, 1, 10],
 // })
-if (process.env['METRICS_ENABLED'] === 'false') {
-    client.register.clear();
-}
 const cacheDataGetCount = new client.Counter({
     name: 'cache_data_get_count',
     help: 'A counter that increments every time a value is fetched from the cache',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainlink/external-adapter-framework",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "main": "dist/index.js",
   "license": "MIT",
   "dependencies": {

package/transports/index.js

@@ -30,7 +30,6 @@ exports.buildTransportHandler = exports.buildCacheEntriesFromResults = void 0;
 const cache_1 = require("../cache");
 const util_1 = require("../util");
 const transportMetrics = __importStar(require("./metrics"));
-const client = __importStar(require("prom-client"));
 __exportStar(require("./batch-warming"), exports);
 __exportStar(require("./rest"), exports);
 __exportStar(require("./websocket"), exports);
@@ -111,6 +110,3 @@ const buildTransportHandler = (adapter) => async (req, reply) => {
     return reply.send();
 };
 exports.buildTransportHandler = buildTransportHandler;
-if (process.env['METRICS_ENABLED'] === 'false') {
-    client.register.clear();
-}

package/validation/index.js

@@ -40,9 +40,7 @@ const validatorMiddleware = (adapter) => (req, reply, done) => {
             statusCode: 404,
         });
     }
-    const validatedData = endpoint.validator
-        ? endpoint.validator.validateInput(req.body?.['data'])
-        : req.body?.['data'];
+    const validatedData = endpoint.validator.validateInput(req.body?.['data']);
     req.requestContext = {
         cacheKey: '',
         data: validatedData,

package/validation/input-validator.d.ts

@@ -4,7 +4,7 @@ export declare class InputValidator {
     private readonly inputConfig;
     private aliases;
     constructor(inputConfig: InputParameters);
-    validateInput(input: any): NormalizedInput;
+    validateInput(input: Record<string, unknown>): NormalizedInput;
     private initializeInputs;
     private validateInputParamsSchema;
     private validateRequiredConfig;