onebots 0.2.4 → 0.2.5

package/README.md

@@ -79,5 +79,5 @@ node ./index.js
 | /remove | get | uin,force       | 移除机器人,force为true时，将删除机器人data目录 |
 
 # 鸣谢
-1. [takayama-lily/icqq](https://github.com/takayama-lily/icqq) 底层服务支持
-2. [takayama-lily/onebot](https://github.com/takayama-lily/node-onebot) oneBots原先版本
+1. [icqqjs/icqq](https://github.com/icqqjs/icqq) 底层服务支持
+2. [takayama-lily/onebot](https://github.com/takayama-lily/node-onebot) oneBot V11 原先版本

package/lib/onebot.js

@@ -92,7 +92,6 @@ class OneBot extends events_1.EventEmitter {
         });
         this.client.trap('system.login.device', function deviceHelper(e) {
             console.log('请选择验证方式：1.短信验证  2.url验证');
-            this.sendSmsCode();
             process.stdin.once('data', (buf) => {
                 const input = e.toString().trim();
                 if (input === '1') {
@@ -104,7 +103,7 @@ class OneBot extends events_1.EventEmitter {
                 }
                 else {
                     console.log(`请前往：${e.url} 完成验证后回车继续`);
-                    process.stdin.once('data', buf => {
+                    process.stdin.once('data', () => {
                         this.login();
                     });
                 }
@@ -125,7 +124,6 @@ class OneBot extends events_1.EventEmitter {
             this.off('system.login.error', errorHandler);
         });
         this.client.trap('system.login.slider', function sliderHelper(e) {
-            console.log('滑块验证地址：' + e.url);
             console.log('请输入滑块验证返回的ticket');
             process.stdin.once('data', (e) => {
                 this.submitSlider(e.toString().trim());

package/lib/service/V11/action/friend.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FriendAction = void 0;
-const utils_1 = require("../../../service/V11/action/utils");
+const utils_1 = require("../../../service/V11/utils");
 class FriendAction {
     /**
      * 发送私聊消息
@@ -10,12 +10,12 @@ class FriendAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendPrivateMsg(user_id, message, message_id) {
-        const msg = message ? await this.client.getMsg(message_id) : undefined;
+        const msg = message_id ? await this.client.getMsg(message_id) : undefined;
         const { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, msg]);
         if (music)
-            await this.client.pickUser(user_id).shareMusic(music.data.platform, music.data.id);
+            await this.client.pickFriend(user_id).shareMusic(music.data.platform, music.data.id);
         if (share)
-            await this.client.pickUser(user_id).shareUrl(music.data);
+            await this.client.pickFriend(user_id).shareUrl(music.data);
         if (element.length) {
             return await this.client.sendPrivateMsg(user_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
         }

package/lib/service/V11/action/group.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupAction = void 0;
-const utils_1 = require("../../../service/V11/action/utils");
+const utils_1 = require("../../../service/V11/utils");
 class GroupAction {
     /**
      * 发送群聊消息
@@ -10,7 +10,7 @@ class GroupAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendGroupMsg(group_id, message, message_id) {
-        const msg = message ? await this.client.getMsg(message_id) : undefined;
+        const msg = message_id ? await this.client.getMsg(message_id) : undefined;
         const { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, msg]);
         if (music)
             await this.client.pickGroup(group_id).shareMusic(music.data.platform, music.data.id);

package/lib/service/V11/{action/utils.js → utils.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processMessage = void 0;
-const utils_1 = require("../../../utils");
+const utils_1 = require("../../utils");
 const utils_2 = require("icqq-cq-enable/lib/utils");
 async function processMessage(message, source) {
     const element = typeof message === 'string' ? (0, utils_2.fromCqcode)(message) : (0, utils_2.fromSegment)(message);

package/lib/service/V12/action/friend.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FriendAction = void 0;
-const utils_1 = require("../../../service/V12/action/utils");
+const utils_1 = require("../../../service/V12/utils");
 class FriendAction {
     getUserInfo(user_id) {
         return this.client.getStrangerInfo(user_id);
@@ -18,9 +18,9 @@ class FriendAction {
     async sendPrivateMsg(user_id, message, source) {
         let { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, source]);
         if (music)
-            await this.client.pickUser(user_id).shareMusic(music.data.platform, music.data.id);
+            await this.client.pickFriend(user_id).shareMusic(music.data.platform, music.data.id);
         if (share)
-            await this.client.pickUser(user_id).shareUrl(music.data);
+            await this.client.pickFriend(user_id).shareUrl(music.data);
         if (element.length) {
             return await this.client.sendPrivateMsg(user_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
         }

package/lib/service/V12/action/group.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupAction = void 0;
-const utils_1 = require("../../../service/V12/action/utils");
+const utils_1 = require("../../../service/V12/utils");
 class GroupAction {
     /**
      * 发送群聊消息

package/lib/service/V12/action/guild.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildAction = void 0;
-const utils_1 = require("../../../service/V12/action/utils");
+const utils_1 = require("../../../service/V12/utils");
 class GuildAction {
     getGuildList() {
         return this.client.getGuildList();

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

@@ -38,7 +38,7 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
         sub_type: string;
     } & Omit<V12.BotEventMap[E], E>;
     dispatch(data: Record<string, any>): void;
-    apply(req: any): Promise<string>;
+    apply(req: V12.RequestAction): Promise<string>;
     private _httpRequestHandler;
     /**
      * 快速操作
@@ -215,4 +215,9 @@ export declare namespace V12 {
         type: string;
         sub_type: string;
     } & Omit<BotEventMap[K], K>;
+    type RequestAction = {
+        action: string;
+        params: Record<string, any>;
+        echo?: number;
+    };
 }

package/lib/service/V12/{action/utils.d.ts → utils.d.ts}

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

package/lib/service/V12/{action/utils.js → utils.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processMessage = void 0;
-const V12_1 = require("../../../service/V12");
-const utils_1 = require("../../../utils");
+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')

package/lib/utils.d.ts

@@ -4,13 +4,13 @@ export declare function transformObj(obj: any, callback: any): any;
 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 declare function toLine<T extends string>(name: T): string;
 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 remove<T>(list: T[], item: T): void;
-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;

package/lib/utils.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.toLine = exports.remove = exports.toHump = exports.Mixin = 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.omit = exports.pick = exports.deepClone = exports.transformObj = exports.deepMerge = exports.version = void 0;
 const crypto = __importStar(require("crypto"));
 const packageJson = require('../package.json');
 exports.version = packageJson.version;
@@ -114,6 +114,10 @@ function omit(source, keys) {
     return result;
 }
 exports.omit = omit;
+function toLine(name) {
+    return name.replace(/([A-Z])/g, "_$1").toLowerCase();
+}
+exports.toLine = toLine;
 function Mixin(base, ...classes) {
     classes.forEach(ctr => {
         Object.getOwnPropertyNames(ctr.prototype).forEach(name => {
@@ -137,10 +141,6 @@ function remove(list, item) {
         list.splice(idx, 1);
 }
 exports.remove = remove;
-function toLine(name) {
-    return name.replace(/([A-Z])/g, "_$1").toLowerCase();
-}
-exports.toLine = toLine;
 function toBool(v) {
     if (v === "0" || v === "false")
         v = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -14,6 +14,9 @@
     "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
     "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": {
@@ -40,7 +43,8 @@
     "ts-node-dev": "latest",
     "tsc-alias": "latest",
     "tsconfig-paths": "latest",
-    "typescript": "latest"
+    "typescript": "latest",
+    "vitepress": "^1.0.0-alpha.72"
   },
   "files": [
     "/lib/**/*.js",
@@ -50,7 +54,7 @@
   ],
   "dependencies": {
     "@koa/router": "^10.1.1",
-    "icqq": "^0.2.0",
+    "icqq": "^0.3.6",
     "icqq-cq-enable": "^1.0.0",
     "js-yaml": "^4.1.0",
     "koa": "^2.13.4",