fix(koishi): mount the command permission gate under inject so it follows the permission service

Author: dingyi222666

package.json

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

patchbay.json

@@ -40,7 +40,8 @@
       "description": "Run Koishi on Cordis 4; also installed as koishi. Inject shapes are normalized by the @satorijs/core patch",
       "fixes": [
         "ChatLunaLab/boilerplate#12",
-        "ChatLunaLab/v2-mirror#28"
+        "ChatLunaLab/v2-mirror#28",
+        "ChatLunaLab/v2-mirror#111"
       ],
       "dependencies": {
         "cordis": "^4.0.0-rc.8"

patches/@koishijs+core@4.18.11.patch

@@ -292,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..cbac35c 100644
+index b99cd02..ddbf1bf 100644
 --- a/lib/index.mjs
 +++ b/lib/index.mjs
 @@ -2,16 +2,120 @@ var __defProp = Object.defineProperty;
@@ -691,27 +691,51 @@ index b99cd02..cbac35c 100644
      return this;
    }
    /** @deprecated */
-@@ -1095,7 +1231,9 @@ __name(toStringType, "toStringType");
+@@ -1095,6 +1231,43 @@ __name(toStringType, "toStringType");
  // src/command/validate.ts
  import { isNullable as isNullable2 } from "cosmokit";
  function validate(ctx) {
--  ctx.permissions.define("command:(name)", {
-+  const permissions = ctx.get("permissions", false);
-+  if (!permissions) return;
-+  permissions.define("command:(name)", {
++  // patchbay: the gate comes and goes with the permission service, whichever loads first and across its reloads.
++  ctx.inject(["permissions"], (ctx2) => validatePermissions(ctx2));
++  ctx.before("command/execute", async (argv) => {
++    const { args, options, command, session } = argv;
++    function sendHint(message, ...param) {
++      return command.config.showWarning ? session.text(message, param) : "";
++    }
++    __name(sendHint, "sendHint");
++    if (command.config.checkArgCount) {
++      let index = args.length;
++      while (command._arguments[index]?.required) {
++        const decl = command._arguments[index];
++        await session.send(session.text("internal.prompt-argument", [
++          session.text(`commands.${command.name}.arguments.${decl.name}`)
++        ]));
++        const source = await session.prompt();
++        if (isNullable2(source)) {
++          return sendHint("internal.insufficient-arguments", decl.name);
++        }
++        args.push(ctx.$commander.parseValue(source, "argument", argv, decl));
++        index++;
++      }
++      const finalArg = command._arguments[command._arguments.length - 1] || {};
++      if (args.length > command._arguments.length && !finalArg.variadic) {
++        return sendHint("internal.redunant-arguments");
++      }
++    }
++    if (command.config.checkUnknown) {
++      const unknown = Object.keys(options).filter((key) => !command._options[key]);
++      if (unknown.length) {
++        return sendHint("internal.unknown-option", unknown.join(", "));
++      }
++    }
++  }, true);
++}
++__name(validate, "validate");
++function validatePermissions(ctx) {
+   ctx.permissions.define("command:(name)", {
      depends: /* @__PURE__ */ __name(({ name }) => {
        const command = ctx.$commander.get(name);
-       if (!command) return;
-@@ -1110,7 +1248,7 @@ function validate(ctx) {
-       return ctx.$commander._commandList.map((command) => `command:${command.name}`);
-     }, "list")
-   });
--  ctx.permissions.define("command:(name):option:(name2)", {
-+  permissions.define("command:(name):option:(name2)", {
-     depends: /* @__PURE__ */ __name(({ name, name2 }) => {
-       return ctx.$commander.get(name)?._options[name2]?.dependencies;
-     }, "depends"),
-@@ -1130,13 +1268,13 @@ function validate(ctx) {
+@@ -1130,50 +1303,19 @@ function validate(ctx) {
        return command.config.showWarning ? session.text(message, param) : "";
      }
      __name(sendHint, "sendHint");
@@ -720,15 +744,55 @@ index b99cd02..cbac35c 100644
      for (const option of Object.values(command._options)) {
        if (option.name in options) {
 -        permissions.push(`command:${command.name}:option:${option.name}`);
+-      }
+-    }
+-    if (!await ctx.permissions.test(permissions, session)) {
+-      return sendHint("internal.low-authority");
+-    }
+-  }, true);
+-  ctx.before("command/execute", async (argv) => {
+-    const { args, options, command, session } = argv;
+-    function sendHint(message, ...param) {
+-      return command.config.showWarning ? session.text(message, param) : "";
+-    }
+-    __name(sendHint, "sendHint");
+-    if (command.config.checkArgCount) {
+-      let index = args.length;
+-      while (command._arguments[index]?.required) {
+-        const decl = command._arguments[index];
+-        await session.send(session.text("internal.prompt-argument", [
+-          session.text(`commands.${command.name}.arguments.${decl.name}`)
+-        ]));
+-        const source = await session.prompt();
+-        if (isNullable2(source)) {
+-          return sendHint("internal.insufficient-arguments", decl.name);
+-        }
+-        args.push(ctx.$commander.parseValue(source, "argument", argv, decl));
+-        index++;
+-      }
+-      const finalArg = command._arguments[command._arguments.length - 1] || {};
+-      if (args.length > command._arguments.length && !finalArg.variadic) {
+-        return sendHint("internal.redunant-arguments");
 +        required.push(`command:${command.name}:option:${option.name}`);
        }
      }
--    if (!await ctx.permissions.test(permissions, session)) {
-+    if (!await permissions.test(required, session)) {
-       return sendHint("internal.low-authority");
+-    if (command.config.checkUnknown) {
+-      const unknown = Object.keys(options).filter((key) => !command._options[key]);
+-      if (unknown.length) {
+-        return sendHint("internal.unknown-option", unknown.join(", "));
+-      }
++    if (!await ctx.permissions.test(required, session)) {
++      const level = command.config.permissions?.map((name) => /^authority:(\d+)$/.exec(name)?.[1]).find(Boolean);
++      return level === void 0 ? sendHint("internal.low-authority") : sendHint("internal.low-authority-level", command.displayName, level);
      }
    }, true);
-@@ -1182,7 +1320,7 @@ var Commander = class {
+ }
+-__name(validate, "validate");
++__name(validatePermissions, "validatePermissions");
+ 
+ // src/command/index.ts
+ var isArray = Array.isArray;
+@@ -1182,7 +1324,7 @@ var Commander = class {
    constructor(ctx, config = {}) {
      this.ctx = ctx;
      this.config = config;
@@ -737,7 +801,7 @@ index b99cd02..cbac35c 100644
      ctx.plugin(validate);
      ctx.before("parse", (content, session) => {
        const { isDirect, stripped: { prefix, appel } } = session;
-@@ -1255,7 +1393,7 @@ var Commander = class {
+@@ -1255,7 +1397,7 @@ var Commander = class {
        permissions: Schema2.array(String).role("perms").default(["authority:0"]).description("权限继承。"),
        dependencies: Schema2.array(String).role("perms").description("权限依赖。")
      }), 1e3);
@@ -746,7 +810,7 @@ index b99cd02..cbac35c 100644
        const bots = ctx.bots.filter((v) => v.status === Universal3.Status.ONLINE && v.updateCommands);
        bots.forEach((bot) => this.updateCommands(bot));
      });
-@@ -1334,6 +1472,8 @@ var Commander = class {
+@@ -1334,6 +1476,8 @@ var Commander = class {
    static {
      __name(this, "Commander");
    }
@@ -755,7 +819,7 @@ index b99cd02..cbac35c 100644
    _commandList = [];
    defineElementDomain(name, key = name, type = name) {
      this.domain(name, (source, session) => {
-@@ -1456,13 +1596,14 @@ var Commander = class {
+@@ -1456,13 +1600,14 @@ var Commander = class {
      });
      Object.assign(parent.config, config);
      created.forEach((command) => this.ctx.emit("command-added", command));
@@ -773,7 +837,20 @@ index b99cd02..cbac35c 100644
      return this.ctx.set(service, { transform, ...options });
    }
    resolveDomain(type) {
-@@ -1570,6 +1711,8 @@ var I18n = class {
+@@ -1533,10 +1678,10 @@ import { fallback, LocaleTree } from "@koishijs/i18n-utils";
+ import { h as h4, Logger as Logger2, Schema as Schema3 } from "@satorijs/core";
+ 
+ // src/locales/zh-CN.yml
+-var zh_CN_default = { general: { $: "通用设置", name: "中文", paren: "（{0}）", quote: "“{0}”", comma: "，", and: "和", or: "或", day: "天", hour: "小时", minute: "分钟", second: "秒" }, internal: { $: "核心文本", "error-encountered": "发生未知错误。", "low-authority": "权限不足。", "prompt-argument": "请发送{0}。", "insufficient-arguments": "缺少参数，输入帮助以查看用法。", "redunant-arguments": "存在多余参数，输入帮助以查看用法。", "invalid-argument": "参数 {0} 输入无效，{1}", "unknown-option": "存在未知选项 {0}，输入帮助以查看用法。", "invalid-option": "选项 {0} 输入无效，{1}", "check-syntax": "输入帮助以查看用法。", "invalid-number": "请提供一个数字。", "invalid-integer": "请提供一个整数。", "invalid-posint": "请提供一个正整数。", "invalid-natural": "请提供一个非负整数。", "invalid-date": "请输入合法的时间。", "invalid-user": "请指定正确的用户。", "invalid-channel": "请指定正确的频道。", "invalid-image": "请上传图片。", "invalid-audio": "请上传音频。", "invalid-video": "请上传视频。", "invalid-file": "请上传文件。", "suggest-hint": "您要找的是不是{0}？", "suggest-command": "回复句号以使用推测的指令。" }, commands: { $: "指令系统" } };
++var zh_CN_default = { general: { $: "通用设置", name: "中文", paren: "（{0}）", quote: "“{0}”", comma: "，", and: "和", or: "或", day: "天", hour: "小时", minute: "分钟", second: "秒" }, internal: { $: "核心文本", "error-encountered": "发生未知错误。", "low-authority": "权限不足。", "low-authority-level": "权限不足：{0} 需要 {1} 级权限。", "prompt-argument": "请发送{0}。", "insufficient-arguments": "缺少参数，输入帮助以查看用法。", "redunant-arguments": "存在多余参数，输入帮助以查看用法。", "invalid-argument": "参数 {0} 输入无效，{1}", "unknown-option": "存在未知选项 {0}，输入帮助以查看用法。", "invalid-option": "选项 {0} 输入无效，{1}", "check-syntax": "输入帮助以查看用法。", "invalid-number": "请提供一个数字。", "invalid-integer": "请提供一个整数。", "invalid-posint": "请提供一个正整数。", "invalid-natural": "请提供一个非负整数。", "invalid-date": "请输入合法的时间。", "invalid-user": "请指定正确的用户。", "invalid-channel": "请指定正确的频道。", "invalid-image": "请上传图片。", "invalid-audio": "请上传音频。", "invalid-video": "请上传视频。", "invalid-file": "请上传文件。", "suggest-hint": "您要找的是不是{0}？", "suggest-command": "回复句号以使用推测的指令。" }, commands: { $: "指令系统" } };
+ 
+ // src/locales/en-US.yml
+-var en_US_default = { general: { $: "General Settings", name: "English", paren: " ({0}) ", quote: '"{0}"', comma: "，", and: "and", or: "or", day: "day", hour: "hour", minute: "minute", second: "second" }, internal: { $: "Internal Text", "error-encountered": "An unknown error has occurred.", "low-authority": "Low authority.", "prompt-argument": "请发送{0}。", "insufficient-arguments": "Insufficient arguments, type help to see usage.", "redunant-arguments": "Redunant arguments, type help to see usage.", "invalid-argument": "Invalid argument {0}, {1}", "unknown-option": "Unknown option {0}, type help to see usage.", "invalid-option": "Invalid option {0}, {1}", "check-syntax": "Type help to see usage.", "invalid-number": "Expect a number.", "invalid-integer": "Expect an integer.", "invalid-posint": "Expect a positive integer.", "invalid-natural": "Expect a non-negative integer.", "invalid-date": "Expect a valid date.", "invalid-user": "Expect a valid user.", "invalid-channel": "Expect a valid channel.", "invalid-image": "Expect an image.", "invalid-audio": "Expect an audio.", "invalid-video": "Expect a video.", "invalid-file": "Expect a file.", "suggest-hint": "Do you mean {0}?", "suggest-command": "Send a period to apply the suggestion." }, commands: { $: "Command System" } };
++var en_US_default = { general: { $: "General Settings", name: "English", paren: " ({0}) ", quote: '"{0}"', comma: "，", and: "and", or: "or", day: "day", hour: "hour", minute: "minute", second: "second" }, internal: { $: "Internal Text", "error-encountered": "An unknown error has occurred.", "low-authority": "Low authority.", "low-authority-level": "Low authority: {0} needs level {1}.", "prompt-argument": "请发送{0}。", "insufficient-arguments": "Insufficient arguments, type help to see usage.", "redunant-arguments": "Redunant arguments, type help to see usage.", "invalid-argument": "Invalid argument {0}, {1}", "unknown-option": "Unknown option {0}, type help to see usage.", "invalid-option": "Invalid option {0}, {1}", "check-syntax": "Type help to see usage.", "invalid-number": "Expect a number.", "invalid-integer": "Expect an integer.", "invalid-posint": "Expect a positive integer.", "invalid-natural": "Expect a non-negative integer.", "invalid-date": "Expect a valid date.", "invalid-user": "Expect a valid user.", "invalid-channel": "Expect a valid channel.", "invalid-image": "Expect an image.", "invalid-audio": "Expect an audio.", "invalid-video": "Expect a video.", "invalid-file": "Expect a file.", "suggest-hint": "Do you mean {0}?", "suggest-command": "Send a period to apply the suggestion." }, commands: { $: "Command System" } };
+ 
+ // src/i18n.ts
+ var logger2 = new Logger2("i18n");
+@@ -1570,6 +1715,8 @@ var I18n = class {
    static {
      __name(this, "I18n");
    }
@@ -782,7 +859,7 @@ index b99cd02..cbac35c 100644
    _data = {};
    _presets = {};
    locales;
-@@ -1613,7 +1756,7 @@ var I18n = class {
+@@ -1613,7 +1760,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");
@@ -791,7 +868,7 @@ index b99cd02..cbac35c 100644
        for (const path2 of paths) {
          delete dict[path2];
        }
-@@ -1680,7 +1823,7 @@ var I18n = class {
+@@ -1680,7 +1827,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";
@@ -800,7 +877,7 @@ index b99cd02..cbac35c 100644
  var logger3 = new Logger3("session");
  function collectFields(argv, collectors, fields) {
    for (const collector of collectors) {
-@@ -1700,7 +1843,8 @@ var KoishiSession = class {
+@@ -1700,7 +1847,8 @@ var KoishiSession = class {
      __name(this, "KoishiSession");
    }
    constructor(ctx) {
@@ -810,7 +887,7 @@ index b99cd02..cbac35c 100644
        resolve: "session.resolve",
        stripped: "session.stripped",
        username: "session.username",
-@@ -1969,7 +2113,7 @@ var KoishiSession = class {
+@@ -1969,7 +2117,7 @@ var KoishiSession = class {
        }
      }
      const { command } = argv;
@@ -819,7 +896,7 @@ index b99cd02..cbac35c 100644
      if (this.app.database) {
        if (!this.isDirect) {
          await this.observeChannel(this.collect("channel", argv, /* @__PURE__ */ new Set(["permissions", "locales"])));
-@@ -2058,8 +2202,7 @@ var logger4 = new Logger4("app");
+@@ -2058,8 +2206,7 @@ var logger4 = new Logger4("app");
  var Permissions = class {
    constructor(ctx) {
      this.ctx = ctx;
@@ -829,7 +906,7 @@ index b99cd02..cbac35c 100644
      this.define("authority:(value)", {
        check: /* @__PURE__ */ __name(({ value }, { user }) => {
          return !user || user.authority >= +value;
-@@ -2076,6 +2219,8 @@ var Permissions = class {
+@@ -2076,6 +2223,8 @@ var Permissions = class {
    static {
      __name(this, "Permissions");
    }
@@ -838,7 +915,7 @@ index b99cd02..cbac35c 100644
    store = [];
    define(pattern, options) {
      const entry = {
-@@ -2167,7 +2312,8 @@ var KoishiBot = class {
+@@ -2167,7 +2316,8 @@ var KoishiBot = class {
      __name(this, "KoishiBot");
    }
    constructor(ctx) {
@@ -848,7 +925,7 @@ index b99cd02..cbac35c 100644
        getGuildMemberMap: "bot.getGuildMemberMap",
        broadcast: "bot.broadcast"
      });
-@@ -2238,9 +2384,11 @@ var SchemaService = class {
+@@ -2238,9 +2388,11 @@ var SchemaService = class {
    static {
      __name(this, "SchemaService");
    }
@@ -861,7 +938,7 @@ index b99cd02..cbac35c 100644
      const target = this.get(name);
      const index = target.list.findIndex((a) => a[kSchemaOrder] < order);
      schema[kSchemaOrder] = order;
-@@ -2250,7 +2398,7 @@ var SchemaService = class {
+@@ -2250,7 +2402,7 @@ var SchemaService = class {
        target.list.push(schema);
      }
      this.ctx.emit("internal/schema", name);
@@ -870,7 +947,7 @@ index b99cd02..cbac35c 100644
        remove3(target.list, schema);
        this.ctx.emit("internal/schema", name);
      });
-@@ -2259,10 +2407,10 @@ var SchemaService = class {
+@@ -2259,10 +2411,10 @@ var SchemaService = class {
      return this._data[name] ||= Schema4.intersect([]);
    }
    set(name, schema) {
@@ -883,7 +960,7 @@ index b99cd02..cbac35c 100644
        delete this._data[name];
        this.ctx.emit("internal/schema", name);
      });
-@@ -2272,6 +2420,95 @@ var SchemaService = class {
+@@ -2272,6 +2424,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";
@@ -979,7 +1056,7 @@ index b99cd02..cbac35c 100644
  var Context = class extends satori.Context {
    static {
      __name(this, "Context");
-@@ -2279,31 +2516,8 @@ var Context = class extends satori.Context {
+@@ -2279,31 +2520,8 @@ var Context = class extends satori.Context {
    static shadow = /* @__PURE__ */ Symbol.for("session.shadow");
    constructor(config = {}) {
      super(config);
@@ -1013,7 +1090,7 @@ index b99cd02..cbac35c 100644
    }
    /** @deprecated use `ctx.root` instead */
    get app() {
-@@ -2313,25 +2527,6 @@ var Context = class extends satori.Context {
+@@ -2313,25 +2531,6 @@ var Context = class extends satori.Context {
    get options() {
      return this.root.config;
    }
@@ -1039,7 +1116,7 @@ index b99cd02..cbac35c 100644
    before(name, listener, append = false) {
      const seg = name.split("/");
      seg[seg.length - 1] = "before-" + seg[seg.length - 1];
-@@ -2339,19 +2534,36 @@ var Context = class extends satori.Context {
+@@ -2339,19 +2538,36 @@ var Context = class extends satori.Context {
    }
  };
  var Koishi = class extends cordis.Service {
@@ -1083,7 +1160,7 @@ index b99cd02..cbac35c 100644
  };
  ((Context3) => {
    Context3.Config = Schema5.intersect([
-@@ -2399,12 +2611,15 @@ var Service3 = class extends satori.Service {
+@@ -2399,12 +2615,15 @@ var Service3 = class extends satori.Service {
      this.ctx = new Context();
    }
  };
@@ -1099,7 +1176,7 @@ index b99cd02..cbac35c 100644
    Context as App,
    Argv,
    Bot3 as Bot,
-@@ -2426,6 +2641,7 @@ export {
+@@ -2426,6 +2645,7 @@ export {
    Schema6 as Schema,
    SchemaService,
    Service3 as Service,