@alemonjs/telegram 0.1.1 → 0.2.0

package/README.md

@@ -19,7 +19,7 @@ telegram:
   # 代理地址 (推荐填)
   proxy: 'http://127.0.0.1:7890'
   # 主人编号
-  master_id: null
+  master_key: null
   # other
   base_api_url: null
   request_url: null

package/lib/index.d.ts

@@ -1,7 +1,8 @@
+import * as alemonjs from 'alemonjs';
 import TelegramClient from 'node-telegram-bot-api';
 
 type Client = typeof TelegramClient.prototype;
 declare const client: Client;
-declare const _default: () => typeof global.alemonjs;
+declare const _default: () => alemonjs.ClientAPI;
 
 export { type Client, client, _default as default };

package/lib/index.js

@@ -1,13 +1,13 @@
-import { defineBot, getConfig, createHash, Text, OnProcessor, useParse } from 'alemonjs';
+import { defineBot, getConfigValue, useUserHashKey, OnProcessor } from 'alemonjs';
 import TelegramClient from 'node-telegram-bot-api';
 
 const client = global.client;
 var index = defineBot(() => {
-    //
-    const cfg = getConfig();
-    const config = cfg.value?.['telegram'];
+    const value = getConfigValue();
+    const config = value?.telegram;
     if (!config)
         return;
+    const Platform = 'telegram';
     //
     const client = new TelegramClient(config.token, {
         polling: true,
@@ -17,6 +17,11 @@ var index = defineBot(() => {
             proxy: config?.proxy ?? ''
         }
     });
+    /**
+     *
+     * @param UserId
+     * @returns
+     */
     const getUserProfilePhotosUrl = (UserId) => {
         return new Promise((resolve, reject) => {
             if (!UserId) {
@@ -45,31 +50,43 @@ var index = defineBot(() => {
                 .catch(reject);
         });
     };
-    //
     client.on('text', async (event) => {
-        let UserAvatar = undefined;
-        const UserKey = createHash(`telegram:${event?.from?.id}`);
-        try {
-            if (event?.chat.type == 'supergroup' || event?.chat.type == 'private') {
-                const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
-                if (typeof photo == 'string') {
-                    UserAvatar = {
-                        toBuffer: async () => {
-                            const arrayBuffer = await fetch(photo).then(res => res.arrayBuffer());
-                            return Buffer.from(arrayBuffer);
-                        },
-                        toURL: Promise.resolve(photo),
-                        toBase64: async () => {
-                            const arrayBuffer = await fetch(photo).then(res => res.arrayBuffer());
-                            return Buffer.from(arrayBuffer).toString('base64');
-                        }
-                    };
+        const UserId = String(event?.from?.id);
+        const UserKey = useUserHashKey({
+            Platform: Platform,
+            UserId: UserId
+        });
+        const UserAvatar = {
+            toBuffer: async () => {
+                if (event?.chat.type == 'supergroup' || event?.chat.type == 'private') {
+                    const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
+                    if (typeof photo == 'string') {
+                        const arrayBuffer = await fetch(photo).then(res => res.arrayBuffer());
+                        return Buffer.from(arrayBuffer);
+                    }
+                }
+                return;
+            },
+            toURL: async () => {
+                if (event?.chat.type == 'supergroup' || event?.chat.type == 'private') {
+                    const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
+                    if (typeof photo == 'string') {
+                        return photo;
+                    }
                 }
+                return;
+            },
+            toBase64: async () => {
+                if (event?.chat.type == 'supergroup' || event?.chat.type == 'private') {
+                    const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
+                    if (typeof photo == 'string') {
+                        const arrayBuffer = await fetch(photo).then(res => res.arrayBuffer());
+                        return Buffer.from(arrayBuffer).toString('base64');
+                    }
+                }
+                return;
             }
-        }
-        catch (e) {
-            console.error(e);
-        }
+        };
         if (event?.chat.type == 'channel' || event?.chat.type == 'supergroup') {
             // 机器人消息不处理
             if (event?.from?.is_bot)
@@ -77,20 +94,19 @@ var index = defineBot(() => {
             // 定义消
             const e = {
                 // 事件类型
-                Platform: 'telegram',
+                Platform: Platform,
                 // 频道
                 GuildId: String(event?.chat.id),
-                GuildName: event?.chat.title,
                 ChannelId: String(event?.chat.id),
                 // user
-                UserId: String(event?.from?.id),
+                UserId: UserId,
                 UserKey: UserKey,
                 UserName: event?.chat.username,
                 UserAvatar: UserAvatar,
                 IsMaster: false,
+                IsBot: false,
                 // message
                 MessageId: String(event?.message_id),
-                MessageBody: [Text(event?.text)],
                 OpenId: String(event?.chat?.id),
                 CreateAt: Date.now(),
                 // other
@@ -111,16 +127,16 @@ var index = defineBot(() => {
             // 定义消
             const e = {
                 // 事件类型
-                Platform: 'telegram',
+                Platform: Platform,
                 // 用户Id
                 UserId: String(event?.from.id),
                 UserKey: UserKey,
                 UserName: event?.from?.username,
                 UserAvatar: UserAvatar,
                 IsMaster: false,
+                IsBot: false,
                 // message
                 MessageId: String(event?.message_id),
-                MessageBody: [Text(event?.text)],
                 MessageText: event?.text,
                 OpenId: String(event?.chat?.id),
                 CreateAt: Date.now(),
@@ -142,50 +158,58 @@ var index = defineBot(() => {
         // 机器人消息不处理
         if (event?.from.is_bot)
             return;
-        let UserAvatar = undefined;
-        try {
-            const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
-            if (typeof photo == 'string') {
-                UserAvatar = {
-                    toBuffer: async () => {
-                        const arrayBuffer = await fetch(photo).then(res => res.arrayBuffer());
-                        return Buffer.from(arrayBuffer);
-                    },
-                    toURL: Promise.resolve(photo),
-                    toBase64: async () => {
-                        const arrayBuffer = await fetch(photo).then(res => res.arrayBuffer());
-                        return Buffer.from(arrayBuffer).toString('base64');
-                    }
-                };
+        const UserId = String(event?.from?.id);
+        const UserKey = useUserHashKey({
+            Platform: Platform,
+            UserId: UserId
+        });
+        const UserAvatar = {
+            toBuffer: async () => {
+                const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
+                if (typeof photo == 'string') {
+                    const arrayBuffer = await fetch(photo).then(res => res.arrayBuffer());
+                    return Buffer.from(arrayBuffer);
+                }
+                return;
+            },
+            toURL: async () => {
+                const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
+                if (typeof photo == 'string') {
+                    return photo;
+                }
+                return;
+            },
+            toBase64: async () => {
+                const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
+                if (typeof photo == 'string') {
+                    const arrayBuffer = await fetch(photo).then(res => res.arrayBuffer());
+                    return Buffer.from(arrayBuffer).toString('base64');
+                }
+                return;
             }
-        }
-        catch (e) {
-            console.error(e);
-        }
-        const UserKey = createHash(`telegram:${event?.from?.id}`);
+        };
         // 定义消
         const e = {
             // 事件类型
-            Platform: 'telegram',
+            Platform: Platform,
             // guild
             GuildId: String(event?.chat.id),
-            GuildName: event?.chat.title,
             ChannelId: String(event?.chat.id),
-            // 用户Id
-            UserId: String(event?.from?.id),
+            // GuildName: event?.chat.title,
+            // user
+            UserId: UserId,
             UserKey: UserKey,
             UserName: event?.chat.username,
             UserAvatar: UserAvatar,
             IsMaster: false,
+            IsBot: false,
             // message
             MessageId: String(event?.message_id),
-            MessageBody: [Text(event?.text)],
             MessageText: event?.text,
             OpenId: String(event?.chat?.id),
             CreateAt: Date.now(),
-            //
+            // othder
             tag: 'txt',
-            //
             value: null
         };
         // 当访问的时候获取
@@ -197,73 +221,6 @@ var index = defineBot(() => {
         //
         OnProcessor(e, 'member.add');
     });
-    // const eventKeys = [
-    //   'message',
-    //   'text',
-    //   'animation',
-    //   'audio',
-    //   'channel_chat_created',
-    //   'contact',
-    //   'delete_chat_photo',
-    //   'document',
-    //   'game',
-    //   'group_chat_created',
-    //   'invoice',
-    //   'left_chat_member',
-    //   'location',
-    //   'migrate_from_chat_id',
-    //   'migrate_to_chat_id',
-    //   'new_chat_members',
-    //   'new_chat_photo',
-    //   'new_chat_title',
-    //   'passport_data',
-    //   'photo',
-    //   'pinned_message',
-    //   'sticker',
-    //   'successful_payment',
-    //   'supergroup_chat_created',
-    //   'video',
-    //   'video_note',
-    //   'voice',
-    //   'video_chat_started',
-    //   'video_chat_ended',
-    //   'video_chat_participants_invited',
-    //   'video_chat_scheduled',
-    //   'message_auto_delete_timer_changed',
-    //   'chat_invite_link',
-    //   'chat_member_updated',
-    //   'web_app_data',
-    //   'callback_query',
-    //   'inline_query',
-    //   'poll',
-    //   'poll_answer',
-    //   'chat_member',
-    //   'my_chat_member',
-    //   'chosen_inline_result',
-    //   // hannel
-    //   'channel_post',
-    //   // edited
-    //   'edited_message',
-    //   'edited_message_text',
-    //   'edited_message_caption',
-    //   // 频道消息修改
-    //   'edited_channel_post',
-    //   // 频道消息修改
-    //   'edited_channel_post_text',
-    //   // 频道消息修改
-    //   'edited_channel_post_caption',
-    //   'shipping_query',
-    //   'pre_checkout_query',
-    //   'polling_error',
-    //   'webhook_error',
-    //   'chat_join_request'
-    // ]
-    // // 打印全部的消息
-    // for (const key of eventKeys) {
-    //   client.on(key, event => {
-    //     console.log(key, event)
-    //   })
-    // }
     global.client = client;
     return {
         api: {
@@ -271,22 +228,23 @@ var index = defineBot(() => {
                 send: (event, val) => {
                     if (val.length < 0)
                         return Promise.all([]);
-                    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('');
                     const e = event?.value;
                     if (content) {
                         return Promise.all([content].map(item => client.sendMessage(e.chat.id, item)));
                     }
-                    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.sendPhoto(e.chat.id, item)));
                     }
                     return Promise.all([]);
+                },
+                mention: async () => {
+                    // const event: TelegramClient.Message = e.value
+                    return [];
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/telegram",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "telegram-bot",
   "author": "lemonade",
   "license": "MIT",