alemonjs 2.1.32 → 2.1.33

package/lib/app/SinglyLinkedList.d.ts

@@ -13,5 +13,6 @@ export declare class SinglyLinkedList<T> {
     popNext(): ListNode<T> | null;
     removeCurrent(): void;
     getSize(): number;
+    forEach(callback: (node: ListNode<T>) => boolean | undefined): void;
 }
 export {};

package/lib/app/SinglyLinkedList.js

@@ -63,13 +63,22 @@ class SinglyLinkedList {
             if (this.current === this.tail) {
                 this.tail = previous;
             }
-            this.current = null;
+            this.current = previous;
             this.size--;
         }
     }
     getSize() {
         return this.size;
     }
+    forEach(callback) {
+        let node = this.head;
+        while (node) {
+            if (callback(node) === true) {
+                break;
+            }
+            node = node.next;
+        }
+    }
 }
 
 export { SinglyLinkedList };

package/lib/app/event-processor-cycleRoute.js

@@ -77,6 +77,7 @@ const createRouteProcessChildren = (valueEvent, select, nextCycle, callHandler)
                     }
                     const selects = Array.isArray(app.select) ? app.select : [app.select];
                     if (!selects.includes(select)) {
+                        middleware.pop();
                         void nextNode();
                         return;
                     }

package/lib/app/event-processor-subscribe.js

