onebots 0.4.23 → 0.4.26

package/lib/utils.js

@@ -22,10 +22,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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;
+exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.remove = exports.toHump = exports.Mixin = exports.toLine = exports.randomId = 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 seed_random_1 = __importDefault(require("seed-random"));
+const packageJson = require('../package.json');
 exports.version = packageJson.version;
 // 合并对象/数组
 function deepMerge(base, ...from) {
@@ -34,7 +38,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 +47,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 +67,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 +76,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)) {
@@ -114,6 +118,19 @@ function omit(source, keys) {
     return result;
 }
 exports.omit = omit;
+function randomId(seed, ...args) {
+    let [min = 0, max = 1] = args;
+    let formatter = (n) => n;
+    if (args.length === 1) {
+        const len = Math.min(Number.MAX_SAFE_INTEGER.toString().length, args[0]);
+        min = 10 ** (len - 1);
+        max = Math.min(Number.MAX_SAFE_INTEGER, 10 ** len - 1);
+        formatter = (n) => Math.floor(n);
+    }
+    const rand = (0, seed_random_1.default)(seed);
+    return formatter(rand() * (max - min) + min);
+}
+exports.randomId = randomId;
 /**
  * 将驼峰命名替换为下划线分割命名
  * @param name
@@ -127,7 +144,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 +153,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,38 +172,26 @@ 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,6 +1,6 @@
 {
     "name": "onebots",
-    "version": "0.4.23",
+    "version": "0.4.26",
     "description": "基于icqq的多例oneBot实现",
     "engines": {
         "node": ">=16"
@@ -12,9 +12,9 @@
     "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",
+        "dev": "ts-node-dev -r tsconfig-paths/register ./src/bin.ts -c config.yaml -r qq -r icqq",
         "pub": "npm publish --access public",
-        "lint": "prettier --check ./**/*.{ts,js,vue}",
+        "lint": "prettier --check ./**/*.{ts,js}",
         "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",
@@ -42,9 +42,9 @@
         "@types/koa-bodyparser": "^4.3.7",
         "@types/node": "latest",
         "@types/ws": "^8.5.3",
+        "prettier": "^3.0.0",
         "ts-node-dev": "latest",
         "tsc-alias": "latest",
-        "prettier": "^3.0.0",
         "tsconfig-paths": "latest",
         "typescript": "latest",
         "vitepress": "^1.0.0-alpha.72"
@@ -68,6 +68,7 @@
         "log4js": "^6.5.2",
         "mime-types": "^2.1.35",
         "reflect-metadata": "^0.1.13",
+        "seed-random": "^2.2.0",
         "sqlite3": "^5.1.6",
         "typeorm": "^0.3.17",
         "ws": "^8.8.0"

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

@@ -1,8 +0,0 @@
-import { MessageElem } from "icqq";
-import { V12 } from "../../service/V12";
-export declare function processMessage(this: V12, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<{
-    element: MessageElem[];
-    music?: V12.SegmentElem<'music'>;
-    share?: V12.SegmentElem<'share'>;
-    quote?: V12.SegmentElem<'reply'>;
-}>;

package/lib/service/V12/utils.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.processMessage = void 0;
-const V12_1 = require("../../service/V12");
-const utils_1 = require("../../utils");
-async function processMessage(message, source) {
-    let segments = [].concat(message).map(m => {
-        if (typeof m === 'string')
-            return { type: 'text', data: { text: m } };
-        return m;
-    });
-    let quote = segments.find(e => e.type === 'reply');
-    if (quote)
-        (0, utils_1.remove)(segments, quote);
-    let music = segments.find(e => e.type === 'music');
-    if (music)
-        (0, utils_1.remove)(segments, music);
-    let share = segments.find(e => e.type === 'share');
-    if (share)
-        (0, utils_1.remove)(segments, share);
-    segments = segments.filter(n => [
-        'face', 'text', 'image',
-        'rpx', 'dice', 'poke', 'mention', 'mention_all',
-        'voice', 'file', 'record',
-        'forward', 'node',
-        'music', 'share', 'xml', 'json', 'location', // 分享类
-    ].includes(n.type));
-    for (const seg of segments) {
-        if (['image', 'video', 'audio'].includes(seg.type)) {
-            const { file_id } = seg.data;
-            const fileInfo = this.getFile(file_id);
-            if (fileInfo)
-                seg.data['file_id'] = fileInfo.url || fileInfo.path || `base64://${fileInfo.data}`;
-            if (seg.data['file_id']?.startsWith('base64://'))
-                seg.data['file_id'] = Buffer.from(seg.data['file_id'].slice(9), 'base64');
-        }
-        else if (['mention', 'mention_all'].includes(seg.type)) {
-            seg.data['qq'] = seg.data['user_id'];
-        }
-        else if (seg.type === 'node') {
-            seg.data['message'] = (await processMessage.call(this, seg.data['message'])).element;
-        }
-    }
-    const element = V12_1.V12.fromSegment(segments);
-    return { element, quote: quote || source, share, music };
-}
-exports.processMessage = processMessage;