feat: support custom action maay.yield

.prettierignore

@@ -1,7 +1,6 @@
 node_modules
 dist
 assets
-pkgs/loader
 
 pnpm-lock.yaml
 

app/main/src/components/maafw/index.ts

@@ -1,4 +1,12 @@
-import { FlatToStream, context, deinit, init, set_log_dir, set_save_draw } from '@maa/loader'
+import {
+  FlatToStream,
+  context,
+  deinit,
+  init,
+  serverContext,
+  set_log_dir,
+  set_save_draw
+} from '@maa/loader'
 import { logger } from '@maa/logger'
 import { shallowRef } from '@vue/reactivity'
 import { ChildProcess, spawn } from 'child_process'
@@ -122,8 +130,8 @@ export class MaaFrameworkModule extends Module {
       await set_log_dir(path.join(process.cwd(), 'debug'))
       await set_save_draw(this.cfg.debug)
       logger.info('maa configured')
-      const stream = FlatToStream(context, (id, msg, detail) => {
-        ipcMainSend('renderer.loader.callback', id, msg, detail)
+      const stream = FlatToStream(serverContext, (msg, id, ...args) => {
+        ipcMainSend('renderer.loader.callback', msg, id, ...args)
       })
       ipcMainHandle('main.loader.stream', async (_, cmd, args) => {
         try {

app/renderer/src/stores/instance.ts

@@ -236,6 +236,7 @@ async function run(
   output: {
     state: RunningState
     current: number | null
+    log: (x: string) => void
   }
 ) {
   output.state = RunningState.Loading
@@ -270,6 +271,13 @@ async function run(
   await hinst.bind_resource(hres)
   await hinst.bind_controller(hctrl)
 
+  hinst.register_custom_action('maay.yield', {
+    run(_1, task, param, box, detail) {
+      output.log(`task ${task} yield ${param}`)
+      return true
+    }
+  })
+
   output.state = RunningState.Running
 
   const globDiff = buildDiffConfig(

app/renderer/src/utils/maa.ts

@@ -18,7 +18,7 @@ export function setupMaa() {
     }
   })
   setContext(ctx)
-  window.ipcRenderer.on('renderer.loader.callback', (_, id, msg, detail) => {
-    recv(id, msg, detail)
+  window.ipcRenderer.on('renderer.loader.callback', (_, msg, id, ...args) => {
+    recv(msg, id, ...args)
   })
 }

app/renderer/src/views/Instances/InstancesMain.vue

@@ -50,7 +50,10 @@ async function run() {
     curInstanceHandle.value,
     reactive({
       state: running,
-      current: null
+      current: null,
+      log: (x: string) => {
+        statusMessage.value.push(x)
+      }
     })
   )
 }

pkgs/ipc/src/client.ts

@@ -3,6 +3,6 @@ import type { SyncVarInterfaceList_M2R, SyncVarPullInterfaceList_R2M } from './s
 export type ClientSideInterface = {
   'renderer.core.log': (s: string) => void
 
-  'renderer.loader.callback': (id: string, msg: string, detail: string) => void
+  'renderer.loader.callback': (msg: string, id: string, ...args: any[]) => void
 } & SyncVarInterfaceList_M2R &
   SyncVarPullInterfaceList_R2M