onebots 0.4.21 → 0.4.23

package/lib/service/V11/utils.d.ts

@@ -1,9 +1,6 @@
 import { Client, MessageElem, ShareElem } from "icqq";
-import { SegmentElem } from "icqq-cq-enable/lib/utils";
-import { QuoteElem } from "icqq/lib/message";
-export declare function processMessage(this: Client, message: string | SegmentElem | SegmentElem[], source?: QuoteElem): Promise<{
+export declare function processMessage(this: Client, elements: MessageElem[]): Promise<{
     element: MessageElem[];
     music?: MessageElem;
     share?: ShareElem;
-    quote?: QuoteElem;
 }>;

package/lib/service/V11/utils.js

@@ -2,30 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processMessage = void 0;
 const utils_1 = require("../../utils");
-const utils_2 = require("icqq-cq-enable/lib/utils");
-async function processMessage(message, source) {
-    const elements = typeof message === 'string' ? (0, utils_2.fromCqcode)(message) : (0, utils_2.fromSegment)(message);
-    let quote = elements.find(e => e.type === 'reply');
-    if (quote)
-        (0, utils_1.remove)(elements, quote);
-    let music = elements.find(e => e.type === 'music');
+async function processMessage(elements) {
+    let music = elements.find((e) => e.type === "music");
     if (music) {
         (0, utils_1.remove)(elements, music);
-        if (String(music.platform) === 'custom') {
-            music.platform = music['subtype']; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
+        if (String(music.platform) === "custom") {
+            music.platform = music["subtype"]; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
         }
     }
-    let share = elements.find(e => e.type === 'share');
+    let share = elements.find((e) => e.type === "share");
     if (share)
         (0, utils_1.remove)(elements, share);
     for (const element of elements) {
-        if (['image', 'video', 'audio'].includes(element.type)) {
-            if (element['file_id']?.startsWith('base64://'))
-                element['file_id'] = Buffer.from(element['file_id'].slice(9), 'base64');
-            if (element['file']?.startsWith('base64://'))
-                element['file'] = Buffer.from(element['file'].slice(9), 'base64');
+        if (["image", "video", "audio"].includes(element.type)) {
+            if (element["file_id"]?.startsWith("base64://"))
+                element["file_id"] = Buffer.from(element["file_id"].slice(9), "base64");
+            if (element["file"]?.startsWith("base64://"))
+                element["file"] = Buffer.from(element["file"].slice(9), "base64");
         }
     }
-    return { element: elements, quote: quote || source, share, music };
+    return { element: elements, share, music };
 }
 exports.processMessage = processMessage;

package/lib/service/V12/index.d.ts

@@ -1,16 +1,14 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Client, EventMap, MessageElem, Sendable as IcqqCanSend } from "icqq";
 import { Config } from './config';
 import { OneBot } from "../../onebot";
 import { Action } from "./action";
-import { EventEmitter } from "events";
 import { Logger } from "log4js";
 import { WebSocket, WebSocketServer } from "ws";
-export declare class V12 extends EventEmitter implements OneBot.Base {
+import { Service } from "../../service";
+export declare class V12 extends Service<'V12'> implements OneBot.Base {
     oneBot: OneBot<'V12'>;
     client: Client;
-    config: V12.Config;
     version: string;
     action: Action;
     protected timestamp: number;
@@ -20,7 +18,7 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     wss?: WebSocketServer;
     wsr: Set<WebSocket>;
     private db;
-    constructor(oneBot: OneBot<'V12'>, client: Client, config: V12.Config);
+    constructor(oneBot: OneBot<'V12'>, client: Client, config: OneBot.Config<'V12'>);
     get history(): V12.Payload<keyof Action>[];
     getFile(file_id: string): V12.FileInfo;
     delFile(file_id: string): boolean;

package/lib/service/V12/index.js

@@ -9,7 +9,6 @@ const utils_1 = require("../../utils");
 const path_1 = require("path");
 const onebot_1 = require("../../onebot");
 const action_1 = require("./action");
-const events_1 = require("events");
 const url_1 = require("url");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
@@ -19,12 +18,12 @@ const db_1 = require("../../db");
 const app_1 = require("../../server/app");
 const fs_1 = require("fs");
 const message_1 = require("icqq/lib/message");
-class V12 extends events_1.EventEmitter {
+const service_1 = require("../../service");
+class V12 extends service_1.Service {
     constructor(oneBot, client, config) {
-        super();
+        super(config);
         this.oneBot = oneBot;
         this.client = client;
-        this.config = config;
         this.version = 'V12';
         this.timestamp = Date.now();
         this.wsr = new Set();
@@ -110,6 +109,25 @@ class V12 extends events_1.EventEmitter {
             }
             this.startWsReverse(config);
         });
+        this.on('dispatch', (unserialized) => {
+            const serialized = JSON.stringify(unserialized);
+            for (const ws of this.wss.clients) {
+                ws.send(serialized, (err) => {
+                    if (err)
+                        this.logger.error(`正向WS(${ws.url})上报事件失败: ` + err.message);
+                    else
+                        this.logger.debug(`正向WS(${ws.url})上报事件成功: ` + serialized);
+                });
+            }
+            for (const ws of this.wsr) {
+                ws.send(serialized, (err) => {
+                    if (err)
+                        this.logger.error(`反向WS(${ws.url})上报事件失败: ` + err.message);
+                    else
+                        this.logger.debug(`反向WS(${ws.url})上报事件成功: ` + serialized);
+                });
+            }
+        });
         if (this.config.heartbeat) {
             this.heartbeat = setInterval(() => {
                 this.dispatch(V12.formatPayload(this.oneBot.uin, 'heartbeat', {
@@ -258,31 +276,9 @@ class V12 extends events_1.EventEmitter {
             }
             this._webSocketHandler(ws);
         });
-        this.on('dispatch', (unserialized) => {
-            const serialized = JSON.stringify(unserialized);
-            for (const ws of this.wss.clients) {
-                ws.send(serialized, (err) => {
-                    if (err)
-                        this.logger.error(`正向WS(${ws.url})上报事件失败: ` + err.message);
-                    else
-                        this.logger.debug(`正向WS(${ws.url})上报事件成功: ` + serialized);
-                });
-            }
-        });
     }
     startWsReverse(config) {
         this._createWsr(config.url, config);
-        this.on('dispatch', (unserialized) => {
-            const serialized = JSON.stringify(unserialized);
-            for (const ws of this.wsr) {
-                ws.send(serialized, (err) => {
-                    if (err)
-                        this.logger.error(`反向WS(${ws.url})上报事件失败: ` + err.message);
-                    else
-                        this.logger.debug(`反向WS(${ws.url})上报事件成功: ` + serialized);
-                });
-            }
-        });
     }
     async stop(force) {
         if (this.client.status === icqq_1.OnlineStatus.Online) {
@@ -369,6 +365,8 @@ class V12 extends events_1.EventEmitter {
                 return value + '';
             }),
         };
+        if (!this.filterFn(payload))
+            return;
         this.emit('dispatch', payload);
     }
     async apply(req) {

package/lib/service/shareMusicCustom.js

@@ -17,8 +17,8 @@ async function buildMusic(target, bu, music) {
         let { singer = null, title = null, jumpUrl = null, musicUrl = null, preview = null } = music.id ? await getMusicInfo(music.id) : {};
         singer = music['content'] || music.singer || singer; // 自定义参数优先级高于默认值(gocq的参数名与icqq有区别，做下兼容)
         title = music.title || title;
-        jumpUrl = music.jumpUrl || jumpUrl;
-        musicUrl = music['url'] || music['voice'] || music.musicUrl || musicUrl;
+        jumpUrl = music.jumpUrl || music['url'] || jumpUrl;
+        musicUrl = music['voice'] || music['url'] || music.musicUrl || musicUrl;
         preview = music['image'] || music.preview || preview;
         if (!musicUrl)
             style = 0;

package/lib/service.d.ts

@@ -0,0 +1,29 @@
+/// <reference types="node" />
+import { EventEmitter } from "events";
+import { OneBot } from "./onebot";
+import { Dict } from "@zhinjs/shared";
+export interface Service<V extends OneBot.Version> {
+    filterFn(event: Dict): boolean;
+}
+export declare class Service<V extends OneBot.Version> extends EventEmitter {
+    config: OneBot.Config<V>;
+    constructor(config: OneBot.Config<V>);
+}
+export declare namespace Service {
+    type MaybeArray<T = any> = T | T[];
+    type AttrFilter = {
+        [P in keyof Dict]?: MaybeArray | boolean;
+    };
+    export type Filters = AttrFilter | WithFilter | UnionFilter | ExcludeFilter;
+    export type WithFilter = {
+        $and: Filters;
+    };
+    export type UnionFilter = {
+        $or: Filters;
+    };
+    export type ExcludeFilter = {
+        $not: Filters;
+    };
+    export function createFilterFunction(filters: Filters): (event: Dict) => any;
+    export {};
+}

package/lib/service.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Service = void 0;
+const events_1 = require("events");
+class Service extends events_1.EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+        this.filterFn = Service.createFilterFunction(config.filters || {});
+    }
+}
+exports.Service = Service;
+(function (Service) {
+    function createFilterFunction(filters) {
+        const isLogicKey = (key) => {
+            return [
+                "$and",
+                "$or",
+                "$not",
+                "$nor",
+                "$regexp",
+                "$like",
+                "$gt",
+                "$gte",
+                "$lt",
+                "$lte",
+                "$between",
+            ].includes(key);
+        };
+        const filterFn = (event, key, value) => {
+            // 如果 key 为 $and、$or、$not、$nor 则递归调用
+            if (key === "$and" || key === "$or" || key === "$not" || key === "$nor") {
+                if (!value || typeof value !== "object")
+                    throw new Error("invalid filter");
+                switch (key) {
+                    case "$and":
+                        return Array.isArray(value)
+                            ? value.every(item => filterFn(event, key, item))
+                            : Object.entries(value).every(([key, value]) => filterFn(event, key, value));
+                    case "$or":
+                        return Array.isArray(value)
+                            ? value.some(item => filterFn(event, key, item))
+                            : Object.entries(value).some(([key, value]) => filterFn(event, key, value));
+                    case "$nor":
+                        return !filterFn(event, "$or", value);
+                    case "$not":
+                        return !filterFn(event, "$and", value);
+                }
+            }
+            if (typeof value === "boolean" && typeof event[key] !== "boolean") {
+                return value;
+            }
+            if (typeof value !== "object") {
+                if (key === "$regex" && typeof value === "string")
+                    return new RegExp(value).test(String(event));
+                if (key === "$like" && typeof value === "string")
+                    return String(event).includes(value);
+                if (key === "$gt" && typeof value === "number")
+                    return Number(event) > value;
+                if (key === "$gte" && typeof value === "number")
+                    return Number(event) >= value;
+                if (key === "$lt" && typeof value === "number")
+                    return Number(event) < value;
+                if (key === "$lte" && typeof value === "number")
+                    return Number(event) <= value;
+                return value === event[key];
+            }
+            if (key === "$between" &&
+                Array.isArray(value) &&
+                value.length === 2 &&
+                value.every(item => typeof item === "number")) {
+                const [start, end] = value;
+                return event >= start && event <= end;
+            }
+            if (Array.isArray(value)) {
+                return value.includes(event[key]);
+            }
+            return createFilterFunction(value)(isLogicKey(key) ? event : event[key]);
+        };
+        return (event) => {
+            return Object.entries(filters).every(([key, value]) => filterFn(event, key, value));
+        };
+    }
+    Service.createFilterFunction = createFilterFunction;
+})(Service || (exports.Service = Service = {}));

package/lib/types.d.ts

@@ -2,8 +2,8 @@ export type LogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal" |
 export type Dispose = () => any;
 export type MayBeArray<T extends any> = T | T[];
 /**
-* 异步锁---
-*/
+ * 异步锁---
+ */
 export declare class AsyncLock {
     private _lock;
     private _waitList;

package/lib/types.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsyncLock = void 0;
 /**
-* 异步锁---
-*/
+ * 异步锁---
+ */
 class AsyncLock {
     constructor() {
         this._lock = false;
@@ -11,7 +11,7 @@ class AsyncLock {
     }
     async lock() {
         if (this._lock) {
-            await new Promise((resolve) => {
+            await new Promise(resolve => {
                 this._waitList.push(resolve);
             });
         }

package/lib/utils.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.remove = exports.toHump = exports.Mixin = exports.toLine = exports.omit = exports.pick = exports.deepClone = exports.transformObj = exports.deepMerge = exports.version = void 0;
 const crypto = __importStar(require("crypto"));
-const packageJson = require('../package.json');
+const packageJson = require("../package.json");
 exports.version = packageJson.version;
 // 合并对象/数组
 function deepMerge(base, ...from) {
@@ -34,7 +34,7 @@ function deepMerge(base, ...from) {
     if (from.length === 0) {
         return base;
     }
-    if (typeof base !== 'object') {
+    if (typeof base !== "object") {
         return base;
     }
     if (Array.isArray(base)) {
@@ -43,7 +43,7 @@ function deepMerge(base, ...from) {
     for (const item of from) {
         for (const key in item) {
             if (base.hasOwnProperty(key)) {
-                if (typeof base[key] === 'object') {
+                if (typeof base[key] === "object") {
                     base[key] = deepMerge(base[key], item[key]);
                 }
                 else {
@@ -63,7 +63,7 @@ function transformObj(obj, callback) {
         return obj;
     if (Array.isArray(obj))
         return obj.map(item => transformObj(item, callback));
-    if (typeof obj !== 'object')
+    if (typeof obj !== "object")
         return obj;
     return Object.fromEntries(Object.keys(obj).map(key => {
         return [key, callback(key, obj[key])];
@@ -72,13 +72,13 @@ function transformObj(obj, callback) {
 exports.transformObj = transformObj;
 // 深拷贝
 function deepClone(obj) {
-    if (typeof obj !== 'object')
+    if (typeof obj !== "object")
         return obj;
     if (!obj)
         return obj;
     //判断拷贝的obj是对象还是数组
     if (Array.isArray(obj))
-        return obj.map((item) => deepClone(item));
+        return obj.map(item => deepClone(item));
     const objClone = {};
     for (const key in obj) {
         if (obj.hasOwnProperty(key)) {
@@ -127,7 +127,7 @@ exports.toLine = toLine;
 function Mixin(base, ...classes) {
     classes.forEach(ctr => {
         Object.getOwnPropertyNames(ctr.prototype).forEach(name => {
-            if (name === 'constructor')
+            if (name === "constructor")
                 return;
             base.prototype[name] = ctr.prototype[name];
         });
@@ -136,7 +136,7 @@ function Mixin(base, ...classes) {
 }
 exports.Mixin = Mixin;
 function toHump(action) {
-    return action.replace(/_[\w]/g, (s) => {
+    return action.replace(/_[\w]/g, s => {
         return s[1].toUpperCase();
     });
 }
@@ -155,26 +155,38 @@ function toBool(v) {
 exports.toBool = toBool;
 function uuid() {
     let hex = crypto.randomBytes(16).toString("hex");
-    return hex.substr(0, 8) + "-" + hex.substr(8, 4) + "-" + hex.substr(12, 4) + "-" + hex.substr(16, 4) + "-" + hex.substr(20);
+    return (hex.substr(0, 8) +
+        "-" +
+        hex.substr(8, 4) +
+        "-" +
+        hex.substr(12, 4) +
+        "-" +
+        hex.substr(16, 4) +
+        "-" +
+        hex.substr(20));
 }
 exports.uuid = uuid;
 function protectedFields(source, ...keys) {
-    const protocolValue = (value) => {
-        if (value && typeof value === 'object')
+    const protocolValue = value => {
+        if (value && typeof value === "object")
             return Object.fromEntries(Object.entries(value).map(([key, value]) => {
                 return [key, protocolValue(value)];
             }));
-        return `${value}`.split('').map(() => '*').join('');
+        return `${value}`
+            .split("")
+            .map(() => "*")
+            .join("");
     };
-    if (!source || typeof source !== 'object')
-        throw new Error('source must is object');
+    if (!source || typeof source !== "object")
+        throw new Error("source must is object");
     return Object.fromEntries(Object.entries(source).map(([key, value]) => {
         return [key, keys.includes(key) ? protocolValue(value) : value];
     }));
 }
 exports.protectedFields = protectedFields;
 function getProperties(obj) {
-    if (obj.__proto__ === null) { //说明该对象已经是最顶层的对象
+    if (obj.__proto__ === null) {
+        //说明该对象已经是最顶层的对象
         return [];
     }
     return Object.getOwnPropertyNames(obj).concat(getProperties(obj.__proto__));

package/package.json

@@ -1,72 +1,75 @@
 {
-  "name": "onebots",
-  "version": "0.4.21",
-  "description": "基于icqq的多例oneBot实现",
-  "engines": {
-    "node": ">=16"
-  },
-  "main": "lib/index.js",
-  "bin": {
-    "onebots": "./lib/bin.js"
-  },
-  "scripts": {
-    "start": "node .",
-    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && cp -r src/config.sample.yaml lib/config.sample.yaml",
-    "dev": "ts-node-dev -r tsconfig-paths/register ./src/bin.ts -c config.yaml",
-    "pub": "npm publish --access public",
-    "docs:dev": "vitepress dev docs --port 8989",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/liucl-cn/onebots.git"
-  },
-  "keywords": [
-    "onebot",
-    "icqq",
-    "cq-http"
-  ],
-  "author": "凉菜",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/liucl-cn/onebots/issues"
-  },
-  "homepage": "https://github.com/liucl-cn/onebots#readme",
-  "devDependencies": {
-    "@types/koa": "^2.13.4",
-    "@types/koa__router": "^8.0.11",
-    "@types/koa-bodyparser": "^4.3.7",
-    "@types/node": "latest",
-    "@types/ws": "^8.5.3",
-    "ts-node-dev": "latest",
-    "tsc-alias": "latest",
-    "tsconfig-paths": "latest",
-    "typescript": "latest",
-    "vitepress": "^1.0.0-alpha.72"
-  },
-  "files": [
-    "/lib/**/*.js",
-    "/lib/**/*.d.ts",
-    "/lib/*.yaml",
-    "/**/LICENSE"
-  ],
-  "peerDependencies": {
-    "icqq": "latest"
-  },
-  "dependencies": {
-    "@koa/router": "^10.1.1",
-    "@zhinjs/shared": "^0.0.9",
-    "icqq-cq-enable": "^1.0.1",
-    "js-yaml": "^4.1.0",
-    "koa": "^2.13.4",
-    "koa-bodyparser": "^4.3.0",
-    "log4js": "^6.5.2",
-    "mime-types": "^2.1.35",
-    "ws": "^8.8.0",
-    "better-sqlite3": "^8.6.0",
-    "reflect-metadata": "^0.1.13",
-    "typeorm": "^0.3.17"
-  }
+    "name": "onebots",
+    "version": "0.4.23",
+    "description": "基于icqq的多例oneBot实现",
+    "engines": {
+        "node": ">=16"
+    },
+    "main": "lib/index.js",
+    "bin": {
+        "onebots": "./lib/bin.js"
+    },
+    "scripts": {
+        "start": "node .",
+        "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && cp -r src/config.sample.yaml lib/config.sample.yaml",
+        "dev": "ts-node-dev -r tsconfig-paths/register ./src/bin.ts -c config.yaml",
+        "pub": "npm publish --access public",
+        "lint": "prettier --check ./**/*.{ts,js,vue}",
+        "lint:fix": "prettier --write ./**/*.{ts,js,md}",
+        "test": "ts-node-dev -r tsconfig-paths/register ./src/test.ts",
+        "docs:dev": "vitepress dev docs --port 8989",
+        "docs:build": "vitepress build docs",
+        "docs:preview": "vitepress preview docs"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/liucl-cn/onebots.git"
+    },
+    "keywords": [
+        "onebot",
+        "icqq",
+        "cq-http"
+    ],
+    "author": "凉菜",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/liucl-cn/onebots/issues"
+    },
+    "homepage": "https://github.com/liucl-cn/onebots#readme",
+    "devDependencies": {
+        "@types/koa": "^2.13.4",
+        "@types/koa__router": "^8.0.11",
+        "@types/koa-bodyparser": "^4.3.7",
+        "@types/node": "latest",
+        "@types/ws": "^8.5.3",
+        "ts-node-dev": "latest",
+        "tsc-alias": "latest",
+        "prettier": "^3.0.0",
+        "tsconfig-paths": "latest",
+        "typescript": "latest",
+        "vitepress": "^1.0.0-alpha.72"
+    },
+    "files": [
+        "/lib/**/*.js",
+        "/lib/**/*.d.ts",
+        "/lib/*.yaml",
+        "/**/LICENSE"
+    ],
+    "peerDependencies": {
+        "icqq": "latest"
+    },
+    "dependencies": {
+        "@koa/router": "^10.1.1",
+        "@zhinjs/shared": "^0.0.9",
+        "icqq-cq-enable": "^1.0.1",
+        "js-yaml": "^4.1.0",
+        "koa": "^2.13.4",
+        "koa-bodyparser": "^4.3.0",
+        "log4js": "^6.5.2",
+        "mime-types": "^2.1.35",
+        "reflect-metadata": "^0.1.13",
+        "sqlite3": "^5.1.6",
+        "typeorm": "^0.3.17",
+        "ws": "^8.8.0"
+    }
 }