@alemonjs/onebot 0.1.1 → 0.2.1

package/README.md

@@ -8,6 +8,6 @@
 onebot:
   url: ''
   token: ''
-  master_id: null
+  master_key: null
   version: 'v11'
 ```

package/lib/index-11.js

@@ -1,6 +1,7 @@
-import { defineBot, getConfig, createHash, Text, At, OnProcessor, useParse } from 'alemonjs';
+import { defineBot, getConfig, useUserHashKey, OnProcessor } from 'alemonjs';
 import { OneBotClient } from './sdk-v11/wss.js';
 
+const platform = 'onebot';
 var INDEXV11 = defineBot(() => {
     const cfg = getConfig();
     const config = cfg.value?.onebot;
@@ -26,7 +27,7 @@ var INDEXV11 = defineBot(() => {
         const uis = config.master_uids ?? [];
         let msg = '';
         const arr = [];
-        let at_users = [];
+        // let at_users = []
         for (const item of event.message) {
             if (item.type == 'text') {
                 msg = item.data.text;
@@ -49,39 +50,30 @@ var INDEXV11 = defineBot(() => {
                 return url;
             }
         };
-        const UserKey = createHash(`onebot:${event.user_id}`);
+        const UserId = String(event.user_id);
+        const UserKey = useUserHashKey({
+            Platform: platform,
+            UserId
+        });
         // 定义消
         const e = {
             // 平台类型
-            Platform: 'onebot',
+            Platform: platform,
             // 频道
             GuildId: String(event.group_id),
             // guild_name: event.group_name,
             // 子频道
             ChannelId: String(event.group_id),
-            // 是否是主人
             IsMaster: uis.includes(String(event.user_id)),
-            // 用户Id
-            UserId: String(event.user_id),
-            // 用户名
+            IsBot: false,
+            UserId: UserId,
             UserName: event.sender.nickname,
             UserKey,
-            // 用户头像
             UserAvatar: UserAvatar,
-            // 格式化数据
+            // message
             MessageId: String(event.message_id),
-            // 用户消息
-            MessageBody: [
-                Text(msg),
-                ...at_users.map(item => At(item.id, 'user', {
-                    name: item.name,
-                    avatar: item.avatar,
-                    bot: item.bot
-                }))
-            ],
             MessageText: msg,
             // 用户openId
-            // 用户openId
             OpenId: String(event.user_id),
             // 创建时间
             CreateAt: Date.now(),
@@ -117,15 +109,17 @@ var INDEXV11 = defineBot(() => {
     client.on('ERROR', event => {
         console.error('ERROR', event);
     });
+    global.client = client;
     return {
         api: {
             use: {
                 send: (event, val) => {
                     if (val.length < 0)
                         return Promise.all([]);
-                    const content = useParse({
-                        MessageBody: val
-                    }, 'Text');
+                    const content = val
+                        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+                        .map(item => item.value)
+                        .join('');
                     if (content) {
                         return Promise.all([content].map(item => client.sendGroupMessage({
                             group_id: event.ChannelId,
@@ -139,9 +133,7 @@ var INDEXV11 = defineBot(() => {
                             ]
                         })));
                     }
-                    const images = useParse({
-                        MessageBody: val
-                    }, 'Image');
+                    const images = val.filter(item => item.type == 'Image').map(item => item.value);
                     if (images) {
                         return Promise.all(images.map(item => client.sendGroupMessage({
                             group_id: event.ChannelId,
@@ -156,6 +148,9 @@ var INDEXV11 = defineBot(() => {
                         })));
                     }
                     return Promise.all([]);
+                },
+                mention: async () => {
+                    return [];
                 }
             }
         }

package/lib/index-12.js

@@ -1,6 +1,7 @@
-import { defineBot, getConfig, createHash, Text, At, OnProcessor, useParse } from 'alemonjs';
+import { defineBot, getConfig, useUserHashKey, OnProcessor } from 'alemonjs';
 import { OneBotClient } from './sdk-v12/wss.js';
 
+const platform = 'onebot';
 var INDEXV12 = defineBot(() => {
     const cfg = getConfig();
     const config = cfg.value?.onebot;
@@ -67,45 +68,34 @@ var INDEXV12 = defineBot(() => {
                 return url;
             }
         };
-        const UserKey = createHash(`onebot:${event.user_id}`);
+        const UserId = String(event.user_id);
+        const UserKey = useUserHashKey({
+            Platform: platform,
+            UserId
+        });
         // 定义消
         const e = {
             // 平台类型
-            Platform: 'onebot',
+            Platform: platform,
             // 频道
             GuildId: event.group_id,
             // guild_name: event.group_name,
             // 子频道
             ChannelId: event.group_id,
-            // 是否是主人
+            // uyser
             IsMaster: uis.includes(String(event.user_id)),
-            // 用户Id
-            UserId: event.user_id,
+            UserId: UserId,
+            IsBot: false,
             UserKey,
-            // 用户名
             UserName: event.sender.nickname,
-            // 用户头像
             UserAvatar: UserAvatar,
-            // 格式化数据
+            // message
             MessageId: event.message_id,
-            // 用户消息
-            MessageBody: [
-                Text(msg),
-                ...at_users.map(item => At(item.id, 'user', {
-                    name: item.name,
-                    avatar: item.avatar,
-                    bot: item.bot
-                }))
-            ],
             MessageText: msg,
-            // 表情
-            // 用户openId
             OpenId: event.user_id,
-            //
-            tag: 'MESSAGES',
-            // 创建时间
             CreateAt: Date.now(),
-            //
+            // ohther
+            tag: 'MESSAGES',
             value: null
         };
         // 当访问的时候获取
@@ -135,15 +125,17 @@ var INDEXV12 = defineBot(() => {
     client.on('ERROR', event => {
         console.error(event);
     });
+    global.client = client;
     return {
         api: {
             use: {
                 send: (event, val) => {
                     if (val.length < 0)
                         return Promise.all([]);
-                    const content = useParse({
-                        MessageBody: val
-                    }, 'Text');
+                    const content = val
+                        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+                        .map(item => item.value)
+                        .join('');
                     if (content) {
                         return Promise.all([content].map(item => client.sendGroupMessage({
                             group_id: event.ChannelId,
@@ -157,9 +149,7 @@ var INDEXV12 = defineBot(() => {
                             ]
                         })));
                     }
-                    const images = useParse({
-                        MessageBody: val
-                    }, 'Image');
+                    const images = val.filter(item => item.type == 'Image').map(item => item.value);
                     if (images) {
                         return Promise.all(images.map(item => client.sendGroupMessage({
                             group_id: event.ChannelId,
@@ -174,6 +164,9 @@ var INDEXV12 = defineBot(() => {
                         })));
                     }
                     return Promise.all([]);
+                },
+                mention: async () => {
+                    return [];
                 }
             }
         }

package/lib/index.d.ts

@@ -1,3 +1,9 @@
-declare const _default: () => typeof global.alemonjs;
+import * as alemonjs from 'alemonjs';
+import { OneBotClient } from './sdk-v11/wss.js';
 
-export { _default as default };
+declare const platform = "onebot";
+type Client = OneBotClient;
+declare const client: Client;
+declare const _default: () => alemonjs.ClientAPI;
+
+export { type Client, client, _default as default, platform };

package/lib/index.js

@@ -2,6 +2,15 @@ import { defineBot, getConfig } from 'alemonjs';
 import INDEXV12 from './index-12.js';
 import INDEXV11 from './index-11.js';
 
+const platform = 'onebot';
+const client = new Proxy({}, {
+    get: (_, prop) => {
+        if (prop in global.client) {
+            return global.client[prop];
+        }
+        return undefined;
+    }
+});
 var index = defineBot(() => {
     const cfg = getConfig();
     const config = cfg.value?.onebot;
@@ -13,4 +22,4 @@ var index = defineBot(() => {
     return INDEXV11();
 });
 
-export { index as default };
+export { client, index as default, platform };

package/lib/sdk-v11/type.d.ts

@@ -0,0 +1,90 @@
+interface Sender {
+    user_id: number;
+    nickname: string;
+    card: string;
+    role: 'admin' | 'member';
+}
+type Message = {
+    type: 'image';
+    data: {
+        file: string;
+        sub_type: number;
+        file_id: string;
+        url: string;
+        file_size: string;
+        file_unique: string;
+    };
+} | {
+    type: 'text';
+    data: {
+        text: string;
+    };
+} | {
+    type: 'json';
+    data: string;
+} | {
+    type: 'forward';
+    data: {
+        id: number;
+        content: any[];
+    };
+};
+interface MESSAGES_TYPE {
+    self_id: number;
+    user_id: number;
+    time: number;
+    message_id: number;
+    message_seq: number;
+    real_id: number;
+    message_type: 'group';
+    sender: Sender;
+    raw_message: string;
+    font: number;
+    sub_type: 'normal';
+    message: Message[];
+    message_format: 'array';
+    post_type: 'message';
+    group_id: number;
+}
+interface DIRECT_MESSAGE_TYPE {
+    self_id: number;
+    user_id: number;
+    time: number;
+    message_id: number;
+    message_seq: number;
+    real_id: number;
+    message_type: 'private';
+    sender: {
+        user_id: 1715713638;
+        nickname: string;
+        card: '';
+    };
+    raw_message: string;
+    font: 14;
+    sub_type: 'group' | 'friend';
+    message: Message[];
+    message_format: 'array';
+    post_type: 'message';
+    group_id: number;
+    temp_source: number;
+}
+interface meta_event_lifecycle {
+    time: number;
+    self_id: number;
+    post_type: 'meta_event';
+    meta_event_type: 'lifecycle';
+    sub_type: 'connect';
+}
+interface meta_event_heartbeat {
+    time: number;
+    self_id: number;
+    post_type: 'meta_event';
+    meta_event_type: 'heartbeat';
+    status: {
+        online: boolean;
+        good: boolean;
+    };
+    interval: number;
+}
+
+export type { DIRECT_MESSAGE_TYPE, MESSAGES_TYPE, meta_event_heartbeat, meta_event_lifecycle };

package/lib/sdk-v11/wss.d.ts

@@ -0,0 +1,53 @@
+import { DIRECT_MESSAGE_TYPE, MESSAGES_TYPE, meta_event_lifecycle, meta_event_heartbeat } from './type.js';
+
+type OneBotEventMap = {
+    DIRECT_MESSAGE: DIRECT_MESSAGE_TYPE;
+    MESSAGES: MESSAGES_TYPE;
+    META: meta_event_lifecycle | meta_event_heartbeat;
+    ERROR: any;
+};
+/**
+ * 连接
+ */
+declare class OneBotClient {
+    #private;
+    /**
+     * 设置配置
+     * @param opstion
+     */
+    constructor(opstion: {
+        url: string;
+        access_token: string;
+    });
+    /**
+     * 注册事件处理程序
+     * @param key 事件名称
+     * @param val 事件处理函数
+     */
+    on<T extends keyof OneBotEventMap>(key: T, val: (event: OneBotEventMap[T]) => any): this;
+    /**
+     *
+     * @param cfg
+     * @param conversation
+     */
+    connect(): Promise<void>;
+    /**
+     *
+     * @param options
+     * @returns
+     */
+    sendGroupMessage(options: {
+        group_id: number;
+        message: any[];
+    }): void;
+    /**
+     * @param options
+     * @returns
+     */
+    sendPrivateMessage(options: {
+        user_id: number;
+        message: any[];
+    }): void;
+}
+
+export { OneBotClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "onebot",
   "author": "lemonade",
   "license": "MIT",