onebots 0.0.14 → 0.0.15

package/lib/types.d.ts

@@ -1,3 +1,3 @@
-export declare type LogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal" | "mark" | "off";
-export declare type Dispose = () => any;
-export declare type MayBeArray<T extends any> = T | T[];
+export type LogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal" | "mark" | "off";
+export type Dispose = () => any;
+export type MayBeArray<T extends any> = T | T[];

package/lib/types.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/utils.d.ts

@@ -1,14 +1,14 @@
-export declare function deepMerge<T extends any>(base: T, ...from: T[]): T;
-export declare function deepClone<T extends any>(obj: T): T;
-export declare function pick<T, K extends keyof T>(source: T, keys?: Iterable<K>, forced?: boolean): Pick<T, K>;
-export declare function omit<T, K extends keyof T>(source: T, keys?: Iterable<K>): Omit<T, K>;
-export interface Class {
-    new (...args: any[]): any;
-}
-export declare function Mixin(base: Class, ...classes: Class[]): Class;
-export declare function toHump(action: string): string;
-export declare function toLine(name: string): string;
-export declare function toBool(v: any): boolean;
-export declare function uuid(): string;
-export declare function protectedFields<T>(source: T, ...keys: (keyof T)[]): T;
-export declare function getProperties(obj: any): any;
+export declare function deepMerge<T extends any>(base: T, ...from: T[]): T;
+export declare function deepClone<T extends any>(obj: T): T;
+export declare function pick<T extends object, K extends keyof T>(source: T, keys?: Iterable<K>, forced?: boolean): Pick<T, K>;
+export declare function omit<T, K extends keyof T>(source: T, keys?: Iterable<K>): Omit<T, K>;
+export interface Class {
+    new (...args: any[]): any;
+}
+export declare function Mixin(base: Class, ...classes: Class[]): Class;
+export declare function toHump(action: string): string;
+export declare function toLine(name: string): string;
+export declare function toBool(v: any): boolean;
+export declare function uuid(): string;
+export declare function protectedFields<T>(source: T, ...keys: (keyof T)[]): T;
+export declare function getProperties(obj: any): any;

package/lib/utils.js

