alemonjs 1.1.35 → 1.1.37

package/lib/core/dealmsg.js

@@ -69,8 +69,8 @@ export async function InstructionMatching(e) {
     /**
      * 上下文
      */
-    for (const item in this.CommandApp) {
-        const { name, APP } = this.CommandApp[item];
+    for (const item in APPLICATION.CommandApp) {
+        const { name, APP } = APPLICATION.CommandApp[item];
         const AppFnc = MSG.get(name);
         const AppArg = ARG.get(name);
         const arr = SLICING.get(name);
@@ -85,7 +85,7 @@ export async function InstructionMatching(e) {
             if (typeof AppArg == 'function')
                 ARGCACHE[item] = await AppArg(e);
             const app = new APP(e);
-            // 设置this.e
+            // 设置this
             app.e = e;
             // 如果存在用户上下文
             if (app.getContext) {
@@ -125,12 +125,12 @@ export async function InstructionMatching(e) {
     /**
      *  撤回事件 || 匹配不到事件 || 大正则不匹配
      */
-    if (!this.Command[e.event] || !APPLICATION.mergedRegex.test(e.msg))
+    if (!APPLICATION.Command[e.event] || !APPLICATION.mergedRegex.test(e.msg))
         return true;
     /**
      * 循环所有指令
      */
-    for (const data of this.Command[e.event]) {
+    for (const data of APPLICATION.Command[e.event]) {
         if (e.typing != data.typing ||
             data.reg === undefined ||
             !data.reg.test(e.msg)) {
@@ -164,7 +164,7 @@ export async function InstructionMatching(e) {
 export async function InstructionMatchingByNotMessage(e) {
     if (process.env?.ALEMONJS_MESSAGE == 'dev')
         console.info('e', e);
-    if (!this.CommandNotMessage[e.event])
+    if (!APPLICATION.CommandNotMessage[e.event])
         return true;
     /**
      * 回调系统
@@ -184,8 +184,8 @@ export async function InstructionMatchingByNotMessage(e) {
     }
     const APPCACHE = {};
     const ARGCACHE = {};
-    for (const item in this.CommandApp) {
-        const { name, APP } = this.CommandApp[item];
+    for (const item in APPLICATION.CommandApp) {
+        const { name, APP } = APPLICATION.CommandApp[item];
         const AppFnc = MSG.get(name);
         const AppArg = ARG.get(name);
         try {
@@ -203,7 +203,7 @@ export async function InstructionMatchingByNotMessage(e) {
         }
     }
     // 循环查找
-    for (const data of this.CommandNotMessage[e.event]) {
+    for (const data of APPLICATION.CommandNotMessage[e.event]) {
         if (e.typing != data.typing)
             continue;
         try {

package/lib/core/utils/pup.js

@@ -1,16 +1,10 @@
-import { arch } from 'os';
 import { existsSync, realpathSync } from 'fs';
 import { execSync } from 'child_process';
-const isArch = arch();
 const platform = process.platform;
 const win32Edge = 'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe';
-// Downloa
-let skipDownload = false;
 // Path
 let executablePath;
 if (process.platform == 'win32' && existsSync(win32Edge)) {
-    //  win32  Edge
-    skipDownload = true;
     executablePath = win32Edge;
 }
 else if (platform == 'linux' || platform == 'android') {
@@ -22,6 +16,8 @@ else if (platform == 'linux' || platform == 'android') {
         'whereis chromium',
         'whereis firefox'
     ];
+    // Downloa
+    let skipDownload = false;
     // get path
     for (const item of chromium) {
         try {
@@ -44,28 +40,19 @@ else if (platform == 'linux' || platform == 'android') {
         const arr = [
             '/usr/bin/chromium',
             '/snap/bin/chromium',
-            '/usr/bin/chromium-browser'
+            '/usr/bin/chromium-browser',
+            '/data/data/com.termux/files/usr/lib/chromium-browser'
         ];
         for (const item of arr) {
             if (existsSync(item)) {
-                skipDownload = true;
                 executablePath = item;
                 break;
             }
         }
     }
-    //  arm64/arrch64
-    if (isArch == 'arm64' || isArch == 'aarch64') {
-        skipDownload = true;
-    }
 }
 /**
  * 得到可寻地址
  * @returns 配置对象
  */
-export function getPupPath() {
-    return {
-        skipDownload,
-        executablePath
-    };
-}
+export { executablePath };

package/lib/core/utils/puppeteer.js

@@ -1,7 +1,7 @@
 import puppeteer from 'puppeteer';
 import queryString from 'querystring';
 import { watch } from 'fs';
-import { getPupPath as PupPath } from './pup.js';
+import { executablePath } from './pup.js';
 class Pup {
     // 截图次数记录
     pic = 0;
@@ -13,8 +13,9 @@ class Pup {
     isBrowser = false;
     // 配置
     launch = {
-        headless: process.env?.ALEMONJS_PUPPERTEER_HEADLESS ?? 'new',
-        timeout: Number(process.env?.ALEMONJS_PUPPERTEER_TIMEOUT ?? 30000),
+        headless: 'new',
+        timeout: 30000,
+        executablePath,
         args: [
             '--disable-gpu',
             '--disable-dev-shm-usage',
@@ -23,8 +24,7 @@ class Pup {
             '--no-sandbox',
             '--no-zygote',
             '--single-process'
-        ],
-        skipDownload: true
+        ]
     };
     /**
      * 设置
@@ -207,13 +207,8 @@ class Pup {
             delete this.watchCache[tplFile];
         });
     }
-    init = PupPath;
 }
 export const Screenshot = new Pup();
-/**
- * @deprecated 已废弃
- */
-export const getPupPath = Screenshot.init;
 /**
  * @deprecated 已废弃
  */

package/lib/define/main.js

@@ -36,8 +36,7 @@ export async function defineAlemonConfig(Options) {
      * pup配置
      * *******
      */
-    const pCig = { ...Screenshot.launch, ...Screenshot.init() };
-    BOTCONFIG.set('puppeteer', pCig);
+    BOTCONFIG.set('puppeteer', Screenshot.launch);
     if (Options?.puppeteer) {
         BOTCONFIG.set('puppeteer', Options?.puppeteer);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.1.35",
+  "version": "1.1.37",
   "description": "DOCS https://alemonjs.com/",
   "scripts": {
     "dev": "ts-node alemon.config.ts",

package/types/core/utils/pup.d.ts

@@ -1,6 +1,6 @@
-import { Configuration } from 'puppeteer';
+declare let executablePath: string;
 /**
  * 得到可寻地址
  * @returns 配置对象
  */
-export declare function getPupPath(): Configuration;
+export { executablePath };

package/types/core/utils/puppeteer.d.ts

@@ -1,14 +1,13 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import puppeteer, { Browser, PuppeteerLaunchOptions, ScreenshotOptions, PuppeteerLifeCycleEvent } from 'puppeteer';
+import { Browser, PuppeteerLaunchOptions, ScreenshotOptions, PuppeteerLifeCycleEvent } from 'puppeteer';
 import queryString from 'querystring';
-import { getPupPath as PupPath } from './pup.js';
 declare class Pup {
     pic: number;
     restart: number;
     browser: Browser;
     isBrowser: boolean;
-    launch: puppeteer.PuppeteerLaunchOptions;
+    launch: PuppeteerLaunchOptions;
     /**
      * 设置
      * @param val
@@ -18,7 +17,7 @@ declare class Pup {
      * 获取
      * @returns
      */
-    getLaunch(): puppeteer.PuppeteerLaunchOptions;
+    getLaunch(): PuppeteerLaunchOptions;
     /**
      * 启动pup
      * @returns
@@ -58,21 +57,22 @@ declare class Pup {
         cache?: boolean;
         waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[];
     }): Promise<string | false | Buffer>;
-    cache: {};
-    html: {};
-    watchCache: {};
+    cache: {
+        [key: string]: any;
+    };
+    html: {
+        [key: string]: any;
+    };
+    watchCache: {
+        [key: string]: any;
+    };
     /**
      * 缓存监听
      * @param tplFile 模板地址
      */
     watch(tplFile: string): void;
-    init: typeof PupPath;
 }
 export declare const Screenshot: Pup;
-/**
- * @deprecated 已废弃
- */
-export declare const getPupPath: typeof PupPath;
 /**
  * @deprecated 已废弃
  */