onebots 0.4.0 → 0.4.2

package/lib/onebot.js

@@ -196,5 +196,5 @@ var OneBotStatus;
 (function (OneBotStatus) {
     OneBotStatus[OneBotStatus["Good"] = 0] = "Good";
     OneBotStatus[OneBotStatus["Bad"] = 1] = "Bad";
-})(OneBotStatus = exports.OneBotStatus || (exports.OneBotStatus = {}));
+})(OneBotStatus || (exports.OneBotStatus = OneBotStatus = {}));
 exports.BOOLS = ["no_cache", "auto_escape", "as_long", "enable", "reject_add_request", "is_dismiss", "approve", "block"];

package/lib/server/app.js

@@ -202,10 +202,10 @@ class App extends koa_1.default {
         }
     }
 }
+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);
@@ -241,5 +241,4 @@ exports.defineConfig = defineConfig;
         },
         log_level: 'info',
     };
-})(App = exports.App || (exports.App = {}));
-exports.App = App;
+})(App || (exports.App = App = {}));

package/lib/server/router.d.ts

@@ -5,5 +5,5 @@ import { WebSocketServer } from "ws";
 import http from "http";
 export declare class Router extends KoaRouter {
     wsStack: WebSocketServer[];
-    ws(path: string, server: http.Server): import("ws").Server<import("ws").WebSocket>;
+    ws(path: string, server: http.Server): import("ws").Server<typeof import("ws"), typeof http.IncomingMessage>;
 }

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