@@ -1,150 +1,150 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.toLine = exports.toHump = exports.Mixin = exports.omit = exports.pick = exports.deepClone = exports.deepMerge = void 0;
-const crypto = __importStar(require("crypto"));
-// 合并对象/数组
-function deepMerge(base, ...from) {
-    if (from.length === 0) {
-        return base;
-    }
-    if (typeof base !== 'object') {
-        return base;
-    }
-    if (Array.isArray(base)) {
-        return base.concat(...from);
-    }
-    for (const item of from) {
-        for (const key in item) {
-            if (base.hasOwnProperty(key)) {
-                if (typeof base[key] === 'object') {
-                    // @ts-ignore
-                    base[key] = deepMerge(base[key], item[key]);
-                }
-                else {
-                    // @ts-ignore
-                    base[key] = item[key];
-                }
-            }
-            else {
-                // @ts-ignore
-                base[key] = item[key];
-            }
-        }
-    }
-    return base;
-}
-exports.deepMerge = deepMerge;
-// 深拷贝
-function deepClone(obj) {
-    if (typeof obj !== 'object')
-        return obj;
-    if (!obj)
-        return obj;
-    //判断拷贝的obj是对象还是数组
-    if (Array.isArray(obj))
-        return obj.map((item) => deepClone(item));
-    const objClone = {};
-    for (const key in obj) {
-        if (obj.hasOwnProperty(key)) {
-            if (obj[key] && typeof obj[key] === "object") {
-                objClone[key] = deepClone(obj[key]);
-            }
-            else {
-                objClone[key] = obj[key];
-            }
-        }
-    }
-    return objClone;
-}
-exports.deepClone = deepClone;
-function pick(source, keys, forced) {
-    if (!keys)
-        return { ...source };
-    const result = {};
-    for (const key of keys) {
-        if (forced || key in source)
-            result[key] = source[key];
-    }
-    return result;
-}
-exports.pick = pick;
-function omit(source, keys) {
-    if (!keys)
-        return { ...source };
-    const result = { ...source };
-    for (const key of keys) {
-        Reflect.deleteProperty(result, key);
-    }
-    return result;
-}
-exports.omit = omit;
-function Mixin(base, ...classes) {
-    classes.forEach(ctr => {
-        Object.getOwnPropertyNames(ctr.prototype).forEach(name => {
-            if (name === 'constructor')
-                return;
-            base.prototype[name] = ctr.prototype[name];
-        });
-    });
-    return base;
-}
-exports.Mixin = Mixin;
-function toHump(action) {
-    return action.replace(/_[\w]/g, (s) => {
-        return s[1].toUpperCase();
-    });
-}
-exports.toHump = toHump;
-function toLine(name) {
-    return name.replace(/([A-Z])/g, "_$1").toLowerCase();
-}
-exports.toLine = toLine;
-function toBool(v) {
-    if (v === "0" || v === "false")
-        v = false;
-    return Boolean(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);
-}
-exports.uuid = uuid;
-function protectedFields(source, ...keys) {
-    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) ? value.split('').map(c => '*').join('') : value];
-    }));
-}
-exports.protectedFields = protectedFields;
-function getProperties(obj) {
-    if (obj.__proto__ === null) { //说明该对象已经是最顶层的对象
-        return [];
-    }
-    return Object.getOwnPropertyNames(obj).concat(getProperties(obj.__proto__));
-}
-exports.getProperties = getProperties;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.toLine = exports.toHump = exports.Mixin = exports.omit = exports.pick = exports.deepClone = exports.deepMerge = void 0;
+const crypto = __importStar(require("crypto"));
+// 合并对象/数组
+function deepMerge(base, ...from) {
+    if (from.length === 0) {
+        return base;
+    }
+    if (typeof base !== 'object') {
+        return base;
+    }
+    if (Array.isArray(base)) {
+        return base.concat(...from);
+    }
+    for (const item of from) {
+        for (const key in item) {
+            if (base.hasOwnProperty(key)) {
+                if (typeof base[key] === 'object') {
+                    // @ts-ignore
+                    base[key] = deepMerge(base[key], item[key]);
+                }
+                else {
+                    // @ts-ignore
+                    base[key] = item[key];
+                }
+            }
+            else {
+                // @ts-ignore
+                base[key] = item[key];
+            }
+        }
+    }
+    return base;
+}
+exports.deepMerge = deepMerge;
+// 深拷贝
+function deepClone(obj) {
+    if (typeof obj !== 'object')
+        return obj;
+    if (!obj)
+        return obj;
+    //判断拷贝的obj是对象还是数组
+    if (Array.isArray(obj))
+        return obj.map((item) => deepClone(item));
+    const objClone = {};
+    for (const key in obj) {
+        if (obj.hasOwnProperty(key)) {
+            if (obj[key] && typeof obj[key] === "object") {
+                objClone[key] = deepClone(obj[key]);
+            }
+            else {
+                objClone[key] = obj[key];
+            }
+        }
+    }
+    return objClone;
+}
+exports.deepClone = deepClone;
+function pick(source, keys, forced) {
+    if (!keys)
+        return { ...source };
+    const result = {};
+    for (const key of keys) {
+        if (forced || key in source)
+            result[key] = source[key];
+    }
+    return result;
+}
+exports.pick = pick;
+function omit(source, keys) {
+    if (!keys)
+        return { ...source };
+    const result = { ...source };
+    for (const key of keys) {
+        Reflect.deleteProperty(result, key);
+    }
+    return result;
+}
+exports.omit = omit;
+function Mixin(base, ...classes) {
+    classes.forEach(ctr => {
+        Object.getOwnPropertyNames(ctr.prototype).forEach(name => {
+            if (name === 'constructor')
+                return;
+            base.prototype[name] = ctr.prototype[name];
+        });
+    });
+    return base;
+}
+exports.Mixin = Mixin;
+function toHump(action) {
+    return action.replace(/_[\w]/g, (s) => {
+        return s[1].toUpperCase();
+    });
+}
+exports.toHump = toHump;
+function toLine(name) {
+    return name.replace(/([A-Z])/g, "_$1").toLowerCase();
+}
+exports.toLine = toLine;
+function toBool(v) {
+    if (v === "0" || v === "false")
+        v = false;
+    return Boolean(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);
+}
+exports.uuid = uuid;
+function protectedFields(source, ...keys) {
+    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) ? value.split('').map(c => '*').join('') : value];
+    }));
+}
+exports.protectedFields = protectedFields;
+function getProperties(obj) {
+    if (obj.__proto__ === null) { //说明该对象已经是最顶层的对象
+        return [];
+    }
+    return Object.getOwnPropertyNames(obj).concat(getProperties(obj.__proto__));
+}
+exports.getProperties = getProperties;

