utilitas 1995.2.83 → 1995.2.85

package/lib/horizon.mjs

@@ -6,6 +6,11 @@ RegExp.escape = RegExp.escape || (str => { //$& means the whole matched string
     return String(str).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }); // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
 
+// BigInt
+BigInt.prototype.toJSON = BigInt.prototype.toJSON || function() {
+    return this.toString();
+};
+
 // Assert
 import { default as asst } from 'assert';
 const _assert = asst || ((val, err) => {

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.83",
+    "version": "1995.2.85",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/storage.mjs

@@ -12,7 +12,7 @@ import { homedir, tmpdir } from 'os';
 import { promisify } from 'util';
 import { v4 as uuidv4 } from 'uuid';
 
-const _NEED = ['mime-types', '@google-cloud/storage'];
+const _NEED = ['file-type', 'mime-types', '@google-cloud/storage'];
 const errorMessage = 'Invalid file.';
 const defaultMetadata = { cacheControl: 'public, max-age=31536000' };
 const getGcUrlByBucket = bucket => `https://storage.cloud.google.com/${bucket}`;
@@ -24,11 +24,12 @@ const log = content => _log(content, import.meta.url);
 const sanitizeFilename = (s, r) => s.replace(/[\/?<>\\:*|"]/g, r || '_').trim();
 
 const [
-    NULL, BASE64, BUFFER, FILE, STREAM, TEXT, _JSON, encoding, BINARY, mode,
-    dirMode,
+    NULL, BASE64, BUFFER, FILE, STREAM, TEXT, _JSON, encoding, BINARY, BLOB,
+    DATAURL, mode, dirMode, MIME_TEXT, MIME_BINARY
 ] = [
         'NULL', 'BASE64', 'BUFFER', 'FILE', 'STREAM', 'TEXT', 'JSON', 'utf8',
-        'binary', '0644', '0755',
+        'binary', 'BLOB', 'DATAURL', '0644', '0755', 'text/plain',
+        'application/octet-stream',
     ];
 
 const [encodeBase64, encodeBinary, encodeNull]
@@ -161,7 +162,17 @@ const touchPath = async (path, options) => {
 const encodeBase64DataURL = (mime, buffer) => {
     assert((mime = trim(mime)), 'MIME type is required.', 400);
     assert(Buffer.isBuffer(buffer), 'Data buffer is required.', 400);
-    return `data:${mime};${BASE64},${buffer.toString(BASE64)}`;
+    return `data:${mime};${BASE64},${base64Encode(buffer, true)}`;
+};
+
+const decodeBase64DataURL = dataUrl => {
+    const parts = dataUrl.split(',');
+    const mime = parts[0].match(/:(.*?);/)[1];
+    const binStr = atob(parts[1]);
+    const buffer = new ArrayBuffer(binStr.length);
+    const bfView = new Uint8Array(buffer);
+    for (let i = 0; i < binStr.length; i++) { bfView[i] = binStr.charCodeAt(i); }
+    return { mime, buffer: Buffer.from(buffer) };
 };
 
 // https://stackoverflow.com/questions/42210199/remove-illegal-characters-from-a-file-name-but-leave-spaces
@@ -203,6 +214,15 @@ const unzip = async (any, options) => {
     ), options);
 };
 
+const blobToBuffer = async blob => {
+    const reader = new FileReader();
+    return new Promise((resolve, reject) => {
+        reader.onload = () => resolve(Buffer.from(reader.result));
+        reader.onerror = reject;
+        reader.readAsArrayBuffer(blob);
+    });
+};
+
 const convert = async (any, options) => {
     assert(any, options?.errorMessage || 'Invalid input.', 400);
     const result = {}
@@ -210,19 +230,31 @@ const convert = async (any, options) => {
         (Buffer.isBuffer(any) || ArrayBuffer.isArrayBuffer(any))
             ? BUFFER : options?.input, options?.expected || BUFFER
     ].map(x => ensureString(x, { case: 'UP' }));
-    let [oriFile, meta, subExp] = [null, null, expected];
+    let [oriFile, meta, mime, subExp] = [null, null, MIME_BINARY, expected];
     switch (input) {
         case FILE:
             oriFile = any;
             break;
         case TEXT:
             any = Buffer.from(any);
+            mime = MIME_TEXT;
+            input = BUFFER;
+            break;
+        case BLOB:
+            any = await blobToBuffer(any);
+            input = BUFFER;
+            break;
+        case DATAURL:
+            const resp = decodeBase64DataURL(any);
+            any = resp.buffer;
+            mime = resp.mime;
             input = BUFFER;
             break;
     }
     switch (expected) {
         case STREAM: subExp = FILE; break;
-        case TEXT: case _JSON: subExp = BUFFER;
+        case DATAURL: subExp = BUFFER; break;
+        case TEXT: case _JSON: subExp = BUFFER; break;
     }
     oriFile && (meta = await assertPath(any, 'F', 'R'));
     if (input !== subExp) {
@@ -240,6 +272,7 @@ const convert = async (any, options) => {
         case STREAM: result.content = createReadStream(any); break;
         case TEXT: result.content = any.toString(); break;
         case _JSON: result.content = JSON.parse(any.toString()); break;
+        case DATAURL: result.content = encodeBase64DataURL(options?.mime || mime, any); break;
         default: result.content = any;
     }
     // use options.cleanup to remove original file
@@ -254,7 +287,7 @@ const convert = async (any, options) => {
         }
     );
     // get file with meta data
-    options?.meta && (result.meta = meta);
+    options?.meta && (result = { ...result, mime, meta });
     // return
     return Object.keys(result).length === 1 ? result.content : result;
 };
@@ -268,7 +301,7 @@ const analyzeFile = async (any, options) => {
     return {
         content, extname: extname(filename).replace(/^\.|\.$/g, ''),
         filename, hashAlgorithm, hash: _hash,
-        mime: extract(await fileTypeFromBuffer(content), 'mime') || lookup(filename) || 'application/octet-stream',
+        mime: extract(await fileTypeFromBuffer(content), 'mime') || lookup(filename) || MIME_BINARY,
         size: content.length,
     };
 };
@@ -430,7 +463,9 @@ export {
     _NEED,
     analyzeFile,
     assertPath,
+    blobToBuffer,
     convert,
+    decodeBase64DataURL,
     deleteFileOnCloud,
     deleteOnCloud,
     downloadFileFromCloud,

package/lib/utilitas.mjs

@@ -267,9 +267,16 @@ const decode = (string, toBuf, encoding) => {
     return toBuf ? buf : buf.toString('utf8');
 };
 
-const parseJson = (any, fallback) => {
-    try { return JSON.parse(any); }
-    catch (e) { return isSet(fallback) ? fallback : {}; }
+const parseJson = (any, fallback, options) => {
+    try {
+        return JSON.parse(any, options?.reviver || ((key, value) => {
+            if (value && value.type === 'Buffer' && Array.isArray(value.data)) {
+                return Buffer.from(value.data);
+            }
+            return value;
+
+        }));
+    } catch (e) { return isSet(fallback) ? fallback : {}; }
 };
 
 const extract = (...path) => {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.83",
+    "version": "1995.2.85",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",