techeduspace 0.2.3 → 0.2.4

package/bin/techeduspace.js

@@ -37,8 +37,14 @@ function findInstalledApp() {
     }
   } else if (platform === "darwin") {
     const candidates = [
-      "/Applications/TechEduSpace.app/Contents/MacOS/TechEduSpace",
-      path.join(os.homedir(), "Applications", "TechEduSpace.app", "Contents", "MacOS", "TechEduSpace"),
+      "/Applications/TechEduSpace Beta.app",
+      "/Applications/TechEduSpace.app",
+      path.join(os.homedir(), "Applications", "TechEduSpace Beta.app"),
+      path.join(os.homedir(), "Applications", "TechEduSpace.app"),
+      path.resolve(__dirname, "../../dist/mac-arm64/TechEduSpace Beta.app"),
+      path.resolve(__dirname, "../../dist/mac/TechEduSpace.app"),
+      path.resolve(process.cwd(), "agents/tes-exam-app/dist/mac-arm64/TechEduSpace Beta.app"),
+      path.resolve(process.cwd(), "dist/mac-arm64/TechEduSpace Beta.app"),
     ]
     for (const c of candidates) {
       if (fs.existsSync(c)) return c
@@ -48,15 +54,38 @@ function findInstalledApp() {
       const p = execSync("which techeduspace 2>/dev/null").toString().trim()
       if (p && fs.existsSync(p)) return p
     } catch {}
+    const defaultAppImage = path.join(os.homedir(), ".local", "bin", "TESExamApp.AppImage")
+    if (fs.existsSync(defaultAppImage)) return defaultAppImage
   }
   return null
 }
 
+function launchApp(appPath) {
+  const platform = os.platform()
+  log(`Launching TechEduSpace workstation...`)
+
+  let executable = appPath
+  if (platform === "darwin" && appPath.endsWith(".app")) {
+    const binName = path.basename(appPath, ".app")
+    const innerBin = path.join(appPath, "Contents", "MacOS", binName)
+    if (fs.existsSync(innerBin)) {
+      executable = innerBin
+    }
+  }
+
+  const env = { ...process.env }
+  delete env.ELECTRON_RUN_AS_NODE
+
+  const child = spawn(executable, [], { detached: true, stdio: "ignore", env })
+  child.unref()
+  process.exit(0)
+}
+
 function downloadFile(url, dest) {
   return new Promise((resolve, reject) => {
     log(`Downloading installer from ${url}...`)
     const file = fs.createWriteStream(dest)
-    
+
     function get(currentUrl) {
       https.get(currentUrl, (response) => {
         if (response.statusCode >= 300 && response.statusCode < 400 && response.headers.location) {
@@ -86,10 +115,8 @@ async function main() {
   const installed = findInstalledApp()
   if (installed) {
     log(`Found installed workstation at: ${installed}`)
-    log("Launching TechEduSpace...")
-    const child = spawn(installed, [], { detached: true, stdio: "ignore" })
-    child.unref()
-    process.exit(0)
+    launchApp(installed)
+    return
   }
 
   const platform = os.platform()
@@ -107,8 +134,7 @@ async function main() {
       const newlyInstalled = findInstalledApp()
       if (newlyInstalled) {
         log("Installation complete! Launching TechEduSpace...")
-        const child = spawn(newlyInstalled, [], { detached: true, stdio: "ignore" })
-        child.unref()
+        launchApp(newlyInstalled)
       } else {
         log("Installation completed. Launch 'TechEduSpace' from Start Menu.")
       }
@@ -117,6 +143,51 @@ async function main() {
       log("You can download directly from: " + url)
       process.exit(1)
     }
+  } else if (platform === "darwin") {
+    log("TechEduSpace is not installed. Downloading macOS installer...")
+    const arch = process.arch === "arm64" ? "arm64" : "x64"
+    const dmgName = `TESExamApp-darwin-${arch}.dmg`
+    const tempDmg = path.join(os.tmpdir(), dmgName)
+    const url = `${BASE_DOWNLOAD_URL}/${dmgName}`
+
+    try {
+      await downloadFile(url, tempDmg)
+      log("Mounting installer image...")
+      const mountPoint = path.join(os.tmpdir(), "TechEduSpaceMount")
+      try {
+        try { execSync(`hdiutil detach "${mountPoint}" -quiet 2>/dev/null`) } catch {}
+        execSync(`hdiutil attach "${tempDmg}" -nobrowse -mountpoint "${mountPoint}" -quiet`)
+
+        let foundApp = null
+        for (const name of ["TechEduSpace Beta.app", "TechEduSpace.app"]) {
+          const p = path.join(mountPoint, name)
+          if (fs.existsSync(p)) {
+            foundApp = p
+            break
+          }
+        }
+
+        const targetDir = fs.existsSync("/Applications") ? "/Applications" : path.join(os.homedir(), "Applications")
+        const targetApp = path.join(targetDir, foundApp ? path.basename(foundApp) : "TechEduSpace Beta.app")
+
+        if (foundApp) {
+          log(`Installing TechEduSpace to ${targetApp}...`)
+          execSync(`rm -rf "${targetApp}" && cp -R "${foundApp}" "${targetApp}"`)
+        }
+        execSync(`hdiutil detach "${mountPoint}" -quiet`)
+        fs.unlinkSync(tempDmg)
+
+        log("Installation complete! Launching TechEduSpace...")
+        launchApp(targetApp)
+      } catch (mountErr) {
+        log("Opening DMG for manual install...")
+        execSync(`open "${tempDmg}"`)
+      }
+    } catch (e) {
+      err(`Automated download failed: ${e.message}`)
+      log("You can download directly from: https://techeduspace.com/downloads")
+      process.exit(1)
+    }
   } else if (platform === "linux") {
     const appImage = path.join(os.homedir(), ".local", "bin", "TESExamApp.AppImage")
     fs.mkdirSync(path.dirname(appImage), { recursive: true })
@@ -125,8 +196,7 @@ async function main() {
       await downloadFile(url, appImage)
       fs.chmodSync(appImage, 0o755)
       log("Launching TechEduSpace AppImage...")
-      const child = spawn(appImage, [], { detached: true, stdio: "ignore" })
-      child.unref()
+      launchApp(appImage)
     } catch (e) {
       err(`Download failed: ${e.message}`)
       process.exit(1)
@@ -140,4 +210,3 @@ main().catch((e) => {
   err(e.message)
   process.exit(1)
 })
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "techeduspace",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Cross-platform CLI installer and workstation launcher for TechEduSpace",
   "bin": {
     "techeduspace": "./bin/techeduspace.js"