halbot 1995.1.21 → 1995.1.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another AI powered Telegram bot, which is simple design, easy to use, extendable and fun.",
-  "version": "1995.1.21",
+  "version": "1995.1.23",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -46,9 +46,9 @@
     "pg": "^8.16.3",
     "pgvector": "^0.2.1",
     "telegraf": "^4.16.3",
-    "tellegram": "^1.1.2",
+    "tellegram": "^1.1.3",
     "tesseract.js": "^7.0.0",
-    "utilitas": "^2001.1.94",
+    "utilitas": "^2001.1.98",
     "youtube-transcript": "^1.2.1"
   }
 }

package/pipeline/010_broca.mjs

@@ -174,6 +174,10 @@ const ctxExt = ctx => {
     ctx.image = async (s, o) => await replyWith(ctx, 'replyWithPhoto', s, o);
     ctx.video = async (s, o) => await replyWith(ctx, 'replyWithVideo', s, o);
     ctx.media = async (s, o) => await replyWith(ctx, 'replyWithMediaGroup', s, o);
+    ctx.sessionSet = async () => {
+        ctx._.saved || await sessionSet(ctx._.chatId, ctx._.session);
+        ctx._.saved = true;
+    };
 };
 
 const action = async (ctx, next) => {
@@ -251,7 +255,7 @@ const action = async (ctx, next) => {
         || (ctx._.message.new_chat_member || ctx._.message.left_chat_member))
         && await next();
     // persistence
-    await sessionSet(ctx._.chatId, ctx._.session);
+    await ctx.sessionSet();
     // fallback response and log
     if (ctx._.done.length) { return; }
     const errStr = ctx._.cmd?.cmd

package/pipeline/060_config.mjs

@@ -26,8 +26,8 @@ const action = async (ctx, next) => {
                 }
             };
             Object.keys(ctx._.config).map(x => _config[x] += ` ${hal.CHECK}`);
-            ctx._.result = hal.map(_config);
             ctx.hello();
+            await ctx.sessionSet(); // save config before break
             break;
         case 'toggle':
             parsed = {};
@@ -43,12 +43,14 @@ const action = async (ctx, next) => {
                 };
                 assert(utilitas.countKeys(ctx._.config), 'No option matched.');
                 Object.keys(ctx._.config).map(x => _config[x] += ` ${hal.CHECK}`);
+                await ctx.sessionSet(); // save config before return
                 return await ctx.sendConfig(_config);
             } catch (err) {
                 return await ctx.err(err.message || err);
             }
         case 'reset':
             ctx._.session.config = ctx._.config = {};
+            await ctx.sessionSet(); // save config before return
             return await ctx.complete({ keyboards: ctx.getKeyboard() });
     }
     await next();

package/pipeline/100_chat.mjs

@@ -5,29 +5,35 @@ const log = (c, o) => utilitas.log(c, _name, { time: 1, ...o || {} });
 
 const action = async (ctx, next) => {
     if (!ctx._.text && !ctx._.collected.length) { return await next(); }
-    let [resp, extra, delay, lock, sResp, lastMsg, lastSent] =
-        [null, { buttons: [] }, 1000 * 3, false, null, null, 0];
+    let [resp, extra, lastLen, status] = [null, { buttons: [] }, 0, 0];
     const ok = async options => {
-        if (options?.processing && (
-            Date.now() - lastSent < ctx._.limit || lastMsg === resp.text || lock
-        )) { return; }
-        [lastSent, lastMsg, lock] = [Date.now() + delay, resp.text, true];
+        const newLen = ~~resp?.text?.length;
+        if (options?.processing && lastLen === newLen) { return; }
+        lastLen = newLen;
         if (!options?.processing) {
             (resp.annotations || []).map((x, i) => extra.buttons.push({
                 label: `${i + 1}. ${x.title}`, url: x.url,
             }));
         }
-        sResp = await ctx.ok(resp.text, {
+        return await ctx.ok(resp.text, {
             ...ctx._.keyboards ? { keyboards: ctx._.keyboards } : {},
             ...extra, ...options || {},
         });
-        [lastSent, lock] = [Date.now(), false];
-        return sResp;
     };
+    (async () => {
+        while (!status) {
+            // console.log('Processing...');
+            await ok({ processing: true });
+            await ctx.timeout(1000 * ctx._.limit);
+        }
+        status++;
+    })();
     resp = await alan.talk(ctx._.text, {
         ...ctx._, sessionId: ctx._.chatId, // THIS LINE IS IMPORTANT
-        stream: async rsp => { resp = rsp; ok({ processing: true }); }, // Never await, it will block the stream.
+        stream: rsp => resp = rsp, // Never await, it will block the stream.
     });
+    status++;
+    // console.log('Done');
     for (let image of resp?.images || []) {
         await ctx.timeout();
         await ctx.image(image.data, { caption: image.caption });
@@ -41,7 +47,11 @@ const action = async (ctx, next) => {
         await ctx.audio(audio.data, { caption: audio.caption });
     }
     // print(resp);
-    await ctx.timeout();
+    while (status < 2) {
+        // console.log('Waiting...');
+        await ctx.timeout();
+    }
+    // console.log('Finished');
     await (resp.text.trim() ? ok({ processing: false })
         : ctx.deleteMessage(ctx._.done[0].message_id));
     ctx._.request = resp.request;