utilitas 1989.8.70 → 1989.8.75

package/lib/encryption.js

@@ -38,7 +38,7 @@ const random = (length) => {
 const randomString = (length = 128, encoding = 'HEX') => {
     let byteLength = Math.ceil(~~length / 2);
     byteLength = byteLength > 0 ? byteLength : 1;
-    return random(byteLength).toString(encoding).substr(0, length);
+    return random(byteLength).toString(encoding).substring(0, length);
 };
 
 const digestObject = (object, algorithm) => {

package/lib/storage.js

@@ -1,11 +1,27 @@
 'use strict';
 
-const encoding = 'utf8';
+const [encoding, mode] = ['utf8', '0644'];
 
 const handleError = (err, opts) => {
     if (opts?.throw) { throw err; } else if (opts?.log) { console.log(err); }
 };
 
+const stringify = (data, opts) => {
+    return JSON.stringify(data || {}, opts?.replacer || null, opts?.space || 4);
+};
+
+const writeTempFile = async (data, options) => {
+    let { filename, encoding: ec, mode: md, prefix, suffix: s } = options || {};
+    filename = `${prefix || ''}${filename || uuid.v4()}${s ? `.${s}` : ''}`;
+    if (String(ec).toUpperCase() === 'JSON') {
+        data = stringify(data, options); ec = null;
+    }
+    const filepath = path.join(os.tmpdir(), filename);
+    await fs.promises.writeFile(filepath, data, ec || encoding);
+    await fs.promises.chmod(filepath, md || mode);
+    return filepath;
+};
+
 const readJson = async (filename, options) => {
     let data = {};
     try {
@@ -17,11 +33,8 @@ const readJson = async (filename, options) => {
 };
 
 const writeJson = async (filename, data, options) => {
-    const json = JSON.stringify(
-        data || {}, options?.replacer || null, options?.space || 4
-    );
     return await fs.promises.writeFile(
-        filename, json, options?.encoding || encoding
+        filename, stringify(data, options), options?.encoding || encoding
     );
 };
 
@@ -143,10 +156,12 @@ module.exports = {
     setConfig,
     writeIni,
     writeJson,
+    writeTempFile,
 }
 
-const utilitas = require('./utilitas');
-const path = require('path');
+const fs = require('fs');
 const ini = require('ini');
 const os = require('os');
-const fs = require('fs');
+const path = require('path');
+const utilitas = require('./utilitas');
+const uuid = require('uuid');

package/lib/utilitas.js

@@ -12,6 +12,11 @@ RegExp.escape = RegExp.escape || ((str) => { //$& means the whole matched string
 
 const invalidTime = 'Invalid time.';
 
+const tryOpts = {
+    interval: 1000 * 1, maxTry: 10, log: false,
+    verify: async (err, res) => { return !err && res; },
+};
+
 const clone = (any) => {
     let resp = any;                       // typeof Object === 'function' || etc
     switch (getType(any)) {
@@ -577,6 +582,23 @@ const ignoreErrFunc = async (fn, args, options) => {
     catch (err) { return options?.log ? console.error(err) : err; }
 };
 
+const tryUntil = async (fnTry, options) => {
+    options = { ...tryOpts, ...options || {} };
+    let [curTry, result, err] = [0, null, null];
+    while (curTry++ < options.maxTry && !(await options.verify(err, result))) {
+        try {
+            result = await fnTry();
+            err = null;
+        } catch (e) {
+            err = e;
+            options?.log && console.error(e);
+            await timeout(options.interval);
+        }
+    }
+    err && throwError(err, 500);
+    return result;
+};
+
 // https://www.unicode.org/Public/13.0.0/ucd/emoji/emoji-data.txt
 // https://stackoverflow.com/questions/10992921/how-to-remove-emoji-code-using-javascript
 // https://twitter.com/_cxa/status/1384304473493831681?s=20
@@ -660,6 +682,7 @@ module.exports = {
     timeout,
     toExponential,
     trim,
+    tryUntil,
     uniqueArray,
     verifyEmail,
     verifyPhone,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for Node.js.",
-    "version": "1989.8.70",
+    "version": "1989.8.75",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.js",
@@ -10,7 +10,7 @@
         "debug": "node --inspect --trace-warnings debug.js",
         "test": "node --inspect --trace-warnings test.js",
         "ncuinit": "npm install -g npm-check-updates",
-        "updep": "npx ncu -u && npm install && npm install node-fetch@2 && ( git commit -am 'update dependencies' || true )",
+        "updep": "npx ncu -u && npm install && npm install file-type@16 && npm install node-fetch@2 && npm install public-ip@4 && ( git commit -am 'update dependencies' || true )",
         "gitsync": "git pull && git push",
         "prepublishOnly": "npm version patch && npm run updep && npm run gitsync"
     },
@@ -21,26 +21,26 @@
         "url": "https://github.com/Leask/utilitas.git"
     },
     "dependencies": {
-        "@sentry/node": "^6.15.0",
+        "@sentry/node": "^6.16.1",
         "base64url": "^3.0.1",
-        "colors": "^1.4.0",
-        "fast-geoip": "^1.1.47",
-        "file-type": "^17.0.0",
+        "colors": "^1.4.2",
+        "fast-geoip": "^1.1.53",
+        "file-type": "^16.5.3",
         "ini": "github:Leask/ini",
-        "ioredis": "^4.28.1",
+        "ioredis": "^4.28.2",
         "jsonwebtoken": "^8.5.1",
         "mailgun-js": "^0.22.0",
-        "mathjs": "^10.0.0",
+        "mathjs": "^10.0.2",
         "mysql2": "^2.3.3",
         "node-fetch": "^2.6.6",
         "node-mailjet": "^3.3.4",
         "ping": "^0.4.1",
         "public-ip": "^4.0.4",
-        "qs": "^6.10.1",
+        "qs": "^6.10.2",
         "telesignsdk": "^2.2.1",
-        "twilio": "^3.71.2",
+        "twilio": "^3.72.0",
         "uuid": "^8.3.2",
-        "winston": "^3.3.3",
+        "winston": "^3.3.4",
         "winston-papertrail-mproved": "^1.0.7"
     }
 }