@chatluna/patchbay 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatluna/patchbay",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "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

@@ -3,7 +3,11 @@
     {
       "name": "@cordisjs/plugin-cli-cordis",
       "version": "1.0.5",
-      "description": "Stable root include id, launcher include overrides and IPC health pings"
+      "description": "Stable root include id, launcher include overrides and IPC health pings; best-effort stdio, exit on parent disconnect and a bounded exit",
+      "fixes": [
+        "ChatLunaLab/v2-mirror#99",
+        "cordiverse/cordis#294"
+      ]
     },
     {
       "name": "@cordisjs/plugin-database",
@@ -35,7 +39,8 @@
       "version": "4.18.11",
       "description": "Run Koishi on Cordis 4; also installed as koishi. Inject shapes are normalized by the @satorijs/core patch",
       "fixes": [
-        "ChatLunaLab/boilerplate#12"
+        "ChatLunaLab/boilerplate#12",
+        "ChatLunaLab/v2-mirror#28"
       ],
       "dependencies": {
         "cordis": "^4.0.0-rc.8"

package/patches/@cordisjs+plugin-cli-cordis@1.0.5.patch

@@ -14,12 +14,40 @@ index 4362cf8..ae92999 100644
      prelude?: EntryOptions[];
  }
 diff --git a/lib/worker/index.js b/lib/worker/index.js
-index 91ff829..ec55279 100644
+index 91ff829..9c9b5ef 100644
 --- a/lib/worker/index.js
 +++ b/lib/worker/index.js
-@@ -31,6 +31,12 @@ function* apply(ctx, config = {}) {
+@@ -17,20 +17,39 @@ __export(daemon_exports, {
+ });
+ var name = "daemon";
+ function* apply(ctx, config = {}) {
++  // Bounded: a stuck `exit` listener must not keep a signalled or orphaned worker alive.
++  function exit(signal) {
++    setTimeout(() => process.exit(1), 1e4).unref();
++    ctx.parallel("exit", signal).finally(() => process.exit());
++  }
++  __name(exit, "exit");
+   function handleSignal(signal) {
+     process.stderr.write("\x1B[2K\r");
+     if (config.autoRestart) {
+       process.send({ type: "exit" });
+     }
+     ctx.logger.info(`terminated by ${signal}`);
+-    ctx.parallel("exit", signal).finally(() => process.exit());
++    exit(signal);
+   }
+   __name(handleSignal, "handleSignal");
+   process.on("SIGINT", handleSignal);
+   yield () => process.off("SIGINT", handleSignal);
    process.on("SIGTERM", handleSignal);
    yield () => process.off("SIGTERM", handleSignal);
++  // The parent owns this worker: once its IPC channel closes, nothing pings, restarts or stops it.
++  const onDisconnect = /* @__PURE__ */ __name(() => {
++    ctx.logger.info("terminated by parent disconnect");
++    exit("SIGTERM");
++  }, "onDisconnect");
++  process.on("disconnect", onDisconnect);
++  yield () => process.off("disconnect", onDisconnect);
    process.send({ type: "start", body: config });
 +  // Health over IPC: the supervisor pings, the worker answers; no network address involved.
 +  const onMessage = /* @__PURE__ */ __name((message) => {
@@ -30,7 +58,20 @@ index 91ff829..ec55279 100644
    if (config.heartbeatInterval) {
      const timer = setInterval(() => {
        process.send({ type: "heartbeat" });
-@@ -59,12 +65,22 @@ async function start(config) {
+@@ -43,6 +62,12 @@ __name(apply, "apply");
+ // src/worker/index.ts
+ async function start(config) {
+   const ctx = new Context();
++  // Output is best-effort. Without a listener, a write to a closed stdout/stderr pipe becomes an
++  // uncaughtException, which is logged to the same pipe and fails again, forever.
++  const ignore = /* @__PURE__ */ __name(() => {
++  }, "ignore");
++  process.stdout.on("error", ignore);
++  process.stderr.on("error", ignore);
+   process.on("uncaughtException", (error) => {
+     ctx.logger.error(error);
+     process.exitCode = 1;
+@@ -59,12 +84,22 @@ async function start(config) {
      await ctx.loader.create(plugin);
    }
    await ctx.loader.create({

package/patches/@koishijs+core@4.18.11.patch

@@ -1,3 +1,31 @@
+diff --git a/lib/index.cjs b/lib/index.cjs
+index a11da83..c0f81ec 100644
+--- a/lib/index.cjs
++++ b/lib/index.cjs
+@@ -581,8 +581,21 @@ var KoishiDatabase = class {
+   }
+   async createUser(platform, pid, data) {
+     const user = await this.create("user", data);
+-    await this.create("binding", { aid: user.id, bid: user.id, pid, platform });
+-    return user;
++    try {
++      await this.create("binding", { aid: user.id, bid: user.id, pid, platform });
++      return user;
++    } catch (error) {
++      // patchbay: a concurrent attach bound this account first, or the binding outlived its user row.
++      const [binding] = await this.get("binding", { platform, pid }, ["aid"]);
++      if (!binding) throw error;
++      const [existing] = await this.get("user", { id: binding.aid });
++      if (existing) {
++        await this.remove("user", { id: user.id });
++        return existing;
++      }
++      await this.set("binding", { platform, pid }, { aid: user.id, bid: user.id });
++      return user;
++    }
+   }
+   async getChannel(platform, id, modifier) {
+     const data = await this.get("channel", { platform, id }, modifier);
 diff --git a/lib/index.d.ts b/lib/index.d.ts
 index b0e0826..004cff1 100644
 --- a/lib/index.d.ts
@@ -264,7 +292,7 @@ index b0e0826..004cff1 100644
 +export * from '@cordisjs/plugin-database';
  export { version };
 diff --git a/lib/index.mjs b/lib/index.mjs
-index b99cd02..2d446d8 100644
+index b99cd02..cbac35c 100644
 --- a/lib/index.mjs
 +++ b/lib/index.mjs
 @@ -2,16 +2,120 @@ var __defProp = Object.defineProperty;
@@ -465,7 +493,31 @@ index b99cd02..2d446d8 100644
        getUser: "database.getUser",
        setUser: "database.setUser",
        createUser: "database.createUser",
-@@ -607,37 +714,29 @@ var Next;
+@@ -517,8 +624,21 @@ var KoishiDatabase = class {
+   }
+   async createUser(platform, pid, data) {
+     const user = await this.create("user", data);
+-    await this.create("binding", { aid: user.id, bid: user.id, pid, platform });
+-    return user;
++    try {
++      await this.create("binding", { aid: user.id, bid: user.id, pid, platform });
++      return user;
++    } catch (error) {
++      // patchbay: a concurrent attach bound this account first, or the binding outlived its user row.
++      const [binding] = await this.get("binding", { platform, pid }, ["aid"]);
++      if (!binding) throw error;
++      const [existing] = await this.get("user", { id: binding.aid });
++      if (existing) {
++        await this.remove("user", { id: user.id });
++        return existing;
++      }
++      await this.set("binding", { platform, pid }, { aid: user.id, bid: user.id });
++      return user;
++    }
+   }
+   async getChannel(platform, id, modifier) {
+     const data = await this.get("channel", { platform, id }, modifier);
+@@ -607,37 +727,29 @@ var Next;
    Next2.compose = compose;
    __name(compose, "compose");
  })(Next || (Next = {}));
@@ -514,7 +566,7 @@ index b99cd02..2d446d8 100644
        let ms = +attrs.value;
        for (let index = 0; index < 3; index++) {
          const major = Time[units[index]];
-@@ -653,6 +752,21 @@ var Processor = class {
+@@ -653,6 +765,21 @@ var Processor = class {
        }
        return Math.round(ms / Time.second) + " " + session.text("general.second");
      }, { session: true });
@@ -536,7 +588,7 @@ index b99cd02..2d446d8 100644
      ctx.before("attach", (session) => {
        for (const matcher of this._matchers) {
          this._executeMatcher(session, matcher);
-@@ -663,6 +777,8 @@ var Processor = class {
+@@ -663,6 +790,8 @@ var Processor = class {
    static {
      __name(this, "Processor");
    }
@@ -545,7 +597,7 @@ index b99cd02..2d446d8 100644
    _hooks = [];
    _sessions = /* @__PURE__ */ Object.create(null);
    _matchers = /* @__PURE__ */ new Set();
-@@ -670,12 +786,12 @@ var Processor = class {
+@@ -670,12 +799,12 @@ var Processor = class {
      if (typeof options !== "object") {
        options = { prepend: options };
      }
@@ -560,7 +612,7 @@ index b99cd02..2d446d8 100644
        return this._matchers.delete(matcher);
      });
    }
-@@ -683,7 +799,7 @@ var Processor = class {
+@@ -683,7 +812,7 @@ var Processor = class {
      const { stripped, quote } = session;
      const { appel, context, i18n, regex, fuzzy, pattern, response } = matcher;
      if ((appel || stripped.hasAt) && !stripped.appel) return;
@@ -569,7 +621,7 @@ index b99cd02..2d446d8 100644
      let content = stripped.content;
      if (quote?.content) content += " " + quote.content;
      let params = null;
-@@ -724,7 +840,7 @@ var Processor = class {
+@@ -724,7 +853,7 @@ var Processor = class {
    }
    async attach(session, next) {
      this.ctx.emit(session, "before-attach", session);
@@ -578,7 +630,7 @@ index b99cd02..2d446d8 100644
        if (!session.isDirect) {
          const channelFields = /* @__PURE__ */ new Set(["flag", "assignee", "guildId", "permissions", "locales"]);
          this.ctx.emit("before-attach-channel", session, channelFields);
-@@ -747,7 +863,7 @@ var Processor = class {
+@@ -747,7 +876,7 @@ var Processor = class {
    async _handleMessage(session) {
      if (session.selfId === session.userId) return;
      this._sessions[session.id] = session;
@@ -587,7 +639,7 @@ index b99cd02..2d446d8 100644
      let index = 0;
      const next = /* @__PURE__ */ __name(async (callback) => {
        try {
-@@ -778,7 +894,14 @@ ${stack}`);
+@@ -778,7 +907,14 @@ ${stack}`);
        await session.user?.$update();
        await session.channel?.$update();
        await session.guild?.$update();
@@ -603,7 +655,7 @@ index b99cd02..2d446d8 100644
      }
    }
  };
-@@ -843,7 +966,7 @@ var Command = class _Command extends Argv.CommandBase {
+@@ -843,7 +979,7 @@ var Command = class _Command extends Argv.CommandBase {
      ctx.$commander._commandList.push(this);
    }
    get caller() {
@@ -612,7 +664,7 @@ index b99cd02..2d446d8 100644
    }
    get displayName() {
      return Object.keys(this._aliases)[0];
-@@ -971,7 +1094,7 @@ var Command = class _Command extends Argv.CommandBase {
+@@ -971,7 +1107,7 @@ var Command = class _Command extends Argv.CommandBase {
      return this;
    }
    match(session) {
@@ -621,7 +673,7 @@ index b99cd02..2d446d8 100644
    }
    check(callback, append = false) {
      return this.before(callback, append);
-@@ -982,7 +1105,7 @@ var Command = class _Command extends Argv.CommandBase {
+@@ -982,7 +1118,7 @@ var Command = class _Command extends Argv.CommandBase {
      } else {
        this._checkers.unshift(callback);
      }
@@ -630,7 +682,7 @@ index b99cd02..2d446d8 100644
      return this;
    }
    action(callback, prepend = false) {
-@@ -991,7 +1114,7 @@ var Command = class _Command extends Argv.CommandBase {
+@@ -991,7 +1127,7 @@ var Command = class _Command extends Argv.CommandBase {
      } else {
        this._actions.push(callback);
      }
@@ -639,7 +691,7 @@ index b99cd02..2d446d8 100644
      return this;
    }
    /** @deprecated */
-@@ -1095,7 +1218,9 @@ __name(toStringType, "toStringType");
+@@ -1095,7 +1231,9 @@ __name(toStringType, "toStringType");
  // src/command/validate.ts
  import { isNullable as isNullable2 } from "cosmokit";
  function validate(ctx) {
@@ -650,7 +702,7 @@ index b99cd02..2d446d8 100644
      depends: /* @__PURE__ */ __name(({ name }) => {
        const command = ctx.$commander.get(name);
        if (!command) return;
-@@ -1110,7 +1235,7 @@ function validate(ctx) {
+@@ -1110,7 +1248,7 @@ function validate(ctx) {
        return ctx.$commander._commandList.map((command) => `command:${command.name}`);
      }, "list")
    });
@@ -659,7 +711,7 @@ index b99cd02..2d446d8 100644
      depends: /* @__PURE__ */ __name(({ name, name2 }) => {
        return ctx.$commander.get(name)?._options[name2]?.dependencies;
      }, "depends"),
-@@ -1130,13 +1255,13 @@ function validate(ctx) {
+@@ -1130,13 +1268,13 @@ function validate(ctx) {
        return command.config.showWarning ? session.text(message, param) : "";
      }
      __name(sendHint, "sendHint");
@@ -676,7 +728,7 @@ index b99cd02..2d446d8 100644
        return sendHint("internal.low-authority");
      }
    }, true);
-@@ -1182,7 +1307,7 @@ var Commander = class {
+@@ -1182,7 +1320,7 @@ var Commander = class {
    constructor(ctx, config = {}) {
      this.ctx = ctx;
      this.config = config;
@@ -685,7 +737,7 @@ index b99cd02..2d446d8 100644
      ctx.plugin(validate);
      ctx.before("parse", (content, session) => {
        const { isDirect, stripped: { prefix, appel } } = session;
-@@ -1255,7 +1380,7 @@ var Commander = class {
+@@ -1255,7 +1393,7 @@ var Commander = class {
        permissions: Schema2.array(String).role("perms").default(["authority:0"]).description("权限继承。"),
        dependencies: Schema2.array(String).role("perms").description("权限依赖。")
      }), 1e3);
@@ -694,7 +746,7 @@ index b99cd02..2d446d8 100644
        const bots = ctx.bots.filter((v) => v.status === Universal3.Status.ONLINE && v.updateCommands);
        bots.forEach((bot) => this.updateCommands(bot));
      });
-@@ -1334,6 +1459,8 @@ var Commander = class {
+@@ -1334,6 +1472,8 @@ var Commander = class {
    static {
      __name(this, "Commander");
    }
@@ -703,7 +755,7 @@ index b99cd02..2d446d8 100644
    _commandList = [];
    defineElementDomain(name, key = name, type = name) {
      this.domain(name, (source, session) => {
-@@ -1456,13 +1583,14 @@ var Commander = class {
+@@ -1456,13 +1596,14 @@ var Commander = class {
      });
      Object.assign(parent.config, config);
      created.forEach((command) => this.ctx.emit("command-added", command));
@@ -721,7 +773,7 @@ index b99cd02..2d446d8 100644
      return this.ctx.set(service, { transform, ...options });
    }
    resolveDomain(type) {
-@@ -1570,6 +1698,8 @@ var I18n = class {
+@@ -1570,6 +1711,8 @@ var I18n = class {
    static {
      __name(this, "I18n");
    }
@@ -730,7 +782,7 @@ index b99cd02..2d446d8 100644
    _data = {};
    _presets = {};
    locales;
-@@ -1613,7 +1743,7 @@ var I18n = class {
+@@ -1613,7 +1756,7 @@ var I18n = class {
      const dict = this._data[locale] ||= {};
      const paths = [...typeof args[0] === "string" ? this.set(locale, args[0] + ".", args[1]) : this.set(locale, "", args[0])];
      this.ctx.emit("internal/i18n");
@@ -739,7 +791,7 @@ index b99cd02..2d446d8 100644
        for (const path2 of paths) {
          delete dict[path2];
        }
-@@ -1680,7 +1810,7 @@ var I18n = class {
+@@ -1680,7 +1823,7 @@ var I18n = class {
  import { observe } from "@koishijs/utils";
  import { isNullable as isNullable4, makeArray as makeArray2 } from "cosmokit";
  import { h as h5, Logger as Logger3 } from "@satorijs/core";
@@ -748,7 +800,7 @@ index b99cd02..2d446d8 100644
  var logger3 = new Logger3("session");
  function collectFields(argv, collectors, fields) {
    for (const collector of collectors) {
-@@ -1700,7 +1830,8 @@ var KoishiSession = class {
+@@ -1700,7 +1843,8 @@ var KoishiSession = class {
      __name(this, "KoishiSession");
    }
    constructor(ctx) {
@@ -758,7 +810,7 @@ index b99cd02..2d446d8 100644
        resolve: "session.resolve",
        stripped: "session.stripped",
        username: "session.username",
-@@ -1969,7 +2100,7 @@ var KoishiSession = class {
+@@ -1969,7 +2113,7 @@ var KoishiSession = class {
        }
      }
      const { command } = argv;
@@ -767,7 +819,7 @@ index b99cd02..2d446d8 100644
      if (this.app.database) {
        if (!this.isDirect) {
          await this.observeChannel(this.collect("channel", argv, /* @__PURE__ */ new Set(["permissions", "locales"])));
-@@ -2058,8 +2189,7 @@ var logger4 = new Logger4("app");
+@@ -2058,8 +2202,7 @@ var logger4 = new Logger4("app");
  var Permissions = class {
    constructor(ctx) {
      this.ctx = ctx;
@@ -777,7 +829,7 @@ index b99cd02..2d446d8 100644
      this.define("authority:(value)", {
        check: /* @__PURE__ */ __name(({ value }, { user }) => {
          return !user || user.authority >= +value;
-@@ -2076,6 +2206,8 @@ var Permissions = class {
+@@ -2076,6 +2219,8 @@ var Permissions = class {
    static {
      __name(this, "Permissions");
    }
@@ -786,7 +838,7 @@ index b99cd02..2d446d8 100644
    store = [];
    define(pattern, options) {
      const entry = {
-@@ -2167,7 +2299,8 @@ var KoishiBot = class {
+@@ -2167,7 +2312,8 @@ var KoishiBot = class {
      __name(this, "KoishiBot");
    }
    constructor(ctx) {
@@ -796,7 +848,7 @@ index b99cd02..2d446d8 100644
        getGuildMemberMap: "bot.getGuildMemberMap",
        broadcast: "bot.broadcast"
      });
-@@ -2238,9 +2371,11 @@ var SchemaService = class {
+@@ -2238,9 +2384,11 @@ var SchemaService = class {
    static {
      __name(this, "SchemaService");
    }
@@ -809,7 +861,7 @@ index b99cd02..2d446d8 100644
      const target = this.get(name);
      const index = target.list.findIndex((a) => a[kSchemaOrder] < order);
      schema[kSchemaOrder] = order;
-@@ -2250,7 +2385,7 @@ var SchemaService = class {
+@@ -2250,7 +2398,7 @@ var SchemaService = class {
        target.list.push(schema);
      }
      this.ctx.emit("internal/schema", name);
@@ -818,7 +870,7 @@ index b99cd02..2d446d8 100644
        remove3(target.list, schema);
        this.ctx.emit("internal/schema", name);
      });
-@@ -2259,10 +2394,10 @@ var SchemaService = class {
+@@ -2259,10 +2407,10 @@ var SchemaService = class {
      return this._data[name] ||= Schema4.intersect([]);
    }
    set(name, schema) {
@@ -831,7 +883,7 @@ index b99cd02..2d446d8 100644
        delete this._data[name];
        this.ctx.emit("internal/schema", name);
      });
-@@ -2272,6 +2407,95 @@ var SchemaService = class {
+@@ -2272,6 +2420,95 @@ var SchemaService = class {
  // src/context.ts
  import { Adapter as Adapter2, Bot as Bot3, Element, h as h6, HTTP as HTTP2, Logger as Logger5, MessageEncoder, Messenger, Quester, Schema as Schema6, segment, Universal as Universal5, z } from "@satorijs/core";
  import { resolveConfig } from "cordis";
@@ -927,7 +979,7 @@ index b99cd02..2d446d8 100644
  var Context = class extends satori.Context {
    static {
      __name(this, "Context");
-@@ -2279,31 +2503,8 @@ var Context = class extends satori.Context {
+@@ -2279,31 +2516,8 @@ var Context = class extends satori.Context {
    static shadow = /* @__PURE__ */ Symbol.for("session.shadow");
    constructor(config = {}) {
      super(config);
@@ -961,7 +1013,7 @@ index b99cd02..2d446d8 100644
    }
    /** @deprecated use `ctx.root` instead */
    get app() {
-@@ -2313,25 +2514,6 @@ var Context = class extends satori.Context {
+@@ -2313,25 +2527,6 @@ var Context = class extends satori.Context {
    get options() {
      return this.root.config;
    }
@@ -987,7 +1039,7 @@ index b99cd02..2d446d8 100644
    before(name, listener, append = false) {
      const seg = name.split("/");
      seg[seg.length - 1] = "before-" + seg[seg.length - 1];
-@@ -2339,19 +2521,36 @@ var Context = class extends satori.Context {
+@@ -2339,19 +2534,36 @@ var Context = class extends satori.Context {
    }
  };
  var Koishi = class extends cordis.Service {
@@ -1031,7 +1083,7 @@ index b99cd02..2d446d8 100644
  };
  ((Context3) => {
    Context3.Config = Schema5.intersect([
-@@ -2399,12 +2598,15 @@ var Service3 = class extends satori.Service {
+@@ -2399,12 +2611,15 @@ var Service3 = class extends satori.Service {
      this.ctx = new Context();
    }
  };
@@ -1047,7 +1099,7 @@ index b99cd02..2d446d8 100644
    Context as App,
    Argv,
    Bot3 as Bot,
-@@ -2426,6 +2628,7 @@ export {
+@@ -2426,6 +2641,7 @@ export {
    Schema6 as Schema,
    SchemaService,
    Service3 as Service,