@typed-assistant/builder 0.0.36 → 0.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",

package/src/appProcess.tsx

@@ -18,6 +18,44 @@ import { restartAddon } from "./restartAddon"
 import { getAddonInfo as getAddonInfoAPI } from "./getAddonInfo"
 import debounce from "debounce"
 
+export async function setup({
+  entryFile,
+  mdiPaths,
+  onProcessError,
+}: {
+  entryFile: string
+} & Parameters<typeof generateTypes>[0] &
+  Pick<Parameters<typeof checkProcesses>[1], "onProcessError">) {
+  const addonInfo = await getAddonInfo()
+  const basePath = addonInfo?.data.ingress_entry ?? ""
+  const slug = addonInfo?.data.slug ?? ""
+  const directoryToWatch = join(process.cwd(), "./src")
+  const addonUrl = `${slug}/ingress`
+
+  checkProcesses(entryFile, { addonUrl, onProcessError })
+  await setupGitSync()
+
+  let subprocesses = await buildAndStartAppProcess(entryFile, {
+    mdiPaths: mdiPaths,
+  })
+
+  startWebappServer({
+    basePath,
+    getSubprocesses: () => subprocesses,
+  })
+  setupWatcher({
+    directoryToWatch,
+    entryFile,
+    mdiPaths,
+    onSubprocessChange: (newSubprocesses) => {
+      subprocesses = newSubprocesses
+    },
+    getSubprocesses: () => subprocesses,
+  })
+
+  return subprocesses
+}
+
 type Processes = Awaited<ReturnType<typeof buildAndStartAppProcess>>
 
 async function buildAndStartAppProcess(
@@ -59,29 +97,21 @@ const checkProcesses = async (
   {
     addonUrl,
     onProcessError,
-    restartAddonUrl,
   }: {
     addonUrl: string
-    onProcessError?: (
-      message: string,
-      addonUrl: string,
-      restartAddonUrl?: string,
-    ) => void
-    restartAddonUrl: string
+    onProcessError?: (message: string, addonUrl: string) => void
   },
 ) => {
   const ps = await $`ps -f`.text()
   const matches = ps.match(new RegExp(`bun .+${entryFile}`, "gmi")) ?? []
-  onProcessError?.("message", addonUrl, restartAddonUrl)
 
   if (matches.length > 1) {
     multipleProcessesErrorCount++
     if (multipleProcessesErrorCount > 5) {
-      const message = `🚨 Multiple processes detected. Restarting TypedAssistant addon...`
+      const message = `🚨 Multiple processes detected. Check the logs...`
       log(message)
       log(ps)
-      onProcessError?.(message, addonUrl, restartAddonUrl)
-      // restartAddon()
+      onProcessError?.(message, addonUrl)
       return
     }
   } else {
@@ -91,11 +121,10 @@ const checkProcesses = async (
   if (matches.length === 0) {
     noProcessesErrorCount++
     if (noProcessesErrorCount > 5) {
-      const message = `🚨 No processes detected. Restarting TypedAssistant addon...`
+      const message = `🚨 No processes detected. Check the logs...`
       log(message)
       log(ps)
-      onProcessError?.(message, addonUrl, restartAddonUrl)
-      // restartAddon()
+      onProcessError?.(message, addonUrl)
       return
     }
   } else {
@@ -103,50 +132,11 @@ const checkProcesses = async (
   }
 
   setTimeout(
-    () =>
-      checkProcesses(entryFile, { addonUrl, onProcessError, restartAddonUrl }),
+    () => checkProcesses(entryFile, { addonUrl, onProcessError }),
     5000,
   )
 }
 
-export async function setup({
-  entryFile,
-  mdiPaths,
-  onProcessError,
-}: {
-  entryFile: string
-} & Parameters<typeof generateTypes>[0] &
-  Pick<Parameters<typeof checkProcesses>[1], "onProcessError">) {
-  const addonInfo = await getAddonInfo()
-  const basePath = addonInfo?.data.ingress_entry ?? ""
-  const directoryToWatch = join(process.cwd(), "./src")
-  const addonUrl = basePath
-  const restartAddonUrl = `${basePath}/restart-addon`
-
-  checkProcesses(entryFile, { addonUrl, onProcessError, restartAddonUrl })
-  await setupGitSync()
-
-  let subprocesses = await buildAndStartAppProcess(entryFile, {
-    mdiPaths: mdiPaths,
-  })
-
-  startWebappServer({
-    basePath,
-    getSubprocesses: () => subprocesses,
-  })
-  setupWatcher({
-    directoryToWatch,
-    entryFile,
-    mdiPaths,
-    onSubprocessChange: (newSubprocesses) => {
-      subprocesses = newSubprocesses
-    },
-    getSubprocesses: () => subprocesses,
-  })
-
-  return subprocesses
-}
-
 const getAddonInfo = async () => {
   log("🔍 Getting addon info...")
 
@@ -204,7 +194,6 @@ function setupWatcher({
     directoryToWatch,
     { recursive: true },
     debounce(async function onFileChange(event, filename) {
-      console.log("😅😅😅 ~ event:", event)
       if (!filename) return
       if (shouldIgnoreFileOrFolder(filename)) return
       log(`⚠️ Change to ${filename} detected.`)

package/src/setupWebserver.tsx

@@ -108,6 +108,7 @@ export const startWebappServer = async ({
     .get("/restart-addon", async () => {
       await killSubprocess(getSubprocesses().app)
       restartAddon()
+      return { message: "Restarting addon..." }
     })
     .get("/addon-info", async () => {
       const { data, error } = await getAddonInfo()