onebots 0.4.13 → 0.4.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +42 -41
- package/lib/config.sample.yaml +2 -0
- package/lib/onebot.js +3 -3
- package/lib/server/app.js +5 -5
- package/lib/service/V11/index.js +22 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -91,53 +91,54 @@ general: # 通用配置，在单个配置省略时的默认值
|
|
|
91
91
|
```
|
|
92
92
|
# 配置解释
|
|
93
93
|
## Config
|
|
94
|
-
| 配置项
|
|
95
|
-
|
|
96
|
-
| port
|
|
97
|
-
| logLevel| string
|
|
98
|
-
| general
|
|
99
|
-
| [number] | OneBotConfig\|OneBotConfig[] | - |
|
|
94
|
+
| 配置项 | 类型 | 默认值 | desc |
|
|
95
|
+
|:---------|:-----------------------------|:--------|:-------|
|
|
96
|
+
| port | number | 6727 | 服务监听端口 |
|
|
97
|
+
| logLevel | string | info | 日志级别 |
|
|
98
|
+
| general | OneBotConfig | general | 通用配置 |
|
|
99
|
+
| [number] | OneBotConfig\|OneBotConfig[] | - | 机器人配置 |
|
|
100
100
|
## OneBotConfig
|
|
101
|
-
| 配置项
|
|
102
|
-
|
|
103
|
-
| V11| ConfigV11| configV11| V11
|
|
104
|
-
| V12| ConfigV12| configV12| V12
|
|
101
|
+
| 配置项 | 类型 | 默认值 | desc |
|
|
102
|
+
|:---------|:----------|:----------|:-------|
|
|
103
|
+
| V11 | ConfigV11 | configV11 | V11配置 |
|
|
104
|
+
| V12 | ConfigV12 | configV12 | V12配置 |
|
|
105
|
+
| protocol | Config | {} | icqq配置 |
|
|
105
106
|
## ConfigV11
|
|
106
|
-
| 配置项
|
|
107
|
-
|
|
108
|
-
| heartbeat| number | 3
|
|
109
|
-
| access_token| string | -
|
|
110
|
-
| secret| string | -
|
|
111
|
-
|rate_limit_interval| number | 4
|
|
112
|
-
| post_message_format| string | string
|
|
113
|
-
|reconnect_interval| number | 3
|
|
114
|
-
| use_http| boolean | false
|
|
115
|
-
| enable_cors| boolean | false
|
|
116
|
-
| use_ws| boolean | false
|
|
117
|
-
|http_reverse_url| string[] | -
|
|
118
|
-
| ws_reverse_url| string[] | -
|
|
107
|
+
| 配置项 | 类型 | 默认值 | desc |
|
|
108
|
+
|:--------------------|:---------|:-------|:-----------|
|
|
109
|
+
| heartbeat | number | 3 | 心跳间隔 单位：秒 |
|
|
110
|
+
| access_token | string | - | 访问令牌 |
|
|
111
|
+
| secret | string | - | 签名密钥 |
|
|
112
|
+
| rate_limit_interval | number | 4 | 限速间隔 单位：秒 |
|
|
113
|
+
| post_message_format | string | string | 消息格式化 |
|
|
114
|
+
| reconnect_interval | number | 3 | 重连间隔 单位：秒 |
|
|
115
|
+
| use_http | boolean | false | 是否使用http协议 |
|
|
116
|
+
| enable_cors | boolean | false | 是否允许跨域 |
|
|
117
|
+
| use_ws | boolean | false | 是否使用ws协议 |
|
|
118
|
+
| http_reverse_url | string[] | - | http上报地址地址 |
|
|
119
|
+
| ws_reverse_url | string[] | - | 反向ws连接地址 |
|
|
119
120
|
## ConfigV12
|
|
120
|
-
| 配置项
|
|
121
|
-
|
|
122
|
-
| heartbeat| number | 3
|
|
123
|
-
| access_token| string | -
|
|
124
|
-
| request_timeout| number | 15
|
|
125
|
-
| reconnect_interval| number | 3
|
|
126
|
-
|enable_cors| boolean | false
|
|
127
|
-
|use_http| boolean | false
|
|
128
|
-
|use_ws| boolean | false
|
|
129
|
-
|webhook_reverse_url| string[] | -
|
|
130
|
-
|ws_reverse_url| string[] | -
|
|
121
|
+
| 配置项 | 类型 | 默认值 | desc |
|
|
122
|
+
|:--------------------|:---------|:------|:------------|
|
|
123
|
+
| heartbeat | number | 3 | 心跳间隔 单位：秒 |
|
|
124
|
+
| access_token | string | - | 访问令牌 |
|
|
125
|
+
| request_timeout | number | 15 | 请求超时 单位：秒 |
|
|
126
|
+
| reconnect_interval | number | 3 | 重连间隔 单位：秒 |
|
|
127
|
+
| enable_cors | boolean | false | 是否允许跨域 |
|
|
128
|
+
| use_http | boolean | false | 是否使用http协议 |
|
|
129
|
+
| use_ws | boolean | false | 是否使用ws协议 |
|
|
130
|
+
| webhook_reverse_url | string[] | - | webhook上报地址 |
|
|
131
|
+
| ws_reverse_url | string[] | - | 反向ws连接地址 |
|
|
131
132
|
# 使用API管理oneBot
|
|
132
133
|
|
|
133
134
|
| url | method | params | desc |
|
|
134
|
-
|
|
135
|
-
| /list | GET
|
|
136
|
-
| /detail | GET
|
|
137
|
-
| /qrcode | GET
|
|
138
|
-
| /add | POST
|
|
139
|
-
| /edit | POST
|
|
140
|
-
| /remove | get
|
|
135
|
+
|:--------|:-------|:----------------|:-------------------------------|
|
|
136
|
+
| /list | GET | | 获取当前运行的机器人列表 |
|
|
137
|
+
| /detail | GET | uin | 获取指定机器人配置 |
|
|
138
|
+
| /qrcode | GET | uin | 获取指定机器人登录二维码 |
|
|
139
|
+
| /add | POST | {uin,...config} | 添加机器人 config 为机器人配置 |
|
|
140
|
+
| /edit | POST | {uin,...config} | 修改机器人配置 config 为机器人配置 |
|
|
141
|
+
| /remove | get | uin,force | 移除机器人,force为true时，将删除机器人data目录 |
|
|
141
142
|
|
|
142
143
|
# 鸣谢
|
|
143
144
|
1. [icqqjs/icqq](https://github.com/icqqjs/icqq) 底层服务支持
|
package/lib/config.sample.yaml
CHANGED
package/lib/onebot.js
CHANGED
|
@@ -49,7 +49,7 @@ class OneBot extends events_1.EventEmitter {
|
|
|
49
49
|
config = [].concat(config);
|
|
50
50
|
const protocolConfig = {
|
|
51
51
|
data_dir: (0, path_1.join)(app_1.App.configDir, 'data'),
|
|
52
|
-
...this.app.config.general
|
|
52
|
+
...this.app.config.general.protocol
|
|
53
53
|
};
|
|
54
54
|
this.config = config.map(c => {
|
|
55
55
|
if (!c.version)
|
|
@@ -182,13 +182,13 @@ class OneBot extends events_1.EventEmitter {
|
|
|
182
182
|
case 'group':
|
|
183
183
|
data.message.unshift({
|
|
184
184
|
type: 'reply',
|
|
185
|
-
|
|
185
|
+
id: (0, icqq_2.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time)
|
|
186
186
|
});
|
|
187
187
|
break;
|
|
188
188
|
case 'private':
|
|
189
189
|
data.message.unshift({
|
|
190
190
|
type: 'reply',
|
|
191
|
-
|
|
191
|
+
id: (0, icqq_2.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time)
|
|
192
192
|
});
|
|
193
193
|
break;
|
|
194
194
|
}
|
package/lib/server/app.js
CHANGED
|
@@ -47,7 +47,7 @@ class App extends koa_1.default {
|
|
|
47
47
|
constructor(config = {}) {
|
|
48
48
|
super(config);
|
|
49
49
|
this.oneBots = [];
|
|
50
|
-
this.config = (0, utils_1.deepMerge)((0, utils_1.deepClone)(
|
|
50
|
+
this.config = (0, utils_1.deepMerge)((0, utils_1.deepClone)(_a.defaultConfig), config);
|
|
51
51
|
this.logger = (0, log4js_1.getLogger)('[icqq-OneBot]');
|
|
52
52
|
this.logger.level = this.config.log_level;
|
|
53
53
|
this.router = new router_1.Router({ prefix: config.path });
|
|
@@ -86,7 +86,7 @@ class App extends koa_1.default {
|
|
|
86
86
|
this.config[uin] = config;
|
|
87
87
|
const oneBot = this.createOneBot(uin, config);
|
|
88
88
|
oneBot.startListen();
|
|
89
|
-
(0, fs_1.writeFileSync)(
|
|
89
|
+
(0, fs_1.writeFileSync)(_a.configPath, js_yaml_1.default.dump((0, utils_1.deepClone)(this.config)));
|
|
90
90
|
}
|
|
91
91
|
updateAccount(uin, config) {
|
|
92
92
|
if (typeof uin !== "number")
|
|
@@ -112,7 +112,7 @@ class App extends koa_1.default {
|
|
|
112
112
|
oneBot.stop(force);
|
|
113
113
|
delete this.config[uin];
|
|
114
114
|
this.oneBots.splice(currentIdx, 1);
|
|
115
|
-
(0, fs_1.writeFileSync)(
|
|
115
|
+
(0, fs_1.writeFileSync)(_a.configPath, js_yaml_1.default.dump(this.config));
|
|
116
116
|
}
|
|
117
117
|
createOneBot(uin, config) {
|
|
118
118
|
const oneBot = new onebot_1.OneBot(this, uin, config);
|
|
@@ -132,11 +132,11 @@ class App extends koa_1.default {
|
|
|
132
132
|
});
|
|
133
133
|
this.router.get('/qrcode', (ctx) => {
|
|
134
134
|
const { uin } = ctx.query;
|
|
135
|
-
const uinUrl = path.join(
|
|
135
|
+
const uinUrl = path.join(_a.configDir, 'data', uin);
|
|
136
136
|
if (!(0, fs_1.existsSync)(uinUrl)) {
|
|
137
137
|
return ctx.res.writeHead(400).end('未登录');
|
|
138
138
|
}
|
|
139
|
-
const qrcodePath = path.join(
|
|
139
|
+
const qrcodePath = path.join(_a.configDir, 'data', uin, 'qrcode.png');
|
|
140
140
|
let file = null;
|
|
141
141
|
try {
|
|
142
142
|
file = (0, fs_2.readFileSync)(qrcodePath); //读取文件
|
package/lib/service/V11/index.js
CHANGED
|
@@ -196,7 +196,19 @@ class V11 extends events_1.EventEmitter {
|
|
|
196
196
|
if (data.post_type === 'system') {
|
|
197
197
|
}
|
|
198
198
|
if (data.message && data.post_type === 'message') {
|
|
199
|
-
|
|
199
|
+
if (this.config.post_message_format === 'array') {
|
|
200
|
+
data.message = (0, icqq_cq_enable_1.toSegment)(data.message);
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
if (data.source) {
|
|
204
|
+
this.db.set(`KVMap.${data.source.seq}`, data.message[0].id);
|
|
205
|
+
data.message.shift();
|
|
206
|
+
data.message = (0, icqq_cq_enable_1.toCqcode)(data).replace(/^(\[CQ:reply,id=)(.+?)\]/, `$1${data.source.seq}]`);
|
|
207
|
+
}
|
|
208
|
+
else {
|
|
209
|
+
data.message = (0, icqq_cq_enable_1.toCqcode)(data);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
200
212
|
}
|
|
201
213
|
if (data.message_id) {
|
|
202
214
|
this.db.set(`KVMap.${data.seq}`, data.message_id);
|
|
@@ -377,6 +389,9 @@ class V11 extends events_1.EventEmitter {
|
|
|
377
389
|
*/
|
|
378
390
|
async apply(req) {
|
|
379
391
|
let { action, params, echo } = req;
|
|
392
|
+
if (typeof params.message_id == 'number' || /^\d+$/.test(params.message_id)) {
|
|
393
|
+
params.message_id = this.db.get(`KVMap.${params.message_id}`);
|
|
394
|
+
}
|
|
380
395
|
action = (0, utils_1.toLine)(action);
|
|
381
396
|
let is_async = action.includes("_async");
|
|
382
397
|
if (is_async)
|
|
@@ -448,6 +463,12 @@ class V11 extends events_1.EventEmitter {
|
|
|
448
463
|
}
|
|
449
464
|
if (result.data instanceof Map)
|
|
450
465
|
result.data = [...result.data.values()];
|
|
466
|
+
if (result.data?.message)
|
|
467
|
+
result.data.message = (0, icqq_cq_enable_1.toSegment)(result.data.message);
|
|
468
|
+
if (result.data?.message_id && result.data?.seq) {
|
|
469
|
+
this.db.set(`KVMap.${result.data.seq}`, result.data.message_id);
|
|
470
|
+
result.data.message_id = result.data.seq;
|
|
471
|
+
}
|
|
451
472
|
if (echo) {
|
|
452
473
|
result.echo = echo;
|
|
453
474
|
}
|