feat: almost support run task

server/src/index.ts

@@ -9,7 +9,12 @@ import os from 'os'
 import path from 'path'
 import sms from 'source-map-support'
 
-import { MaaController, MaaFrameworkLoader, MaaResource } from '../MaaJSLoader'
+import {
+  MaaController,
+  MaaFrameworkLoader,
+  MaaInstance,
+  MaaResource
+} from '../MaaJSLoader'
 import { MaaAdbControllerTypeEnum } from '../MaaJSLoader/src/framework/types'
 
 interface Config {
@@ -105,17 +110,84 @@ async function main() {
     })
   })
 
+  app.ws('/api/instance', async (ws, req) => {
+    if (!controller) {
+      ws.close()
+      return
+    }
+
+    const resource = await prepareResource()
+    if (!resource) {
+      ws.close()
+      return
+    }
+
+    const instance = new MaaInstance(loader, (msg, detail) => {
+      ws.send(
+        JSON.stringify({
+          type: 'callback',
+          msg,
+          detail
+        })
+      )
+    })
+
+    instance.bindController(controller)
+    instance.bindResource(resource)
+
+    if (!instance.inited()) {
+      ws.close()
+      resource.destroy()
+      return
+    }
+
+    ws.on('close', () => {
+      // instance.destroy()
+      resource.destroy()
+    })
+
+    ws.send(
+      JSON.stringify({
+        type: 'inited'
+      })
+    )
+
+    ws.on('message', async data => {
+      const action = JSON.parse(data.toString('utf-8')) as {
+        action: 'start'
+        task: string[]
+      }
+      if (controller) {
+        switch (action.action) {
+          case 'start': {
+            for (const task of action.task) {
+              instance.post(task, {}, status => {
+                ws.send(
+                  JSON.stringify({
+                    type: 'status',
+                    task,
+                    status
+                  })
+                )
+              })
+            }
+          }
+        }
+      }
+    })
+  })
+
   app.listen(config.port, () => {
     console.log(`server started: http://localhost:${config.port}/`)
   })
 
-  loader = new MaaFrameworkLoader()
-  loader.load(path.join(config.maaframework.root, 'bin'))
+  if (config.maaframework.emulator) {
+    loader = new MaaFrameworkLoader()
+    loader.load(path.join(config.maaframework.root, 'bin'))
 
-  loader.setLogging(config.maaframework.log)
-  loader.setDebugMode(config.maaframework.debug)
+    loader.setLogging(config.maaframework.log)
+    loader.setDebugMode(config.maaframework.debug)
 
-  if (config.maaframework.emulator) {
     const ctrl = await prepareController()
     if (ctrl) {
       controller = ctrl

src/App.vue

@@ -1,5 +1,28 @@
 <script setup lang="ts">
+import { onMounted } from 'vue'
 import { RouterView } from 'vue-router'
+
+import { fs } from '@/filesystem'
+import { loadFS } from '@/loader'
+
+onMounted(async () => {
+  await loadFS()
+  window.onkeydown = ev => {
+    if (ev.ctrlKey && (ev.key === 'z' || ev.key === 'Z')) {
+      ev.stopPropagation()
+      ev.preventDefault()
+      if (ev.shiftKey) {
+        if (fs.history.canRedo.value) {
+          fs.history.redo()
+        }
+      } else {
+        if (fs.history.canUndo.value) {
+          fs.history.undo()
+        }
+      }
+    }
+  }
+})
 </script>
 
 <template>

src/api.ts

@@ -26,3 +26,12 @@ export async function controller() {
     }
   })
 }
+
+export async function instance() {
+  return new Promise<WebSocket>(resolve => {
+    const ws = new WebSocket('ws://' + window.location.host + '/api/instance')
+    ws.onopen = () => {
+      resolve(ws)
+    }
+  })
+}

src/components/atomic/ClearButton.vue

