feat(chat): proxy url based on satori protocol

Author: shigma

packages/chat/client/avatar.vue

@@ -11,18 +11,21 @@
 <script setup lang="ts">
 
 import { useRpc } from '@cordisjs/client'
+import type { Login } from '@satorijs/protocol'
 import getWidth from 'string-width'
 import type { Data } from '../src'
 
-defineProps<{
+const props = defineProps<{
   src?: string
   name?: string
+  login: Login
 }>()
 
 const data = useRpc<Data>()
 
 function withProxy(url: string) {
-  return (data.value.proxy ? data.value.proxy + '/' : '') + url
+  if (!props.login.proxyUrls.some((proxy) => url.startsWith(proxy))) return url
+  return data.value.serverUrl + '/v1/proxy/' + url
 }
 
 function short(name: string) {

packages/chat/client/index.ts

@@ -1,9 +1,9 @@
 import { Context, Dict, Service } from '@cordisjs/client'
-import { computed, markRaw, reactive } from 'vue'
+import { computed, markRaw, reactive, Ref } from 'vue'
 import HTTP from '@cordisjs/plugin-http'
 import Satori, { Bot, Universal } from '@satorijs/core'
 import SatoriAdapter from '@satorijs/adapter-satori'
-import {} from '../src'
+import { Data } from '../src'
 import Chat from './index.vue'
 import './icons'
 
@@ -44,7 +44,7 @@ export default class ChatService extends Service {
     return result
   })
 
-  constructor(ctx: Context) {
+  constructor(ctx: Context, data: Ref<Data>) {
     super(ctx, 'chat', true)
     ctx.plugin(HTTP)
     ctx.plugin(Satori)
@@ -72,7 +72,7 @@ export default class ChatService extends Service {
 
     ctx.inject(['satori'], (ctx) => {
       ctx.plugin(SatoriAdapter, {
-        endpoint: new URL('/satori', location.href).href,
+        endpoint: data.value.serverUrl,
       })
 
       ctx.page({

packages/chat/client/index.vue

@@ -30,7 +30,8 @@
           @click="setGuild(guild)"
           @contextmenu.stop="triggerGuild($event, guild)"
         >
-          <avatar :src="guild.avatar" :name="guild.name" class="w-48px h-48px"/>
+          <avatar :src="guild.avatar" :name="guild.name" :login="ctx.bots[guild.assignees[0]]"
+            class="w-48px h-48px"/>
           <div class="flex flex-col flex-1">
             <div>{{ guild.name }}</div>
             <div>{{ guild.id }}</div>
@@ -58,11 +59,11 @@
             <span
               class="left-timestamp text-gray-4 text-xs
               absolute top-0 left-0 h-full w-18
-                inline-flex items-center justify-center"
+              inline-flex items-center justify-center"
             >{{ formatTime(new Date(message?.createdAt!)) }}</span>
           </template>
           <template v-else>
-            <avatar :src="message.user?.avatar" :name="message.user?.name"
+            <avatar :src="message.user?.avatar" :name="message.user?.name" :login="useBot()"
               class="w-10 h-10 absolute mt-1.5"/>
             <div class="header">
               <span class="font-bold lh-relaxed ml-14">{{ message.user?.name }}</span>

packages/chat/package.json

@@ -31,11 +31,11 @@
   "cordis": {
     "service": {
       "required": [
-        "satori.database",
         "webui"
       ],
       "optional": [
-        "server.proxy"
+        "satori.database",
+        "satori.server"
       ]
     }
   },
@@ -47,11 +47,11 @@
   "devDependencies": {
     "@cordisjs/client": "^0.1.4",
     "@cordisjs/plugin-http": "^0.5.1",
-    "@cordisjs/plugin-server-proxy": "^0.2.0",
     "@cordisjs/plugin-webui": "^0.1.4",
     "@satorijs/adapter-satori": "^1.3.0",
     "@satorijs/core": "^4.1.0",
-    "@satorijs/plugin-database": "^0.1.1"
+    "@satorijs/plugin-database": "^0.1.1",
+    "@satorijs/plugin-server": "^2.6.3"
   },
   "dependencies": {
     "cosmokit": "^1.6.2",

packages/chat/src/index.ts

@@ -1,15 +1,15 @@
 import { Context, Schema } from '@satorijs/core'
 import {} from '@cordisjs/plugin-webui'
-import {} from '@cordisjs/plugin-server-proxy'
 import {} from '@satorijs/plugin-database'
+import {} from '@satorijs/plugin-server'
 
 export interface Data {
-  proxy?: string
+  serverUrl: string
 }
 
 export const name = 'chat'
 
-export const inject = ['webui']
+export const inject = ['webui', 'satori.server']
 
 export interface Config {}
 
@@ -23,6 +23,6 @@ export function apply(ctx: Context) {
       import.meta.resolve('../dist/style.css'),
     ],
   }, () => ({
-    proxy: ctx.get('server.proxy')?.path,
+    serverUrl: ctx.satori.server.url,
   }))
 }

packages/database/package.json

@@ -38,7 +38,7 @@
     }
   },
   "devDependencies": {
-    "@satorijs/plugin-server": "^2.6.0",
+    "@satorijs/plugin-server": "^2.6.3",
     "minato": "^3.3.0"
   },
   "peerDependencies": {

packages/status/client/bots/preview.vue

@@ -39,14 +39,16 @@ const statusNames: Record<Status, string> = {
   [Status.DISCONNECT]: '正在断开',
 }
 
-defineProps<{
+const props = defineProps<{
   bot: Data.Bot
 }>()
 
 const data = useRpc<Data>()
 
 function withProxy(url: string) {
-  return (data.value.proxy ? data.value.proxy + '/' : '') + url
+  if (!data.value.serverUrl) return url
+  if (!props.bot.proxyUrls.some((proxy) => url.startsWith(proxy))) return url
+  return data.value.serverUrl + '/v1/proxy/' + url
 }
 
 </script>

packages/status/client/config.vue

@@ -1,7 +1,7 @@
 <template>
   <template v-if="bots?.length">
     <h2 class="k-schema-header">
-      机器人
+      登录号
     </h2>
     <div class="bots-container flex flex-wrap gap-4">
       <bot-preview v-for="(bot, sid) in bots" :key="sid" :bot="bot"/>
@@ -22,7 +22,7 @@ const data = useRpc<Data>()
 
 const bots = computed(() => {
   return Object.values(data.value.bots || {}).filter(bot => {
-    return bot.paths?.includes(ctx.get('manager')!.current.value!.path)
+    return bot.paths?.includes(ctx.get('manager')!.current.value!.id)
   })
 })
 

packages/status/package.json

@@ -35,7 +35,7 @@
       ],
       "optional": [
         "manager",
-        "server.proxy"
+        "satori.server"
       ]
     }
   },
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@cordisjs/client": "^0.1.4",
     "@cordisjs/plugin-manager": "^0.1.1",
-    "@cordisjs/plugin-server-proxy": "^0.2.0"
+    "@satorijs/plugin-server": "^2.6.3"
   },
   "dependencies": {
     "cosmokit": "^1.6.2"

packages/status/src/index.ts

@@ -1,7 +1,7 @@
 import { Bot, Context, Dict, Schema, Time, Universal } from '@satorijs/core'
 import {} from '@cordisjs/loader'
 import {} from '@cordisjs/plugin-webui'
-import {} from '@cordisjs/plugin-server-proxy'
+import {} from '@satorijs/plugin-server'
 
 declare module '@satorijs/core' {
   interface Bot {
@@ -11,8 +11,8 @@ declare module '@satorijs/core' {
 }
 
 export interface Data {
-  proxy?: string
   bots: Dict<Data.Bot>
+  serverUrl?: string
 }
 
 export namespace Data {
@@ -54,7 +54,10 @@ class TickCounter {
 
 export const name = 'status'
 
-export const inject = ['webui']
+export const inject = {
+  required: ['webui'],
+  optional: ['satori.server'],
+}
 
 export interface Config {}
 
@@ -79,7 +82,7 @@ export function apply(ctx: Context) {
         messageReceived: bot._messageReceived.get(),
       }
     }
-    return { bots, proxy: ctx.get('server.proxy')?.path }
+    return { bots, serverUrl: ctx.get('satori.server')?.url }
   })
 
   const update = ctx.debounce(() => entry.refresh(), 0)