alemonjs 1.0.25 → 1.0.27

package/lib/core/buffer.js

@@ -2,6 +2,7 @@ import { readFileSync } from 'fs';
 import http from 'http';
 import https from 'https';
 import { join } from 'path';
+import { createCanvas, loadImage } from 'canvas';
 /**
  * 异步请求图片
  * @param url
@@ -36,3 +37,26 @@ export function getPathBuffer(path) {
     const BufferImage = Buffer.from(image);
     return BufferImage;
 }
+/**
+ * 压缩buffer图片
+ * @param img
+ * @param quality
+ * @returns
+ */
+export async function compressImage(img, quality) {
+    const image = await loadImage(img);
+    const canvas = createCanvas(image.width, image.height);
+    const ctx = canvas.getContext('2d');
+    ctx.drawImage(image, 0, 0);
+    ctx.canvas.toDataURL('image/jpeg', quality);
+    return new Promise((resolve, reject) => {
+        canvas.toBuffer((err, buf) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve(buf);
+            }
+        }, 'image/jpeg');
+    });
+}

package/lib/core/puppeteer.js

@@ -16,18 +16,6 @@ let browser;
  * 实例控制
  */
 let isBrowser = false;
-/**
- * 对每个页面进行缓存
- */
-const pageCache = {};
-/**
- * 清除缓存
- */
-function delCache() {
-    for (const item in pageCache) {
-        delete pageCache[item];
-    }
-}
 /**
  * 实例配置
  */
