utilitas 1989.9.28 → 1989.9.32

package/lib/bot.mjs

@@ -15,18 +15,18 @@ const c = (s, r) => { return ~~utilitas.insensitiveCompare(s, r, { w: true }) };
 let bot;
 
 const questions = [{
-    q: ['The Ultimate Question of Life, the Universe, and Everything',
-        'The answer to life the universe and everything'],
-    a: '42',
-}, {
     q: ['THE THREE LAWS'],
     a: ['- A robot may not injure a human being or, through inaction, allow a human being to come to harm.',
         '- A robot must obey the orders given it by human beings except where such orders would conflict with the First Law.',
         '- A robot must protect its own existence as long as such protection does not conflict with the First or Second Laws.'].join('\n'),
+}, {
+    q: ['The Ultimate Question of Life, the Universe, and Everything',
+        'The answer to life the universe and everything'],
+    a: '42',
 }];
 
 const subconscious = {
-    run: true, name: 'Subconscious', func: async (bot) => {
+    run: true, name: 'subconscious', func: async (bot) => {
         bot.use(async (ctx, next) => {
             log(`Updated: ${ctx.update.update_id}`);
             process.stdout.write(`${JSON.stringify(ctx.update)}\n`);

package/lib/tape.mjs

@@ -7,12 +7,16 @@ import * as utilitas from './utilitas.mjs';
 // Handle, report, or silently ignore connection errors and failures
 const handleError = (err) => { process.stdout.write(`${err.message}\n`); };
 const consoleMap = { log: 'verbose', info: 0, debug: 0, warn: 0, error: 0 };
-const [TAPE, defBufSize, maxLength] = ['TAPE', 100, 4096];
+const [TAPE, maxLength, defBufCycle, maxBufCycle] = ['TAPE', 4096, 10, 100];
 const modLog = (content) => { return utilitas.modLog(content, TAPE); };
 const getLogger = async () => { return (await init()).logger; };
 const [BOT, RSYSLOG, PAPERTRAIL] = ['BOT', 'RSYSLOG', 'PAPERTRAIL'];
+const getSendTxt = (arr) => { return arr.map(x => x[1]).join('\n'); };
+const getSndSize = (arr) => { return getSendTxt(arr).length; };
+const getBufSize = () => { return maxLength * bufferCycle; };
+const nextLen = () => { return botBuffer?.[0]?.[1].length || (maxLength + 1); };
 
-let chatIds, tarLevel, botBuffer, bufferSize, logger, silent, provider;
+let chatIds, tarLevel, botBuffer, bufferCycle, logger, silent, provider;
 
 // Do something after the connection to the Papertrail server is established
 const handleConnect = (data) => {
@@ -25,9 +29,14 @@ const hookConsole = () => {
         const bakAct = `_${act}`;
         console[bakAct] = console[act];
         console[act] = function() {
-            const str = [...arguments].map(utilitas.ensureString).join(' ');
-            logger && logger.log(tar, str.replace(/\u001b\[\d+m/g, ''));
             console[bakAct].apply(console, arguments);
+            const str = [...arguments].map(
+                utilitas.ensureString
+            ).join(' ').replace(/\u001b\[\d+m/g, '').split('');
+            while (str.length) {
+                const t = str.splice(0, maxLength).join('').trim();
+                t.length && logger && logger.log(tar, str);
+            }
         };
     }
 };
@@ -77,8 +86,8 @@ const botLoggerInit = async (options) => {
     chatIds = utilitas.ensureArray(options?.chatId);
     utilitas.assert(chatIds.length, 'ChatId is required.', 501);
     handleConnect(`Sending logs via bot, chatId: ${chatIds.join(', ')}.`);
-    bufferSize = utilitas.ensureInt(
-        options?.bufferSize || defBufSize, { min: 1, max: defBufSize }
+    bufferCycle = utilitas.ensureInt(
+        options?.bufferCycle || defBufCycle, { min: 1, max: maxBufCycle }
     );
     logger = botLogger;
     await event.loop(
@@ -89,11 +98,11 @@ const botLoggerInit = async (options) => {
 };
 
 const botLoggerSync = async () => {
-    let fetched = (botBuffer?.length ? botBuffer.splice(0) : [
-    ]).map(x => x[1]).join('\n').slice(0, maxLength);
-    if (!fetched.length) { return; }
+    let f = [];
+    while (getSndSize(f) + nextLen() <= maxLength) { f.push(botBuffer.shift()) }
+    if (!(f = getSendTxt(f)).length) { return; };
     for (let id of chatIds) {
-        try { await bot.send(id, fetched); } catch (err) { handleError(err); }
+        try { await bot.send(id, f); } catch (err) { handleError(err); }
     }
 };
 
@@ -101,7 +110,7 @@ const botLogger = {
     log: (level, message) => {
         if (tarLevel !== 'verbose' && level === 'verbose') { return; }
         (botBuffer = botBuffer || []).push([level, message]);
-        botBuffer.splice(0, botBuffer.length - defBufSize);
+        while (getSndSize(botBuffer) > getBufSize()) { botBuffer.shift(); }
     },
     end: () => {
         chatIds = undefined; botBuffer = undefined; event.end(TAPE);

package/package.json

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