alemonjs 1.0.52 → 1.0.53

package/lib/core/ip.js

@@ -4,11 +4,12 @@ let myIp;
  * 得到本机IP地址
  * @returns
  */
-export async function getIP() {
+export async function getIP(options = {}) {
     if (myIp)
         return myIp;
     return await publicIp({
-        timeout: 10000
+        onlyHttps: true,
+        ...options
     }).then(ip => {
         if (/^(\d{1,3}\.){3}\d{1,3}$/.test(ip))
             myIp = ip;

package/lib/define/main.js

@@ -4,7 +4,7 @@ import { nodeScripts } from './child_process.js';
 import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
 import { ClientNTQQ } from '../ntqq/sdk/index.js';
 import { command } from './command.js';
-import { createApp, setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom } from '../core/index.js';
+import { createApp, setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom, getIP } from '../core/index.js';
 import { getPupPath, setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 import { createWeb } from '../koa/index.js';
 import { autoClearImages } from '../koa/img.js';
@@ -159,8 +159,12 @@ export async function defineAlemonConfig(Options) {
     if (Options?.server?.state != false) {
         // 创建server端
         createWeb(Options?.server);
-        // 定时清除
-        autoClearImages();
+        if (Options?.server?.clear != false) {
+            // 定时清除
+            autoClearImages();
+        }
+        // 缓存ip
+        getIP();
     }
     /**
      * ***********

package/lib/koa/img.js

@@ -56,10 +56,13 @@ export async function setLocalImg(img) {
     const imgSize = getServerConfig('imgSize');
     const port = getServerConfig('port');
     const http = getServerConfig('http');
-    let ip = await getIP();
-    const ipp = getServerConfig('ip');
-    if (ipp != 'localhost')
-        ip = ipp;
+    let ip = getServerConfig('ip');
+    if (ip == 'localhost') {
+        const ipp = await getIP();
+        if (ipp)
+            ip = ipp;
+    }
+    console.log('测试1');
     // 生成文件名
     const filename = `${Math.floor(Math.random() * imgSize)}.${(await fileTypeFromBuffer(img))?.ext}`;
     // 文件路径

package/lib/ntqq/alemon/message/C2C_MESSAGE_CREATE.js

@@ -56,7 +56,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg[isBuffer]);
                 if (!url)
                     return false;
-                return await ClientNTQQ.postMessageByUser(event.author.user_openid, `${cont}  ![text #${dimensions.width}px #${dimensions.height}px](${url})`, select?.quote).catch(everyoneError);
+                return await ClientNTQQ.postMessageByUser(event.author.user_openid, `${cont}  ![text #${dimensions.width}px #${dimensions.height}px](${url})`, event.id).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -86,7 +86,7 @@ export const C2C_MESSAGE_CREATE = async (event) => {
                 return await ClientNTQQ.postFilesByUsers(event.author.user_openid, url).catch(everyoneError);
             }
         }
-        return await ClientNTQQ.postMessageByUser(event.author.user_openid, content, select?.quote).catch(everyoneError);
+        return await ClientNTQQ.postMessageByUser(event.author.user_openid, content, event.id).catch(everyoneError);
     };
     e.replyCard = async (arr) => {
         for (const item of arr) {

package/lib/ntqq/alemon/message/GROUP_AT_MESSAGE_CREATE.js

@@ -62,7 +62,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
                 const url = await ClientKOA.setLocalImg(msg[isBuffer]);
                 if (!url)
                     return false;
-                return await ClientNTQQ.postMessageByGroup(event.group_id, `${cont} ![text #${dimensions.width}px #${dimensions.height}px](${url})`, select?.quote).catch(everyoneError);
+                return await ClientNTQQ.postMessageByGroup(event.group_id, `${cont} ![text #${dimensions.width}px #${dimensions.height}px](${url})`, event.id).catch(everyoneError);
             }
             catch (err) {
                 console.error(err);
@@ -92,7 +92,7 @@ export const GROUP_AT_MESSAGE_CREATE = async (event) => {
                 return await ClientNTQQ.postFilesByGroup(event.group_id, url).catch(everyoneError);
             }
         }
-        return await ClientNTQQ.postMessageByGroup(event.group_id, content, select?.quote).catch(everyoneError);
+        return await ClientNTQQ.postMessageByGroup(event.group_id, content, event.id).catch(everyoneError);
     };
     e.replyCard = async (arr) => {
         for (const item of arr) {

package/lib/villa/sdk/client.js

@@ -109,10 +109,12 @@ export function createClient({ bot_id, bot_secret, callback_url = '/api/mys/call
                 await logFnc(port);
             }
             // 获取ip4
-            let ip = await getIP();
-            const ipp = getServerConfig('ip');
-            if (ipp != 'localhost')
-                ip = ipp;
+            let ip = getServerConfig('ip');
+            if (ip == 'localhost') {
+                const ipp = await getIP();
+                if (ipp)
+                    ip = ipp;
+            }
             console.info('villa open', `http://${ip}:${port}${callback_url}`);
             if (!ip)
                 console.error('vllia no public ip');

package/package.json

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

package/types/core/ip.d.ts

@@ -1,5 +1,6 @@
+import { Options } from 'public-ip';
 /**
  * 得到本机IP地址
  * @returns
  */
-export declare function getIP(): Promise<string | false>;
+export declare function getIP(options?: Options): Promise<string | false>;

package/types/koa/types.d.ts

@@ -30,4 +30,9 @@ export interface ServerOptions {
      * 当前服务状态
      */
     state?: boolean;
+    /**
+     * 定时清除是否开启
+     * 默认关闭
+     */
+    clear?: boolean;
 }