@chainlink/external-adapter-framework 0.0.41 → 0.0.43

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@chainlink/external-adapter-framework",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "main": "dist/index.js",
   "license": "MIT",
   "dependencies": {
-    "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "fastify": "^4.5.3",
     "ioredis": "^5.0.4",
@@ -28,8 +27,8 @@
   },
   "devDependencies": {
     "@sinonjs/fake-timers": "^9.1.2",
-    "@types/jest": "^29.0.3",
-    "@types/node": "^18.7.18",
+    "@types/jest": "^28.1.7",
+    "@types/node": "^18.6.5",
     "@types/sinonjs__fake-timers": "^8.1.2",
     "@types/supertest": "^2.0.12",
     "@types/ws": "^8.5.3",

package/rate-limiting/background/fixed-frequency.js

@@ -12,6 +12,9 @@ class FixedFrequencyRateLimiter {
     initialize(endpoints, limits) {
         // Translate the hourly limit into reqs per minute
         let sharedMsBetweenRequests = 1000 / (0, __1.consolidateTierLimits)(limits);
+        console.log(limits);
+        console.log(sharedMsBetweenRequests);
+        console.log((0, __1.consolidateTierLimits)(limits));
         // If there is no limit set, we use some reasonable number
         if (!limits?.rateLimit1h && !limits?.rateLimit1m && !limits?.rateLimit1s) {
             // 5s period for all seems good

package/transports/batch-warming.js

@@ -56,20 +56,11 @@ class BatchWarmingTransport {
         this.subscriptionSet = dependencies.subscriptionSetFactory.buildSet();
     }
     async hasBeenSetUp(req) {
-        logger.debug(`Checking if entry is in batch warming set: [${req.requestContext.cacheKey}]`);
-        logger.debug(`!!(await this.subscriptionSet.get(req.requestContext.cacheKey)) ${!!(await this.subscriptionSet.get(req.requestContext.cacheKey))}`);
         return !!(await this.subscriptionSet.get(req.requestContext.cacheKey));
     }
     async setup(req, config) {
         logger.debug(`Adding entry to batch warming set: [${req.requestContext.cacheKey}] = ${req.requestContext.data}`);
-        logger.debug('about to add to subscription set');
-        const res = await this.subscriptionSet.add(req.requestContext.cacheKey, req.requestContext.data, config.WARMUP_SUBSCRIPTION_TTL);
-        logger.debug('done adding to subscription set');
-        logger.debug(`Adding subscription set res ${res}`);
-        logger.debug(`Get request ${await this.subscriptionSet.get(req.requestContext.cacheKey)}`);
-        logger.debug(`!!(await this.subscriptionSet.get(req.requestContext.cacheKey)t; ${!!(await this.subscriptionSet.get(req.requestContext.cacheKey))}`);
-        logger.debug(`!await this.subscriptionSet.get(req.requestContext.cacheKey)t; ${!(await this.subscriptionSet.get(req.requestContext.cacheKey))}`);
-        logger.debug(`await this.subscriptionSet.get(req.requestContext.cacheKey)t; ${this.subscriptionSet.get(req.requestContext.cacheKey)}`);
+        await this.subscriptionSet.add(req.requestContext.cacheKey, req.requestContext.data, config.WARMUP_SUBSCRIPTION_TTL);
     }
     async backgroundExecute(context) {
         logger.debug('Starting background execute');
@@ -77,12 +68,10 @@ class BatchWarmingTransport {
         if (!entries.length) {
             logger.debug('No entries in batch warming set, skipping');
             if (this.WARMER_ACTIVE) {
-                logger.debug(this.WARMER_ACTIVE);
                 // Decrement count when warmer changed from having entries to having none
                 cacheMetrics.cacheWarmerCount.labels({ isBatched: 'true' }).dec();
                 this.WARMER_ACTIVE = false;
             }
-            logger.debug(this.WARMER_ACTIVE);
             return this.rateLimiter.msUntilNextExecution(context.adapterEndpoint.name);
         }
         else if (this.WARMER_ACTIVE === false) {
@@ -90,7 +79,6 @@ class BatchWarmingTransport {
             cacheMetrics.cacheWarmerCount.labels({ isBatched: 'true' }).inc();
             this.WARMER_ACTIVE = true;
         }
-        logger.debug('Preparing request');
         const request = this.config.prepareRequest(entries, context);
         logger.trace('Sending request to data provider...');
         const providerResponse = await (0, util_2.axiosRequest)(request, context.adapterConfig);

package/transports/metrics.js

@@ -23,14 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wsMessageTotal = exports.wsSubscriptionTotal = exports.wsSubscriptionActive = exports.wsConnectionErrors = exports.wsConnectionActive = exports.recordWsMessageMetrics = exports.messageSubsLabels = exports.connectionErrorLabels = exports.dataProviderRequestDurationSeconds = exports.dataProviderRequests = exports.dataProviderMetricsLabel = exports.clearRegistry = void 0;
+exports.wsMessageTotal = exports.wsSubscriptionTotal = exports.wsSubscriptionActive = exports.wsConnectionErrors = exports.wsConnectionActive = exports.recordWsMessageMetrics = exports.messageSubsLabels = exports.connectionErrorLabels = exports.dataProviderRequestDurationSeconds = exports.dataProviderRequests = exports.dataProviderMetricsLabel = void 0;
 const client = __importStar(require("prom-client"));
 const cache_1 = require("../cache");
 const constants_1 = require("../metrics/constants");
-const clearRegistry = () => {
-    client.register.clear();
-};
-exports.clearRegistry = clearRegistry;
 // Data Provider Metrics
 const dataProviderMetricsLabel = (providerStatusCode, method = 'get') => ({
     provider_status_code: providerStatusCode,

package/util/subscription-set/expiring-sorted-set.js

@@ -22,7 +22,7 @@ class ExpiringSortedSet {
         if (!entry) {
             return;
         }
-        else if (entry.expirationTimestamp > Date.now()) {
+        else if (entry.expirationTimestamp < Date.now()) {
             return entry.value;
         }
         else {