@mrlingxd/koishi-plugin-adapter-onebot 0.2.2 → 0.2.3

package/lib/bot/index.js

@@ -11,8 +11,7 @@ export class OneBot extends Bot {
     internal;
     constructor(ctx, config) {
         super(ctx, config, "onebot");
-        this.selfId = config.selfId;
-        this.user.avatar = `http://q.qlogo.cn/headimg_dl?dst_uin=${config.selfId}&spec=640`;
+        this.selfId = this.userId = config.selfId;
         this.internal = new Internal(this);
         if (config.protocol === "http") {
             ctx.plugin(HttpServer, this);

package/lib/http.js

@@ -36,6 +36,9 @@ export class HttpServer extends Adapter {
                 if (signature !== `sha1=${sig}`)
                     return (ctx.status = 403);
             }
+            const bot = this.bots.find((bot) => bot.selfId === ctx.headers["x-self-id"].toString());
+            if (!bot)
+                return (ctx.status = 403);
             if (!isBaseEvent(ctx.request.response.body))
                 return (ctx.status = 400);
             dispatchSession(bot, ctx.request.response.body);

package/lib/ws.js

@@ -42,13 +42,14 @@ export class WsServer extends Adapter {
         super(ctx);
         this.logger = ctx.logger("onebot");
         const { path = "/onebot" } = bot.config;
-        this.wsServer = ctx.server.ws(path, (socket, { headers }) => {
+        this.wsServer = ctx.server.ws(path, async (socket, { headers }) => {
             this.logger.debug("connected with", headers);
             if (headers["x-client-role"] !== "Universal") {
                 return socket.close(1008, "invalid x-client-role");
             }
-            // const selfId = headers["x-self-id"].toString();
-            // if (!bot) return socket.close(1008, "invalid x-self-id");
+            const bot = this.bots.find((bot) => bot.selfId === headers["x-self-id"].toString());
+            if (!bot)
+                return socket.close(1008, "invalid x-self-id");
             bot[kSocket] = socket;
             accept(socket, bot);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrlingxd/koishi-plugin-adapter-onebot",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "OneBot Adapter for Koishi",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",