onebots 0.4.47 → 0.4.49

package/lib/service/shareMusicCustom.js

@@ -14,12 +14,12 @@ async function buildMusic(target, bu, music) {
     const { appid, package_name, sign, getMusicInfo } = message_1.musicFactory[music.platform];
     let style = 4;
     try {
-        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有区别，做下兼容)
+        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 || music['url'] || jumpUrl;
-        musicUrl = music['voice'] || music['url'] || music.musicUrl || musicUrl;
-        preview = music['image'] || music.preview || preview;
+        jumpUrl = music.jumpUrl || music["url"] || jumpUrl;
+        musicUrl = music["voice"] || music["url"] || music.musicUrl || musicUrl;
+        preview = music["image"] || music.preview || preview;
         if (!musicUrl)
             style = 0;
         return {
@@ -30,9 +30,9 @@ async function buildMusic(target, bu, music) {
                 1: 1,
                 2: "0.0.0",
                 3: package_name,
-                4: sign
+                4: sign,
             },
-            10: typeof bu === 'string' ? 3 : bu,
+            10: typeof bu === "string" ? 3 : bu,
             11: target,
             12: {
                 10: title,
@@ -42,11 +42,16 @@ async function buildMusic(target, bu, music) {
                 14: preview,
                 16: musicUrl,
             },
-            19: typeof bu === 'string' ? Number(bu) : undefined
+            19: typeof bu === "string" ? Number(bu) : undefined,
         };
     }
     catch (e) {
-        throw new Error("unknown music id: " + music.id + ", in platform: " + music.platform + ", with title: " + process_1.title);
+        throw new Error("unknown music id: " +
+            music.id +
+            ", in platform: " +
+            music.platform +
+            ", with title: " +
+            process_1.title);
     }
 }
 exports.buildMusic = buildMusic;

package/lib/service.js

@@ -18,59 +18,61 @@ exports.Service = Service;
     function createFilterFunction(filters) {
         const isLogicKey = (key) => {
             return [
-                '$and',
-                '$or',
-                '$not',
-                '$nor',
-                '$regexp',
-                '$like',
-                '$gt',
-                '$gte',
-                '$lt',
-                '$lte',
-                '$between',
+                "$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')
+            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));
+                        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));
+                        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);
+                        return !filterFn(event, "$or", value);
                     case "$not":
-                        return !filterFn(event, '$and', value);
+                        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')
+                if (key === "$regex" && typeof value === "string")
                     return new RegExp(value).test(String(event));
-                if (key === '$like' && typeof value === 'string')
+                if (key === "$like" && typeof value === "string")
                     return String(event).includes(value);
-                if (key === '$gt' && typeof value === 'number')
+                if (key === "$gt" && typeof value === "number")
                     return Number(event) > value;
-                if (key === '$gte' && typeof value === 'number')
+                if (key === "$gte" && typeof value === "number")
                     return Number(event) >= value;
-                if (key === '$lt' && typeof value === 'number')
+                if (key === "$lt" && typeof value === "number")
                     return Number(event) < value;
-                if (key === '$lte' && typeof value === 'number')
+                if (key === "$lte" && typeof value === "number")
                     return Number(event) <= value;
                 return value === event[key];
             }
-            if (key === '$between' &&
+            if (key === "$between" &&
                 Array.isArray(value) &&
                 value.length === 2 &&
-                value.every((item) => typeof item === 'number')) {
+                value.every(item => typeof item === "number")) {
                 const [start, end] = value;
                 return event >= start && event <= end;
             }

package/lib/utils.d.ts

@@ -25,7 +25,7 @@ export declare function toBool(v: any): boolean;
 export declare function uuid(): string;
 export declare function randomInt(max: number): number;
 export declare function randomInt(min: number, max: number): number;
-export declare function protectedFields<T>(source: T, ...keys: ((keyof T) | string)[]): T;
+export declare function protectedFields<T>(source: T, ...keys: (keyof T | string)[]): T;
 export declare function getProperties(obj: any): any;
 export declare function setValueToObj(obj: Dict, keys: string[], value: any): boolean;
 export declare function setValueToObj(obj: Dict, key: string, value: any): boolean;

package/lib/utils.js

@@ -27,24 +27,24 @@ exports.stringifyObj = exports.parseObjFromStr = exports.getDataKeyOfObj = expor
 const crypto = __importStar(require("crypto"));
 const fs = __importStar(require("fs"));
 const readline = __importStar(require("readline"));
-const packageJson = require('../package.json');
+const packageJson = require("../package.json");
 exports.version = packageJson.version;
 function readLine(maxLen, ...params) {
     return new Promise((resolve, reject) => {
         const result = [];
         const rl = readline.createInterface({
             input: fs.createReadStream(...params),
-            crlfDelay: Infinity
+            crlfDelay: Infinity,
         });
-        rl.on('line', (line) => {
+        rl.on("line", line => {
             result.push(line);
             if (result.length > maxLen)
                 result.shift();
         });
-        rl.on('close', () => {
-            resolve(result.join('\n'));
+        rl.on("close", () => {
+            resolve(result.join("\n"));
         });
-        rl.on('error', reject);
+        rl.on("error", reject);
     });
 }
 exports.readLine = readLine;
@@ -55,7 +55,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)) {
@@ -64,7 +64,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 {
@@ -84,7 +84,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])];
@@ -93,13 +93,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)) {
@@ -148,7 +148,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];
         });
