@chatluna/patchbay 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatluna/patchbay",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Cordis 4 patches for Koishi, Satori, Satori adapters and Cordis plugins, wired into yarn, pnpm or npm",
   "type": "module",
   "license": "MIT",

package/patchbay.json

@@ -17,7 +17,11 @@
     {
       "name": "@cordisjs/plugin-http",
       "version": "1.5.2",
-      "description": "Use resolveIntercept, which Cordis 4 renamed from resolveConfig"
+      "description": "Use resolveIntercept, which Cordis 4 renamed from resolveConfig; merge request headers per name and send the global FormData as multipart",
+      "fixes": [
+        "ChatLunaLab/v2-mirror#140",
+        "ChatLunaLab/v2-mirror#145"
+      ]
     },
     {
       "name": "@cordisjs/plugin-loader",
@@ -64,7 +68,10 @@
     {
       "name": "koishi-plugin-adapter-onebot",
       "version": "6.9.5",
-      "description": "Import Satori directly and inject http, satori and timer"
+      "description": "Import Satori directly and inject http, satori and timer; mark friend_recall as a direct channel like private messages",
+      "fixes": [
+        "ChatLunaLab/v2-mirror#159"
+      ]
     }
   ],
   "aliases": {

package/patches/@cordisjs+plugin-http@1.5.2.patch

@@ -1,13 +1,28 @@
 diff --git a/lib/index.js b/lib/index.js
-index 3acbdff..56c9913 100644
+index 3acbdff..0fec2d3 100644
 --- a/lib/index.js
 +++ b/lib/index.js
-@@ -202,7 +202,7 @@ var Http = class _Http extends Service {
+@@ -202,7 +202,9 @@ var Http = class _Http extends Service {
      });
    }
    resolveConfig(init) {
 -    return this[Service.resolveConfig](this.config, init);
-+    return { ...this[Service.resolveIntercept](), ...this.config, ...init };
++    // Merge headers per name, so a request's own `headers` (undefined or a Headers instance too) layers over the client's.
++    const configs = [this[Service.resolveIntercept](), this.config, init];
++    return Object.assign({}, ...configs, { headers: Object.fromEntries(configs.flatMap((config) => [...new Headers(config?.headers)])) });
    }
    resolveURL(url, config, isWebSocket = false) {
      try {
+@@ -281,7 +283,11 @@ var Http = class _Http extends Service {
+       }
+       const response = await this.ctx.waterfall(this, "http/fetch", url, init, config, () => {
+         this.ctx.logger("http:request").debug("%C %s", method, url.href);
+-        return this.undici.fetch(url, init);
++        // The undici package serializes only its own FormData and would send the global one as "[object FormData]".
++        if (!(init.body instanceof FormData) || init.body instanceof this.undici.FormData) return this.undici.fetch(url, init);
++        const form = new this.undici.FormData();
++        for (const [name, value] of init.body) form.append(name, value);
++        return this.undici.fetch(url, { ...init, body: form });
+       }).catch((cause) => {
+         this.ctx.logger("http:request").debug("%C %s failed: %o", method, url.href, cause);
+         if (_Http.Error.is(cause)) throw cause;

package/patches/koishi-plugin-adapter-onebot@6.9.5.patch

@@ -78,7 +78,7 @@ index 120885c..d5ba237 100644
          'onebot/message-reactions-updated'(session: Session): void;
          'onebot/channel-updated'(session: Session): void;
 diff --git a/lib/index.js b/lib/index.js
-index 996a9c8..5b58e18 100644
+index 996a9c8..cf1e9bd 100644
 --- a/lib/index.js
 +++ b/lib/index.js
 @@ -46,10 +46,10 @@ __export(index_exports, {
@@ -108,7 +108,15 @@ index 996a9c8..5b58e18 100644
  var SafetyLevel = /* @__PURE__ */ ((SafetyLevel2) => {
    SafetyLevel2[SafetyLevel2["safe"] = 0] = "safe";
    SafetyLevel2[SafetyLevel2["unknown"] = 1] = "unknown";
-@@ -594,7 +594,7 @@ var HttpServer = class extends import_koishi3.Adapter {
+@@ -466,6 +466,7 @@ async function adaptSession(bot, data) {
+         session.type = "message-deleted";
+         session.subtype = "private";
+         session.channelId = `private:${session.userId}`;
++        session.isDirect = true;
+         break;
+       // from go-cqhttp source code, but not mentioned in official docs
+       case "guild_channel_recall":
+@@ -594,7 +595,7 @@ var HttpServer = class extends import_koishi3.Adapter {
  })(HttpServer || (HttpServer = {}));
  
  // src/ws.ts
@@ -117,7 +125,7 @@ index 996a9c8..5b58e18 100644
  var WsClient = class extends import_koishi4.Adapter.WsClient {
    static {
      __name(this, "WsClient");
-@@ -734,10 +734,10 @@ function accept(socket, bot) {
+@@ -734,10 +735,10 @@ function accept(socket, bot) {
  __name(accept, "accept");
  
  // src/bot/base.ts
@@ -130,7 +138,7 @@ index 996a9c8..5b58e18 100644
  var import_node_url = require("node:url");
  var State = class {
    constructor(type) {
-@@ -830,7 +830,7 @@ var OneBotMessageEncoder = class extends import_koishi5.MessageEncoder {
+@@ -830,7 +831,7 @@ var OneBotMessageEncoder = class extends import_koishi5.MessageEncoder {
    }
    async sendFile(attrs) {
      const src = attrs.src || attrs.url;
@@ -139,7 +147,7 @@ index 996a9c8..5b58e18 100644
      const file = src.startsWith("file:") ? (0, import_node_url.fileURLToPath)(src) : await this.bot.internal.downloadFile(src);
      if (this.session.event.channel.type === import_koishi5.Universal.Channel.Type.DIRECT) {
        await this.bot.internal.uploadPrivateFile(
-@@ -977,7 +977,7 @@ var BaseBot2 = class extends import_koishi6.Bot {
+@@ -977,7 +978,7 @@ var BaseBot2 = class extends import_koishi6.Bot {
      __name(this, "BaseBot");
    }
    static MessageEncoder = OneBotMessageEncoder;
@@ -148,7 +156,7 @@ index 996a9c8..5b58e18 100644
    parent;
    internal;
    async createDirectChannel(userId) {
-@@ -1112,7 +1112,7 @@ var QQGuildBot = class extends BaseBot2 {
+@@ -1112,7 +1113,7 @@ var QQGuildBot = class extends BaseBot2 {
  };
  
  // src/bot/cqcode.ts