@chainlink/external-adapter-framework 2.10.0 → 2.11.1

package/generator-adapter/node_modules/p-timeout/index.js

@@ -1,39 +1,13 @@
 export class TimeoutError extends Error {
-	constructor(message) {
-		super(message);
-		this.name = 'TimeoutError';
-	}
-}
+	name = 'TimeoutError';
 
-/**
-An error to be thrown when the request is aborted by AbortController.
-DOMException is thrown instead of this Error when DOMException is available.
-*/
-export class AbortError extends Error {
-	constructor(message) {
-		super();
-		this.name = 'AbortError';
-		this.message = message;
+	constructor(message, options) {
+		super(message, options);
+		Error.captureStackTrace?.(this, TimeoutError);
 	}
 }
 
-/**
-TODO: Remove AbortError and just throw DOMException when targeting Node 18.
-*/
-const getDOMException = errorMessage => globalThis.DOMException === undefined
-	? new AbortError(errorMessage)
-	: new DOMException(errorMessage);
-
-/**
-TODO: Remove below function and just 'reject(signal.reason)' when targeting Node 18.
-*/
-const getAbortedReason = signal => {
-	const reason = signal.reason === undefined
-		? getDOMException('This operation was aborted.')
-		: signal.reason;
-
-	return reason instanceof Error ? reason : getDOMException(reason);
-};
+const getAbortedReason = signal => signal.reason ?? new DOMException('This operation was aborted.', 'AbortError');
 
 export default function pTimeout(promise, options) {
 	const {
@@ -41,40 +15,42 @@ export default function pTimeout(promise, options) {
 		fallback,
 		message,
 		customTimers = {setTimeout, clearTimeout},
+		signal,
 	} = options;
 
 	let timer;
+	let abortHandler;
 
 	const wrappedPromise = new Promise((resolve, reject) => {
 		if (typeof milliseconds !== 'number' || Math.sign(milliseconds) !== 1) {
 			throw new TypeError(`Expected \`milliseconds\` to be a positive number, got \`${milliseconds}\``);
 		}
 
-		if (options.signal) {
-			const {signal} = options;
-			if (signal.aborted) {
-				reject(getAbortedReason(signal));
-			}
+		if (signal?.aborted) {
+			reject(getAbortedReason(signal));
+			return;
+		}
 
-			const abortHandler = () => {
+		if (signal) {
+			abortHandler = () => {
 				reject(getAbortedReason(signal));
 			};
 
 			signal.addEventListener('abort', abortHandler, {once: true});
-
-			promise.finally(() => {
-				signal.removeEventListener('abort', abortHandler);
-			});
 		}
 
+		// Use .then() instead of async IIFE to preserve stack traces
+		// eslint-disable-next-line promise/prefer-await-to-then, promise/prefer-catch
+		promise.then(resolve, reject);
+
 		if (milliseconds === Number.POSITIVE_INFINITY) {
-			promise.then(resolve, reject);
 			return;
 		}
 
 		// We create the error outside of `setTimeout` to preserve the stack trace.
 		const timeoutError = new TimeoutError();
 
+		// `.call(undefined, ...)` is needed for custom timers to avoid context issues
 		timer = customTimers.setTimeout.call(undefined, () => {
 			if (fallback) {
 				try {
@@ -99,21 +75,18 @@ export default function pTimeout(promise, options) {
 				reject(timeoutError);
 			}
 		}, milliseconds);
-
-		(async () => {
-			try {
-				resolve(await promise);
-			} catch (error) {
-				reject(error);
-			}
-		})();
 	});
 
+	// eslint-disable-next-line promise/prefer-await-to-then
 	const cancelablePromise = wrappedPromise.finally(() => {
 		cancelablePromise.clear();
+		if (abortHandler && signal) {
+			signal.removeEventListener('abort', abortHandler);
+		}
 	});
 
 	cancelablePromise.clear = () => {
+		// `.call(undefined, ...)` is needed for custom timers to avoid context issues
 		customTimers.clearTimeout.call(undefined, timer);
 		timer = undefined;
 	};

package/generator-adapter/node_modules/p-timeout/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "p-timeout",
-	"version": "6.1.3",
+	"version": "7.0.1",
 	"description": "Timeout a promise after a specified amount of time",
 	"license": "MIT",
 	"repository": "sindresorhus/p-timeout",
@@ -11,11 +11,13 @@
 		"url": "https://sindresorhus.com"
 	},
 	"type": "module",
-	"exports": "./index.js",
-	"types": "./index.d.ts",
+	"exports": {
+		"types": "./index.d.ts",
+		"default": "./index.js"
+	},
 	"sideEffects": false,
 	"engines": {
-		"node": ">=14.16"
+		"node": ">=20"
 	},
 	"scripts": {
 		"test": "xo && ava && tsd"
@@ -38,13 +40,13 @@
 		"bluebird"
 	],
 	"devDependencies": {
-		"ava": "^4.3.1",
-		"delay": "^5.0.0",
+		"ava": "^6.4.1",
+		"delay": "^6.0.0",
 		"in-range": "^3.0.0",
 		"p-cancelable": "^4.0.1",
-		"sinon": "^19.0.2",
+		"sinon": "^21.0.0",
 		"time-span": "^5.1.0",
-		"tsd": "^0.22.0",
-		"xo": "^0.54.2"
+		"tsd": "^0.33.0",
+		"xo": "^1.2.2"
 	}
 }

package/generator-adapter/node_modules/p-timeout/readme.md

@@ -54,7 +54,7 @@ Passing `Infinity` will cause it to never time out.
 ##### message
 
 Type: `string | Error | false`\
-Default: `'Promise timed out after 50 milliseconds'`
+Default: `'Promise timed out after {milliseconds} milliseconds'`
 
 Specify a custom error message or error to throw when it times out:
 
@@ -78,6 +78,8 @@ Type: `Function`
 
 Do something other than rejecting with an error on timeout.
 
+The function can return a value or a promise.
+
 You could for example retry:
 
 ```js
@@ -89,8 +91,10 @@ const delayedPromise = () => setTimeout(200);
 await pTimeout(delayedPromise(), {
 	milliseconds: 50,
 	fallback: () => {
-		return pTimeout(delayedPromise(), {milliseconds: 300});
-	},
+		return pTimeout(delayedPromise(), {
+			milliseconds: 300
+		});
+	}
 });
 ```
 
@@ -105,8 +109,8 @@ Useful for testing purposes, in particular to work around [`sinon.useFakeTimers(
 Example:
 
 ```js
-import {setTimeout} from 'node:timers/promises';
 import pTimeout from 'p-timeout';
+import sinon from 'sinon';
 
 const originalSetTimeout = setTimeout;
 const originalClearTimeout = clearTimeout;
@@ -123,13 +127,11 @@ await pTimeout(doSomething(), {
 });
 ```
 
-#### signal
+##### signal
 
 Type: [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal)
 
-You can abort the promise using [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).
-
-*Requires Node.js 16 or later.*
+Abort the promise.
 
 ```js
 import pTimeout from 'p-timeout';
@@ -164,7 +166,7 @@ Exposed for instance checking and sub-classing.
 
 > Modern alternative to `p-timeout`
 
-Asynchronous functions like `fetch` can accept an [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal), which can be conveniently created with [`AbortSignal.timeout()`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/timeout_static).
+Async functions like `fetch` can accept an [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal), which can be conveniently created with [`AbortSignal.timeout()`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/timeout_static).
 
 The advantage over `p-timeout` is that the promise-generating function (like `fetch`) is actually notified that the user is no longer expecting an answer, so it can interrupt its work and free resources.
 

package/generator-adapter/package.json

@@ -12,9 +12,9 @@
   ],
   "devDependencies": {
     "yeoman-generator": "7.5.1",
-    "@yeoman/types": "1.8.0",
+    "@yeoman/types": "1.9.1",
     "mem-fs": "4.1.2",
-    "@yeoman/adapter": "3.1.0",
-    "@types/node": "24.10.0"
+    "@yeoman/adapter": "3.1.1",
+    "@types/node": "24.10.1"
   }
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@chainlink/external-adapter-framework",
-  "version": "2.10.0",
+  "version": "2.11.1",
   "main": "dist/index.js",
   "license": "MIT",
   "repository": "git://github.com/smartcontractkit/ea-framework-js.git",
   "dependencies": {
     "ajv": "8.17.1",
     "axios": "1.13.2",
-    "eventsource": "4.0.0",
+    "eventsource": "4.1.0",
     "fastify": "5.6.2",
     "ioredis": "5.8.2",
     "mock-socket": "9.3.1",
@@ -15,7 +15,8 @@
     "pino-pretty": "13.1.2",
     "prom-client": "15.1.3",
     "redlock": "5.0.0-beta.2",
-    "ws": "8.18.3"
+    "ws": "8.18.3",
+    "@date-fns/tz": "1.4.1"
   },
   "scripts": {
     "build": "rm -rf dist/src && mkdir -p ./dist/src && cp package.json dist/src && cp README.md dist/src && tsc && yarn pre-build-generator",
@@ -37,17 +38,17 @@
   },
   "devDependencies": {
     "@sinonjs/fake-timers": "15.0.0",
-    "@types/node": "24.10.0",
+    "@types/node": "24.10.1",
     "@types/sinonjs__fake-timers": "15.0.1",
     "@types/ws": "8.18.1",
-    "@typescript-eslint/eslint-plugin": "8.46.3",
-    "@typescript-eslint/parser": "8.46.3",
+    "@typescript-eslint/eslint-plugin": "8.47.0",
+    "@typescript-eslint/parser": "8.47.0",
     "ava": "6.4.1",
     "axios-mock-adapter": "2.1.0",
     "c8": "10.1.3",
     "eslint": "9.39.1",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-tsdoc": "0.4.0",
+    "eslint-plugin-tsdoc": "0.5.0",
     "mocksse": "1.0.4",
     "prettier": "3.6.2",
     "ts-node": "10.9.2",

package/validation/market-status.d.ts

@@ -0,0 +1,6 @@
+export declare const parseWeekendString: (weekend?: string) => {
+    start: string;
+    end: string;
+    tz: string;
+};
+export declare const isWeekendNow: (weekend?: string) => boolean;

package/validation/market-status.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isWeekendNow = exports.parseWeekendString = void 0;
+const error_1 = require("../validation/error");
+const tz_1 = require("@date-fns/tz");
+const parseWeekendString = (weekend) => {
+    const dayHour = /[0-6](0\d|1\d|2[0-3])/;
+    const timezonePattern = /[^\s]+/;
+    const regex = new RegExp(`^(${dayHour.source})-(${dayHour.source}):(${timezonePattern.source})$`);
+    const match = weekend?.match(regex);
+    if (!match) {
+        throw new error_1.AdapterInputError({
+            statusCode: 400,
+            message: '[Param: weekend] does not match format of DHH-DHH:TZ',
+        });
+    }
+    const result = {
+        start: match[1],
+        end: match[3],
+        tz: match[5],
+    };
+    try {
+        // eslint-disable-next-line new-cap
+        Intl.DateTimeFormat(undefined, { timeZone: result.tz });
+    }
+    catch (error) {
+        throw new error_1.AdapterInputError({
+            statusCode: 400,
+            message: `timezone ${result.tz} in [Param: weekend] is not valid: ${error}`,
+        });
+    }
+    return result;
+};
+exports.parseWeekendString = parseWeekendString;
+const isWeekendNow = (weekend) => {
+    const parsed = (0, exports.parseWeekendString)(weekend);
+    const startDay = Number(parsed.start[0]);
+    const startHour = Number(parsed.start.slice(1));
+    const endDay = Number(parsed.end[0]);
+    const endHour = Number(parsed.end.slice(1));
+    const nowDay = tz_1.TZDate.tz(parsed.tz).getDay();
+    const nowHour = tz_1.TZDate.tz(parsed.tz).getHours();
+    // Case 1: weekend does NOT wrap around the week
+    if (startDay < endDay || (startDay === endDay && startHour < endHour)) {
+        if (nowDay < startDay || nowDay > endDay) {
+            return false;
+        }
+        else if (nowDay === startDay && nowHour < startHour) {
+            return false;
+        }
+        else if (nowDay === endDay && nowHour >= endHour) {
+            return false;
+        }
+        return true;
+    }
+    // Case 2: weekend wraps around (e.g. Fri → Sun)
+    if (nowDay > startDay || nowDay < endDay) {
+        return true;
+    }
+    else if (nowDay === startDay && nowHour >= startHour) {
+        return true;
+    }
+    else if (nowDay === endDay && nowHour < endHour) {
+        return true;
+    }
+    return false;
+};
+exports.isWeekendNow = isWeekendNow;
+//# sourceMappingURL=market-status.js.map

package/validation/market-status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"market-status.js","sourceRoot":"","sources":["../../../src/validation/market-status.ts"],"names":[],"mappings":"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"}