alemonjs 1.1.2 → 1.1.4

package/lib/api.js

@@ -24,6 +24,10 @@ export { ClientKOOK } from './kook/index.js';
  * one客户端
  */
 export { ClientONE } from './one/index.js';
+/**
+ * discord
+ */
+export { ClientDISOCRD } from './discord/index.js';
 /**
  * 控制器
  */

package/lib/config/login.js

@@ -7,6 +7,7 @@ import { defineVILLA as villa } from '../villa/villa.js';
 import { defineQQ as qq } from '../qq/qq.js';
 import { defineNtqq as ntqq } from '../ntqq/ntqq.js';
 import { defineOne as one } from '../one/one.js';
+import { defineDISCORD as discord } from '../discord/discord.js';
 /**
  * *************
  * defset-config
@@ -21,7 +22,8 @@ const config = {
     ntqq,
     server,
     puppeteer,
-    one
+    one,
+    discord
 };
 /**
  * 设置机器人基础配置

package/lib/define/main.js

@@ -137,6 +137,10 @@ export async function defineAlemonConfig(Options) {
             // 自定义覆盖
             setBotConfigByKey('one', Options.login.one);
         }
+        if (Options.login?.discord) {
+            // 自定义覆盖
+            setBotConfigByKey('discord', Options.login.discord);
+        }
         for (const item in Options.login) {
             if (arr.indexOf(item) != -1)
                 continue;

package/lib/define/map.js

@@ -43,5 +43,13 @@ export const rebotMap = {
             console.error('ONE BOT open err');
             return false;
         });
+    },
+    discord: async () => {
+        const { createAlemonByDISCORD: discord } = await import('../discord/index.js');
+        return discord().catch(err => {
+            console.error(err);
+            console.error('DISCORD BOT open err');
+            return false;
+        });
     }
 };

package/lib/discord/alemon/conversation.js

@@ -0,0 +1,16 @@
+import { MESSAGES } from './message/MESSAGES.js';
+export function conversation(t, d) {
+    console.log(t);
+    if (t == 'READY') {
+        console.log('机器人', d.user);
+    }
+    else if (t == 'GUILD_CREATE') {
+        // console.log(d)
+    }
+    else if (t == 'MESSAGE_CREATE') {
+        MESSAGES(d);
+    }
+    else {
+        console.log('数据', d);
+    }
+}

package/lib/discord/alemon/message/MESSAGES.js

@@ -0,0 +1,7 @@
+/**
+ * 基础消息
+ * @param event
+ */
+export function MESSAGES(event) {
+    console.log('数据', event);
+}

package/lib/discord/discord.js

@@ -0,0 +1,18 @@
+import { IntentsEnum } from './sdk/index.js';
+/**
+ *
+ */
+export const defineDISCORD = {
+    token: '',
+    intent: [
+        IntentsEnum.DIRECT_MESSAGES,
+        IntentsEnum.DIRECT_MESSAGE_TYPING,
+        IntentsEnum.DIRECT_MESSAGE_REACTIONS,
+        IntentsEnum.GUILD_MESSAGE_TYPING,
+        IntentsEnum.GUILD_MESSAGE_REACTIONS,
+        IntentsEnum.GUILD_MESSAGES,
+        IntentsEnum.GUILDS
+    ],
+    masterID: '',
+    password: ''
+};

package/lib/discord/index.js

@@ -0,0 +1,35 @@
+import { getIntents, setDISOCRD, createClient } from './sdk/index.js';
+import { conversation } from './alemon/conversation.js';
+import { checkRobotByDISCORD } from './login.js';
+import { getBotConfigByKey } from '../config/index.js';
+/**
+ * 创建实例
+ * @returns
+ */
+export async function createAlemonByDISCORD() {
+    /**
+     * 创建登录配置
+     */
+    if (await checkRobotByDISCORD().catch(err => {
+        console.error(err);
+        return false;
+    })) {
+        /**
+         * 读取配置
+         */
+        const cfg = getBotConfigByKey('discord');
+        const size = getIntents(cfg.intent);
+        /**
+         * 设置配置
+         */
+        setDISOCRD(cfg.token, size);
+        /**
+         * 启动监听
+         */
+        createClient(conversation);
+        return true;
+    }
+    return false;
+}
+// 客户端
+export { ClientDISOCRD } from './sdk/index.js';

