@vpmedia/simplify 1.24.0 → 1.26.0

package/README.md

@@ -1,6 +1,6 @@
 # @vpmedia/simplify
 
-[![npm version](https://badge.fury.io/js/@vpmedia%2Fsimplify.svg?v=1.24.0)](https://badge.fury.io/js/@vpmedia%2Fsimplify)
+[![npm version](https://badge.fury.io/js/@vpmedia%2Fsimplify.svg?v=1.26.0)](https://badge.fury.io/js/@vpmedia%2Fsimplify)
 [![Node.js CI](https://github.com/vpmedia/simplify/actions/workflows/ci.yml/badge.svg)](https://github.com/vpmedia/simplify/actions/workflows/ci.yml)
 
 @vpmedia/simplify TBD

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/simplify",
-  "version": "1.24.0",
+  "version": "1.26.0",
   "description": "@vpmedia/simplify",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",
@@ -19,14 +19,14 @@
   "types": "./types/index.d.ts",
   "type": "module",
   "devDependencies": {
-    "@babel/preset-env": "^7.26.9",
-    "@eslint/js": "^9.23.0",
+    "@babel/preset-env": "^7.27.2",
+    "@eslint/js": "^9.25.1",
     "@jest/globals": "^29.7.0",
     "@types/jest": "^29.5.14",
-    "eslint": "^9.24.0",
-    "eslint-plugin-jsdoc": "^50.6.9",
-    "eslint-plugin-unicorn": "^58.0.0",
-    "globals": "^16.0.0",
+    "eslint": "^9.26.0",
+    "eslint-plugin-jsdoc": "^50.6.14",
+    "eslint-plugin-unicorn": "^59.0.1",
+    "globals": "^16.1.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "prettier": "^3.5.3",

package/src/index.js

@@ -12,6 +12,7 @@ export { deg2rad } from './util/deg2rad.js';
 export { delayPromise } from './util/delayPromise.js';
 export { FetchError, fetchRetry, HTTP_0_ANY } from './util/fetchRetry.js';
 export { fixFloatPrecision } from './util/fixFloatPrecision.js';
+export { getErrorDetails } from './util/getErrorDetails.js';
 export { getObjValueByPath } from './util/getObjValueByPath.js';
 export { getRandomInt } from './util/getRandomInt.js';
 export { getURLParam } from './util/getURLParam.js';

package/src/util/fetchRetry.js

@@ -6,6 +6,7 @@ import {
 } from '../const/http_status.js';
 import { Logger } from '../logging/Logger.js';
 import { delayPromise } from './delayPromise.js';
+import { getErrorDetails } from './getErrorDetails.js';
 
 const logger = new Logger('fetch');
 
@@ -32,11 +33,12 @@ export class FetchError extends Error {
  * Fetch with retry.
  * @param {string | URL | Request} resource - Fetch URL.
  * @param {RequestInit} [fetchOptions] - Fetch options.
- * @param {{delay?: number, numTries?: number, statusExcludes?: number[]}} [retryOptions] - Retry options.
+ * @param {{delay?: number, numTries?: number, statusExcludes?: number[], timeout?: number}} [retryOptions] - Retry options.
  * @returns {Promise<Response>} Fetch result.
  */
 export const fetchRetry = async (resource, fetchOptions, retryOptions) => {
   retryOptions = retryOptions ?? {};
+  retryOptions.timeout = Math.max(retryOptions.timeout ?? 10000, 1000);
   retryOptions.delay = Math.max(retryOptions.delay ?? 500, 1);
   retryOptions.numTries = Math.max(retryOptions.numTries ?? 3, 1);
   retryOptions.statusExcludes = retryOptions.statusExcludes ?? [
@@ -47,6 +49,9 @@ export const fetchRetry = async (resource, fetchOptions, retryOptions) => {
   ];
   while (retryOptions.numTries > 0) {
     logger.info('request', { resource, fetchOptions, retryOptions });
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), retryOptions.timeout);
+    fetchOptions.signal = controller.signal;
     try {
       const response = await fetch(resource, fetchOptions);
       if (!response.ok) {
@@ -63,6 +68,7 @@ export const fetchRetry = async (resource, fetchOptions, retryOptions) => {
     } catch (error) {
       const typedError = error instanceof Error ? error : new Error(String(error));
       logger.error('error', typedError);
+      logger.info('errorDetails', getErrorDetails(typedError));
       retryOptions.numTries -= 1;
       if (
         retryOptions.numTries === 0 ||
@@ -74,6 +80,8 @@ export const fetchRetry = async (resource, fetchOptions, retryOptions) => {
       }
       await delayPromise(retryOptions.delay);
       retryOptions.delay *= 2;
+    } finally {
+      clearTimeout(timeoutId);
     }
   }
 };

package/src/util/getErrorDetails.js

@@ -0,0 +1,17 @@
+/**
+ * Retrieves detailed information from an error object.
+ * @param {Error} error - The error to extract details from.
+ * @param {string[]} [excludes] - An array of property names to exclude from the result.
+ * @returns {object} - An object containing the error details.
+ */
+export const getErrorDetails = (error, excludes = ['stack']) => {
+  const errorDetails = {
+    type: error.constructor?.name || typeof error, // e.g., "TypeError"
+  };
+  for (const key of Object.getOwnPropertyNames(error)) {
+    if (!excludes.includes(key)) {
+      errorDetails[key] = error[key];
+    }
+  }
+  return errorDetails;
+};

package/src/util/getErrorDetails.test.js

@@ -0,0 +1,9 @@
+import { getErrorDetails } from './getErrorDetails.js';
+
+test('Tests getErrorDetails', () => {
+  const error = new Error('Test error', { cause: 'Test cause' });
+  const errorDetails = getErrorDetails(error);
+  expect(errorDetails.type).toBe('Error');
+  expect(errorDetails.message).toBe('Test error');
+  expect(errorDetails.cause).toBe('Test cause');
+});

package/src/util/serverDataToState.test.js

@@ -1,15 +1,18 @@
 import { serverDataToState } from './serverDataToState.js';
 
 test('serverDataToState() recursive', () => {
-  const state = serverDataToState({
-    my_array: [{ key_a: 'value1' }],
-    my_data: { key_a: 'value1' },
-    my_list: [1, 2, 3],
-    my_null: null,
-    my_number: 1000,
-    my_string: 'a',
-    my_var: 'test',
-  }, true);
+  const state = serverDataToState(
+    {
+      my_array: [{ key_a: 'value1' }],
+      my_data: { key_a: 'value1' },
+      my_list: [1, 2, 3],
+      my_null: null,
+      my_number: 1000,
+      my_string: 'a',
+      my_var: 'test',
+    },
+    true
+  );
   expect(state.myArray[0].keyA).toBe('value1');
   expect(state.myData.keyA).toBe('value1');
   expect(state.myList[0]).toBe(1);
@@ -20,15 +23,18 @@ test('serverDataToState() recursive', () => {
 });
 
 test('serverDataToState() non-recursive', () => {
-  const state = serverDataToState({
-    my_array: [{ key_a: 'value1' }],
-    my_data: { key_a: 'value1' },
-    my_list: [1, 2, 3],
-    my_null: null,
-    my_number: 1000,
-    my_string: 'a',
-    my_var: 'test',
-  }, false);
+  const state = serverDataToState(
+    {
+      my_array: [{ key_a: 'value1' }],
+      my_data: { key_a: 'value1' },
+      my_list: [1, 2, 3],
+      my_null: null,
+      my_number: 1000,
+      my_string: 'a',
+      my_var: 'test',
+    },
+    false
+  );
   expect(state.myArray[0].key_a).toBe('value1');
   expect(state.myData.key_a).toBe('value1');
   expect(state.myList[0]).toBe(1);
@@ -37,4 +43,3 @@ test('serverDataToState() non-recursive', () => {
   expect(state.myString).toBe('a');
   expect(state.myVar).toBe('test');
 });
-

package/types/index.d.ts

@@ -10,6 +10,7 @@ export { deepMerge } from "./util/deepMerge.js";
 export { deg2rad } from "./util/deg2rad.js";
 export { delayPromise } from "./util/delayPromise.js";
 export { fixFloatPrecision } from "./util/fixFloatPrecision.js";
+export { getErrorDetails } from "./util/getErrorDetails.js";
 export { getObjValueByPath } from "./util/getObjValueByPath.js";
 export { getRandomInt } from "./util/getRandomInt.js";
 export { getURLParam } from "./util/getURLParam.js";

package/types/util/fetchRetry.d.ts

@@ -16,5 +16,6 @@ export function fetchRetry(resource: string | URL | Request, fetchOptions?: Requ
     delay?: number;
     numTries?: number;
     statusExcludes?: number[];
+    timeout?: number;
 }): Promise<Response>;
 //# sourceMappingURL=fetchRetry.d.ts.map

package/types/util/fetchRetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchRetry.d.ts","sourceRoot":"","sources":["../../src/util/fetchRetry.js"],"names":[],"mappings":"AAWA,yBAA0B,CAAC,CAAC;AAE5B;IACE;;;;;;OAMG;IACH,qBALW,MAAM,YACN,MAAM,GAAG,GAAG,GAAG,OAAO,gBACtB,WAAW,YACX,QAAQ,EAQlB;IAHC,iCAAwB;IACxB,0BAAgC;IAChC,mBAAwB;CAE3B;AASM,qCALI,MAAM,GAAG,GAAG,GAAG,OAAO,iBACtB,WAAW,iBACX;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAAC,GAC5D,OAAO,CAAC,QAAQ,CAAC,CA2C7B"}
+{"version":3,"file":"fetchRetry.d.ts","sourceRoot":"","sources":["../../src/util/fetchRetry.js"],"names":[],"mappings":"AAYA,yBAA0B,CAAC,CAAC;AAE5B;IACE;;;;;;OAMG;IACH,qBALW,MAAM,YACN,MAAM,GAAG,GAAG,GAAG,OAAO,gBACtB,WAAW,YACX,QAAQ,EAQlB;IAHC,iCAAwB;IACxB,0BAAgC;IAChC,mBAAwB;CAE3B;AASM,qCALI,MAAM,GAAG,GAAG,GAAG,OAAO,iBACtB,WAAW,iBACX;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,GAC9E,OAAO,CAAC,QAAQ,CAAC,CAkD7B"}

package/types/util/getErrorDetails.d.ts

@@ -0,0 +1,2 @@
+export function getErrorDetails(error: Error, excludes?: string[]): object;
+//# sourceMappingURL=getErrorDetails.d.ts.map

package/types/util/getErrorDetails.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getErrorDetails.d.ts","sourceRoot":"","sources":["../../src/util/getErrorDetails.js"],"names":[],"mappings":"AAMO,uCAJI,KAAK,aACL,MAAM,EAAE,GACN,MAAM,CAYlB"}