@@ -29,27 +29,23 @@ const expendSubscribe = (valueEvent, select, next, choose) => {
         const onActive = () => {
             for (const select of selects) {
                 const subListVal = getSubscribeList(choose, select);
-                let item = subListVal.popNext();
-                while (item) {
-                    if (item.data.id === ID) {
-                        item.data.status = SubscribeStatus.active;
-                        break;
+                subListVal.forEach(node => {
+                    if (node.data.id === ID) {
+                        node.data.status = SubscribeStatus.active;
+                        return true;
                     }
-                    item = subListVal.popNext();
-                }
+                });
             }
         };
         const onPaused = () => {
             for (const select of selects) {
                 const subListVal = getSubscribeList(choose, select);
-                let item = subListVal.popNext();
-                while (item) {
-                    if (item.data.id === ID) {
-                        item.data.status = SubscribeStatus.paused;
-                        break;
+                subListVal.forEach(node => {
+                    if (node.data.id === ID) {
+                        node.data.status = SubscribeStatus.paused;
+                        return true;
                     }
-                    item = subListVal.popNext();
-                }
+                });
             }
         };
         onPaused();

package/lib/app/event-processor.js

@@ -86,14 +86,16 @@ const onProcessor = (name, event, data) => {
         }
     }
     const mappingText = value?.mapping_text ?? [];
-    for (const mapping of mappingText) {
-        const { regular, target } = mapping ?? {};
-        if (!regular) {
-            continue;
-        }
-        const cachedReg = getCachedRegExp(regular);
-        if (cachedReg.test(event['MessageText'])) {
-            event['MessageText'] = event['MessageText'].replace(cachedReg, target);
+    if (event['MessageText']) {
+        for (const mapping of mappingText) {
+            const { regular, target } = mapping ?? {};
+            if (!regular) {
+                continue;
+            }
+            const cachedReg = getCachedRegExp(regular);
+            if (cachedReg.test(event['MessageText'])) {
+                event['MessageText'] = event['MessageText'].replace(cachedReg, target);
+            }
         }
     }
     const masterId = value?.master_id ?? {};

package/lib/app/hook-use-state.js

@@ -29,14 +29,12 @@ const useState = (name, defaultValue = true) => {
         cfg.value.core ??= {};
         cfg.value.core.state ??= [];
         const cfgState = cfg.value.core.state;
-        const cur = cfgState.find((i) => i === name);
-        if (cur !== value) {
-            if (value) {
-                cfg.value.core.state = cfg.value.core.state.filter((i) => i !== name);
-            }
-            else {
-                cfg.value.core.state.push(name);
-            }
+        const exists = cfgState.includes(name);
+        if (value && exists) {
+            cfg.value.core.state = cfg.value.core.state.filter((i) => i !== name);
+        }
+        else if (!value && !exists) {
+            cfg.value.core.state.push(name);
         }
         cfg.saveValue(cfg.value);
     };

package/lib/app/hook-use-subscribe.js

@@ -22,11 +22,16 @@ const useSubscribe = (event, selects) => {
     const register = (callback, keys, choose) => {
         const curSelects = Array.isArray(selects) ? selects : [selects];
         const ID = Date.now().toString(36) + Math.random().toString(36).substring(2, 15);
+        if (keys.length === 0) {
+            logger.warn({
+                code: ResultCode.FailParams,
+                message: 'subscribe keys is empty',
+                data: null
+            });
+            return { selects: curSelects, choose, id: ID };
+        }
         for (const select of curSelects) {
             const subList = new SubscribeList(choose, select);
-            if (keys.length === 0) {
-                return;
-            }
             const values = {};
             for (const key of keys) {
                 if (typeof key === 'string' && (typeof event[key] === 'string' || typeof event[key] === 'number' || typeof event[key] === 'boolean')) {
@@ -69,18 +74,12 @@ const useSubscribe = (event, selects) => {
         const ID = value.id;
         for (const select of selects) {
             const subList = new SubscribeList(value.choose, select);
-            const find = () => {
-                const item = subList.value.popNext();
-                if (!item) {
-                    return;
+            subList.value.forEach(node => {
+                if (node.data.id === ID) {
+                    node.data.status = SubscribeStatus.paused;
+                    return true;
                 }
-                if (item.data.id !== ID) {
-                    find();
-                    return;
-                }
-                item.data.status = SubscribeStatus.paused;
-            };
-            find();
+            });
         }
     };
     const subscribe = {

package/lib/core/variable.js

@@ -43,9 +43,6 @@ class Result {
         if (this.#data[this.#currentIndex]) {
             this.#currentIndex++;
         }
-        else {
-            this.#currentIndex = 0;
-        }
         return this;
     }
     updateMessage(msg) {
@@ -67,6 +64,7 @@ class Result {
                 data: data
             };
         }
+        this.#data[this.#currentIndex].data = data;
         return this;
     }
     updateCode(callback) {

package/lib/process/direct-channel.js

@@ -52,10 +52,12 @@ const createDirectServer = (sockPath, onMessage) => {
             const parser = createMessageParser(onMessage);
             socket.on('data', parser);
             socket.on('error', () => {
-                connection = null;
+                if (connection === socket)
+                    connection = null;
             });
             socket.on('close', () => {
-                connection = null;
+                if (connection === socket)
+                    connection = null;
             });
         });
         const cleanup = () => {
@@ -93,6 +95,9 @@ const createDirectClient = (sockPath, onMessage, maxRetries = 30, retryDelay = 1
         return new Promise((resolve, reject) => {
             const parser = createMessageParser(onMessage);
             const socket = net.createConnection(sockPath, () => {
+                socket.removeListener('error', reject);
+                socket.on('error', () => {
+                });
                 resolve({
                     send: (data) => {
                         if (!socket.destroyed) {

package/lib/types/event/index.d.ts

@@ -2,7 +2,7 @@ import { ChildrenCycle, Next } from '../cycle';
 import { ClientAPI } from '../client';
 import { EventKeys, Events } from './map';
 import { DataEnums } from '../message';
-export type Current<T extends EventKeys> = (event: Events[T], next: Next) => void | boolean | Promise<void | boolean>;
+export type Current<T extends EventKeys> = (event: Events[T], next: Next) => boolean | Promise<boolean> | undefined;
 export type OnResponseValue<C, T extends EventKeys> = {
     current: C;
     select: T | T[];
@@ -54,8 +54,8 @@ export type childrenCallbackRes = {
     middleware?: ReturnType<defineMiddlewareFunc>;
     responseRouter?: ReturnType<DefineRouterFunc>;
     middlewareRouter?: ReturnType<DefineRouterFunc>;
-} | void;
+} | undefined;
 export type childrenCallback = ChildrenCycle & {
-    register?: () => (childrenCallbackRes | void) | Promise<childrenCallbackRes | void>;
+    register?: () => (childrenCallbackRes | undefined) | Promise<childrenCallbackRes | undefined>;
 };
 export type DefineChildrenCallback = (() => Promise<childrenCallback> | childrenCallback) | childrenCallback;

package/lib/types/event/member/index.d.ts

@@ -4,7 +4,7 @@ import { User } from '../base/user';
 import { platform } from '../base/platform';
 import { Expansion } from '../base/expansion';
 export type PublicEventMemberAdd = platform & Guild & Channel & Message & User & {
-    naem: 'member.add';
+    name: 'member.add';
 } & Expansion;
 export type PublicEventMemberRemove = platform & Guild & Channel & Message & User & {
     name: 'member.remove';

package/lib/types/event/request/index.d.ts

@@ -3,8 +3,8 @@ import { Message } from '../base/message';
 import { platform } from '../base/platform';
 import { User } from '../base/user';
 export type PrivateEventRequestFriendAdd = platform & Message & User & {
-    name: 'private.request.friend.add';
+    name: 'private.friend.add';
 } & Expansion;
 export type PrivateEventRequestGuildAdd = platform & Message & User & {
-    name: 'private.request.guild.add';
+    name: 'private.guild.add';
 } & Expansion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.32",
+  "version": "2.1.33",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",