package/lib/discord/login.js

@@ -0,0 +1,20 @@
+import { setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
+/**
+ * 登录配置
+ * @param Bcf
+ * @param val
+ * @returns
+ */
+export async function checkRobotByDISCORD() {
+    /**
+     * 读取配置
+     */
+    const config = getBotConfigByKey('discord');
+    if ((config ?? '') !== '' && (config.token ?? '') !== '') {
+        setBotConfigByKey('kook', config);
+        return true;
+    }
+    console.error('[LOGIN]', '-----------------------');
+    console.error('[LOGIN]', 'KOOK ERR');
+    return false;
+}

package/lib/discord/sdk/api.js

@@ -0,0 +1,25 @@
+import axios from 'axios';
+import { getDISCORD } from './config.js';
+/**
+ * KOOK服务
+ * @param config
+ * @returns
+ */
+export function Service(config) {
+    const { token } = getDISCORD();
+    const service = axios.create({
+        baseURL: 'https://discord.com/api/v10',
+        timeout: 6000,
+        headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bot ${token}`
+        }
+    });
+    return service(config);
+}
+export function gateway() {
+    return Service({
+        method: 'get',
+        url: '/gateway'
+    }).then(res => res.data);
+}

package/lib/discord/sdk/config.js

@@ -0,0 +1,20 @@
+let token = '';
+let intent = 0;
+/**
+ *
+ * @param val
+ */
+export function setDISOCRD(val, i) {
+    token = val;
+    intent = i;
+}
+/**
+ *
+ * @returns
+ */
+export function getDISCORD() {
+    return {
+        token,
+        intent
+    };
+}

package/lib/discord/sdk/index.js

@@ -0,0 +1,5 @@
+export * from './types.js';
+export * as ClientDISOCRD from './api.js';
+export * from './wss.js';
+export * from './intents.js';
+export * from './config.js';

package/lib/discord/sdk/intents.js

@@ -0,0 +1,7 @@
+export function getIntents(intents) {
+    let result = 0;
+    for (const intent of intents) {
+        result += intent;
+    }
+    return result;
+}

package/lib/discord/sdk/types.js

@@ -0,0 +1,23 @@
+export var IntentsEnum;
+(function (IntentsEnum) {
+    IntentsEnum[IntentsEnum["GUILDS"] = 1] = "GUILDS";
+    IntentsEnum[IntentsEnum["GUILD_MEMBERS"] = 2] = "GUILD_MEMBERS";
+    IntentsEnum[IntentsEnum["GUILD_MODERATION"] = 4] = "GUILD_MODERATION";
+    IntentsEnum[IntentsEnum["GUILD_EMOJIS_AND_STICKERS"] = 8] = "GUILD_EMOJIS_AND_STICKERS";
+    IntentsEnum[IntentsEnum["GUILD_INTEGRATIONS"] = 16] = "GUILD_INTEGRATIONS";
+    IntentsEnum[IntentsEnum["GUILD_WEBHOOKS"] = 32] = "GUILD_WEBHOOKS";
+    IntentsEnum[IntentsEnum["GUILD_INVITES"] = 64] = "GUILD_INVITES";
+    IntentsEnum[IntentsEnum["GUILD_VOICE_STATES"] = 128] = "GUILD_VOICE_STATES";
+    IntentsEnum[IntentsEnum["GUILD_PRESENCES"] = 256] = "GUILD_PRESENCES";
+    IntentsEnum[IntentsEnum["GUILD_MESSAGES"] = 512] = "GUILD_MESSAGES";
+    IntentsEnum[IntentsEnum["GUILD_MESSAGE_REACTIONS"] = 1024] = "GUILD_MESSAGE_REACTIONS";
+    IntentsEnum[IntentsEnum["GUILD_MESSAGE_TYPING"] = 2048] = "GUILD_MESSAGE_TYPING";
+    IntentsEnum[IntentsEnum["DIRECT_MESSAGES"] = 4096] = "DIRECT_MESSAGES";
+    IntentsEnum[IntentsEnum["DIRECT_MESSAGE_REACTIONS"] = 8192] = "DIRECT_MESSAGE_REACTIONS";
+    IntentsEnum[IntentsEnum["DIRECT_MESSAGE_TYPING"] = 16384] = "DIRECT_MESSAGE_TYPING";
+    IntentsEnum[IntentsEnum["MESSAGE_CONTENT"] = 32768] = "MESSAGE_CONTENT";
+    IntentsEnum[IntentsEnum["GUILD_SCHEDULED_EVENTS"] = 65536] = "GUILD_SCHEDULED_EVENTS";
+    IntentsEnum[IntentsEnum["AUTO_MODERATION_CONFIGURATION"] = 1048576] = "AUTO_MODERATION_CONFIGURATION";
+    IntentsEnum[IntentsEnum["AUTO_MODERATION_EXECUTION"] = 2097152] = "AUTO_MODERATION_EXECUTION";
+})(IntentsEnum = IntentsEnum || (IntentsEnum = {}));
+// 65025

package/lib/discord/sdk/wss.js

@@ -0,0 +1,117 @@
+import WebSocket from 'ws';
+import { gateway } from './api.js';
+import { getDISCORD } from './config.js';
+/**
+ * 创建ws监听
+ */
+export async function createClient(conversation) {
+    const data = await gateway();
+    const websocketUrl = data.url;
+    const wsConn = new WebSocket(`${websocketUrl}?v=10&encoding=json`);
+    let heartbeat_interval = 0;
+    let session_id = '';
+    let resume_gateway_url = '';
+    wsConn.on('open', async () => {
+        // 打开成功
+    });
+    const call = async () => {
+        wsConn.send(JSON.stringify({
+            op: 1,
+            d: null // 如果是第一次连接，传null
+        }));
+        setTimeout(call, heartbeat_interval);
+    };
+    const { token, intent } = getDISCORD();
+    const map = {
+        0: ({ d, t }) => {
+            conversation(t, d);
+            if (t == 'READY') {
+                session_id = d?.session_id;
+                if (d?.resume_gateway_url) {
+                    resume_gateway_url = d?.resume_gateway_url;
+                }
+            }
+        },
+        7: () => {
+            console.info('重新请求');
+            wsConn.send(JSON.stringify({
+                op: 6,
+                d: {
+                    token: token,
+                    session_id: session_id,
+                    seq: 1337
+                }
+            }));
+        },
+        9: () => {
+            //  6 或 2 失败
+            console.info('无效会话');
+        },
+        /**
+         * 打招呼
+         * @param param0
+         */
+        10: ({ d }) => {
+            const { heartbeat_interval: ih } = d;
+            heartbeat_interval = ih;
+            wsConn.send(JSON.stringify({
+                op: 1,
+                d: null
+            }));
+            setTimeout(call, heartbeat_interval);
+            const data = {
+                op: 2,
+                d: {
+                    shard: [0, 1],
+                    token: `Bot ${token}`,
+                    intents: intent,
+                    properties: {
+                        os: process.platform,
+                        browser: 'alemonjs',
+                        device: 'alemonjs'
+                    }
+                }
+            };
+            if (process.argv.includes('dev')) {
+                console.info('data', data);
+            }
+            // 在初次握手期间启动新会话
+            wsConn.send(JSON.stringify(data));
+        },
+        11: ({ d }) => {
+            console.info('心跳确认');
+        }
+    };
+    wsConn.on('message', data => {
+        const jsonData = data.toString();
+        const parsedData = JSON.parse(jsonData);
+        if (process.argv.includes('dev')) {
+            console.info('parsedData', parsedData);
+        }
+        const { op } = parsedData;
+        if (Object.prototype.hasOwnProperty.call(map, op)) {
+            map[op](parsedData);
+        }
+    });
+    // 关闭
+    wsConn.on('close', () => {
+        console.error('ws close');
+    });
+    // 出错
+    wsConn.on('error', error => {
+        console.error('ws error:', error);
+    });
+}
+/**
+0	派遣	收到	已发送事件。
+1	心跳	发送/接收	由客户端定期触发以保持连接处于活动状态。
+2	确认	发送	在初次握手期间启动新会话。
+3	状态更新	发送	更新客户的状态。
+4	语音状态更新	发送	用于加入/离开或在语音通道之间移动。
+6	恢复	发送	恢复先前断开的会话。
+7	重新连接	收到	您应该尝试立即重新连接并恢复。
+8	请求公会成员	发送	请求有关大型公会中的离线公会成员的信息。
+9	无效会话	收到	会话已失效。您应该重新连接并相应地识别/恢复。
+10	你好	收到	连接后立即发送，包含heartbeat_interval要使用的。
+11	心跳确认	收到	发送以响应收到心跳以确认已收到。
+ */

package/lib/kook/alemon/conversation.js

@@ -60,47 +60,63 @@ const ConversationMap = {
      */
     [255]: {
         public: async (event) => {
-            // overheadData | memberData | ChannelData |  | EditingData
-            console.log(event.extra.body);
+            // overheadData | memberData
+            console.info(event.extra.body);
             if (event.extra.type == 'added_reaction' ||
                 event.extra.type == 'deleted_reaction') {
                 //StatementData
                 return await GUILD_MESSAGE_REACTIONS(event);
             }
             else if (event.extra.type == 'joined_channel') {
-                console.log('joined_channel');
+                //
+                console.info('joined_channel');
                 return;
             }
-            else if (event.extra.type == 'updated_channel') {
-                // ChannelData
-                console.log('updated_channel');
+            else if (event.extra.type == 'exited_channel') {
+                //
+                console.info('exited_channel');
                 return;
             }
-            else if (event.extra.type == 'exited_channel') {
-                console.log('exited_channel');
+            else if (event.extra.type == 'updated_channel') {
+                // ChannelData
+                console.info('updated_channel');
                 return;
+                /**
+                 * ***********
+                 * 频道进出
+                 * *******
+                 */
             }
             else if (event.extra.type == 'joined_guild') {
-                console.log('joined_guild');
+                console.info('joined_guild');
                 return;
             }
             else if (event.extra.type == 'exited_guild') {
-                console.log('exited_guild');
+                console.info('exited_guild');
                 return;
+                /**
+                 * **********
+                 * 消息变动
+                 * ********
+                 */
             }
             else if (event.extra.type == 'updated_message') {
                 // 消息更新
-                console.log('updated_message');
+                // EditingData
+                console.info('updated_message');
                 return;
             }
             else if (event.extra.type == 'pinned_message') {
                 // 顶置消息
-                console.log('pinned_message');
+                // overheadData
+                console.info('pinned_message');
                 return;
             }
-            else if (event.extra.type == 'guild_member_online') {
-                // 成员上线
-                console.log('exited_guild');
+        },
+        direct: async (event) => {
+            if (event.extra.type == 'guild_member_online') {
+                //OnLineData
+                console.info('exited_guild');
                 return;
             }
         }

package/lib/kook/index.js

@@ -18,7 +18,7 @@ export async function createAlemonByKOOK() {
         /**
          * 读取配置
          */
-        const cfg = await getBotConfigByKey('kook');
+        const cfg = getBotConfigByKey('kook');
         /**
          * 创建连接
          */

package/lib/one/sdk/wss.js

@@ -25,7 +25,7 @@ export function createWsHandler(options, fun) {
             }
             else {
                 if (event?.status != 'ok') {
-                    console.log('[ONE]', event);
+                    console.info('[ONE]', event);
                 }
             }
         }

package/lib/utils.js

@@ -37,6 +37,10 @@ export function buttonAutomaticArrangement(arr = []) {
             slist = [];
         }
     }
+    if (slist.length == 3) {
+        small_component_group_list.push(slist);
+        slist = [];
+    }
     // 如果   slist是 1 slist是  2 就留到下一批
     for (const item of slist) {
         mid.push(item);
@@ -51,8 +55,15 @@ export function buttonAutomaticArrangement(arr = []) {
             mlist = [];
         }
     }
+    if (mlist.length == 2) {
+        mid_component_group_list.push(mlist);
+        mlist = [];
+    }
     for (const item of mlist) {
-        big_component_group_list.push(item);
+        big_component_group_list.push([item]);
+    }
+    for (const item of big) {
+        big_component_group_list.push([item]);
     }
     return {
         big_component_group_list: big_component_group_list,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "DOCS https://alemonjs.com/",
   "author": "ningmengchongshui",
   "license": "GPL-2.0",

package/types/api.d.ts

@@ -24,6 +24,10 @@ export { ClientKOOK } from './kook/index.js';
  * one客户端
  */
 export { ClientONE } from './one/index.js';
+/**
+ * discord
+ */
+export { ClientDISOCRD } from './discord/index.js';
 import { type MessageControllerType, type MemberControllerType, type ControllerOption } from './core/index.js';
 declare const PlatformEnum: readonly ["villa", "qq", "kook", "ntqq", "one"];
 /**

package/types/config/types.d.ts

@@ -1,11 +1,12 @@
-import { PuppeteerLaunchOptions } from 'puppeteer';
-import { MysqlOptions, RedisOptions } from '../default/types.js';
-import { ServerOptions } from '../koa/types.js';
-import { KOOKOptions } from '../kook/kook.js';
-import { VILLAOptions } from '../villa/villa.js';
-import { QQOptions } from '../qq/qq.js';
-import { NTQQOptions } from '../ntqq/ntqq.js';
-import { OneOptions } from '../one/one.js';
+import { type PuppeteerLaunchOptions } from 'puppeteer';
+import { type MysqlOptions, type RedisOptions } from '../default/types.js';
+import { type ServerOptions } from '../koa/types.js';
+import { type KOOKOptions } from '../kook/kook.js';
+import { type VILLAOptions } from '../villa/villa.js';
+import { type QQOptions } from '../qq/qq.js';
+import { type NTQQOptions } from '../ntqq/ntqq.js';
+import { type OneOptions } from '../one/one.js';
+import { type DISOCRDOptions } from '../discord/discord.js';
 /**
  * ******
  * config
@@ -21,4 +22,5 @@ export interface ConfigType {
     puppeteer: PuppeteerLaunchOptions;
     ntqq: NTQQOptions;
     one: OneOptions;
+    discord: DISOCRDOptions;
 }

package/types/default/types.d.ts

@@ -3,6 +3,7 @@ import { KOOKOptions } from '../kook/kook.js';
 import { QQOptions } from '../qq/qq.js';
 import { NTQQOptions } from '../ntqq/ntqq.js';
 import { OneOptions } from '../one/one.js';
+import { DISOCRDOptions } from '../discord/discord.js';
 /**
  * *****
  * login
@@ -29,6 +30,10 @@ export interface LoginOptions {
      * qq配置
      */
     one?: OneOptions;
+    /**
+     * discord配置
+     */
+    discord?: DISOCRDOptions;
 }
 /**
  * ****

package/types/define/map.d.ts

@@ -9,4 +9,5 @@ export declare const rebotMap: {
     kook: () => Promise<boolean>;
     ntqq: () => Promise<boolean>;
     one: () => Promise<boolean>;
+    discord: () => Promise<boolean>;
 };

package/types/discord/alemon/conversation.d.ts

@@ -0,0 +1 @@
+export declare function conversation(t: string, d: any): void;

package/types/discord/alemon/message/MESSAGES.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 基础消息
+ * @param event
+ */
+export declare function MESSAGES(event: any): void;

package/types/discord/discord.d.ts

@@ -0,0 +1,28 @@
+import { IntentsEnum } from './sdk/index.js';
+/**
+ * ****
+ * discord
+ * ***
+ */
+export interface DISOCRDOptions {
+    /**
+     * 钥匙
+     */
+    token: string;
+    /**
+     *
+     */
+    intent?: IntentsEnum[];
+    /**
+     * 主人编号
+     */
+    masterID?: string;
+    /**
+     * 主人密码
+     */
+    password?: string;
+}
+/**
+ *
+ */
+export declare const defineDISCORD: DISOCRDOptions;

package/types/discord/index.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 创建实例
+ * @returns
+ */
+export declare function createAlemonByDISCORD(): Promise<boolean>;
+export { ClientDISOCRD } from './sdk/index.js';

package/types/discord/login.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 登录配置
+ * @param Bcf
+ * @param val
+ * @returns
+ */
+export declare function checkRobotByDISCORD(): Promise<boolean>;

package/types/discord/sdk/api.d.ts

@@ -0,0 +1,10 @@
+import { type AxiosRequestConfig } from 'axios';
+/**
+ * KOOK服务
+ * @param config
+ * @returns
+ */
+export declare function Service(config: AxiosRequestConfig): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function gateway(): Promise<{
+    url: string;
+}>;

package/types/discord/sdk/config.d.ts

@@ -0,0 +1,13 @@
+/**
+ *
+ * @param val
+ */
+export declare function setDISOCRD(val: string, i: number): void;
+/**
+ *
+ * @returns
+ */
+export declare function getDISCORD(): {
+    token: string;
+    intent: number;
+};

package/types/discord/sdk/index.d.ts

@@ -0,0 +1,5 @@
+export * from './types.js';
+export * as ClientDISOCRD from './api.js';
+export * from './wss.js';
+export * from './intents.js';
+export * from './config.js';

package/types/discord/sdk/intents.d.ts

@@ -0,0 +1,2 @@
+import { type IntentsEnum } from './types.js';
+export declare function getIntents(intents: IntentsEnum[]): number;

package/types/discord/sdk/types.d.ts

@@ -0,0 +1,21 @@
+export declare enum IntentsEnum {
+    GUILDS = 1,
+    GUILD_MEMBERS = 2,
+    GUILD_MODERATION = 4,
+    GUILD_EMOJIS_AND_STICKERS = 8,
+    GUILD_INTEGRATIONS = 16,
+    GUILD_WEBHOOKS = 32,
+    GUILD_INVITES = 64,
+    GUILD_VOICE_STATES = 128,
+    GUILD_PRESENCES = 256,
+    GUILD_MESSAGES = 512,
+    GUILD_MESSAGE_REACTIONS = 1024,
+    GUILD_MESSAGE_TYPING = 2048,
+    DIRECT_MESSAGES = 4096,
+    DIRECT_MESSAGE_REACTIONS = 8192,
+    DIRECT_MESSAGE_TYPING = 16384,
+    MESSAGE_CONTENT = 32768,
+    GUILD_SCHEDULED_EVENTS = 65536,
+    AUTO_MODERATION_CONFIGURATION = 1048576,
+    AUTO_MODERATION_EXECUTION = 2097152
+}

package/types/discord/sdk/wss.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 创建ws监听
+ */
+export declare function createClient(conversation: (...args: any[]) => any): Promise<void>;
+/**
+0	派遣	收到	已发送事件。
+1	心跳	发送/接收	由客户端定期触发以保持连接处于活动状态。
+2	确认	发送	在初次握手期间启动新会话。
+3	状态更新	发送	更新客户的状态。
+4	语音状态更新	发送	用于加入/离开或在语音通道之间移动。
+6	恢复	发送	恢复先前断开的会话。
+7	重新连接	收到	您应该尝试立即重新连接并恢复。
+8	请求公会成员	发送	请求有关大型公会中的离线公会成员的信息。
+9	无效会话	收到	会话已失效。您应该重新连接并相应地识别/恢复。
+10	你好	收到	连接后立即发送，包含heartbeat_interval要使用的。
+11	心跳确认	收到	发送以响应收到心跳以确认已收到。
+ */

package/types/kook/sdk/typings.d.ts

@@ -300,13 +300,18 @@ export interface SystemData {
     content: string;
     extra: {
         type: (typeof SystemDataEnum)[number];
-        body: overheadData | memberData | ChannelData | StatementData | EditingData;
+        body: overheadData | memberData | ChannelData | StatementData | EditingData | OnLineData;
     };
     msg_id: string;
     msg_timestamp: number;
     nonce: string;
     from_type: number;
 }
+export interface OnLineData {
+    user_id: string;
+    event_time: number;
+    guilds: any[];
+}
 export interface overheadData {
     channel_id: string;
     operator_id: string;