@@ -43,7 +43,7 @@ export declare class V11 extends EventEmitter implements OneBot.Base {
     /**
      * 创建反向ws
      */
-    protected _createWsr(url: string): import("ws");
+    protected _createWsr(url: string): void;
     /**
      * 快速操作
      */
@@ -83,6 +83,7 @@ export declare namespace V11 {
         access_token?: string;
         post_timeout?: number;
         enable_cors?: boolean;
+        enable_reissue?: boolean;
         rate_limit_interval?: number;
         post_message_format?: 'string' | 'array';
         heartbeat?: number;

package/lib/service/V11/index.js

@@ -161,12 +161,13 @@ class V11 extends events_1.EventEmitter {
         });
     }
     startWsReverse(url) {
-        const ws = this._createWsr(url);
+        this._createWsr(url);
         this.on('dispatch', (serialized) => {
-            if (this.wsr.has(ws)) {
+            for (const ws of this.wsr) {
                 ws.send(serialized, (err) => {
-                    if (err)
+                    if (err) {
                         this.logger.error(`反向WS(${ws.url})上报事件失败: ` + err.message);
+                    }
                     else
                         this.logger.debug(`反向WS(${ws.url})上报事件成功: ` + serialized);
                 });
@@ -331,7 +332,6 @@ class V11 extends events_1.EventEmitter {
                 this._createWsr(url);
             }, this.config.reconnect_interval * 1000);
         });
-        return ws;
     }
     /**
      * 快速操作
@@ -491,6 +491,7 @@ exports.V11 = V11;
         reconnect_interval: 3,
         use_http: true,
         enable_cors: true,
+        enable_reissue: false,
         use_ws: true,
         http_reverse: [],
         ws_reverse: []
@@ -505,4 +506,4 @@ exports.V11 = V11;
         };
     }
     V11.genMetaEvent = genMetaEvent;
-})(V11 = exports.V11 || (exports.V11 = {}));
+})(V11 || (exports.V11 = V11 = {}));

package/lib/service/V11/utils.js

@@ -4,16 +4,24 @@ exports.processMessage = void 0;
 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);
-    let quote = element.find(e => e.type === 'reply');
+    const elements = typeof message === 'string' ? (0, utils_2.fromCqcode)(message) : (0, utils_2.fromSegment)(message);
+    let quote = elements.find(e => e.type === 'reply');
     if (quote)
-        (0, utils_1.remove)(element, quote);
-    let music = element.find(e => e.type === 'music');
+        (0, utils_1.remove)(elements, quote);
+    let music = elements.find(e => e.type === 'music');
     if (music)
-        (0, utils_1.remove)(element, music);
-    let share = element.find(e => e.type === 'share');
+        (0, utils_1.remove)(elements, music);
+    let share = elements.find(e => e.type === 'share');
     if (share)
-        (0, utils_1.remove)(element, share);
-    return { element, quote: quote || source, share, music };
+        (0, utils_1.remove)(elements, share);
+    for (const element of elements) {
+        if (['image', 'video', 'audio'].includes(element.type)) {
+            if (element['file_id']?.startsWith('base64://'))
+                element['file_id'] = Buffer.from(element['file_id'].slice(9), 'base64');
+            if (element['file']?.startsWith('base64://'))
+                element['file'] = Buffer.from(element['file'].slice(9), 'base64');
+        }
+    }
+    return { element: elements, quote: quote || source, share, music };
 }
 exports.processMessage = processMessage;

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

@@ -53,7 +53,7 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     /**
      * 创建反向ws
      */
-    protected _createWsr(url: string, config: V12.WsReverseConfig): import("ws");
+    protected _createWsr(url: string, config: V12.WsReverseConfig): void;
     /**
      * 处理ws消息
      */
@@ -138,6 +138,7 @@ export declare namespace V12 {
         request_timeout?: number;
         reconnect_interval?: number;
         enable_cors?: boolean;
+        enable_reissue?: boolean;
         use_http?: boolean | HttpConfig;
         webhook?: (string | WebhookConfig)[];
         use_ws?: boolean | WsConfig;

package/lib/service/V12/index.js

@@ -270,10 +270,10 @@ class V12 extends events_1.EventEmitter {
         });
     }
     startWsReverse(config) {
-        const ws = this._createWsr(config.url, config);
+        this._createWsr(config.url, config);
         this.on('dispatch', (unserialized) => {
             const serialized = JSON.stringify(unserialized);
-            if (this.wsr.has(ws)) {
+            for (const ws of this.wsr) {
                 ws.send(serialized, (err) => {
                     if (err)
                         this.logger.error(`反向WS(${ws.url})上报事件失败: ` + err.message);
@@ -340,14 +340,13 @@ class V12 extends events_1.EventEmitter {
             data.detail_type = data.message_type || data.notice_type || data.request_type || data.system_type;
         data.message = data.type === 'message' ? V12.toSegment(data.message) : data.message;
         if (data.source)
-            data.quote = {
-                type: 'reply',
-                data: {
-                    message_id: data.detail_type === 'private' ?
-                        (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time) :
-                        (0, message_1.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time),
-                    user_id: data.source.user_id
-                }
+            data.source = {
+                ...data.source,
+                message_id: data.detail_type === 'private' ?
+                    (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time) :
+                    (0, message_1.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time),
+                user_id: data.source.user_id,
+                message: data.source.message,
             };
         return V12.formatPayload(this.oneBot.uin, event, data);
     }
@@ -380,7 +379,7 @@ class V12 extends events_1.EventEmitter {
                 action = "send_" + params.detail_type + "_msg";
             }
             else if (params.user_id)
-                action = "send_Private_Msg";
+                action = "send_private_Msg";
             else if (params.group_id)
                 action = "send_group_msg";
             else if (params.discuss_id)
@@ -407,6 +406,7 @@ class V12 extends events_1.EventEmitter {
             }
             let ret, result;
             try {
+                console.log(method, args);
                 ret = this.action[method].apply(this, args);
             }
             catch (e) {
@@ -541,7 +541,6 @@ class V12 extends events_1.EventEmitter {
                 this.startWsReverse(config);
             }, this.config.reconnect_interval * 1000);
         });
-        return ws;
     }
     /**
      * 处理ws消息
@@ -657,6 +656,7 @@ exports.V12 = V12;
         request_timeout: 15,
         reconnect_interval: 3,
         enable_cors: true,
+        enable_reissue: false,
         use_http: true,
         use_ws: true,
         webhook: [],
@@ -693,4 +693,4 @@ exports.V12 = V12;
         };
     }
     V12.formatPayload = formatPayload;
-})(V12 = exports.V12 || (exports.V12 = {}));
+})(V12 || (exports.V12 = V12 = {}));

package/lib/service/V12/utils.js

@@ -31,6 +31,8 @@ async function processMessage(message, source) {
             const fileInfo = this.getFile(file_id);
             if (fileInfo)
                 seg.data['file_id'] = fileInfo.url || fileInfo.path || `base64://${fileInfo.data}`;
+            if (seg.data['file_id']?.startsWith('base64://'))
+                seg.data['file_id'] = Buffer.from(seg.data['file_id'].slice(9), 'base64');
         }
     });
     const element = V12_1.V12.fromSegment(segments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"