@alemonjs/qq-bot 0.0.8 → 0.0.10

package/lib/send/index.js

@@ -1,101 +1,111 @@
 const GROUP_AT_MESSAGE_CREATE = (client, event, val) => {
-    const content = val
-        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
-        .map(item => {
-        if (item.type == 'Link') {
-            return `[${item.options?.title ?? item.value}](${item.value})`;
+  const content = val
+    .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+    .map(item => {
+      if (item.type == 'Link') {
+        return `[${item.options?.title ?? item.value}](${item.value})`
+      } else if (item.type == 'Mention') {
+        if (
+          item.value == 'everyone' ||
+          item.value == 'all' ||
+          item.value == '' ||
+          typeof item.value != 'string'
+        ) {
+          return ``
         }
-        else if (item.type == 'Mention') {
-            if (item.value == 'everyone' ||
-                item.value == 'all' ||
-                item.value == '' ||
-                typeof item.value != 'string') {
-                return ``;
-            }
-            if (item.options?.belong == 'user') {
-                return `<@${item.value}>`;
-            }
-            return '';
-        }
-        else if (item.type == 'Text') {
-            return item.value;
+        if (item.options?.belong == 'user') {
+          return `<@${item.value}>`
         }
+        return ''
+      } else if (item.type == 'Text') {
+        return item.value
+      }
     })
-        .join('');
-    if (content) {
-        return Promise.all([content].map(item => client.groupOpenMessages(event.GuildId, {
-            content: item,
-            msg_id: event.MessageId,
-            msg_type: 0,
-            msg_seq: client.getMessageSeq(event.MessageId)
-        })));
-    }
-    const images = val.filter(item => item.type == 'Image').map(item => item.value);
-    if (images) {
-        return Promise.all(images.map(async (msg) => {
-            const file_info = await client
-                .postRichMediaByGroup(event.GuildId, {
-                file_type: 1,
-                file_data: msg.toString('base64')
-            })
-                .then(res => res?.file_info);
-            if (!file_info)
-                return Promise.resolve(null);
-            return client.groupOpenMessages(event.GuildId, {
-                content: '',
-                media: {
-                    file_info
-                },
-                msg_id: event.MessageId,
-                msg_type: 7,
-                msg_seq: client.getMessageSeq(event.MessageId)
-            });
-        }));
-    }
-    return [];
-};
+    .join('')
+  if (content) {
+    return Promise.all(
+      [content].map(item =>
+        client.groupOpenMessages(event.GuildId, {
+          content: item,
+          msg_id: event.MessageId,
+          msg_type: 0,
+          msg_seq: client.getMessageSeq(event.MessageId)
+        })
+      )
+    )
+  }
+  const images = val.filter(item => item.type == 'Image').map(item => item.value)
+  if (images) {
+    return Promise.all(
+      images.map(async msg => {
+        const file_info = await client
+          .postRichMediaByGroup(event.GuildId, {
+            file_type: 1,
+            file_data: msg.toString('base64')
+          })
+          .then(res => res?.file_info)
+        if (!file_info) return Promise.resolve(null)
+        return client.groupOpenMessages(event.GuildId, {
+          content: '',
+          media: {
+            file_info
+          },
+          msg_id: event.MessageId,
+          msg_type: 7,
+          msg_seq: client.getMessageSeq(event.MessageId)
+        })
+      })
+    )
+  }
+  return []
+}
 const C2C_MESSAGE_CREATE = (client, event, val) => {
-    const content = val
-        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
-        .map(item => {
-        if (item.type == 'Text') {
-            return item.value;
-        }
-        return '';
+  const content = val
+    .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+    .map(item => {
+      if (item.type == 'Text') {
+        return item.value
+      }
+      return ''
     })
-        .join('');
-    if (content) {
-        return Promise.all([content].map(item => client.usersOpenMessages(event.OpenId, {
-            content: item,
-            msg_id: event.MessageId,
-            msg_type: 0,
-            msg_seq: client.getMessageSeq(event.MessageId)
-        })));
-    }
-    const images = val.filter(item => item.type == 'Image').map(item => item.value);
-    if (images) {
-        return Promise.all(images.map(async (msg) => {
-            const file_info = await client
-                .postRichMediaByUsers(event.OpenId, {
-                file_type: 1,
-                file_data: msg.toString('base64')
-            })
-                .then(res => res?.file_info);
-            if (!file_info)
-                return Promise.resolve(null);
-            return client.usersOpenMessages(event.OpenId, {
-                content: '',
-                media: {
-                    file_info
-                },
-                msg_id: event.MessageId,
-                msg_type: 7,
-                msg_seq: client.getMessageSeq(event.MessageId)
-            });
-        }));
-    }
-    return [];
-};
+    .join('')
+  if (content) {
+    return Promise.all(
+      [content].map(item =>
+        client.usersOpenMessages(event.OpenId, {
+          content: item,
+          msg_id: event.MessageId,
+          msg_type: 0,
+          msg_seq: client.getMessageSeq(event.MessageId)
+        })
+      )
+    )
+  }
+  const images = val.filter(item => item.type == 'Image').map(item => item.value)
+  if (images) {
+    return Promise.all(
+      images.map(async msg => {
+        const file_info = await client
+          .postRichMediaByUsers(event.OpenId, {
+            file_type: 1,
+            file_data: msg.toString('base64')
+          })
+          .then(res => res?.file_info)
+        if (!file_info) return Promise.resolve(null)
+        return client.usersOpenMessages(event.OpenId, {
+          content: '',
+          media: {
+            file_info
+          },
+          msg_id: event.MessageId,
+          msg_type: 7,
+          msg_seq: client.getMessageSeq(event.MessageId)
+        })
+      })
+    )
+  }
+  return []
+}
 /**
  * 频道私聊
  * @param client
@@ -104,72 +114,87 @@ const C2C_MESSAGE_CREATE = (client, event, val) => {
  * @returns
  */
 const DIRECT_MESSAGE_CREATE = (client, event, val) => {
-    const content = val
-        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
-        .map(item => {
-        if (item.type == 'Text') {
-            return item.value;
-        }
-        return '';
+  const content = val
+    .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+    .map(item => {
+      if (item.type == 'Text') {
+        return item.value
+      }
+      return ''
     })
-        .join('');
-    if (content) {
-        return Promise.all([content].map(item => client.dmsMessage(event.OpenId, {
-            content: item,
-            msg_id: event.MessageId
-        })));
-    }
-    const images = val.filter(item => item.type == 'Image').map(item => item.value);
-    if (images) {
-        return Promise.all(images.map(item => client.postDirectImage(event.OpenId, {
-            msg_id: event.MessageId,
-            image: item
-        })));
-    }
-    return [];
-};
+    .join('')
+  if (content) {
+    return Promise.all(
+      [content].map(item =>
+        client.dmsMessage(event.OpenId, {
+          content: item,
+          msg_id: event.MessageId
+        })
+      )
+    )
+  }
+  const images = val.filter(item => item.type == 'Image').map(item => item.value)
+  if (images) {
+    return Promise.all(
+      images.map(item =>
+        client.postDirectImage(event.OpenId, {
+          msg_id: event.MessageId,
+          image: item
+        })
+      )
+    )
+  }
+  return []
+}
 const AT_MESSAGE_CREATE = (client, event, val) => {
-    const content = val
-        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
-        .map(item => {
-        if (item.type == 'Link') {
-            return `[${item.options?.title ?? item.value}](${item.value})`;
+  const content = val
+    .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+    .map(item => {
+      if (item.type == 'Link') {
+        return `[${item.options?.title ?? item.value}](${item.value})`
+      } else if (item.type == 'Mention') {
+        if (
+          item.value == 'everyone' ||
+          item.value == 'all' ||
+          item.value == '' ||
+          typeof item.value != 'string'
+        ) {
+          return `@everyone`
         }
-        else if (item.type == 'Mention') {
-            if (item.value == 'everyone' ||
-                item.value == 'all' ||
-                item.value == '' ||
-                typeof item.value != 'string') {
-                return `@everyone`;
-            }
-            if (item.options?.belong == 'user') {
-                return `<@!${item.value}>`;
-            }
-            else if (item.options?.belong == 'channel') {
-                return `<#${item.value}>`;
-            }
-            return '';
-        }
-        else if (item.type == 'Text') {
-            return item.value;
+        if (item.options?.belong == 'user') {
+          return `<@!${item.value}>`
+        } else if (item.options?.belong == 'channel') {
+          return `<#${item.value}>`
         }
+        return ''
+      } else if (item.type == 'Text') {
+        return item.value
+      }
     })
-        .join('');
-    if (content) {
-        return Promise.all([content].map(item => client.channelsMessagesPost(event.ChannelId, {
-            content: item,
-            msg_id: event.MessageId
-        })));
-    }
-    const images = val.filter(item => item.type == 'Image').map(item => item.value);
-    if (images) {
-        return Promise.all(images.map(item => client.postImage(event.ChannelId, {
-            msg_id: event.MessageId,
-            image: item
-        })));
-    }
-    return [];
-};
+    .join('')
+  if (content) {
+    return Promise.all(
+      [content].map(item =>
+        client.channelsMessagesPost(event.ChannelId, {
+          content: item,
+          msg_id: event.MessageId
+        })
+      )
+    )
+  }
+  const images = val.filter(item => item.type == 'Image').map(item => item.value)
+  if (images) {
+    return Promise.all(
+      images.map(item =>
+        client.postImage(event.ChannelId, {
+          msg_id: event.MessageId,
+          image: item
+        })
+      )
+    )
+  }
+  return []
+}
 /**
  *
  * @param event
@@ -177,46 +202,59 @@ const AT_MESSAGE_CREATE = (client, event, val) => {
  * @returns
  */
 const MESSAGE_CREATE = (client, event, val) => {
-    const content = val
-        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
-        .map(item => {
-        if (item.type == 'Link') {
-            return `[${item.options?.title ?? item.value}](${item.value})`;
-        }
-        else if (item.type == 'Mention') {
-            if (item.value == 'everyone' ||
-                item.value == 'all' ||
-                item.value == '' ||
-                typeof item.value != 'string') {
-                return `@everyone`;
-            }
-            if (item.options?.belong == 'user') {
-                return `<@!${item.value}>`;
-            }
-            else if (item.options?.belong == 'channel') {
-                return `<#${item.value}>`;
-            }
-            return '';
+  const content = val
+    .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+    .map(item => {
+      if (item.type == 'Link') {
+        return `[${item.options?.title ?? item.value}](${item.value})`
+      } else if (item.type == 'Mention') {
+        if (
+          item.value == 'everyone' ||
+          item.value == 'all' ||
+          item.value == '' ||
+          typeof item.value != 'string'
+        ) {
+          return `@everyone`
         }
-        else if (item.type == 'Text') {
-            return item.value;
+        if (item.options?.belong == 'user') {
+          return `<@!${item.value}>`
+        } else if (item.options?.belong == 'channel') {
+          return `<#${item.value}>`
         }
+        return ''
+      } else if (item.type == 'Text') {
+        return item.value
+      }
     })
-        .join('');
-    if (content) {
-        return Promise.all([content].map(item => client.channelsMessagesPost(event.ChannelId, {
-            content: item,
-            msg_id: event.MessageId
-        })));
-    }
-    const images = val.filter(item => item.type == 'Image').map(item => item.value);
-    if (images) {
-        return Promise.all(images.map(item => client.postImage(event.ChannelId, {
-            msg_id: event.MessageId,
-            image: item
-        })));
-    }
-    return [];
-};
+    .join('')
+  if (content) {
+    return Promise.all(
+      [content].map(item =>
+        client.channelsMessagesPost(event.ChannelId, {
+          content: item,
+          msg_id: event.MessageId
+        })
+      )
+    )
+  }
+  const images = val.filter(item => item.type == 'Image').map(item => item.value)
+  if (images) {
+    return Promise.all(
+      images.map(item =>
+        client.postImage(event.ChannelId, {
+          msg_id: event.MessageId,
+          image: item
+        })
+      )
+    )
+  }
+  return []
+}
 
-export { AT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, MESSAGE_CREATE };
+export {
+  AT_MESSAGE_CREATE,
+  C2C_MESSAGE_CREATE,
+  DIRECT_MESSAGE_CREATE,
+  GROUP_AT_MESSAGE_CREATE,
+  MESSAGE_CREATE
+}

package/lib/typing.d.ts

@@ -0,0 +1,73 @@
+type MessageType = 0 | 1 | 2 | 3 | 4 | 7
+type FileType = 1 | 2 | 3 | 4
+interface ButtonType {
+  id: string
+  render_data: {
+    label: string
+    visited_label: string
+    style: number
+  }
+  action: {
+    type: number
+    permission: {
+      type: number
+    }
+    reply?: boolean
+    enter?: boolean
+    unsupport_tips: string
+    data: string
+  }
+}
+interface KeyboardType {
+  id?: string
+  content?: {
+    rows: {
+      buttons: ButtonType[]
+    }[]
+  }
+}
+interface MarkdownType {
+  /** markdown 模版id，申请模版后获得 */
+  custom_template_id: string
+  /** 原生 markdown 文本内容（内邀使用） */
+  content?: string
+  /** 模版内变量与填充值的kv映射 */
+  params?: Array<{
+    key: string
+    values: string[]
+  }>
+}
+interface ApiRequestData {
+  content?: string
+  msg_type: MessageType
+  markdown?: MarkdownType
+  keyboard?: KeyboardType
+  media?: {
+    file_info: string
+  }
+  ark?: any
+  image?: any
+  message_reference?: any
+  event_id?: any
+  msg_id?: string
+  msg_seq?: number
+}
+interface Options {
+  secret: string
+  app_id: string
+  token: string
+  sandbox?: boolean
+  route?: string
+  port?: string
+  ws?: string
+}
+
+export type {
+  ApiRequestData,
+  ButtonType,
+  FileType,
+  KeyboardType,
+  MarkdownType,
+  MessageType,
+  Options
+}

package/lib/webhook.js

@@ -1,53 +1,51 @@
-import { ed25519 } from '@noble/curves/ed25519';
+import { ed25519 } from '@noble/curves/ed25519'
 
 class WebhookAPI {
-    config;
-    constructor(config) {
-        this.config = config;
-    }
-    /**
-     *  验证签名
-     * @param ts
-     * @param body
-     * @param sign
-     * @returns
-     */
-    validSign(ts, body, sign) {
-        const { publicKey } = this.getKey();
-        const sig = Buffer.isBuffer(sign) ? sign : Buffer.from(sign, 'hex');
-        const httpBody = Buffer.from(body);
-        const msg = Buffer.from(ts + httpBody);
-        return ed25519.verify(sig, msg, publicKey);
-    }
-    /**
-     *   生成签名
-     * @param eventTs
-     * @param plainToken
-     * @returns
-     */
-    getSign(eventTs, plainToken) {
-        const { privateKey } = this.getKey();
-        const msg = Buffer.from(eventTs + plainToken);
-        const signature = Buffer.from(ed25519.sign(msg, privateKey)).toString('hex');
-        return signature;
-    }
-    /**
-     * 获取 key
-     * @returns
-     */
-    getKey() {
-        let seed = this.config.secret;
-        if (!seed)
-            throw new Error("secret not set, can't calc ed25519 key");
-        while (seed.length < 32)
-            seed = seed.repeat(2); // Ed25519 的种子大小是 32 字节
-        seed = seed.slice(0, 32); // 修剪到 32 字节
-        const privateKey = Buffer.from(seed);
-        return {
-            privateKey,
-            publicKey: ed25519.getPublicKey(privateKey)
-        };
+  config
+  constructor(config) {
+    this.config = config
+  }
+  /**
+   *  验证签名
+   * @param ts
+   * @param body
+   * @param sign
+   * @returns
+   */
+  validSign(ts, body, sign) {
+    const { publicKey } = this.getKey()
+    const sig = Buffer.isBuffer(sign) ? sign : Buffer.from(sign, 'hex')
+    const httpBody = Buffer.from(body)
+    const msg = Buffer.from(ts + httpBody)
+    return ed25519.verify(sig, msg, publicKey)
+  }
+  /**
+   *   生成签名
+   * @param eventTs
+   * @param plainToken
+   * @returns
+   */
+  getSign(eventTs, plainToken) {
+    const { privateKey } = this.getKey()
+    const msg = Buffer.from(eventTs + plainToken)
+    const signature = Buffer.from(ed25519.sign(msg, privateKey)).toString('hex')
+    return signature
+  }
+  /**
+   * 获取 key
+   * @returns
+   */
+  getKey() {
+    let seed = this.config.secret
+    if (!seed) throw new Error("secret not set, can't calc ed25519 key")
+    while (seed.length < 32) seed = seed.repeat(2) // Ed25519 的种子大小是 32 字节
+    seed = seed.slice(0, 32) // 修剪到 32 字节
+    const privateKey = Buffer.from(seed)
+    return {
+      privateKey,
+      publicKey: ed25519.getPublicKey(privateKey)
     }
+  }
 }
 
-export { WebhookAPI };
+export { WebhookAPI }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "qq-bot",
   "author": "lemonade",
   "license": "MIT",
@@ -37,7 +37,29 @@
       "import": "./lib/index.js",
       "types": "./lib/index.d.ts"
     },
-    "./package": "./package.json"
+    "./package": "./package.json",
+    "./desktop": "./lib/desktop.js"
+  },
+  "alemonjs": {
+    "desktop": {
+      "platform": [
+        {
+          "name": "qq-bot"
+        }
+      ],
+      "commond": [
+        {
+          "name": "qq-bot",
+          "commond": "open.qq-bot"
+        }
+      ],
+      "sidebars": [
+        {
+          "name": "qq-bot",
+          "commond": "open.qq-bot"
+        }
+      ]
+    }
   },
   "keywords": [
     "alemonjs"