utilitas 1989.9.46 → 1989.9.47

package/lib/shot.mjs

@@ -1,9 +1,14 @@
+import { promises as fs } from 'fs';
+import { sha256 } from './encryption.mjs';
 import * as fileType from 'file-type';
 import * as storage from './storage.mjs';
 import * as utilitas from './utilitas.mjs';
 import fetch from 'node-fetch';
+import path from 'path';
 
 const defFetchOpt = { redirect: 'follow', follow: 3, timeout: 1000 * 10 };
+const fakeRsp = { status: 200, statusText: 'OK', headers: { get() { }, raw() { } } };
+const buf2utf = buf => buf.toString('utf8');
 
 const getVersionOnNpm = async (packName) => {
     utilitas.assert(packName, 'Package name is required.', 400);
@@ -44,11 +49,23 @@ const get = async (url, options) => {
     utilitas.assert(url, 'URL is required.');
     options = options || {};
     options.encode = utilitas.ensureString(options.encode, { case: 'UP' });
-    const r = await fetch(url, { defFetchOpt, ...options.fetch || {} });
-    const ts = (b) => { return b.toString('utf8'); };
+    const requestHash = sha256(JSON.stringify({ url, ...options }));
+    const cachePath = options.cache?.tmp || process.env.TMPDIR;
+    const cacheFile = cachePath ? path.join(cachePath, requestHash) : null;
+    const cacheable = options.cache && cacheFile;
+    let cacheAction, content;
+    const cache = cacheable && await utilitas.ignoreErrFunc(async () => {
+        const resp = await fs.readFile(cacheFile);
+        cacheAction = 'READ';
+        return resp;
+    });
+    const r = cache
+        ? { ...fakeRsp, async buffer() { return cache } }
+        : await fetch(url, { defFetchOpt, ...options.fetch || {} });
     const [htpMime, buffer] = [r.headers.get('content-type'), await r.buffer()];
     const bufMime = utilitas.extract(await fileType.fileTypeFromBuffer(buffer), 'mime');
-    let [mimeType, content] = [bufMime || htpMime, null];
+    const mimeType = bufMime || htpMime;
+    const length = buffer.length;
     switch (options.encode) {
         case 'BUFFER':
             content = buffer;
@@ -60,18 +77,25 @@ const get = async (url, options) => {
             content = storage.encodeBase64DataURL(mimeType, buffer);
             break;
         case 'JSON':
-            try { content = JSON.parse(ts(buffer)); } catch (e) { }
+            try { content = JSON.parse(buf2utf(buffer)); } catch (e) { }
             break;
         case 'TEXT':
-            content = ts(buffer);
+            content = buf2utf(buffer);
             break;
         default:
             utilitas.assert(!options.encode, 'Invalid encoding.', 400);
-            content = ts(buffer);
+            content = buf2utf(buffer);
     }
+    cacheable && !cache && length && r.status === 200
+        && await utilitas.ignoreErrFunc(async () => {
+            const resp = await fs.writeFile(cacheFile, buffer);
+            cacheAction = 'WRITE';
+            return resp;
+        });
     return {
-        statusCode: r.status, statusText: r.statusText, length: buffer.length,
+        statusCode: r.status, statusText: r.statusText, length,
         mimeType, content, headers: r.headers.raw(), response: r,
+        cache: cacheable && { filename: cacheFile, action: cacheAction },
     };
 }
 

package/lib/utilitas.mjs

@@ -591,8 +591,8 @@ const checkInterval = (itv, sed) => {
     return !((Math.round(Date.now() / 1000) + ensureInt(sed)) % ensureInt(itv));
 };
 
-const ignoreErrFunc = async (f, o) => {
-    try { return await f(); } catch (e) { return o?.log ? console.error(e) : e }
+const ignoreErrFunc = async (func, options) => {
+    try { return await func(); } catch (e) { options?.log && console.error(e); }
 };
 
 const tryUntil = async (fnTry, options) => {

package/package.json

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