melperjs 8.0.0 → 8.1.0

package/lib/esm/index.js

@@ -1,19 +1,15 @@
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import xss from "xss";
 import setCookieParser from "set-cookie-parser";
 import camelCase from "lodash/camelCase.js";
 import upperFirst from "lodash/upperFirst.js";
 import isEmpty from "lodash/isEmpty.js";
-export var CONSTANTS = {
+export const CONSTANTS = {
   LOWER_CASE: "abcdefghijklmnopqrstuvwxyz",
   UPPER_CASE: "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
   HEXADECIMAL: "0123456789abcdef",
   NUMBERS: "0123456789"
 };
-export function Exception(message) {
-  var response = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var name = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+export function Exception(message, response = {}, name = null) {
   class ExceptionClass extends Error {
     constructor(message, response, name) {
       super(message);
@@ -24,55 +20,35 @@ export function Exception(message) {
   }
   return new ExceptionClass(message, response, name);
 }
-export function forever(_x, _x2) {
-  return _forever.apply(this, arguments);
-}
-function _forever() {
-  _forever = _asyncToGenerator(function* (cooldown, onSuccess) {
-    var onError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-    var onCompleted = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-    var checkCooldown = value => value && !isNaN(value) && value > 0;
-    if (!checkCooldown(cooldown)) throw new Error("Cooldown must be a positive number");
-    while (true) {
-      try {
-        var value = yield onSuccess();
-        if (checkCooldown(value)) cooldown = value;
-      } catch (e) {
-        var _value = onError && (yield onError(e));
-        if (checkCooldown(_value)) cooldown = _value;
-      } finally {
-        var _value2 = onCompleted && (yield onCompleted());
-        if (checkCooldown(_value2)) cooldown = _value2;
-        yield sleepMs(cooldown);
-      }
+export async function forever(cooldown, onSuccess, onError = null, onCompleted = null) {
+  const checkCooldown = value => value && !isNaN(value) && value > 0;
+  if (!checkCooldown(cooldown)) throw new Error("Cooldown must be a positive number");
+  while (true) {
+    try {
+      const value = await onSuccess();
+      if (checkCooldown(value)) cooldown = value;
+    } catch (e) {
+      const value = onError && (await onError(e));
+      if (checkCooldown(value)) cooldown = value;
+    } finally {
+      const value = onCompleted && (await onCompleted());
+      if (checkCooldown(value)) cooldown = value;
+      await sleepMs(cooldown);
     }
-  });
-  return _forever.apply(this, arguments);
+  }
 }
 export function time() {
   return Math.floor(Date.now() / 1000);
 }
-export function sleepMs(_x3) {
-  return _sleepMs.apply(this, arguments);
+export async function sleepMs(milliseconds) {
+  return new Promise(resolve => setTimeout(resolve, milliseconds));
 }
-function _sleepMs() {
-  _sleepMs = _asyncToGenerator(function* (milliseconds) {
-    return new Promise(resolve => setTimeout(resolve, milliseconds));
-  });
-  return _sleepMs.apply(this, arguments);
-}
-export function sleep(_x4) {
-  return _sleep.apply(this, arguments);
-}
-function _sleep() {
-  _sleep = _asyncToGenerator(function* (seconds) {
-    return yield sleepMs(seconds * 1000);
-  });
-  return _sleep.apply(this, arguments);
+export async function sleep(seconds) {
+  return await sleepMs(seconds * 1000);
 }
 export function promiseTimeout(milliseconds, promise) {
   return new Promise((resolve, reject) => {
-    var timer = setTimeout(() => {
+    const timer = setTimeout(() => {
       reject(new Error('Promise timed out after ' + milliseconds + 'ms'));
     }, milliseconds);
     promise.then(value => {
@@ -84,19 +60,16 @@ export function promiseTimeout(milliseconds, promise) {
     });
   });
 }
-export function splitClear(rawText) {
-  var _separator;
-  var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  separator = (_separator = separator) !== null && _separator !== void 0 ? _separator : /\r?\n/;
+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) {
-  var pair = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+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 (var index in node) {
-      var result = findKeyNode(key, node[index], pair);
+    for (let index in node) {
+      const result = findKeyNode(key, node[index], pair);
       if (result) {
         return result;
       }
@@ -119,13 +92,12 @@ export function titleCase(str) {
   return str.replace(/\b\w/g, char => char.toUpperCase());
 }
 export function objectStringify(obj) {
-  for (var key in obj) {
+  for (let key in obj) {
     if (obj.hasOwnProperty(key)) {
       if (typeof obj[key] === 'object' && obj[key] !== null) {
         objectStringify(obj[key]);
       } else {
-        var _obj$key;
-        if ((_obj$key = obj[key]) !== null && _obj$key !== void 0 && _obj$key.toString) {
+        if (obj[key]?.toString) {
           obj[key] = obj[key].toString();
         } else {
           obj[key] = String(obj[key]);
@@ -135,9 +107,7 @@ export function objectStringify(obj) {
   }
   return obj;
 }
-export function limitString(str) {
-  var limit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 35;
-  var omission = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "...";
+export function limitString(str, limit = 35, omission = "...") {
   str = str || "";
   if (str.length <= limit) {
     return str;
@@ -153,42 +123,40 @@ export function safeString(str) {
     stripIgnoreTagBody: ["script"]
   });
 }
-export function randomString(length) {
-  var useNumbers = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var useUppercase = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var characters = CONSTANTS.LOWER_CASE;
+export function randomString(length, useNumbers = true, useUppercase = false) {
+  let characters = CONSTANTS.LOWER_CASE;
   if (useUppercase) characters += CONSTANTS.UPPER_CASE;
   if (useNumbers) characters += CONSTANTS.NUMBERS;
-  var randomString = '';
-  for (var i = 0; i < length; i++) {
-    var randomIndex = Math.floor(Math.random() * characters.length);
+  let randomString = '';
+  for (let i = 0; i < length; i++) {
+    const randomIndex = Math.floor(Math.random() * characters.length);
     randomString += characters[randomIndex];
   }
   return randomString;
 }
 export function randomHex(length) {
-  var result = '';
-  for (var i = 0; i < length; i++) {
-    var randomIndex = Math.floor(Math.random() * CONSTANTS.HEXADECIMAL.length);
+  let result = '';
+  for (let i = 0; i < length; i++) {
+    const randomIndex = Math.floor(Math.random() * CONSTANTS.HEXADECIMAL.length);
     result += CONSTANTS.HEXADECIMAL[randomIndex];
   }
   return result;
 }
 export function randomInteger(min, max, callback) {
-  var minNotSpecified = typeof max === 'undefined' || typeof max === 'function';
+  const minNotSpecified = typeof max === 'undefined' || typeof max === 'function';
   if (minNotSpecified) {
     callback = max;
     max = min;
     min = 0;
   }
-  var isSync = typeof callback === 'undefined';
+  const isSync = typeof callback === 'undefined';
   if (typeof min !== 'number' || typeof max !== 'number') {
     throw new Error('min and max must be numerical values');
   }
   if (max <= min) {
     throw new Error('max must be greater than min');
   }
-  var randomNumber = Math.floor(Math.random() * (max - min)) + min;
+  const randomNumber = Math.floor(Math.random() * (max - min)) + min;
   if (isSync) {
     return randomNumber;
   } else {
@@ -198,51 +166,44 @@ export function randomInteger(min, max, callback) {
     callback(randomNumber);
   }
 }
-export function randomUuid() {
-  var useDashes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-  var d = Date.now();
-  var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    var r = (d + Math.random() * 16) % 16 | 0;
+export function randomUuid(useDashes = true) {
+  let d = Date.now();
+  const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    const r = (d + Math.random() * 16) % 16 | 0;
     d = Math.floor(d / 16);
     return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
   });
   return useDashes ? uuid : uuid.replaceAll("-", "");
 }
-export function randomWeighted(dict) {
-  var randomFunc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : totalWeight => Math.random() * totalWeight;
-  var elements = Object.keys(dict);
-  var weights = Object.values(dict);
-  var totalWeight = weights.reduce((sum, weight) => sum + weight, 0);
-  var randomNum = randomFunc(totalWeight);
-  var weightSum = 0;
-  for (var i = 0; i < elements.length; i++) {
+export function randomWeighted(dict, randomFunc = totalWeight => Math.random() * totalWeight) {
+  let elements = Object.keys(dict);
+  let weights = Object.values(dict);
+  let totalWeight = weights.reduce((sum, weight) => sum + weight, 0);
+  let randomNum = randomFunc(totalWeight);
+  let weightSum = 0;
+  for (let i = 0; i < elements.length; i++) {
     weightSum += weights[i];
     if (randomNum <= weightSum) {
       return elements[i];
     }
   }
 }
-export function cookieDict(res) {
-  var decodeValues = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var dict = {};
-  var cookies = setCookieParser.parse(res, {
+export function cookieDict(res, decodeValues = false) {
+  let dict = {};
+  const cookies = setCookieParser.parse(res, {
     decodeValues: decodeValues
   });
-  for (var cookie of cookies) {
+  for (let cookie of cookies) {
     dict[cookie.name] = cookie.value;
   }
   return dict;
 }
 export function cookieHeader(cookieDict) {
-  return Object.entries(cookieDict).map(_ref => {
-    var [key, value] = _ref;
-    return "".concat(key, "=").concat(value);
-  }).join(';');
+  return Object.entries(cookieDict).map(([key, value]) => `${key}=${value}`).join(';');
 }
 export function isIntlHttpCode(httpCode) {
   return httpCode === undefined || httpCode === null || isNaN(httpCode) || httpCode === 0 || httpCode === 100 || httpCode === 402 || httpCode === 407 || 460 <= httpCode && httpCode < 470 || 500 <= httpCode;
 }
 export function isIntlError(e) {
-  var _e$message, _e$message$toLowerCas, _e$message$toLowerCas2, _e$message2, _e$message2$toLowerCa, _e$message2$toLowerCa2, _e$message3, _e$message3$toLowerCa, _e$message3$toLowerCa2, _e$message4, _e$message4$toLowerCa, _e$message4$toLowerCa2, _e$response;
-  return (e === null || e === void 0 || (_e$message = e.message) === null || _e$message === void 0 || (_e$message$toLowerCas = _e$message.toLowerCase) === null || _e$message$toLowerCas === void 0 || (_e$message$toLowerCas = _e$message$toLowerCas.call(_e$message)) === null || _e$message$toLowerCas === void 0 || (_e$message$toLowerCas2 = _e$message$toLowerCas.includes) === null || _e$message$toLowerCas2 === void 0 ? void 0 : _e$message$toLowerCas2.call(_e$message$toLowerCas, "timeout")) || (e === null || e === void 0 || (_e$message2 = e.message) === null || _e$message2 === void 0 || (_e$message2$toLowerCa = _e$message2.toLowerCase) === null || _e$message2$toLowerCa === void 0 || (_e$message2$toLowerCa = _e$message2$toLowerCa.call(_e$message2)) === null || _e$message2$toLowerCa === void 0 || (_e$message2$toLowerCa2 = _e$message2$toLowerCa.includes) === null || _e$message2$toLowerCa2 === void 0 ? void 0 : _e$message2$toLowerCa2.call(_e$message2$toLowerCa, "aborted")) || (e === null || e === void 0 || (_e$message3 = e.message) === null || _e$message3 === void 0 || (_e$message3$toLowerCa = _e$message3.toLowerCase) === null || _e$message3$toLowerCa === void 0 || (_e$message3$toLowerCa = _e$message3$toLowerCa.call(_e$message3)) === null || _e$message3$toLowerCa === void 0 || (_e$message3$toLowerCa2 = _e$message3$toLowerCa.includes) === null || _e$message3$toLowerCa2 === void 0 ? void 0 : _e$message3$toLowerCa2.call(_e$message3$toLowerCa, "tls connection")) || (e === null || e === void 0 || (_e$message4 = e.message) === null || _e$message4 === void 0 || (_e$message4$toLowerCa = _e$message4.toLowerCase) === null || _e$message4$toLowerCa === void 0 || (_e$message4$toLowerCa = _e$message4$toLowerCa.call(_e$message4)) === null || _e$message4$toLowerCa === void 0 || (_e$message4$toLowerCa2 = _e$message4$toLowerCa.includes) === null || _e$message4$toLowerCa2 === void 0 ? void 0 : _e$message4$toLowerCa2.call(_e$message4$toLowerCa, "socket hang")) || isIntlHttpCode(e === null || e === void 0 || (_e$response = e.response) === null || _e$response === void 0 ? void 0 : _e$response.status);
+  return e?.message?.toLowerCase?.()?.includes?.("timeout") || e?.message?.toLowerCase?.()?.includes?.("aborted") || e?.message?.toLowerCase?.()?.includes?.("tls connection") || e?.message?.toLowerCase?.()?.includes?.("socket hang") || isIntlHttpCode(e?.response?.status);
 }

package/lib/esm/node.js

@@ -5,19 +5,17 @@ import { networkInterfaces } from "os";
 import { execSync } from "child_process";
 import bcrypt from "bcryptjs";
 import { CONSTANTS, randomWeighted, splitClear } from "./index.js";
-export function tokenString(length) {
-  var useNumbers = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var useUppercase = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var lowercaseChars = CONSTANTS.LOWER_CASE;
-  var uppercaseChars = CONSTANTS.UPPER_CASE;
-  var numbers = CONSTANTS.NUMBERS;
-  var characters = lowercaseChars;
+export function tokenString(length, useNumbers = true, useUppercase = false) {
+  const lowercaseChars = CONSTANTS.LOWER_CASE;
+  const uppercaseChars = CONSTANTS.UPPER_CASE;
+  const numbers = CONSTANTS.NUMBERS;
+  let characters = lowercaseChars;
   if (useUppercase) characters += uppercaseChars;
   if (useNumbers) characters += numbers;
-  var randomString = '';
+  let randomString = '';
   while (randomString.length < length) {
-    var byte = crypto.randomBytes(1)[0];
-    var index = byte % characters.length;
+    const byte = crypto.randomBytes(1)[0];
+    const index = byte % characters.length;
     if (byte < 256 - 256 % characters.length) {
       randomString += characters[index];
     }
@@ -27,20 +25,19 @@ export function tokenString(length) {
 export function tokenHex(length) {
   return crypto.randomBytes(Math.ceil(length / 2)).toString('hex').slice(0, length);
 }
-export function tokenUuid() {
-  var useDashes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-  var uuid = crypto.randomUUID().toString();
+export function tokenUuid(useDashes = true) {
+  const uuid = crypto.randomUUID().toString();
   return useDashes ? uuid : uuid.replaceAll("-", "");
 }
 export function tokenWeighted(dict) {
   return randomWeighted(dict, crypto.randomInt);
 }
 export function serverIp() {
-  var interfaces = networkInterfaces();
-  for (var devName in interfaces) {
-    var interfaceValue = interfaces[devName];
-    for (var i = 0; i < interfaceValue.length; i++) {
-      var alias = interfaceValue[i];
+  const interfaces = networkInterfaces();
+  for (const devName in interfaces) {
+    const interfaceValue = interfaces[devName];
+    for (let i = 0; i < interfaceValue.length; i++) {
+      const alias = interfaceValue[i];
       if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.address.startsWith("192.168.") && !alias.internal) return alias.address;
     }
   }
@@ -48,15 +45,15 @@ export function serverIp() {
 }
 export function getVersion() {
   try {
-    var date = new Date(execSync('git show -s --format=%ci HEAD').toString().trim());
-    var formatDatePart = value => value.toString().padStart(2, '0');
-    var year = date.getFullYear().toString().slice(-2);
-    var month = formatDatePart(date.getMonth() + 1);
-    var day = formatDatePart(date.getDate());
-    var hour = formatDatePart(date.getHours());
-    var minute = formatDatePart(date.getMinutes());
-    return parseFloat("".concat(year).concat(month).concat(day, ".").concat(hour).concat(minute));
-  } catch (_unused) {
+    const date = new Date(execSync('git show -s --format=%ci HEAD').toString().trim());
+    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());
+    return parseFloat(`${year}${month}${day}.${hour}${minute}`);
+  } catch {
     return 1.0;
   }
 }
@@ -64,61 +61,58 @@ export function createNumDir(mainDirectory) {
   fs.mkdirSync(mainDirectory, {
     recursive: true
   });
-  for (var i = 0; i <= 9; i++) {
+  for (let i = 0; i <= 9; i++) {
     try {
       fs.mkdirSync(path.join(mainDirectory, i.toString()));
     } catch (e) {
-      console.error("createNumDir:".concat(i), e.message);
+      console.error(`createNumDir:${i}`, e.message);
     }
   }
 }
 export function md5(data) {
   return crypto.createHash('md5').update(data).digest("hex");
 }
-export function hashBcrypt(plainText) {
-  var encryptionKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+export function hashBcrypt(plainText, encryptionKey = "") {
   return bcrypt.hashSync(plainText + encryptionKey, bcrypt.genSaltSync(10));
 }
-export function verifyBcrypt(plainText, hash) {
-  var encryptionKey = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
+export function verifyBcrypt(plainText, hash, encryptionKey = "") {
   return bcrypt.compareSync(plainText + encryptionKey, hash);
 }
-export function formatProxy(proxy) {
-  var protocol = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "http";
+export function formatProxy(proxy, protocol = "http") {
   proxy = proxy.trim();
-  var splitByProtocol = proxy.split("://");
+  const splitByProtocol = proxy.split("://");
   if (1 < splitByProtocol.length) protocol = splitByProtocol[0];
   proxy = splitByProtocol[splitByProtocol.length - 1];
   if (!proxy.includes("@")) {
-    var _proxyParts = proxy.split(":");
-    if (4 <= _proxyParts.length) {
-      proxy = "".concat(_proxyParts[_proxyParts.length - 2], ":").concat(_proxyParts[_proxyParts.length - 1], "@");
-      _proxyParts.pop();
-      _proxyParts.pop();
-      proxy += _proxyParts.join(":");
+    const proxyParts = proxy.split(":");
+    if (4 <= proxyParts.length) {
+      proxy = `${proxyParts[proxyParts.length - 2]}:${proxyParts[proxyParts.length - 1]}@`;
+      proxyParts.pop();
+      proxyParts.pop();
+      proxy += proxyParts.join(":");
     }
   }
-  var proxyParts = proxy.split(':');
-  var proxyEnd = parseInt(proxyParts[proxyParts.length - 1]);
-  var proxyStart = proxyParts[proxyParts.length - 2];
+  const proxyParts = proxy.split(':');
+  const proxyEnd = parseInt(proxyParts[proxyParts.length - 1]);
+  const proxyStart = proxyParts[proxyParts.length - 2];
   if (!proxyStart.includes(".")) {
     proxyParts.pop();
     proxyParts[proxyParts.length - 1] = crypto.randomInt(parseInt(proxyStart), proxyEnd + 1).toString();
   }
   return protocol + "://" + proxyParts.join(':');
 }
-export function proxyObject() {
-  var proxy = formatProxy(...arguments);
-  var splitByProtocol = proxy.split('://');
-  var splitById = splitByProtocol[splitByProtocol.length - 1].split('@');
-  var splitByConn = splitById[splitById.length - 1].split(':');
+export function proxyObject(...args) {
+  let proxy = formatProxy(...args);
+  const splitByProtocol = proxy.split('://');
+  const splitById = splitByProtocol[splitByProtocol.length - 1].split('@');
+  const splitByConn = splitById[splitById.length - 1].split(':');
   proxy = {
     protocol: splitByProtocol[0],
     host: splitByConn[0],
     port: parseInt(splitByConn[1])
   };
   if (1 < splitById.length) {
-    var splitByAuth = splitById[0].split(':');
+    const splitByAuth = splitById[0].split(':');
     proxy.auth = {
       username: splitByAuth[0],
       password: splitByAuth[1]
@@ -127,7 +121,7 @@ export function proxyObject() {
   return proxy;
 }
 export function proxyValue(proxies) {
-  var proxy;
+  let proxy;
   proxies = proxies || "";
   proxies = splitClear(proxies);
   if (proxies.length < 1) return null;

package/package.json

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