@epic-web/workshop-app 5.24.2 → 5.26.0

package/bin/epicshop.js

@@ -4,10 +4,13 @@ import { spawn } from 'child_process'
 import crypto from 'crypto'
 import fs from 'fs'
 import http from 'http'
+import os from 'os'
 import path from 'path'
 import { fileURLToPath } from 'url'
+import chalk from 'chalk'
 import closeWithGrace from 'close-with-grace'
 import getPort from 'get-port'
+import open from 'open'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const isPublished = !fs.existsSync(path.join(__dirname, '..', 'app'))
@@ -60,9 +63,13 @@ async function start() {
 	let server = null
 	let child = null
 	let restarting = false
+	let childPort = null
 	let childPortPromiseResolve = null
-	const childPort = new Promise((resolve) => {
+	const childPortPromise = new Promise((resolve) => {
 		childPortPromiseResolve = resolve
+	}).then((port) => {
+		childPort = port
+		return port
 	})
 
 	function parsePortFromLine(line) {
@@ -74,7 +81,7 @@ async function start() {
 	}
 
 	async function waitForChildReady() {
-		const port = await childPort
+		const port = await childPortPromise
 		const url = `http://localhost:${port}/`
 		const maxAttempts = 40 // 20s max (500ms interval)
 		for (let i = 0; i < maxAttempts; i++) {
@@ -187,15 +194,13 @@ async function start() {
 		if (child.stdout) {
 			child.stdout.on('data', (data) => {
 				process.stdout.write(data)
-
-				if (childPortPromiseResolve) {
+				if (!childPort) {
 					const str = data.toString('utf8')
 					const lines = str.split(/\r?\n/)
 					for (const line of lines) {
 						const port = parsePortFromLine(line)
-						if (port && childPortPromiseResolve) {
-							childPortPromiseResolve(port)
-							childPortPromiseResolve = null
+						if (port) {
+							childPortPromiseResolve?.(port)
 						}
 					}
 				}
@@ -211,10 +216,14 @@ async function start() {
 		})
 	}
 
+	console.log(
+		`🐨 Welcome to the workshop, ${chalk.bold.italic(os.userInfo().username)}!`,
+	)
+
 	spawnChild()
 
-	// Listen for 'u' key to update and restart
-	if (process.stdin.isTTY) {
+	if (process.stdin.isTTY && !isDeployed) {
+		printSupportedKeys()
 		process.stdin.setRawMode(true)
 		process.stdin.resume()
 		process.stdin.setEncoding('utf8')
@@ -224,6 +233,38 @@ async function start() {
 					'\n🔄 Update requested from terminal. Running update and restarting app process...',
 				)
 				await doUpdateAndRestart()
+			} else if (key === 'o') {
+				if (childPort) {
+					console.log(
+						chalk.blue(
+							`\n🌐 Opening browser to http://localhost:${childPort} ...`,
+						),
+					)
+					await open(`http://localhost:${childPort}`)
+				} else {
+					console.log(chalk.red('Local server URL not available yet.'))
+				}
+			} else if (key === 'q') {
+				console.log(chalk.yellow('\n👋 Exiting...'))
+				await cleanupBeforeExit()
+				process.exit(0)
+			} else if (key === 'r') {
+				console.log(chalk.magenta('\n🔄 Restarting app process...'))
+				restarting = true
+				await killChild(child)
+				restarting = false
+				spawnChild()
+			} else if (key === 'k') {
+				const messages = [
+					chalk.bgCyan.black('🐨 Kody says: You are koalafied for greatness!'),
+					chalk.bgGreen.black('🐨 Kody says: Keep going, you are pawsome!'),
+					chalk.bgMagenta.white('🐨 Kody says: Eucalyptus up and code on!'),
+					chalk.bgYellow.black('🐨 Kody says: You can do it, fur real!'),
+					chalk.bgBlue.white('🐨 Kody says: Stay curious, stay cuddly!'),
+					chalk.bgRed.white("🐨 Kody says: Don't leaf your dreams behind!"),
+				]
+				const msg = messages[Math.floor(Math.random() * messages.length)]
+				console.log('\n' + msg + '\n')
 			} else if (key === '\u0003') {
 				// Ctrl+C
 				await cleanupBeforeExit()
@@ -251,3 +292,12 @@ async function killChild(child) {
 		child.kill()
 	})
 }
+
+function printSupportedKeys() {
+	console.log(chalk.bold.cyan('\nSupported keys:'))
+	console.log(`  ${chalk.blue('o')} - open browser`)
+	console.log(`  ${chalk.green('u')} - update repo`)
+	console.log(`  ${chalk.magenta('r')} - restart`)
+	console.log(`  ${chalk.cyan('k')} - Kody kudos 🐨`)
+	console.log(`  ${chalk.gray('q')} (or ${chalk.gray('Ctrl+C')}) - exit`)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epic-web/workshop-app",
-  "version": "5.24.2",
+  "version": "5.26.0",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
@@ -44,8 +44,8 @@
     "@epic-web/invariant": "^1.0.0",
     "@epic-web/remember": "^1.1.0",
     "@epic-web/restore-scroll": "^1.1.1",
-    "@epic-web/workshop-presence": "5.24.2",
-    "@epic-web/workshop-utils": "5.24.2",
+    "@epic-web/workshop-presence": "5.26.0",
+    "@epic-web/workshop-utils": "5.26.0",
     "@mdx-js/mdx": "^3.0.1",
     "@mux/mux-player-react": "^3.0.0",
     "@nasa-gcn/remix-seo": "^2.0.1",
@@ -92,6 +92,7 @@
     "mime-types": "^2.1.35",
     "morgan": "^1.10.0",
     "msw": "^2.4.9",
+    "open": "^8.4.2",
     "openid-client": "^6.1.7",
     "p-queue": "^8.0.1",
     "partysocket": "^1.0.2",