melperjs 12.0.0 → 13.0.0

package/lib/cjs/index.js

@@ -9,6 +9,7 @@ exports.checkEmpty = checkEmpty;
 exports.cookieDict = cookieDict;
 exports.cookieHeader = cookieHeader;
 exports.findKeyNode = findKeyNode;
+exports.flipObject = flipObject;
 exports.forever = forever;
 exports.indexByTime = indexByTime;
 exports.isIntlHttpCode = isIntlHttpCode;
@@ -36,6 +37,7 @@ exports.sleepMs = sleepMs;
 exports.splitClear = splitClear;
 exports.time = time;
 exports.titleCase = titleCase;
+exports.waitForProperty = waitForProperty;
 var _xss = _interopRequireDefault(require("xss"));
 var _setCookieParser = _interopRequireDefault(require("set-cookie-parser"));
 var _camelCase = _interopRequireDefault(require("lodash/camelCase.js"));
@@ -47,7 +49,9 @@ const CONSTANTS = exports.CONSTANTS = {
   LOWER_CASE: "abcdefghijklmnopqrstuvwxyz",
   UPPER_CASE: "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
   HEXADECIMAL: "0123456789abcdef",
-  NUMBERS: "0123456789"
+  NUMBERS: "0123456789",
+  INT32_MIN: -2147483648,
+  INT32_MAX: 2147483647
 };
 function Exception(message, response = {}, name = null) {
   const error = new Error(message);
@@ -108,7 +112,7 @@ async function retryFn(fn, retries, errorFn = null) {
       result = await fn();
       return result;
     } catch (error) {
-      errorFn?.(attempt, error, result);
+      errorFn && (await errorFn(attempt, error, result));
       if (attempt >= retries) {
         throw error;
       }
@@ -127,19 +131,6 @@ function splitClear(rawText, separator = null) {
   separator = separator ?? /\r?\n/;
   return rawText.split(separator).map(item => item.trim()).filter(item => !(0, _isEmpty.default)(item));
 }
-function findKeyNode(key, node, pair = null) {
-  if (node && node.hasOwnProperty(key) && (pair ? node[key] === pair : true)) {
-    return node;
-  } else if (typeof node === 'object') {
-    for (let index in node) {
-      const result = findKeyNode(key, node[index], pair);
-      if (result) {
-        return result;
-      }
-    }
-  }
-  return null;
-}
 function checkEmpty(value) {
   if (typeof value === "number") {
     return value === 0;
@@ -155,6 +146,9 @@ function titleCase(str, separator = " ") {
   const words = str.split(separator);
   return words.map(word => (0, _upperFirst.default)(word)).join(separator);
 }
+function isInt32(value) {
+  return Number.isInteger(value) && value >= CONSTANTS.INT32_MIN && value <= CONSTANTS.INT32_MAX;
+}
 function parseNumFromObj(obj) {
   for (let key in obj) {
     let value = obj[key];
@@ -177,6 +171,36 @@ function parseIntFromObj(obj) {
   }
   return obj;
 }
+function findKeyNode(key, node, pair = null) {
+  if (node && node.hasOwnProperty(key) && (pair ? node[key] === pair : true)) {
+    return node;
+  } else if (typeof node === 'object') {
+    for (let index in node) {
+      const result = findKeyNode(key, node[index], pair);
+      if (result) {
+        return result;
+      }
+    }
+  }
+  return null;
+}
+function flipObject(obj) {
+  return Object.fromEntries(Object.entries(obj).map(([key, value]) => [value, key]));
+}
+function waitForProperty(obj, propertyName, timeout = 5000, interval = 100) {
+  return new Promise((resolve, reject) => {
+    const startTime = Date.now();
+    const checkProperty = setInterval(() => {
+      if (obj.hasOwnProperty(propertyName)) {
+        clearInterval(checkProperty);
+        resolve();
+      } else if (Date.now() - startTime > timeout) {
+        clearInterval(checkProperty);
+        reject(new Error(`Property ${propertyName} did not appear within ${timeout} milliseconds`));
+      }
+    }, interval);
+  });
+}
 function objectStringify(obj) {
   for (let key in obj) {
     if (obj.hasOwnProperty(key)) {

package/lib/cjs/node.js

@@ -98,13 +98,17 @@ function serverIp() {
 }
 function getVersion() {
   try {
-    const date = new Date((0, _child_process.execSync)('git show -s --format=%ci HEAD').toString().trim());
+    const timestamp = parseInt((0, _child_process.execSync)('git show -s --format=%ct HEAD').toString().trim());
+    if (isNaN(timestamp)) {
+      return "1.0";
+    }
+    const date = new Date(timestamp * 1000);
     const formatDatePart = value => value.toString().padStart(2, '0');
-    const year = date.getFullYear().toString().slice(-2);
-    const month = formatDatePart(date.getMonth() + 1);
-    const day = formatDatePart(date.getDate());
-    const hour = formatDatePart(date.getHours());
-    const minute = formatDatePart(date.getMinutes());
+    const year = date.getUTCFullYear().toString().slice(-2);
+    const month = formatDatePart(date.getUTCMonth() + 1);
+    const day = formatDatePart(date.getUTCDate());
+    const hour = formatDatePart(date.getUTCHours());
+    const minute = formatDatePart(date.getUTCMinutes());
     return `${year}${month}${day}.${hour}${minute}`;
   } catch {
     return "1.0";
@@ -191,20 +195,20 @@ function proxyValue(proxies) {
   proxy = proxy.replace("{SESSION}", tokenHex(8));
   return proxy || null;
 }
-async function readJsonFile(filePath) {
+async function readJsonFile(filePath, defaultValue = {}) {
   try {
     const data = await _fs.promises.readFile(filePath, 'utf8');
     return JSON.parse(data);
   } catch (error) {
-    return {};
+    return defaultValue;
   }
 }
-function readJsonFileSync(filePath) {
+function readJsonFileSync(filePath, defaultValue = {}) {
   try {
     const data = _fs.default.readFileSync(filePath, 'utf8');
     return JSON.parse(data);
   } catch (error) {
-    return {};
+    return defaultValue;
   }
 }
 async function writeJsonFile(filePath, data) {

package/lib/esm/index.js

@@ -8,7 +8,9 @@ export const CONSTANTS = {
   LOWER_CASE: "abcdefghijklmnopqrstuvwxyz",
   UPPER_CASE: "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
   HEXADECIMAL: "0123456789abcdef",
-  NUMBERS: "0123456789"
+  NUMBERS: "0123456789",
+  INT32_MIN: -2147483648,
+  INT32_MAX: 2147483647
 };
 export function Exception(message, response = {}, name = null) {
   const error = new Error(message);
@@ -69,7 +71,7 @@ export async function retryFn(fn, retries, errorFn = null) {
       result = await fn();
       return result;
     } catch (error) {
-      errorFn?.(attempt, error, result);
+      errorFn && (await errorFn(attempt, error, result));
       if (attempt >= retries) {
         throw error;
       }
@@ -88,19 +90,6 @@ export function splitClear(rawText, separator = null) {
   separator = separator ?? /\r?\n/;
   return rawText.split(separator).map(item => item.trim()).filter(item => !isEmpty(item));
 }
-export function findKeyNode(key, node, pair = null) {
-  if (node && node.hasOwnProperty(key) && (pair ? node[key] === pair : true)) {
-    return node;
-  } else if (typeof node === 'object') {
-    for (let index in node) {
-      const result = findKeyNode(key, node[index], pair);
-      if (result) {
-        return result;
-      }
-    }
-  }
-  return null;
-}
 export function checkEmpty(value) {
   if (typeof value === "number") {
     return value === 0;
@@ -116,6 +105,9 @@ export function titleCase(str, separator = " ") {
   const words = str.split(separator);
   return words.map(word => upperFirst(word)).join(separator);
 }
+function isInt32(value) {
+  return Number.isInteger(value) && value >= CONSTANTS.INT32_MIN && value <= CONSTANTS.INT32_MAX;
+}
 export function parseNumFromObj(obj) {
   for (let key in obj) {
     let value = obj[key];
@@ -138,6 +130,36 @@ export function parseIntFromObj(obj) {
   }
   return obj;
 }
+export function findKeyNode(key, node, pair = null) {
+  if (node && node.hasOwnProperty(key) && (pair ? node[key] === pair : true)) {
+    return node;
+  } else if (typeof node === 'object') {
+    for (let index in node) {
+      const result = findKeyNode(key, node[index], pair);
+      if (result) {
+        return result;
+      }
+    }
+  }
+  return null;
+}
+export function flipObject(obj) {
+  return Object.fromEntries(Object.entries(obj).map(([key, value]) => [value, key]));
+}
+export function waitForProperty(obj, propertyName, timeout = 5000, interval = 100) {
+  return new Promise((resolve, reject) => {
+    const startTime = Date.now();
+    const checkProperty = setInterval(() => {
+      if (obj.hasOwnProperty(propertyName)) {
+        clearInterval(checkProperty);
+        resolve();
+      } else if (Date.now() - startTime > timeout) {
+        clearInterval(checkProperty);
+        reject(new Error(`Property ${propertyName} did not appear within ${timeout} milliseconds`));
+      }
+    }, interval);
+  });
+}
 export function objectStringify(obj) {
   for (let key in obj) {
     if (obj.hasOwnProperty(key)) {

package/lib/esm/node.js

@@ -69,13 +69,17 @@ export function serverIp() {
 }
 export function getVersion() {
   try {
-    const date = new Date(execSync('git show -s --format=%ci HEAD').toString().trim());
+    const timestamp = parseInt(execSync('git show -s --format=%ct HEAD').toString().trim());
+    if (isNaN(timestamp)) {
+      return "1.0";
+    }
+    const date = new Date(timestamp * 1000);
     const formatDatePart = value => value.toString().padStart(2, '0');
-    const year = date.getFullYear().toString().slice(-2);
-    const month = formatDatePart(date.getMonth() + 1);
-    const day = formatDatePart(date.getDate());
-    const hour = formatDatePart(date.getHours());
-    const minute = formatDatePart(date.getMinutes());
+    const year = date.getUTCFullYear().toString().slice(-2);
+    const month = formatDatePart(date.getUTCMonth() + 1);
+    const day = formatDatePart(date.getUTCDate());
+    const hour = formatDatePart(date.getUTCHours());
+    const minute = formatDatePart(date.getUTCMinutes());
     return `${year}${month}${day}.${hour}${minute}`;
   } catch {
     return "1.0";
@@ -162,20 +166,20 @@ export function proxyValue(proxies) {
   proxy = proxy.replace("{SESSION}", tokenHex(8));
   return proxy || null;
 }
-export async function readJsonFile(filePath) {
+export async function readJsonFile(filePath, defaultValue = {}) {
   try {
     const data = await fsp.readFile(filePath, 'utf8');
     return JSON.parse(data);
   } catch (error) {
-    return {};
+    return defaultValue;
   }
 }
-export function readJsonFileSync(filePath) {
+export function readJsonFileSync(filePath, defaultValue = {}) {
   try {
     const data = fs.readFileSync(filePath, 'utf8');
     return JSON.parse(data);
   } catch (error) {
-    return {};
+    return defaultValue;
   }
 }
 export async function writeJsonFile(filePath, data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "melperjs",
-  "version": "12.0.0",
+  "version": "13.0.0",
   "description": "Javascript module to use predefined common functions and utilities",
   "keywords": [
     "melperjs",