package/package.json

@@ -1,58 +1,58 @@
-{
-  "name": "onebots",
-  "version": "0.0.14",
-  "description": "基于oicq的多例oneBot实现",
-  "main": "lib/index.js",
-  "bin": {
-    "onebots": "./lib/bin.js"
-  },
-  "scripts": {
-    "start": "node .",
-    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
-    "dev": "ts-node-dev -r tsconfig-paths/register ./src/test.ts",
-    "pub": "npm publish --access public",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/liucl-cn/onebots.git"
-  },
-  "keywords": [
-    "onebot",
-    "oicq",
-    "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"
-  },
-  "files": [
-    "/lib/**/*.js",
-    "/lib/**/*.d.ts",
-    "/lib/*.yaml",
-    "/**/LICENSE"
-  ],
-  "dependencies": {
-    "@koa/router": "^10.1.1",
-    "js-yaml": "^4.1.0",
-    "koa": "^2.13.4",
-    "koa-bodyparser": "^4.3.0",
-    "log4js": "^6.5.2",
-    "oicq": "^2.3.1",
-    "oicq2-cq-enable": "^1.0.6",
-    "ws": "^8.8.0"
-  }
-}
+{
+  "name": "onebots",
+  "version": "0.0.15",
+  "description": "基于oicq的多例oneBot实现",
+  "main": "lib/index.js",
+  "bin": {
+    "onebots": "./lib/bin.js"
+  },
+  "scripts": {
+    "start": "node .",
+    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
+    "dev": "ts-node-dev -r tsconfig-paths/register ./src/test.ts",
+    "pub": "npm publish --access public",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/liucl-cn/onebots.git"
+  },
+  "keywords": [
+    "onebot",
+    "oicq",
+    "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"
+  },
+  "files": [
+    "/lib/**/*.js",
+    "/lib/**/*.d.ts",
+    "/lib/*.yaml",
+    "/**/LICENSE"
+  ],
+  "dependencies": {
+    "@koa/router": "^10.1.1",
+    "js-yaml": "^4.1.0",
+    "koa": "^2.13.4",
+    "koa-bodyparser": "^4.3.0",
+    "log4js": "^6.5.2",
+    "oicq": "^2.3.1",
+    "oicq2-cq-enable": "^1.0.6",
+    "ws": "^8.8.0"
+  }
+}

package/lib/config.sample.yaml

@@ -1,31 +0,0 @@
-port: 6727 # 监听端口
-general: # 通用配置，在单个配置省略时的默认值
-  V11: # oneBotV11的通用配置
-    heartbeat: 3 # 心跳间隔 (秒)
-    access_token: '' # 访问api的token
-    post_timeout: 15 # 上报超时时间，(秒)
-    secret: '' # 上报数据的sha1签名密钥
-    rate_limit_interval: 4 # ws心跳间隔(秒)
-    post_message_format: string # "string"或"array"
-    reconnect_interval: 3 # 重连间隔 (秒)
-    use_http: true # 是否使用 http
-    enable_cors: true # 是否允许跨域
-    use_ws: true # 是否使用websocket
-    http_reverse: [] # http上报地址
-    ws_reverse: [] # 反向ws连接地址
-  V12: # oneBotV12的通用配置
-    heartbeat: 3 # 心跳间隔 (秒)
-    access_token: '' # 访问api的token
-    request_timeout: 15 # 上报超时时间 (秒)
-    reconnect_interval: 3 # 重连间隔 (秒)
-    enable_cors: true # 是否允许跨域
-    use_http: true # 是否启用http
-    use_ws: true # 是否启用 websocket
-    webhook: [] # http 上报地址
-    ws_reverse: [] # 反向ws连接地址
-log_level: info # 日志等级
-# 每个账号的单独配置(用于覆盖通用配置)
-123456789:
-  version: V11 # 使用的oneBot版本
-  password: abcedfghi # 账号密码，未配置则扫码登陆
-  # 。。。其他配置项参见上方对应oneBot版本的通用配置