@@ -72,7 +60,6 @@ export async function pupStartCheck() {
          */
         pic = 0;
         console.info('[puppeteer] close');
-        delCache();
         isBrowser = false;
         browser.close().catch(err => console.error(err));
         console.info('[puppeteer] reopen');
@@ -125,7 +112,7 @@ export async function screenshotByFile(htmlPath, Options) {
         /**
          * 关闭
          */
-        page.close().catch((err) => console.error(err));
+        await page.close().catch((err) => console.error(err));
         /**
          * 空的
          */
@@ -149,25 +136,22 @@ export async function screenshotByUrl(val) {
         return false;
     }
     const { url, time, rand, params, tab, cache } = val;
-    if (!pageCache[url]) {
-        pageCache[url] = await browser.newPage();
-    }
+    const page = await browser.newPage();
     const isurl = params == undefined ? url : `${url}?${queryString.stringify(params ?? {})}`;
     /**
      * 启用页面缓存
      */
-    await pageCache[url].setCacheEnabled(cache == undefined ? true : cache);
+    await page.setCacheEnabled(cache == undefined ? true : cache);
     /**
      * 启动网页
      */
-    await pageCache[url].goto(isurl);
+    await page.goto(isurl);
     console.info(`open ${isurl}`);
     /**
      * 找到元素
      */
-    const body = await pageCache[url].$(tab ?? 'body');
+    const body = await page.$(tab ?? 'body');
     if (!body) {
-        delete pageCache[url];
         console.error(`tab err`);
         return false;
     }
@@ -192,9 +176,10 @@ export async function screenshotByUrl(val) {
      * 打印错误
      */
     if (!buff) {
-        delete pageCache[url];
         console.error(`buff err:${url}`);
     }
+    // 确保页面已经不再使用后再删除
+    await page.close();
     return buff;
 }
 /**
@@ -205,14 +190,12 @@ export async function startChrom() {
     try {
         browser = await puppeteer.launch(LaunchCfg);
         isBrowser = true;
-        delCache();
         console.info('[puppeteer] open success');
         return true;
     }
     catch (err) {
         console.error(err);
         isBrowser = false;
-        delCache();
         console.error('[puppeteer] open fail');
         return false;
     }

package/lib/core/screenshot.js

@@ -114,7 +114,6 @@ export function createHtml(AppName, tplFile) {
         console.info('[HTML][CREATE]', AdressHtml);
     }
     return {
-        control,
         // 模板地址
         AdressHtml,
         // 模板字符

package/lib/define/main.js

@@ -73,7 +73,8 @@ export async function defineAlemonConfig(Options) {
      * 登录机器人
      * *********
      */
-    if (Options?.login) {
+    if (Options?.login &&
+        (Options?.plugin?.init !== false || Options?.app?.init !== false)) {
         if (Options.login?.discord) {
             // 自定义覆盖
             setBotConfigByKey('discord', Options.login.discord);
@@ -192,7 +193,7 @@ export async function defineAlemonConfig(Options) {
      * 扫描插件
      * ************
      */
-    if (Options?.plugin?.init) {
+    if (Options?.login && Options?.plugin?.init !== false) {
         // 加载插件
         await loadInit();
     }

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

@@ -3,7 +3,7 @@ import { ClientAPIByQQ as Client, getWebConfig } from '../../sdk/index.js';
 import { segmentQQ } from '../segment.js';
 import { getBotMsgByNtqq } from '../bot.js';
 import IMGS from 'image-size';
-import { setLocalImg } from '../../../koa/index.js';
+import { setLocalImg } from '../../sdk/web/index.js';
 export const C2C_MESSAGE_CREATE = async (event) => {
     /**
      * 获取ip

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

@@ -3,7 +3,7 @@ import { ClientAPIByQQ as Client, getWebConfig } from '../../sdk/index.js';
 import { segmentQQ } from '../segment.js';
 import { getBotMsgByNtqq } from '../bot.js';
 import { getBotConfigByKey } from '../../../config/index.js';
-import { setLocalImg } from '../../../koa/index.js';
+import { setLocalImg } from '../../sdk/web/index.js';
 import IMGS from 'image-size';
 /**
  * 公私域合并

package/lib/ntqq/index.js

@@ -2,7 +2,7 @@ import { checkRobotByQQ } from './login.js';
 import { getBotConfigByKey } from '../config/index.js';
 import { conversation } from './alemon/conversation.js';
 import { setBotConfig, createClient, ClientAPIByQQ, getWebConfig } from './sdk/index.js';
-import { createWeb, autoClearImages } from '../koa/index.js';
+import { createWeb, autoClearImages } from './sdk/web/index.js';
 import { getIP } from '../core/index.js';
 export async function createAlemonByNtqq() {
     /**

package/lib/{koa → ntqq/sdk/web}/client.js

@@ -3,7 +3,7 @@ import Router from 'koa-router';
 import bodyParser from 'koa-bodyparser';
 import { mkdirSync } from 'fs';
 import { getLocalImg } from './img.js';
-import { setWebConfig } from '../ntqq/sdk/config.js';
+import { setWebConfig } from '../config.js';
 /**
  * 创建客户端
  * @param param0

package/lib/{koa → ntqq/sdk/web}/img.js

@@ -1,7 +1,7 @@
 import { createReadStream, writeFileSync, readdirSync, unlinkSync } from 'fs';
 import { join } from 'path';
 import { fileTypeFromBuffer } from 'file-type';
-import { getWebConfig } from '../ntqq/sdk/config.js';
+import { getWebConfig } from '../config.js';
 /**
  * 处理图片请求
  * @param ctx

package/lib/{koa → ntqq/sdk/web}/index.js

@@ -1,3 +1,3 @@
 export * from './client.js';
 export * from './img.js';
-export * from '../ntqq/sdk/types.js';
+export * from '../types.js';

package/package.json

@@ -1,72 +1,73 @@
-{
-  "name": "alemonjs",
-  "version": "1.0.25",
-  "description": "docs https://alemonjs.com/",
-  "author": "ningmengchongshui",
-  "license": "GPL-2.0",
-  "type": "module",
-  "scripts": {
-    "tsc": "npx tsc",
-    "format": "prettier --write .",
-    "lint": "eslint . --ext .js,.ts --fix --ignore-path .gitignore"
-  },
-  "dependencies": {
-    "@discordjs/builders": "^1.6.3",
-    "@discordjs/core": "^0.6.0",
-    "@discordjs/rest": "^1.7.1",
-    "axios": "^1.4.0",
-    "discord.js": "^14.11.0",
-    "image-size": "^1.0.2",
-    "kook-ws": "^1.0.4",
-    "lodash": "^4.17.21",
-    "mys-villa": "^1.1.8",
-    "public-ip": "^6.0.1",
-    "puppeteer": "^20.7.1",
-    "qq-channel": "^1.0.0",
-    "qq-guild-bot": "^2.9.5",
-    "qrcode": "^1.5.3"
-  },
-  "devDependencies": {
-    "@types/lodash": "^4.14.186",
-    "@types/node": "^20.2.4",
-    "@types/progress": "^2.0.5",
-    "@types/qrcode": "^1.5.0",
-    "@types/ws": "^8.5.5",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
-    "eslint": "^8.43.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.8.8",
-    "ts-node": "^10.9.1",
-    "typescript": ">=5.0.4 <5.1.0"
-  },
-  "types": "types",
-  "main": "lib/index.js",
-  "files": [
-    "bin",
-    "lib",
-    "types",
-    "run.js",
-    "run.d.ts"
-  ],
-  "exports": {
-    ".": {
-      "import": "./lib/index.js",
-      "types": "./types/index.d.ts"
-    },
-    "./run": {
-      "import": "./run.js",
-      "types": "./run.d.ts"
-    }
-  },
-  "bin": {
-    "alemonjs": "bin/main.js"
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  },
-  "engines": {
-    "node": ">=16.14.0"
-  }
+{
+  "name": "alemonjs",
+  "version": "1.0.27",
+  "description": "docs https://alemonjs.com/",
+  "author": "ningmengchongshui",
+  "license": "GPL-2.0",
+  "type": "module",
+  "scripts": {
+    "tsc": "npx tsc",
+    "format": "prettier --write .",
+    "lint": "eslint . --ext .js,.ts --fix --ignore-path .gitignore"
+  },
+  "dependencies": {
+    "@discordjs/builders": "^1.6.3",
+    "@discordjs/core": "^0.6.0",
+    "@discordjs/rest": "^1.7.1",
+    "axios": "^1.4.0",
+    "canvas": "^2.11.2",
+    "discord.js": "^14.11.0",
+    "image-size": "^1.0.2",
+    "kook-ws": "^1.0.4",
+    "lodash": "^4.17.21",
+    "mys-villa": "^1.1.8",
+    "public-ip": "^6.0.1",
+    "puppeteer": "^20.7.1",
+    "qq-channel": "^1.0.0",
+    "qq-guild-bot": "^2.9.5",
+    "qrcode": "^1.5.3"
+  },
+  "devDependencies": {
+    "@types/lodash": "^4.14.186",
+    "@types/node": "^20.2.4",
+    "@types/progress": "^2.0.5",
+    "@types/qrcode": "^1.5.0",
+    "@types/ws": "^8.5.5",
+    "@typescript-eslint/eslint-plugin": "^5.60.0",
+    "@typescript-eslint/parser": "^5.60.0",
+    "eslint": "^8.43.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.8.8",
+    "ts-node": "^10.9.1",
+    "typescript": ">=5.0.4 <5.1.0"
+  },
+  "types": "types",
+  "main": "lib/index.js",
+  "files": [
+    "bin",
+    "lib",
+    "types",
+    "run.js",
+    "run.d.ts"
+  ],
+  "exports": {
+    ".": {
+      "import": "./lib/index.js",
+      "types": "./types/index.d.ts"
+    },
+    "./run": {
+      "import": "./run.js",
+      "types": "./run.d.ts"
+    }
+  },
+  "bin": {
+    "alemonjs": "bin/main.js"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "engines": {
+    "node": ">=16.14.0"
+  }
 }

package/types/core/buffer.d.ts

@@ -11,3 +11,10 @@ export declare function getUrlbuffer(url: string): Promise<Buffer>;
  * @returns
  */
 export declare function getPathBuffer(path: string): Buffer;
+/**
+ * 压缩buffer图片
+ * @param img
+ * @param quality
+ * @returns
+ */
+export declare function compressImage(img: Buffer, quality: number): Promise<Buffer>;

package/types/core/screenshot.d.ts

@@ -5,7 +5,6 @@
  * @returns
  */
 export declare function createHtml(AppName: string, tplFile: string): {
-    control: boolean;
     AdressHtml: string;
     template: any;
 };

package/types/define/types.d.ts

@@ -18,7 +18,7 @@ export interface AlemonOptions {
         /**
          * 是否创建
          */
-        init?: boolean;
+        init?: false;
         /**
          * 应用名称
          */
@@ -35,7 +35,7 @@ export interface AlemonOptions {
              * 是否生成
              * defaukt true
              */
-            create?: undefined | false;
+            create?: false;
             /**
              * 生成地址
              * defaukt /publick/defset
@@ -56,7 +56,7 @@ export interface AlemonOptions {
         /**
          * 是否加载插件
          */
-        init?: boolean;
+        init?: false;
         /**
          * 插件目录
          */

package/types/{koa → ntqq/sdk/web}/client.d.ts

@@ -1,4 +1,4 @@
-import { type WebConfig } from '../ntqq/sdk/types.js';
+import { type WebConfig } from '../types.js';
 /**
  * 创建客户端
  * @param param0

package/types/{koa → ntqq/sdk/web}/index.d.ts

@@ -1,3 +1,3 @@
 export * from './client.js';
 export * from './img.js';
-export * from '../ntqq/sdk/types.js';
+export * from '../types.js';