@@ -30,7 +30,7 @@ function clean() {
 </script>
 
 <template>
-  <NPopover trigger="hover">
+  <NPopover trigger="hover" :disabled="!propkey">
     <template #trigger>
       <NButton
         secondary

src/components/task/SingleNavigateEdit.vue

@@ -58,7 +58,7 @@ const options = computed(() => {
 </script>
 
 <template>
-  <div class="flex gap-2">
+  <div class="flex gap-2 w-full">
     <NButton
       :disabled="!(value in taskIndex)"
       @click="navigate(taskIndex[value])"

src/layout/MainLayout.vue

@@ -0,0 +1,10 @@
+<template>
+  <div class="flex flex-col gap-2 flex-1 min-h-0">
+    <div class="flex gap-2">
+      <slot name="action"></slot>
+    </div>
+    <div class="flex gap-2 flex-1 min-h-0">
+      <slot></slot>
+    </div>
+  </div>
+</template>

src/router/index.ts

@@ -1,6 +1,7 @@
 import { createRouter, createWebHistory } from 'vue-router'
 
 import EditView from '@/views/EditView.vue'
+import EvalView from '@/views/EvalView.vue'
 
 const router = createRouter({
   history: createWebHistory(),
@@ -12,6 +13,10 @@ const router = createRouter({
     {
       path: '/edit',
       component: EditView
+    },
+    {
+      path: '/eval',
+      component: EvalView
     }
   ]
 })

src/types.ts

@@ -156,3 +156,18 @@ export type Task = Recognition &
 export interface TaskData {
   [task: string]: Task
 }
+
+export interface TaskRunInfo {
+  task: string
+  enable: boolean
+  status: 'skipped' | 'pending' | 'running' | 'success' | 'error'
+}
+
+export const enum DispatcherStatus {
+  Invalid,
+  Pending,
+  Started,
+  Completed,
+  Failed,
+  Stopped
+}

src/views/EditView.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import {
+  BuildOutlined,
   FileDownloadOutlined,
   FileUploadOutlined,
   NavigateBeforeOutlined,
@@ -8,40 +9,32 @@ import {
   UndoOutlined
 } from '@vicons/material'
 import { NButton, NCard, NIcon } from 'naive-ui'
-import { onMounted, ref } from 'vue'
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
 
 import { active, getTask, history, setTask } from '@/data'
 import { type PathKey, fs } from '@/filesystem'
 import { loadFS, saveFS } from '@/loader'
 
 import TaskEdit from '@/components/TaskEdit.vue'
 import TaskTree from '@/components/TaskTree.vue'
+import MainLayout from '@/layout/MainLayout.vue'
 
-const expands = ref<PathKey[]>(['/' as PathKey])
+const router = useRouter()
 
-onMounted(async () => {
-  await loadFS()
-  window.onkeydown = ev => {
-    if (ev.ctrlKey && (ev.key === 'z' || ev.key === 'Z')) {
-      ev.stopPropagation()
-      ev.preventDefault()
-      if (ev.shiftKey) {
-        if (fs.history.canRedo.value) {
-          fs.history.redo()
-        }
-      } else {
-        if (fs.history.canUndo.value) {
-          fs.history.undo()
-        }
-      }
-    }
-  }
-})
+const expands = ref<PathKey[]>(['/' as PathKey])
 </script>
 
 <template>
-  <div class="flex flex-col gap-2 flex-1 min-h-0">
-    <div class="flex gap-2">
+  <MainLayout>
+    <template #action>
+      <NButton @click="router.push('/eval')">
+        <template #icon>
+          <NIcon>
+            <BuildOutlined></BuildOutlined>
+          </NIcon>
+        </template>
+      </NButton>
       <NButton :disabled="!fs.history.canUndo.value" @click="fs.history.undo">
         <template #icon>
           <NIcon>
@@ -90,28 +83,26 @@ onMounted(async () => {
           </NIcon>
         </template>
       </NButton>
-    </div>
-    <div class="flex gap-2 flex-1 min-h-0">
-      <NCard
-        class="min-h-0"
-        style="max-width: 400px"
-        content-style="max-height: 100%; display: flex; flex-direction: column"
-      >
-        <TaskTree v-model:expand="expands"></TaskTree>
-      </NCard>
-      <NCard class="min-h-0" content-style="max-height: 100%">
-        <template v-if="active && getTask(active)">
-          <TaskEdit
-            :name="active"
-            :value="getTask(active)!"
-            @update:value="
-              task => {
-                setTask(active!, task)
-              }
-            "
-          ></TaskEdit>
-        </template>
-      </NCard>
-    </div>
-  </div>
+    </template>
+    <NCard
+      class="min-h-0"
+      style="max-width: 400px"
+      content-style="max-height: 100%; display: flex; flex-direction: column"
+    >
+      <TaskTree v-model:expand="expands"></TaskTree>
+    </NCard>
+    <NCard class="min-h-0" content-style="max-height: 100%">
+      <template v-if="active && getTask(active)">
+        <TaskEdit
+          :name="active"
+          :value="getTask(active)!"
+          @update:value="
+            task => {
+              setTask(active!, task)
+            }
+          "
+        ></TaskEdit>
+      </template>
+    </NCard>
+  </MainLayout>
 </template>