@zhin.js/adapter-milky 1.0.0 → 2.0.0
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 +5 -5
- package/lib/adapter.d.ts +16 -15
- package/lib/adapter.d.ts.map +1 -1
- package/lib/adapter.js +47 -46
- package/lib/adapter.js.map +1 -1
- package/lib/{bot-sse.d.ts → endpoint-sse.d.ts} +3 -3
- package/lib/endpoint-sse.d.ts.map +1 -0
- package/lib/{bot-sse.js → endpoint-sse.js} +4 -4
- package/lib/endpoint-sse.js.map +1 -0
- package/lib/{bot-webhook.d.ts → endpoint-webhook.d.ts} +3 -3
- package/lib/endpoint-webhook.d.ts.map +1 -0
- package/lib/{bot-webhook.js → endpoint-webhook.js} +4 -4
- package/lib/endpoint-webhook.js.map +1 -0
- package/lib/{bot-ws.d.ts → endpoint-ws.d.ts} +3 -3
- package/lib/endpoint-ws.d.ts.map +1 -0
- package/lib/{bot-ws.js → endpoint-ws.js} +14 -14
- package/lib/endpoint-ws.js.map +1 -0
- package/lib/{bot-wss.d.ts → endpoint-wss.d.ts} +3 -3
- package/lib/endpoint-wss.d.ts.map +1 -0
- package/lib/{bot-wss.js → endpoint-wss.js} +7 -7
- package/lib/endpoint-wss.js.map +1 -0
- package/lib/index.d.ts +4 -4
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +8 -6
- package/lib/index.js.map +1 -1
- package/lib/types.d.ts +1 -1
- package/lib/types.d.ts.map +1 -1
- package/lib/utils.d.ts +2 -2
- package/lib/utils.d.ts.map +1 -1
- package/lib/utils.js +12 -4
- package/lib/utils.js.map +1 -1
- package/package.json +8 -7
- package/skills/milky/PERMITS.md +14 -0
- package/skills/milky/SKILL.md +1 -1
- package/src/adapter.ts +43 -41
- package/src/{bot-sse.ts → endpoint-sse.ts} +5 -5
- package/src/{bot-webhook.ts → endpoint-webhook.ts} +4 -4
- package/src/{bot-ws.ts → endpoint-ws.ts} +15 -15
- package/src/{bot-wss.ts → endpoint-wss.ts} +8 -8
- package/src/index.ts +8 -6
- package/src/types.ts +1 -1
- package/src/utils.ts +12 -5
- package/lib/bot-sse.d.ts.map +0 -1
- package/lib/bot-sse.js.map +0 -1
- package/lib/bot-webhook.d.ts.map +0 -1
- package/lib/bot-webhook.js.map +0 -1
- package/lib/bot-ws.d.ts.map +0 -1
- package/lib/bot-ws.js.map +0 -1
- package/lib/bot-wss.d.ts.map +0 -1
- package/lib/bot-wss.js.map +0 -1
|
@@ -44,7 +44,7 @@ export class MilkyWssServer extends EventEmitter {
|
|
|
44
44
|
const path = this.$config.path.startsWith('/') ? this.$config.path : `/${this.$config.path}`;
|
|
45
45
|
const token = this.$config.access_token;
|
|
46
46
|
if (!token)
|
|
47
|
-
this.logger.warn(formatCompact({
|
|
47
|
+
this.logger.warn(formatCompact({ endpoint: this.$id, ok: false, error: 'missing access_token' }));
|
|
48
48
|
this.#wss = this.router.ws(path, {
|
|
49
49
|
verifyClient: (info) => {
|
|
50
50
|
const received = getAccessTokenFromWsRequest(info.req);
|
|
@@ -56,11 +56,11 @@ export class MilkyWssServer extends EventEmitter {
|
|
|
56
56
|
},
|
|
57
57
|
});
|
|
58
58
|
this.$connected = true;
|
|
59
|
-
this.logger.info(formatCompact({ op: 'listen',
|
|
59
|
+
this.logger.info(formatCompact({ op: 'listen', endpoint: this.$id, mode: 'wss', path }));
|
|
60
60
|
this.#wss.on('connection', (client, req) => {
|
|
61
61
|
this.#client = client;
|
|
62
62
|
this.startHeartbeat();
|
|
63
|
-
this.logger.info(formatCompact({
|
|
63
|
+
this.logger.info(formatCompact({ endpoint: this.$id, peer: req.socket?.remoteAddress }));
|
|
64
64
|
client.on('message', (data) => {
|
|
65
65
|
try {
|
|
66
66
|
const event = JSON.parse(data.toString());
|
|
@@ -72,7 +72,7 @@ export class MilkyWssServer extends EventEmitter {
|
|
|
72
72
|
});
|
|
73
73
|
client.on('close', () => {
|
|
74
74
|
this.#client = undefined;
|
|
75
|
-
this.logger.warn(formatCompact({ op: 'disconnect',
|
|
75
|
+
this.logger.warn(formatCompact({ op: 'disconnect', endpoint: this.$id }));
|
|
76
76
|
});
|
|
77
77
|
client.on('error', (err) => this.logger.error('反向 WS 连接错误', err));
|
|
78
78
|
});
|
|
@@ -93,7 +93,7 @@ export class MilkyWssServer extends EventEmitter {
|
|
|
93
93
|
return Message.from(event, {
|
|
94
94
|
$id: '',
|
|
95
95
|
$adapter: 'milky',
|
|
96
|
-
$
|
|
96
|
+
$endpoint: this.$config.name,
|
|
97
97
|
$channel: { id: '', type: 'private' },
|
|
98
98
|
$sender: { id: '', name: '' },
|
|
99
99
|
$content: [],
|
|
@@ -106,7 +106,7 @@ export class MilkyWssServer extends EventEmitter {
|
|
|
106
106
|
const payload = formatMilkyMessagePayload(event, data, (id) => this.$recallMessage(id), (channel, content) => this.adapter.sendMessage({
|
|
107
107
|
...channel,
|
|
108
108
|
context: 'milky',
|
|
109
|
-
|
|
109
|
+
endpoint: this.$config.name,
|
|
110
110
|
content: content,
|
|
111
111
|
}), 'milky', this.$config.name);
|
|
112
112
|
return Message.from(event, payload);
|
|
@@ -222,4 +222,4 @@ export class MilkyWssServer extends EventEmitter {
|
|
|
222
222
|
}, interval);
|
|
223
223
|
}
|
|
224
224
|
}
|
|
225
|
-
//# sourceMappingURL=
|
|
225
|
+
//# sourceMappingURL=endpoint-wss.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"endpoint-wss.js","sourceRoot":"","sources":["../src/endpoint-wss.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -2,10 +2,10 @@ import { MilkyAdapter } from './adapter.js';
|
|
|
2
2
|
export * from './types.js';
|
|
3
3
|
export { callApi } from './api.js';
|
|
4
4
|
export * from './utils.js';
|
|
5
|
-
export { MilkyWsClient } from './
|
|
6
|
-
export { MilkySseClient } from './
|
|
7
|
-
export {
|
|
8
|
-
export { MilkyWssServer } from './
|
|
5
|
+
export { MilkyWsClient } from './endpoint-ws.js';
|
|
6
|
+
export { MilkySseClient } from './endpoint-sse.js';
|
|
7
|
+
export { MilkyWebhookEndpoint } from './endpoint-webhook.js';
|
|
8
|
+
export { MilkyWssServer } from './endpoint-wss.js';
|
|
9
9
|
export { MilkyAdapter, type MilkyBot } from './adapter.js';
|
|
10
10
|
declare module 'zhin.js' {
|
|
11
11
|
namespace Plugin {
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,MAAM,CAAC;QACf,UAAU,QAAQ;YAChB,MAAM,EAAE,OAAO,sBAAsB,EAAE,MAAM,CAAC;SAC/C;KACF;IACD,UAAU,QAAQ;QAChB,KAAK,EAAE,YAAY,CAAC;KACrB;CACF"}
|
package/lib/index.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Milky 适配器入口：单一适配器，支持 WS/SSE/Webhook/反向 WS，依赖 router 注册
|
|
3
3
|
*/
|
|
4
|
-
import { usePlugin, createGroupManagementTools } from 'zhin.js';
|
|
4
|
+
import { usePlugin, createGroupManagementTools, registerDefaultGroupPlatformPermitChecker } from 'zhin.js';
|
|
5
5
|
import { MilkyAdapter } from './adapter.js';
|
|
6
6
|
export * from './types.js';
|
|
7
7
|
export { callApi } from './api.js';
|
|
8
8
|
export * from './utils.js';
|
|
9
|
-
export { MilkyWsClient } from './
|
|
10
|
-
export { MilkySseClient } from './
|
|
11
|
-
export {
|
|
12
|
-
export { MilkyWssServer } from './
|
|
9
|
+
export { MilkyWsClient } from './endpoint-ws.js';
|
|
10
|
+
export { MilkySseClient } from './endpoint-sse.js';
|
|
11
|
+
export { MilkyWebhookEndpoint } from './endpoint-webhook.js';
|
|
12
|
+
export { MilkyWssServer } from './endpoint-wss.js';
|
|
13
13
|
export { MilkyAdapter } from './adapter.js';
|
|
14
14
|
const plugin = usePlugin();
|
|
15
15
|
const { provide, useContext } = plugin;
|
|
@@ -26,8 +26,10 @@ provide({
|
|
|
26
26
|
},
|
|
27
27
|
});
|
|
28
28
|
useContext('tool', 'milky', (toolService, milky) => {
|
|
29
|
+
const disposers = [];
|
|
30
|
+
disposers.push(registerDefaultGroupPlatformPermitChecker('milky'));
|
|
29
31
|
const groupTools = createGroupManagementTools(milky, 'milky');
|
|
30
|
-
|
|
32
|
+
disposers.push(...groupTools.map(t => toolService.addTool(t, plugin.name)));
|
|
31
33
|
return () => disposers.forEach(d => d());
|
|
32
34
|
});
|
|
33
35
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,SAAS,EAA6B,0BAA0B,EAAoB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,SAAS,EAA6B,0BAA0B,EAAE,yCAAyC,EAAoB,MAAM,SAAS,CAAC;AAExJ,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAiB,MAAM,cAAc,CAAC;AAa3D,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;AAC3B,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;AACvC,OAAO,CAAC;IACN,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,8CAA8C;IAC3D,OAAO,EAAE,KAAK,EAAE,CAAS,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,OAAqB,EAAE,EAAE;QACvC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;CAC6B,CAAC,CAAC;AAElC,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,WAAwB,EAAE,KAAmB,EAAE,EAAE;IAC5E,MAAM,SAAS,GAAmB,EAAE,CAAC;IACrC,SAAS,CAAC,IAAI,CAAC,yCAAyC,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,MAAM,UAAU,GAAG,0BAA0B,CAAC,KAAoC,EAAE,OAAO,CAAC,CAAC;IAC7F,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5E,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC"}
|
package/lib/types.d.ts
CHANGED
|
@@ -29,7 +29,7 @@ export interface MilkyWssConfig extends MilkyConfigBase {
|
|
|
29
29
|
path: string;
|
|
30
30
|
heartbeat_interval?: number;
|
|
31
31
|
}
|
|
32
|
-
export type
|
|
32
|
+
export type MilkyEndpointConfig = MilkyWsConfig | MilkySseConfig | MilkyWebhookConfig | MilkyWssConfig;
|
|
33
33
|
/** 协议端 API 响应：status、retcode、data?、message? */
|
|
34
34
|
export interface MilkyApiResponse<T = unknown> {
|
|
35
35
|
status: string;
|
package/lib/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,2DAA2D;AAC3D,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qBAAqB;AACrB,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,UAAU,EAAE,IAAI,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,aAAa;AACb,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,UAAU,EAAE,KAAK,CAAC;CACnB;AAED,4BAA4B;AAC5B,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,UAAU,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,2BAA2B;AAC3B,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,UAAU,EAAE,KAAK,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,2DAA2D;AAC3D,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qBAAqB;AACrB,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,UAAU,EAAE,IAAI,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,aAAa;AACb,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,UAAU,EAAE,KAAK,CAAC;CACnB;AAED,4BAA4B;AAC5B,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,UAAU,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,2BAA2B;AAC3B,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,UAAU,EAAE,KAAK,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,cAAc,GAAG,kBAAkB,GAAG,cAAc,CAAC;AAEvG,+CAA+C;AAC/C,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,OAAO;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wCAAwC;AACxC,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED,wHAAwH;AACxH,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,KAAK,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAClD,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACrF;AAED,sBAAsB;AACtB,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC"}
|
package/lib/utils.d.ts
CHANGED
|
@@ -8,14 +8,14 @@ export declare function formatMilkySegments(segments: MilkyIncomingSegment[]): A
|
|
|
8
8
|
type: string;
|
|
9
9
|
data: Record<string, unknown>;
|
|
10
10
|
}>;
|
|
11
|
-
/** message_receive 事件的 data 转为 zhin Message 的构造参数（含 $adapter、$
|
|
11
|
+
/** message_receive 事件的 data 转为 zhin Message 的构造参数（含 $adapter、$endpoint） */
|
|
12
12
|
export declare function formatMilkyMessagePayload(event: MilkyEvent, data: MilkyIncomingMessage, recallFn: (msgId: string) => Promise<void>, replyFn: (channel: {
|
|
13
13
|
id: string;
|
|
14
14
|
type: 'group' | 'private';
|
|
15
15
|
}, content: (string | {
|
|
16
16
|
type: string;
|
|
17
17
|
data?: Record<string, unknown>;
|
|
18
|
-
})[], quote?: boolean | string) => Promise<string>, adapterName: 'milky',
|
|
18
|
+
})[], quote?: boolean | string) => Promise<string>, adapterName: 'milky', endpointName: string): MessageBase;
|
|
19
19
|
/** 根据 event_type 判断是否为 message_receive，并解析 data 为 MilkyIncomingMessage */
|
|
20
20
|
export declare function parseMessageReceiveData(event: MilkyEvent): MilkyIncomingMessage | null;
|
|
21
21
|
/** zhin SendContent（string | MessageElement 或数组）转为 Milky OutgoingSegment[]（发送用） */
|
package/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEzF,wDAAwD;AACxD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,CAmD5H;AAED,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEzF,wDAAwD;AACxD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,CAmD5H;AAED,2EAA2E;AAC3E,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,oBAAoB,EAC1B,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAC1C,OAAO,EAAE,CAAC,OAAO,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,EAAE,OAAO,EAAE,CAAC,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAClL,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,MAAM,GACnB,WAAW,CAgCb;AAED,0EAA0E;AAC1E,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,oBAAoB,GAAG,IAAI,CAKtF;AAED,mFAAmF;AACnF,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,CAAC,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,EAAE,GACrE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,CAoDxD;AAED,uDAAuD;AACvD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,GACZ;IAAE,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAS7F"}
|
package/lib/utils.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { applyQqSenderRoleToMessageSender } from 'zhin.js';
|
|
1
2
|
/** 将 Milky 接收消息段转为 zhin 的 $content（MessageSegment[]） */
|
|
2
3
|
export function formatMilkySegments(segments) {
|
|
3
4
|
return segments.map((seg) => {
|
|
@@ -51,8 +52,8 @@ export function formatMilkySegments(segments) {
|
|
|
51
52
|
}
|
|
52
53
|
});
|
|
53
54
|
}
|
|
54
|
-
/** message_receive 事件的 data 转为 zhin Message 的构造参数（含 $adapter、$
|
|
55
|
-
export function formatMilkyMessagePayload(event, data, recallFn, replyFn, adapterName,
|
|
55
|
+
/** message_receive 事件的 data 转为 zhin Message 的构造参数（含 $adapter、$endpoint） */
|
|
56
|
+
export function formatMilkyMessagePayload(event, data, recallFn, replyFn, adapterName, endpointName) {
|
|
56
57
|
const scene = data.message_scene;
|
|
57
58
|
const isGroup = scene === 'group';
|
|
58
59
|
const channelId = data.peer_id.toString();
|
|
@@ -65,9 +66,16 @@ export function formatMilkyMessagePayload(event, data, recallFn, replyFn, adapte
|
|
|
65
66
|
return {
|
|
66
67
|
$id: msgId,
|
|
67
68
|
$adapter: 'milky',
|
|
68
|
-
$
|
|
69
|
+
$endpoint: endpointName,
|
|
69
70
|
$channel: channel,
|
|
70
|
-
$sender:
|
|
71
|
+
$sender: (() => {
|
|
72
|
+
const sender = {
|
|
73
|
+
id: senderId,
|
|
74
|
+
name: senderName,
|
|
75
|
+
};
|
|
76
|
+
applyQqSenderRoleToMessageSender(sender, data.group_member?.role);
|
|
77
|
+
return sender;
|
|
78
|
+
})(),
|
|
71
79
|
$content: content,
|
|
72
80
|
$raw: raw,
|
|
73
81
|
$timestamp: data.time,
|
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/adapter-milky",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"description": "Zhin.js adapter for Milky protocol",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -42,16 +42,17 @@
|
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@types/eventsource": "^1.1.15",
|
|
45
|
-
"@types/node": "^25.9.
|
|
45
|
+
"@types/node": "^25.9.2",
|
|
46
46
|
"@types/ws": "^8.18.1",
|
|
47
47
|
"typescript": "^6.0.3",
|
|
48
|
-
"@zhin.js/cli": "1.0.
|
|
49
|
-
"@zhin.js/client": "2.0.
|
|
50
|
-
"zhin.js": "2.0.0"
|
|
48
|
+
"@zhin.js/cli": "1.0.89",
|
|
49
|
+
"@zhin.js/client": "2.0.3",
|
|
50
|
+
"@zhin.js/host-router": "2.0.0",
|
|
51
|
+
"zhin.js": "3.0.0"
|
|
51
52
|
},
|
|
52
53
|
"peerDependencies": {
|
|
53
|
-
"@zhin.js/host-router": "
|
|
54
|
-
"zhin.js": "
|
|
54
|
+
"@zhin.js/host-router": "2.0.0",
|
|
55
|
+
"zhin.js": "3.0.0"
|
|
55
56
|
},
|
|
56
57
|
"peerDependenciesMeta": {
|
|
57
58
|
"@zhin.js/host-router": {
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
# Milky Platform Permits（QQ 群）
|
|
2
|
+
|
|
3
|
+
## 入站字段
|
|
4
|
+
|
|
5
|
+
`data.group_member.role` → `applyQqSenderRoleToMessageSender`。
|
|
6
|
+
|
|
7
|
+
## Permit 词汇表
|
|
8
|
+
|
|
9
|
+
| `platform(milky,…)` | 含义 |
|
|
10
|
+
|---------------------|------|
|
|
11
|
+
| `group_owner` | 群主 |
|
|
12
|
+
| `group_admin` | 群管理员（含群主） |
|
|
13
|
+
|
|
14
|
+
与 OneBot QQ 系相同，使用 core 默认 checker。
|
package/skills/milky/SKILL.md
CHANGED
package/src/adapter.ts
CHANGED
|
@@ -3,28 +3,30 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { formatCompact, Adapter, Plugin, type IGroupManagement } from 'zhin.js';
|
|
5
5
|
import type { Router } from '@zhin.js/host-router';
|
|
6
|
-
import { MilkyWsClient } from './
|
|
7
|
-
import { MilkySseClient } from './
|
|
8
|
-
import {
|
|
9
|
-
import { MilkyWssServer } from './
|
|
6
|
+
import { MilkyWsClient } from './endpoint-ws.js';
|
|
7
|
+
import { MilkySseClient } from './endpoint-sse.js';
|
|
8
|
+
import { MilkyWebhookEndpoint } from './endpoint-webhook.js';
|
|
9
|
+
import { MilkyWssServer } from './endpoint-wss.js';
|
|
10
10
|
import type {
|
|
11
|
-
|
|
11
|
+
MilkyEndpointConfig,
|
|
12
12
|
MilkyWsConfig,
|
|
13
13
|
MilkySseConfig,
|
|
14
14
|
MilkyWebhookConfig,
|
|
15
15
|
MilkyWssConfig,
|
|
16
16
|
} from './types.js';
|
|
17
17
|
|
|
18
|
-
export type MilkyBot = MilkyWsClient | MilkySseClient |
|
|
18
|
+
export type MilkyBot = MilkyWsClient | MilkySseClient | MilkyWebhookEndpoint | MilkyWssServer;
|
|
19
19
|
|
|
20
20
|
export class MilkyAdapter extends Adapter<MilkyBot> {
|
|
21
|
+
static override readonly capabilities = ['inbound', 'outbound'] as const;
|
|
22
|
+
|
|
21
23
|
#router?: Router;
|
|
22
24
|
|
|
23
25
|
constructor(plugin: Plugin) {
|
|
24
26
|
super(plugin, 'milky', []);
|
|
25
27
|
}
|
|
26
28
|
|
|
27
|
-
|
|
29
|
+
createEndpoint(config: MilkyEndpointConfig): MilkyBot {
|
|
28
30
|
switch (config.connection) {
|
|
29
31
|
case 'ws':
|
|
30
32
|
return new MilkyWsClient(this, config as MilkyWsConfig);
|
|
@@ -32,62 +34,62 @@ export class MilkyAdapter extends Adapter<MilkyBot> {
|
|
|
32
34
|
return new MilkySseClient(this, config as MilkySseConfig);
|
|
33
35
|
case 'webhook':
|
|
34
36
|
if (!this.#router) throw new Error('Milky connection: webhook 需要 router，请安装并在配置中启用 @zhin.js/host-router');
|
|
35
|
-
return new
|
|
37
|
+
return new MilkyWebhookEndpoint(this, this.#router, config as MilkyWebhookConfig);
|
|
36
38
|
case 'wss':
|
|
37
39
|
if (!this.#router) throw new Error('Milky connection: wss 需要 router，请安装并在配置中启用 @zhin.js/host-router');
|
|
38
40
|
return new MilkyWssServer(this, this.#router, config as MilkyWssConfig);
|
|
39
41
|
default:
|
|
40
|
-
throw new Error(`Unknown Milky connection: ${(config as
|
|
42
|
+
throw new Error(`Unknown Milky connection: ${(config as MilkyEndpointConfig).connection}`);
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
|
|
44
|
-
async kickMember(
|
|
45
|
-
const
|
|
46
|
-
if (!
|
|
47
|
-
return
|
|
46
|
+
async kickMember(endpointId: string, sceneId: string, userId: string) {
|
|
47
|
+
const endpoint = this.endpoints.get(endpointId);
|
|
48
|
+
if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
|
|
49
|
+
return endpoint.kickMember(Number(sceneId), Number(userId), false);
|
|
48
50
|
}
|
|
49
51
|
|
|
50
|
-
async muteMember(
|
|
51
|
-
const
|
|
52
|
-
if (!
|
|
53
|
-
return
|
|
52
|
+
async muteMember(endpointId: string, sceneId: string, userId: string, duration = 600) {
|
|
53
|
+
const endpoint = this.endpoints.get(endpointId);
|
|
54
|
+
if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
|
|
55
|
+
return endpoint.muteMember(Number(sceneId), Number(userId), duration);
|
|
54
56
|
}
|
|
55
57
|
|
|
56
|
-
async muteAll(
|
|
57
|
-
const
|
|
58
|
-
if (!
|
|
59
|
-
return
|
|
58
|
+
async muteAll(endpointId: string, sceneId: string, enable = true) {
|
|
59
|
+
const endpoint = this.endpoints.get(endpointId);
|
|
60
|
+
if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
|
|
61
|
+
return endpoint.muteAll(Number(sceneId), enable);
|
|
60
62
|
}
|
|
61
63
|
|
|
62
|
-
async setAdmin(
|
|
63
|
-
const
|
|
64
|
-
if (!
|
|
65
|
-
return
|
|
64
|
+
async setAdmin(endpointId: string, sceneId: string, userId: string, enable = true) {
|
|
65
|
+
const endpoint = this.endpoints.get(endpointId);
|
|
66
|
+
if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
|
|
67
|
+
return endpoint.setAdmin(Number(sceneId), Number(userId), enable);
|
|
66
68
|
}
|
|
67
69
|
|
|
68
|
-
async setMemberNickname(
|
|
69
|
-
const
|
|
70
|
-
if (!
|
|
71
|
-
return
|
|
70
|
+
async setMemberNickname(endpointId: string, sceneId: string, userId: string, nickname: string) {
|
|
71
|
+
const endpoint = this.endpoints.get(endpointId);
|
|
72
|
+
if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
|
|
73
|
+
return endpoint.setCard(Number(sceneId), Number(userId), nickname);
|
|
72
74
|
}
|
|
73
75
|
|
|
74
|
-
async setGroupName(
|
|
75
|
-
const
|
|
76
|
-
if (!
|
|
77
|
-
return
|
|
76
|
+
async setGroupName(endpointId: string, sceneId: string, name: string) {
|
|
77
|
+
const endpoint = this.endpoints.get(endpointId);
|
|
78
|
+
if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
|
|
79
|
+
return endpoint.setGroupName(Number(sceneId), name);
|
|
78
80
|
}
|
|
79
81
|
|
|
80
|
-
async listMembers(
|
|
81
|
-
const
|
|
82
|
-
if (!
|
|
83
|
-
const members = await
|
|
82
|
+
async listMembers(endpointId: string, sceneId: string) {
|
|
83
|
+
const endpoint = this.endpoints.get(endpointId);
|
|
84
|
+
if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
|
|
85
|
+
const members = await endpoint.getMemberList(Number(sceneId));
|
|
84
86
|
return { members: Array.isArray(members) ? members : [], count: Array.isArray(members) ? members.length : 0 };
|
|
85
87
|
}
|
|
86
88
|
|
|
87
|
-
async getGroupInfo(
|
|
88
|
-
const
|
|
89
|
-
if (!
|
|
90
|
-
return
|
|
89
|
+
async getGroupInfo(endpointId: string, sceneId: string) {
|
|
90
|
+
const endpoint = this.endpoints.get(endpointId);
|
|
91
|
+
if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
|
|
92
|
+
return endpoint.getGroupInfo(Number(sceneId));
|
|
91
93
|
}
|
|
92
94
|
|
|
93
95
|
async start(): Promise<void> {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import EventSource from 'eventsource';
|
|
5
5
|
import { EventEmitter } from 'events';
|
|
6
|
-
import { formatCompact,
|
|
6
|
+
import { formatCompact, Endpoint, Message, segment, SendOptions } from 'zhin.js';
|
|
7
7
|
import { callApi } from './api.js';
|
|
8
8
|
import type { MilkySseConfig, MilkyEvent } from './types.js';
|
|
9
9
|
import type { MilkyAdapter } from './adapter.js';
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
parseMilkyMessageId,
|
|
15
15
|
} from './utils.js';
|
|
16
16
|
|
|
17
|
-
export class MilkySseClient extends EventEmitter implements
|
|
17
|
+
export class MilkySseClient extends EventEmitter implements Endpoint<MilkySseConfig, MilkyEvent> {
|
|
18
18
|
$connected: boolean;
|
|
19
19
|
private es?: EventSource;
|
|
20
20
|
|
|
@@ -51,7 +51,7 @@ export class MilkySseClient extends EventEmitter implements Bot<MilkySseConfig,
|
|
|
51
51
|
this.es = new EventSource(this.eventUrl, { headers });
|
|
52
52
|
this.$connected = true;
|
|
53
53
|
if (!this.$config.access_token) {
|
|
54
|
-
this.logger.warn(formatCompact({
|
|
54
|
+
this.logger.warn(formatCompact({ endpoint: this.$id, ok: false, error: 'missing access_token' }));
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
this.es.addEventListener('milky_event', (e: MessageEvent) => {
|
|
@@ -82,7 +82,7 @@ export class MilkySseClient extends EventEmitter implements Bot<MilkySseConfig,
|
|
|
82
82
|
return Message.from(event, {
|
|
83
83
|
$id: '',
|
|
84
84
|
$adapter: 'milky',
|
|
85
|
-
$
|
|
85
|
+
$endpoint: this.$config.name,
|
|
86
86
|
$channel: { id: '', type: 'private' },
|
|
87
87
|
$sender: { id: '', name: '' },
|
|
88
88
|
$content: [],
|
|
@@ -100,7 +100,7 @@ export class MilkySseClient extends EventEmitter implements Bot<MilkySseConfig,
|
|
|
100
100
|
this.adapter.sendMessage({
|
|
101
101
|
...channel,
|
|
102
102
|
context: 'milky',
|
|
103
|
-
|
|
103
|
+
endpoint: this.$config.name,
|
|
104
104
|
content: content as import('zhin.js').SendContent,
|
|
105
105
|
}),
|
|
106
106
|
'milky',
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Milky Webhook Bot：无长连接，在 router.post(path) 接收 POST 事件，鉴权后转 Message
|
|
3
3
|
*/
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
5
|
-
import { formatCompact,
|
|
5
|
+
import { formatCompact, Endpoint, Message, segment, SendOptions } from 'zhin.js';
|
|
6
6
|
import { firstHeader, firstQuery, registerFetchRoute, type Router, type RouterContext } from '@zhin.js/host-router/router';
|
|
7
7
|
import { callApi } from './api.js';
|
|
8
8
|
import type { MilkyWebhookConfig, MilkyEvent } from './types.js';
|
|
@@ -20,7 +20,7 @@ function getAccessTokenFromRequest(ctx: RouterContext): string | undefined {
|
|
|
20
20
|
return firstQuery(ctx, 'access_token');
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
export class
|
|
23
|
+
export class MilkyWebhookEndpoint extends EventEmitter implements Endpoint<MilkyWebhookConfig, MilkyEvent> {
|
|
24
24
|
$connected: boolean = true;
|
|
25
25
|
|
|
26
26
|
get logger() {
|
|
@@ -73,7 +73,7 @@ export class MilkyWebhookBot extends EventEmitter implements Bot<MilkyWebhookCon
|
|
|
73
73
|
return Message.from(event, {
|
|
74
74
|
$id: '',
|
|
75
75
|
$adapter: 'milky',
|
|
76
|
-
$
|
|
76
|
+
$endpoint: this.$config.name,
|
|
77
77
|
$channel: { id: '', type: 'private' },
|
|
78
78
|
$sender: { id: '', name: '' },
|
|
79
79
|
$content: [],
|
|
@@ -91,7 +91,7 @@ export class MilkyWebhookBot extends EventEmitter implements Bot<MilkyWebhookCon
|
|
|
91
91
|
this.adapter.sendMessage({
|
|
92
92
|
...channel,
|
|
93
93
|
context: 'milky',
|
|
94
|
-
|
|
94
|
+
endpoint: this.$config.name,
|
|
95
95
|
content: content as import('zhin.js').SendContent,
|
|
96
96
|
}),
|
|
97
97
|
'milky',
|