onebots 0.1.17 → 0.2.0

package/lib/onebot.js

@@ -129,7 +129,7 @@ class OneBot extends events_1.EventEmitter {
                     case 'private':
                         data.message.shift({
                             type: 'reply',
-                            message_id: (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.rand, data.source.time)
+                            message_id: (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time)
                         });
                         break;
                 }

package/lib/server/app.js

@@ -200,10 +200,10 @@ class App extends koa_1.default {
         this.logger.mark(`server listen at http://0.0.0.0:${this.config.port}/${this.config.path ? this.config.path : ''}`);
     }
 }
-exports.App = App;
 _a = App;
 App.configDir = path.join(os.homedir(), '.onebots');
 App.configPath = path.join(_a.configDir, 'config.yaml');
+exports.App = App;
 function createApp(config = 'config.yaml') {
     if (typeof config === 'string') {
         config = path.resolve(process.cwd(), config);
@@ -239,3 +239,4 @@ exports.defineConfig = defineConfig;
         log_level: 'info',
     };
 })(App = exports.App || (exports.App = {}));
+exports.App = App;

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

@@ -83,10 +83,10 @@ class CommonAction {
     callLogin(func, ...args) {
         return new Promise(async (resolve) => {
             const receiveResult = (event) => {
-                this.client.offTrap('system.login.qrcode', receiveResult);
-                this.client.offTrap('system.login.device', receiveResult);
-                this.client.offTrap('system.login.slider', receiveResult);
-                this.client.offTrap('system.login.error', receiveResult);
+                this.client.offTrap('system.login.qrcode');
+                this.client.offTrap('system.login.device');
+                this.client.offTrap('system.login.slider');
+                this.client.offTrap('system.login.error');
                 resolve(event);
             };
             this.client.trap('system.login.qrcode', receiveResult);
@@ -112,8 +112,8 @@ class CommonAction {
         return new Promise(resolve => {
             const receiveResult = (e) => {
                 const callback = (data) => {
-                    this.client.offTrap('internal.verbose', receiveResult);
-                    this.client.offTrap('system.login.error', receiveResult);
+                    this.client.offTrap('internal.verbose');
+                    this.client.offTrap('system.login.error');
                     resolve(data);
                 };
                 if ((typeof e === 'string' && e.includes('已发送')) || typeof e !== 'string') {
@@ -131,7 +131,7 @@ class CommonAction {
     logout(keepalive) {
         return new Promise(async (resolve) => {
             const receiveResult = (e) => {
-                this.client.offTrap('system.offline', receiveResult);
+                this.client.offTrap('system.offline');
                 resolve(e);
             };
             this.client.trap('system.offline', receiveResult);

package/lib/service/V12/action/common.d.ts

@@ -1,5 +1,4 @@
 import { V12 } from '../../../service/V12';
-import { OnlineStatus } from "icqq";
 import { Action } from "./";
 import { V11 } from "../../../service/V11";
 export declare class CommonAction {
@@ -24,7 +23,7 @@ export declare class CommonAction {
         good: boolean;
         bots: {
             self: any;
-            online: OnlineStatus;
+            online: boolean;
         }[];
     };
     getLatestEvents(this: V12, limit?: number, timout?: number): Promise<V12.Payload<keyof Action>[]>;

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

@@ -35,7 +35,7 @@ class CommonAction {
             bots: [
                 {
                     self: this.action.getSelfInfo.apply(this),
-                    online: this.client.status = icqq_1.OnlineStatus.Online,
+                    online: this.client.status === icqq_1.OnlineStatus.Online,
                 }
             ]
         };
@@ -59,10 +59,10 @@ class CommonAction {
     callLogin(func, ...args) {
         return new Promise(async (resolve) => {
             const receiveResult = (event) => {
-                this.client.offTrap('system.login.qrcode', receiveResult);
-                this.client.offTrap('system.login.device', receiveResult);
-                this.client.offTrap('system.login.slider', receiveResult);
-                this.client.offTrap('system.login.error', receiveResult);
+                this.client.offTrap('system.login.qrcode');
+                this.client.offTrap('system.login.device');
+                this.client.offTrap('system.login.slider');
+                this.client.offTrap('system.login.error');
                 resolve(event);
             };
             this.client.trap('system.login.qrcode', receiveResult);
@@ -88,8 +88,8 @@ class CommonAction {
         return new Promise(resolve => {
             const receiveResult = (e) => {
                 const callback = (data) => {
-                    this.client.offTrap('internal.verbose', receiveResult);
-                    this.client.offTrap('system.login.error', receiveResult);
+                    this.client.offTrap('internal.verbose');
+                    this.client.offTrap('system.login.error');
                     resolve(data);
                 };
                 if ((typeof e === 'string' && e.includes('已发送')) || typeof e !== 'string') {
@@ -107,7 +107,7 @@ class CommonAction {
     logout(keepalive) {
         return new Promise(async (resolve) => {
             const receiveResult = (e) => {
-                this.client.offTrap('system.offline', receiveResult);
+                this.client.offTrap('system.offline');
                 resolve(e);
             };
             this.client.on('system.offline', receiveResult);

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

@@ -188,6 +188,7 @@ export declare namespace V12 {
         };
         heartbeat: {
             detail_type: 'heartbeat';
+            status: ReturnType<Action['getStatus']>;
             interval: number;
         };
         status_update: {

package/lib/service/V12/index.js

@@ -94,7 +94,8 @@ class V12 extends events_1.EventEmitter {
             this.heartbeat = setInterval(() => {
                 this.dispatch(V12.formatPayload(this.oneBot.uin, 'heartbeat', {
                     detail_type: "heartbeat",
-                    interval: new Date().getTime() + this.config.heartbeat * 1000
+                    interval: new Date().getTime() + this.config.heartbeat * 1000,
+                    status: this.action.getStatus.apply(this)
                 }));
             }, this.config.heartbeat * 1000);
         }
@@ -299,7 +300,10 @@ class V12 extends events_1.EventEmitter {
         if (data.type === 'notice') {
             switch (data.detail_type) {
                 case 'friend':
-                    data.detail_type += data.sub_type;
+                    if (['increase', 'decrease'].includes(data.sub_type))
+                        data.detail_type = 'friend_' + data.sub_type;
+                    else if (data.sub_type === 'recall')
+                        data.detail_type = 'private_message_delete';
                     break;
                 case 'group':
                     if (['increase', 'decrease'].includes(data.sub_type))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.1.17",
+  "version": "0.2.0",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -50,7 +50,7 @@
   ],
   "dependencies": {
     "@koa/router": "^10.1.1",
-    "icqq": "^0.0.26",
+    "icqq": "^0.0.37",
     "icqq-cq-enable": "^1.0.0",
     "js-yaml": "^4.1.0",
     "koa": "^2.13.4",

package/lib/config.sample.yaml

@@ -1,31 +0,0 @@
-port: 6727 # 监听端口
-log_level: info # 日志等级
-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连接地址
-# 每个账号的单独配置(用于覆盖通用配置)
-123456789:
-  version: V11 # 使用的oneBot版本
-  password: abcedfghi # 账号密码，未配置则扫码登陆
-  # 。。。其他配置项参见上方对应oneBot版本的通用配置