@@ -157,7 +157,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();
     });
 }
@@ -176,40 +176,52 @@ 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 randomInt(...args) {
     let min = args[0] || 0, max = args[1];
     if (args.length === 1)
-        max = min, min = 0;
+        (max = min), (min = 0);
     return Math.floor(Math.random() * (max - min) + min);
 }
 exports.randomInt = randomInt;
 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__));
 }
 exports.getProperties = getProperties;
 function setValueToObj(obj, key, value) {
-    const keys = Array.isArray(key) ? key : key.split('.').filter(Boolean);
+    const keys = Array.isArray(key) ? key : key.split(".").filter(Boolean);
     const lastKey = keys.pop();
     if (!lastKey)
         throw new SyntaxError(`key is empty`);
@@ -223,7 +235,7 @@ function setValueToObj(obj, key, value) {
 }
 exports.setValueToObj = setValueToObj;
 function getValueOfObj(obj, key) {
-    const keys = Array.isArray(key) ? key : key.split('.').filter(Boolean);
+    const keys = Array.isArray(key) ? key : key.split(".").filter(Boolean);
     const lastKey = keys.pop();
     if (!lastKey)
         throw new SyntaxError(`key is empty`);
@@ -240,8 +252,8 @@ function getDataKeyOfObj(data, obj) {
     const _get = (data, obj, prefix) => {
         for (const [key, value] of Object.entries(obj)) {
             if (value === data)
-                return [...prefix, key].join('.');
-            if (!value || typeof value !== 'object')
+                return [...prefix, key].join(".");
+            if (!value || typeof value !== "object")
                 continue;
             const result = _get(data, value, prefix);
             if (result)
@@ -256,9 +268,9 @@ function parseObjFromStr(str) {
     const format = (data, keys) => {
         if (!data)
             return;
-        if (typeof data !== 'object' && typeof data !== 'string')
+        if (typeof data !== "object" && typeof data !== "string")
             return;
-        if (typeof data === 'object')
+        if (typeof data === "object")
             return Object.entries(data).map(([k, v]) => format(v, [...keys, k]));
         if (/\[Function:.+]/.test(data))
             return setValueToObj(result, [...keys], new Function(`return (${data.slice(10, -1)})`)());
@@ -270,19 +282,19 @@ function parseObjFromStr(str) {
 }
 exports.parseObjFromStr = parseObjFromStr;
 function stringifyObj(value) {
-    if (!value || typeof value !== 'object')
+    if (!value || typeof value !== "object")
         return value;
     if (Array.isArray(value))
         return `[${value.map(stringifyObj).join()}]`;
     let result = { ...value }, cache = new WeakMap();
     const _stringify = (obj, prefix) => {
         for (const key of Reflect.ownKeys(obj)) {
-            if (typeof key === 'symbol')
+            if (typeof key === "symbol")
                 continue;
             const val = Reflect.get(obj, key);
-            if (!val || typeof val !== 'object') {
-                if (typeof val === 'function') {
-                    setValueToObj(result, [...prefix, String(key)], `[Function:${(val + '').replace(/\n/g, '')}]`);
+            if (!val || typeof val !== "object") {
+                if (typeof val === "function") {
+                    setValueToObj(result, [...prefix, String(key)], `[Function:${(val + "").replace(/\n/g, "")}]`);
                     continue;
                 }
                 setValueToObj(result, [...prefix, String(key)], val);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.47",
+  "version": "0.4.49",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"