fix(console): do not directly access loader service

packages/console/src/index.ts

@@ -79,7 +79,7 @@ export abstract class Console extends Service {
   async get(client: Client) {
     const result = valueMap(this.entries, ({ files, ctx, data }, key) => ({
       files: this.resolveEntry(files, key),
-      paths: this.ctx.loader?.paths(ctx.scope),
+      paths: this.ctx.get('loader')?.paths(ctx.scope),
       data: data?.(client),
     }))
     result['_id'] = this.id as any

plugins/commands/src/console.ts

@@ -93,7 +93,7 @@ export default class CommandProvider extends DataService<CommandData[]> {
       create: this.manager.snapshots[command.name]?.create,
       initial: this.manager.snapshots[command.name]?.initial || { aliases: command._aliases, config: command.config, options: command._options },
       override: this.manager.snapshots[command.name]?.override || { aliases: command._aliases, config: null, options: {} },
-      paths: this.ctx.loader?.paths(command.ctx.scope) || [],
+      paths: this.ctx.get('loader')?.paths(command.ctx.scope) || [],
     })).sort((a, b) => a.name.localeCompare(b.name))
   }
 }

plugins/config/src/shared/services.ts

@@ -14,11 +14,12 @@ export class ServiceProvider extends DataService<Dict<number>> {
       attach(Object.getPrototypeOf(internal))
       for (const [key, { type }] of Object.entries(internal)) {
         if (type !== 'service') continue
-        const ctx: Context = this.ctx.get(key)?.[Context.source]
-        if (ctx) {
-          const name = key.replace(/^__/, '').replace(/__$/, '')
-          services[name] = ctx.scope.uid
-        }
+        const instance = this.ctx.get(key)
+        if (!(instance instanceof Object)) continue
+        const ctx: Context = Reflect.getOwnPropertyDescriptor(instance, Context.current)?.value
+        if (!ctx) continue
+        const name = key.replace(/^__/, '').replace(/__$/, '')
+        services[name] = ctx.scope.uid
       }
     }
     attach(this.ctx.root[Context.internal])

plugins/console/src/node/index.ts

@@ -49,8 +49,9 @@ class NodeConsole extends Console {
     })
 
     ctx.on('console/connection', () => {
-      if (!ctx.loader) return
-      ctx.loader.envData.clientCount = this.layer.clients.size
+      const loader = ctx.get('loader')
+      if (!loader) return
+      loader.envData.clientCount = this.layer.clients.size
     })
 
     this.root = config.root || (config.devMode
@@ -84,7 +85,7 @@ class NodeConsole extends Console {
 
     this.ctx.on('server/ready', () => {
       const target = this.ctx.server.selfUrl + this.config.uiPath
-      if (this.config.open && !this.ctx.loader?.envData.clientCount && !process.env.KOISHI_AGENT) {
+      if (this.config.open && !this.ctx.get('loader')?.envData.clientCount && !process.env.KOISHI_AGENT) {
         open(target)
       }
       this.logger.info('webui is available at %c', target)

plugins/insight/src/index.ts

@@ -67,7 +67,9 @@ class Insight extends DataService<Insight.Payload> {
     const services = {} as Record<number, string[]>
     for (const [key, { type }] of Object.entries(this.ctx.root[Context.internal])) {
       if (type !== 'service') continue
-      const ctx: Context = this.ctx.get(key)?.[Context.source]
+      const instance = this.ctx.get(key)
+      if (!(instance instanceof Object)) continue
+      const ctx: Context = Reflect.getOwnPropertyDescriptor(instance, Context.current)?.value
       if (ctx?.scope.uid) {
         (services[ctx.scope.uid] ||= []).push(key)
       }
@@ -110,9 +112,12 @@ class Insight extends DataService<Insight.Payload> {
         edges.push({ type, source, target })
       }
 
-      function addDeps(state: EffectScope) {
+      const addDeps = (state: EffectScope) => {
         for (const name of runtime.using) {
-          const uid = state.ctx[name]?.[Context.source]?.state.uid
+          const instance = this.ctx.get(name)
+          if (!(instance instanceof Object)) continue
+          const ctx: Context = Reflect.getOwnPropertyDescriptor(instance, Context.current)?.value
+          const uid = ctx?.state.uid
           if (!uid) continue
           addEdge('dashed', uid, state.uid)
         }

plugins/logger/src/index.ts

@@ -127,12 +127,12 @@ export async function apply(ctx: Context, config: Config) {
   ctx.on('dispose', () => {
     writer?.close()
     remove(Logger.targets, target)
-    if (ctx.loader) {
-      ctx.loader.prolog = []
+    if (loader) {
+      loader.prolog = []
     }
   })
 
-  for (const record of ctx.loader?.prolog || []) {
+  for (const record of loader?.prolog || []) {
     target.record(record)
   }
 

plugins/notifier/src/index.ts

@@ -34,7 +34,7 @@ class Notifier {
   toJSON(): Notifier.Data {
     return {
       ...this.config,
-      paths: this.ctx.loader?.paths(this.ctx.scope),
+      paths: this.ctx.get('loader')?.paths(this.ctx.scope),
     }
   }
 }

plugins/status/src/profile.ts

@@ -141,7 +141,7 @@ class ProfileProvider extends DataService<ProfileProvider.Payload> {
       if (bot.hidden) continue
       bots[bot.sid] = {
         ...bot.toJSON(),
-        paths: this.ctx.loader?.paths(bot.ctx.scope),
+        paths: this.ctx.get('loader')?.paths(bot.ctx.scope),
         error: bot.error?.message,
         messageSent: bot._messageSent.get(),
         messageReceived: bot._messageReceived.get(),