alemonjs 2.0.16 → 2.1.0-alpha.0

package/README.md

@@ -20,14 +20,14 @@ start('src/index.js')
 > src/response/res.js
 
 ```js
-import { onSelects, onResponse, Text, useSend } from 'alemonjs'
+import { Text, useMessage } from 'alemonjs'
 // 创建事件类型
 export const selects = onSelects(['message.create'])
 // 导出响应
 export default onResponse(selects, event => {
   // 使用发送函数
-  const send = useSend(event)
+  const [message] = useMessage(event)
   // 发送文本
-  send(Text('Hello Word!'))
+  message.send(format(Text('Hello Word!')))
 })
 ```

package/lib/app/define-bot.d.ts

@@ -1,5 +1,5 @@
-import { DefinePlatformFunc } from '../typing/event/index.js';
-import '../global.js';
+import { DefinePlatformFunc } from '../typing/event/index.js'
+import '../global.js'
 
 /**
  * 定义机器人
@@ -7,11 +7,11 @@ import '../global.js';
  * @throws {Error} - 如果 callback 无效，抛出错误。
  * @returns
  */
-declare const definePlatform: DefinePlatformFunc;
+declare const definePlatform: DefinePlatformFunc
 /**
  * 废弃，请使用 definePlatform
  * @deprecated
  */
-declare const defineBot: DefinePlatformFunc;
+declare const defineBot: DefinePlatformFunc
 
-export { defineBot, definePlatform };
+export { defineBot, definePlatform }

package/lib/app/define-bot.js

@@ -1,4 +1,4 @@
-import { ResultCode } from '../core/code.js';
+import { ResultCode } from '../core/code.js'
 
 /**
  * 定义机器人
@@ -7,33 +7,33 @@ import { ResultCode } from '../core/code.js';
  * @returns
  */
 const definePlatform = callback => {
-    // 判断是否是函数
-    if (typeof callback !== 'function') {
-        logger.error({
-            code: ResultCode.FailParams,
-            message: 'Invalid callback: callback must be a function',
-            data: null
-        });
-        throw new Error('Invalid callback: callback must be a function');
-    }
-    return {
-        _name: 'platform',
-        callback
-    };
-};
-global.definePlatform = definePlatform;
+  // 判断是否是函数
+  if (typeof callback !== 'function') {
+    logger.error({
+      code: ResultCode.FailParams,
+      message: 'Invalid callback: callback must be a function',
+      data: null
+    })
+    throw new Error('Invalid callback: callback must be a function')
+  }
+  return {
+    _name: 'platform',
+    callback
+  }
+}
+global.definePlatform = definePlatform
 /**
  * 废弃，请使用 definePlatform
  * @deprecated
  */
 const defineBot = callback => {
-    logger.warn({
-        code: ResultCode.Warn,
-        message: 'defineBot is deprecated, please use definePlatform',
-        data: null
-    });
-    return definePlatform(callback);
-};
-global.defineBot = defineBot;
+  logger.warn({
+    code: ResultCode.Warn,
+    message: 'defineBot is deprecated, please use definePlatform',
+    data: null
+  })
+  return definePlatform(callback)
+}
+global.defineBot = defineBot
 
-export { defineBot, definePlatform };
+export { defineBot, definePlatform }

package/lib/app/event-middleware.d.ts

@@ -1,4 +1,4 @@
-import { OnMiddlewareReversalFunc, OnMiddlewareFunc } from '../typing/event/index.js';
+import { OnMiddlewareReversalFunc } from '../typing/event/index.js';
 import '../global.js';
 
 /**
@@ -16,10 +16,5 @@ import '../global.js';
  * @returns
  */
 declare const onMiddleware: OnMiddlewareReversalFunc;
-/**
- * 废弃，请使用 onMiddleware
- * @deprecated
- */
-declare const OnMiddleware: OnMiddlewareFunc;
 
-export { OnMiddleware, onMiddleware };
+export { onMiddleware };

package/lib/app/event-middleware.js

@@ -29,18 +29,5 @@ const onMiddleware = (select, callback) => {
     throw new Error('Invalid select: select must be a string or object');
 };
 global.onMiddleware = onMiddleware;
-/**
- * 废弃，请使用 onMiddleware
- * @deprecated
- */
-const OnMiddleware = (callback, select) => {
-    logger.warn({
-        code: ResultCode.Warn,
-        message: 'OnMiddleware is deprecated, please use onMiddleware',
-        data: null
-    });
-    return { select, current: callback };
-};
-global.OnMiddleware = OnMiddleware;
 
-export { OnMiddleware, onMiddleware };
+export { onMiddleware };

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

