koishi-plugin-18xx 0.0.1 → 0.0.3

package/lib/config.d.ts

@@ -1,9 +1,13 @@
+import { Server } from '@koishijs/plugin-server';
 import { Schema } from 'koishi';
 export declare const name = "18xx";
 export declare const inject: {
     required: string[];
 };
 export interface Config {
+    server: {
+        enable?: boolean;
+    } & Partial<Server.Config>;
     notification: {
         enable: boolean;
         path: string;

package/lib/index.d.ts

@@ -1,5 +1,4 @@
 import { Context } from 'koishi';
-import { Config, name, inject } from './config';
-export { name, inject };
-export { Config };
+import { Config, inject, name } from './config';
+export { Config, inject, name };
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -28,6 +38,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/config.ts
+var import_plugin_server = require("@koishijs/plugin-server");
 var import_koishi = require("koishi");
 var name = "18xx";
 var inject = {
@@ -35,6 +46,20 @@ var inject = {
   // optional: ['puppeteer'],
 };
 var Config = import_koishi.Schema.object({
+  server: import_koishi.Schema.intersect([
+    import_koishi.Schema.object({
+      enable: import_koishi.Schema.boolean().default(false).description("自定义服务器")
+    }),
+    import_koishi.Schema.union([
+      import_koishi.Schema.intersect([
+        import_koishi.Schema.object({
+          enable: import_koishi.Schema.const(true).required()
+        }),
+        import_plugin_server.Server.Config
+      ]),
+      import_koishi.Schema.object({})
+    ])
+  ]),
   notification: import_koishi.Schema.object({
     enable: import_koishi.Schema.boolean().default(true).description("启用通知"),
     path: import_koishi.Schema.string().default("/18xx").description("Webhook 监听路径"),
@@ -144,12 +169,41 @@ ${profiles.map((p) => `${p.id}`).join("\n")}`;
 __name(command, "command");
 
 // src/server.tsx
+var import_plugin_server2 = __toESM(require("@koishijs/plugin-server"));
 var import_jsx_runtime = require("@satorijs/element/jsx-runtime");
+var ForkServer = class extends import_plugin_server2.default {
+  static {
+    __name(this, "ForkServer");
+  }
+};
+var createProxyCtx = /* @__PURE__ */ __name((ctx) => new Proxy(ctx, {
+  get(target, p, receiver) {
+    const val = Reflect.get(target, p, receiver);
+    if (p === "name" && name !== val) {
+      return `${name} > ${val}`;
+    }
+    return val;
+  }
+}), "createProxyCtx");
+var forkServer = /* @__PURE__ */ __name((ctx, config) => new Promise((resolve, reject) => {
+  const proxy = createProxyCtx(ctx.isolate("server"));
+  proxy.plugin(ForkServer, {
+    ...ctx.server.config,
+    ...config.server
+  });
+  proxy.once("server/ready", () => resolve(proxy.server));
+  proxy.once("dispose", reject);
+}), "forkServer");
 var MESSAGE_REGEX = /^<@?(.*?)>\s*(.*)$/;
-function server(ctx, config) {
+async function server(ctx, config) {
   const logger = ctx.logger(name);
+  let server2 = ctx.server;
+  if (config.server.port && config.server.port !== server2.port) {
+    logger.info("Server port is different from koishi Server port, fork server.");
+    server2 = await forkServer(ctx, config);
+  }
   if (config.notification.enable) {
-    ctx.server.post(config.notification.path, async (ptx, _next) => {
+    server2.post(config.notification.path, async (ptx, _next) => {
       const { text = "" } = ptx.request.body || {};
       const result = MESSAGE_REGEX.exec(text);
       if (!result) {

package/lib/server.d.ts

@@ -1,3 +1,3 @@
 import type { Context } from 'koishi';
 import { Config } from './config';
-export declare function server(ctx: Context, config: Config): void;
+export declare function server(ctx: Context, config: Config): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-18xx",
   "description": "18xxGames 机器人",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -24,12 +24,12 @@
   ],
   "devDependencies": {
     "@koishijs/plugin-adapter-onebot": "^6.0.2",
-    "@koishijs/plugin-server": "^3.2.7",
     "typescript": "^5.8.3"
   },
   "peerDependencies": {
-    "koishi": "^4.18.7",
-    "@satorijs/element": "^3.1.8"
+    "@koishijs/plugin-server": "^3.2.7",
+    "@satorijs/element": "^3.1.8",
+    "koishi": "^4.18.7"
   },
   "koishi": {
     "description": {
@@ -47,4 +47,4 @@
       "zh"
     ]
   }
-}
+}