seperate launch_local

Author: Junhui Tong

Diff for: backend/api_impl.ts

@@ -12,7 +12,7 @@ function launchScript() {
         Deno.statSync(scriptFile)
     } catch (_e) {
         scriptFile = Deno.env.get('TEMP') + '\\excel.js'
-        const content = staticAssets['./excel.js']
+        const content = staticAssets['excel.js']
         Deno.writeTextFileSync(scriptFile, content)
     }
     const cmd = new Deno.Command('cscript.exe', {

Diff for: build.ts

@@ -4,8 +4,12 @@
 const htmlContent = Deno.readTextFileSync('./frontend/dist/index.html')
 const jsContent = Deno.readTextFileSync('./frontend/dist/assets/index.js')
 
-// replace content within <!--SCRIPT-START--> and <!--SCRIPT-END--> to jsContent
-const newHtmlContent = htmlContent.replace(/<!--SCRIPT-START-->[\s\S]*<!--SCRIPT-END-->/, `<!--SCRIPT-START-->\n<script type="module">\n${jsContent}\n</script>\n<!--SCRIPT-END-->`)
+// replace this line:
+// <script type="module" crossorigin src="/assets/index.js"></script>
+// to jsContent
+const newHtmlContent = htmlContent.replace(
+    /<script type="module" crossorigin src="\/assets\/index.js"><\/script>/, 
+    `<script type="module"> ${jsContent} </script>`)
 
 const wshScriptContent = Deno.readTextFileSync('./excel.js')
 
@@ -16,3 +20,5 @@ const staticAssets = {
 }
 
 Deno.writeTextFileSync('./static_assets.json', JSON.stringify(staticAssets, null, 2))
+
+console.log(newHtmlContent)

Diff for: launch.ts

@@ -2,17 +2,13 @@
 // wait for frontend exit, then terminate backend
 import { apiImpl } from "./backend/api_impl.ts";
 import { startDenoWebApp } from "./dwa/dwa_service.ts";
-import * as vite from 'npm:vite'
 
 startDenoWebApp('./frontend', 8080, apiImpl);
 
-const frontend = await vite.createServer()
-frontend.listen(5173)
-
 //await new Promise(r => setTimeout(r, 1000))
 // launch chrome with Default proflie
 const cmd3 = new Deno.Command(`C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe`, {
-    args: ['--app=http://localhost:5173', '--new-window', '--profile-directory=Default'],
+    args: ['--app=http://localhost:8080', '--new-window', '--profile-directory=Default'],
 })
 
 const browser = cmd3.spawn()

Diff for: launch_local.ts

@@ -0,0 +1,44 @@
+// launch backend and frontend
+// wait for frontend exit, then terminate backend
+import { apiImpl } from "./backend/api_impl.ts";
+import { startDenoWebApp } from "./dwa/dwa_service.ts";
+import * as vite from 'npm:vite'
+
+startDenoWebApp('./frontend', 8080, apiImpl);
+
+const frontend = await vite.createServer()
+frontend.listen(5173)
+
+//await new Promise(r => setTimeout(r, 1000))
+// launch chrome with Default proflie
+const cmd3 = new Deno.Command(`C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe`, {
+    args: ['--app=http://localhost:5173', '--new-window', '--profile-directory=Default'],
+})
+
+const browser = cmd3.spawn()
+console.log('browser started, pid:', browser.pid)
+
+Deno.addSignalListener("SIGINT", () => {
+    console.log('SIGINT received')
+    Exit()
+})
+
+// stop frontend if backend is closed
+
+function Exit() {
+    const close = (p: Deno.ChildProcess) => {
+        try {
+            p.kill()
+        } catch (e) { 
+            console.log(e.message)
+        }
+    }
+    console.log('exiting app')
+    // console.log('closing frontend')
+    // close(frontend)
+    console.log('closing browser')
+    close(browser)
+    Deno.exit()
+}
+
+