@@ -2,7 +2,7 @@ import { isAsyncFunction } from 'util/types';
 import { useState } from './hook-use-state.js';
 import { showErrorModule } from './utils.js';
 import { Response } from './store.js';
-import { useSend } from './hook-use-api.js';
+import { useMessage } from './hook-use-api.js';
 import { EventMessageText } from '../core/variable.js';
 
 /**
@@ -19,7 +19,7 @@ import { EventMessageText } from '../core/variable.js';
  */
 const expendEvent = async (valueEvent, select, next) => {
     const res = new Response();
-    const Send = useSend(valueEvent);
+    const [message] = useMessage(valueEvent);
     // 得到所有 res
     const StoreResponse = res.value;
     let valueI = 0;
@@ -107,14 +107,14 @@ const expendEvent = async (valueEvent, select, next) => {
                 if (Array.isArray(res)) {
                     if (res.length > 0) {
                         // 发送数据
-                        Send(...res);
+                        message.send(res);
                     }
                     isClose = true;
                 }
                 else if (typeof res === 'object') {
                     if (Array.isArray(res.data)) {
                         // 发送数据
-                        Send(...res.data);
+                        message.send(res.data);
                     }
                     if (!res.allowGrouping) {
                         isClose = true;

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

@@ -2,7 +2,7 @@ import { isAsyncFunction } from 'util/types';
 import { useState } from './hook-use-state.js';
 import { showErrorModule } from './utils.js';
 import { Middleware } from './store.js';
-import { useSend } from './hook-use-api.js';
+import { useMessage } from './hook-use-api.js';
 import { EventMessageText } from '../core/variable.js';
 
 /**
@@ -19,7 +19,7 @@ import { EventMessageText } from '../core/variable.js';
  */
 const expendMiddleware = async (valueEvent, select, next) => {
     const mw = new Middleware();
-    const Send = useSend(valueEvent);
+    const [message] = useMessage(valueEvent);
     // 得到所有 mws
     const mwFiles = mw.value;
     let valueI = 0;
@@ -109,14 +109,14 @@ const expendMiddleware = async (valueEvent, select, next) => {
                 else if (Array.isArray(res)) {
                     if (res.length > 0) {
                         // 发送数据
-                        Send(...res);
+                        message.send(res);
                     }
                     isClose = true;
                 }
                 else if (typeof res === 'object') {
                     if (Array.isArray(res.data)) {
                         // 发送数据
-                        Send(...res.data);
+                        message.send(res.data);
                     }
                     if (!res.allowGrouping) {
                         isClose = true;

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

@@ -20,7 +20,7 @@ const expendSubscribe = async (valueEvent, select, next, chioce) => {
         }
         const item = subList.value.popNext(); // 弹出下一个节点
         // 可能是 undefined
-        if (!item || !item.data.current) {
+        if (!item) {
             // 继续 next
             nextObserver(true);
             return;
@@ -33,17 +33,45 @@ const expendSubscribe = async (valueEvent, select, next, chioce) => {
                 return;
             }
         }
+        const clear = () => {
+            const selects = item.data.selects;
+            const ID = item.data.id; // 订阅的 ID
+            for (const select of selects) {
+                const subList = new SubscribeList(chioce, select);
+                const remove = () => {
+                    const item = subList.value.popNext(); // 弹出下一个节点
+                    if (!item || item.data.id !== ID) {
+                        remove();
+                        return;
+                    }
+                    subList.value.removeCurrent(); // 移除当前节点
+                    return;
+                };
+                remove();
+            }
+        };
+        // 恢复
+        const restore = () => {
+            const selects = item.data.selects;
+            for (const select of selects) {
+                const subList = new SubscribeList(chioce, select);
+                subList.value.append(item.data);
+            }
+        };
         // 订阅是执行则销毁
-        subList.value.removeCurrent(); // 移除当前节点
+        clear();
         const Continue = (cn, ...cns) => {
             // next() 订阅继续
-            subList.value.append(item.data); // 重新连接
+            // 重新注册。
+            restore();
+            // true
             if (cn) {
                 nextObserver(...cns);
                 return;
             }
+            // false
             if (typeof cn === 'boolean') {
-                subList.value.removeCurrent(); // 移除当前节点
+                clear();
                 nextObserver(...cns);
                 return;
             }

package/lib/app/event-response.d.ts

@@ -1,4 +1,4 @@
-import { OnResponseReversalFunc, OnResponseFunc } from '../typing/event/index.js';
+import { OnResponseReversalFunc } from '../typing/event/index.js';
 import '../global.js';
 
 /**
@@ -8,10 +8,5 @@ import '../global.js';
  * @returns 回调函数的执行结果
  */
 declare const onResponse: OnResponseReversalFunc;
-/**
- * 废弃，请使用 onResponse
- * @deprecated
- */
-declare const OnResponse: OnResponseFunc;
 
-export { OnResponse, onResponse };
+export { onResponse };

package/lib/app/event-response.js

@@ -1,5 +1,3 @@
-import { ResultCode } from '../core/code.js';
-
 /**
  * 处理响应事件
  * @param select 事件选择
@@ -10,18 +8,5 @@ const onResponse = (select, callback) => {
     return { current: callback, select };
 };
 global.onResponse = onResponse;
-/**
- * 废弃，请使用 onResponse
- * @deprecated
- */
-const OnResponse = (callback, select) => {
-    logger.warn({
-        code: ResultCode.Warn,
-        message: 'OnResponse is deprecated, please use onResponse',
-        data: null
-    });
-    return { current: callback, select };
-};
-global.OnResponse = OnResponse;
 
-export { OnResponse, onResponse };
+export { onResponse };

package/lib/app/hook-use-api.d.ts

@@ -1,8 +1,7 @@
 import { EventKeys, Events } from '../typing/event/map.js';
-import { ClientAPIMessageResult } from '../typing/client/index.js';
-import { DataEnums } from '../typing/message/index.js';
-import '../global.js';
 import { Result } from './utils.js';
+import '../global.js';
+import { DataEnums } from '../typing/message/index.js';
 
 /**
  * 使用提及。
@@ -26,23 +25,61 @@ declare const useMention: <T extends EventKeys>(event: Events[T]) => {
     }) => Promise<Result>;
 }[];
 /**
- * 使用发送消息。
- * @param {Object} event - 事件对象，包含触发发送的相关信息。
- * @throws {Error} - 如果 event 无效，抛出错误。
+ * 消息处理
+ * @param event
+ * @returns
  */
-declare const useSend: <T extends EventKeys>(event: Events[T]) => (...val: DataEnums[]) => Promise<Result | ClientAPIMessageResult[]>;
-declare const useSends: <T extends EventKeys>(event: Events[T]) => ((val: DataEnums[]) => Promise<Result | ClientAPIMessageResult[]>)[];
+declare const useMessage: <T extends EventKeys>(event: Events[T]) => {
+    send: (val: DataEnums[]) => Promise<Result[]>;
+    withdraw: (message_id?: string) => Promise<Result[]>;
+    forward: (message_id?: string) => Promise<Result[]>;
+    reply: (message_id?: string) => Promise<Result[]>;
+    update: (message_id?: string) => Promise<Result[]>;
+    pinning: (message_id?: string) => Promise<Result[]>;
+    horn: (message_id?: string) => Promise<Result[]>;
+    reaction: (message_id?: string) => Promise<Result[]>;
+}[];
+/**
+ * 用户处理
+ * @deprecated 待支持
+ * @param event
+ * @returns
+ */
+declare const useMenber: <T extends EventKeys>(event: Events[T]) => {
+    information: (user_id?: string) => Promise<Result>;
+    mute: (all?: boolean) => Promise<Result>;
+    unmute: (all?: boolean) => Promise<Result>;
+    remove: (user_id?: string) => Promise<Result>;
+}[];
+/**
+ * 频道处理
+ * @deprecated 待支持
+ * @param event
+ * @returns
+ */
+declare const useChannel: <T extends EventKeys>(event: Events[T]) => {
+    exit: (channel_id?: string) => Promise<Result>;
+    join: (channel_id?: string) => Promise<Result>;
+}[];
+/**
+ * 废弃，请使用 useMessage
+ * @deprecated
+ * @param event
+ * @returns
+ */
+declare const useSend: <T extends EventKeys>(event: Events[T]) => (...val: DataEnums[]) => Promise<Result[]>;
+/**
+ * 废弃，请使用 useMessage
+ * @param event
+ * @returns
+ */
+declare const useSends: <T extends EventKeys>(event: Events[T]) => ((val: DataEnums[]) => Promise<Result[]>)[];
 /**
  * 卸载模块
  * @param name
  * @throws {Error} - 如果 name 无效，抛出错误。
  */
 declare const unChildren: (name?: string) => void;
-/**
- * 废弃,请使用unChildren
- * @deprecated
- */
-declare const unMount: () => void;
 /**
  * 创建选择器
  * @param values
@@ -55,4 +92,4 @@ declare const onSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
  */
 declare const createSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
 
-export { createSelects, onSelects, unChildren, unMount, useMention, useSend, useSends };
+export { createSelects, onSelects, unChildren, useChannel, useMenber, useMention, useMessage, useSend, useSends };