koishi-plugin-chat-patch 5.6.0 → 5.6.1

package/lib/index.js

@@ -2105,12 +2105,15 @@ var WebSocket;
 })(WebSocket || (WebSocket = {}));
 
 // src/satori.ts
+function getSatoriPath(ctx) {
+  const path5 = ctx.satori?.server?.config?.path ?? "/satori";
+  return path5.startsWith("/") ? path5 : `/${path5}`;
+}
+__name(getSatoriPath, "getSatoriPath");
 function resolveSatoriEndpoint(ctx) {
-  const url = ctx.satori?.server?.url ?? "/satori";
-  const clean = url.startsWith("undefined") ? url.slice(9) : url;
-  if (/^https?:\/\//i.test(clean)) return clean;
-  const base = ctx.server?.selfUrl ?? ctx.server?.config?.selfUrl ?? "";
-  return `${base}${clean.startsWith("/") ? clean : `/${clean}`}`;
+  const port = ctx.server?.port ?? ctx.server?.config?.port;
+  const base = `http://localhost${port ? `:${port}` : ""}`;
+  return `${base}${getSatoriPath(ctx)}`;
 }
 __name(resolveSatoriEndpoint, "resolveSatoriEndpoint");
 function toSatoriEventUrl(endpoint) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-patch",
   "description": "[<ruby>chat-patch<rp>（</rp><rt>点我预览效果</rt><rp>）</rp></ruby>](https://i0.hdslb.com/bfs/openplatform/71074dfc9e5256fc3333d8bd8478bec1af874046.png) 视奸小插件((bushi( (低性能警告)。手机端适配。灵感来自 chat 插件。",
-  "version": "5.6.0",
+  "version": "5.6.1",
   "scripts": {
     "build:web": "npm --prefix client/web run build",
     "prepack": "npm run build:web",

package/src/satori.ts

@@ -2,12 +2,15 @@ import { Context } from 'koishi'
 import {} from '@koishijs/plugin-server'
 import {} from '@satorijs/plugin-server'
 
+function getSatoriPath(ctx: Context): string {
+  const path = ctx.satori?.server?.config?.path ?? '/satori'
+  return path.startsWith('/') ? path : `/${path}`
+}
+
 export function resolveSatoriEndpoint(ctx: Context): string {
-  const url = ctx.satori?.server?.url ?? '/satori'
-  const clean = url.startsWith('undefined') ? url.slice(9) : url
-  if (/^https?:\/\//i.test(clean)) return clean
-  const base = ctx.server?.selfUrl ?? ctx.server?.config?.selfUrl ?? ''
-  return `${base}${clean.startsWith('/') ? clean : `/${clean}`}`
+  const port = ctx.server?.port ?? ctx.server?.config?.port
+  const base = `http://localhost${port ? `:${port}` : ''}`
+  return `${base}${getSatoriPath(ctx)}`
 }
 
 export function toSatoriEventUrl(endpoint: string): string {

package/src/server.d.ts

@@ -4,12 +4,13 @@ type ServerContext = ParameterizedContext<DefaultState, DefaultContext>
 
 declare module '@satorijs/core' {
   interface Satori {
-    server: {
-      url: string
-      config: {
-        token?: string
-      }
-    }
+    server: {
+      url: string
+      config: {
+        path: string
+        token?: string
+      }
+    }
   }
 }