fix: terminals view

nuxt · Oct 1, 2023 · df5dd76 · df5dd76
1 parent 91ae0bd
commit df5dd76
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/packages/devtools-kit/src/_types/rpc.ts b/packages/devtools-kit/src/_types/rpc.ts
@@ -36,8 +36,8 @@ export interface ServerFunctions {
 
   // Terminal
   getTerminals(): TerminalInfo[]
-  getTerminalDetail(token: string, id: string): TerminalInfo | undefined
-  runTerminalAction(id: string, action: TerminalAction): Promise<boolean>
+  getTerminalDetail(token: string, id: string): Promise<TerminalInfo | undefined>
+  runTerminalAction(token: string, id: string, action: TerminalAction): Promise<boolean>
 
   // Storage
   getStorageMounts(): Promise<StorageMounts>

diff --git a/packages/devtools/client/components/TerminalPage.vue b/packages/devtools/client/components/TerminalPage.vue
@@ -3,8 +3,8 @@ const terminals = useTerminals()
 const terminalId = useCurrentTerminalId()
 const selected = computed(() => terminals.value?.find(t => t.id === terminalId.value))
 
-function remove(id: string) {
-  rpc.runTerminalAction(id, 'remove')
+async function remove(id: string) {
+  rpc.runTerminalAction(await ensureDevAuthToken(), id, 'remove')
 }
 
 watchEffect(() => {

diff --git a/packages/devtools/client/components/TerminalView.vue b/packages/devtools/client/components/TerminalView.vue
@@ -39,18 +39,26 @@ onMounted(async () => {
   })
 })
 
-function clear() {
-  rpc.runTerminalAction(props.id, 'clear')
+async function clear() {
+  rpc.runTerminalAction(await ensureDevAuthToken(), props.id, 'clear')
   term?.clear()
 }
+
+async function restart() {
+  rpc.runTerminalAction(await ensureDevAuthToken(), props.id, 'restart')
+}
+
+async function terminate() {
+  rpc.runTerminalAction(await ensureDevAuthToken(), props.id, 'terminate')
+}
 </script>
 
 <template>
   <div ref="container" h-full w-full of-auto bg-black />
   <div border="t base" flex="~ gap-2" items-center p2>
     <NButton title="Clear" icon="i-carbon-clean" :border="false" @click="clear()" />
-    <NButton v-if="info?.restartable" title="Restart" icon="carbon-renew" :border="false" @click="rpc.runTerminalAction(id, 'restart')" />
-    <NButton v-if="info?.terminatable" title="Terminate" icon="carbon-delete" :border="false" @click="rpc.runTerminalAction(id, 'terminate')" />
+    <NButton v-if="info?.restartable" title="Restart" icon="carbon-renew" :border="false" @click="restart()" />
+    <NButton v-if="info?.terminatable" title="Terminate" icon="carbon-delete" :border="false" @click="terminate()" />
     <span text-sm op50>{{ info?.description }}</span>
   </div>
 </template>
diff --git a/packages/devtools/src/server-rpc/terminals.ts b/packages/devtools/src/server-rpc/terminals.ts
@@ -1,6 +1,6 @@
 import type { NuxtDevtoolsServerContext, ServerFunctions, TerminalAction, TerminalInfo, TerminalState } from '../types'
 
-export function setupTerminalRPC({ nuxt, rpc, refresh }: NuxtDevtoolsServerContext) {
+export function setupTerminalRPC({ nuxt, rpc, refresh, ensureDevAuthToken }: NuxtDevtoolsServerContext) {
   const terminals = new Map<string, TerminalState>()
 
   nuxt.hook('devtools:terminal:register', (terminal) => {
@@ -63,10 +63,12 @@ export function setupTerminalRPC({ nuxt, rpc, refresh }: NuxtDevtoolsServerConte
       return Array.from(terminals.values())
         .map(i => serializeTerminal(i))
     },
-    getTerminalDetail(id: string) {
+    async getTerminalDetail(token: string, id: string) {
+      await ensureDevAuthToken(token)
       return serializeTerminal(terminals.get(id), true)
     },
-    async runTerminalAction(id: string, action: TerminalAction) {
+    async runTerminalAction(token: string, id: string, action: TerminalAction) {
+      await ensureDevAuthToken(token)
       const terminal = terminals.get(id)
       if (!terminal)
         return false