openrod 0.1.2-rc.1 → 0.1.2-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openrod",
-  "version": "0.1.2-rc.1",
+  "version": "0.1.2-rc.2",
   "description": "A local console for OpenShell gateways, sandboxes, and activity.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/OpenRod/OpenRod#readme",

package/server/api.js

@@ -433,8 +433,11 @@ export function createOpenShellApi({ httpServer, logger = console, security = cr
     connections: remoteConnections, listSandboxes, listTemplates: listImageTemplates, logger,
     defaultLabel: security.config.mode === 'local' ? 'Local' : 'Cloud',
   })
-  const start = async () => {
-    if (closed || (security.config.mode === 'local' && !contextConfigured())) return
+  let ready = Promise.resolve()
+  const start = () => { ready = begin(); return ready }
+  const begin = async () => {
+    if (closed) return
+    if (security.config.mode === 'local' && !contextConfigured()) { await remoteConnections?.autoSelect(); return }
     if (remoteConnections && /^console-ssh-[a-f0-9]{24}$/.test(initialContext.gateway)) {
       const remote = (await remoteConnections.locationSnapshot()).remote
       if (remote?.gateway !== initialContext.gateway || remote.status !== 'connected') return
@@ -688,5 +691,5 @@ export function createOpenShellApi({ httpServer, logger = console, security = cr
     const authenticate = () => security.middleware(req, res, () => route(req, res, next))
     return localCloud ? localCloud.middleware(req, res, authenticate) : authenticate()
   }
-  return { middleware, close, token, launchCode: gate?.launchCode }
+  return { middleware, close, token, launchCode: gate?.launchCode, ready: () => ready }
 }

package/server/cli.js

@@ -171,7 +171,11 @@ export async function startConsole(options = parseOptions([]), logger = console)
   // The link carries this launch's secret; it changes on every restart.
   const url = tokenUrl(host, port, token)
   logger.info(`OpenRod console (open this link): ${url}`)
-  if (options.open) openBrowser(tokenUrl(host, port, api.launchCode?.() ?? token), logger)
+  if (options.open) {
+    // A fresh console first connects to its local gateway, so the page opens on it.
+    await Promise.race([api.ready?.(), new Promise((resolve) => setTimeout(resolve, 5000).unref())])
+    openBrowser(tokenUrl(host, port, api.launchCode?.() ?? token), logger)
+  }
   return { server, url, close }
 }
 

package/server/gateway.js

@@ -32,6 +32,9 @@ let selected = {
 let configured = Boolean(process.env.OPENSHELL_GATEWAY || saved.gateway)
 let selectionSource = process.env.OPENSHELL_GATEWAY ? 'environment' : saved.gateway ? 'saved' : cliGateway ? 'cli' : 'default'
 export const contextConfigured = () => configured
+// A console nobody has pointed anywhere yet: no saved or cleared choice and no
+// OPENSHELL_GATEWAY. Its candidate is the gateway the OpenShell CLI is set to.
+export const unchosenCliGateway = () => !configured && !process.env.OPENSHELL_GATEWAY && cliGateway && !fs.existsSync(CONTEXT_FILE) ? cliGateway : null
 
 const requestContext = new AsyncLocalStorage()
 export const contextSelection = () => ({ ...(requestContext.getStore() ?? selected) })

package/server/openshell-install.js

@@ -146,7 +146,9 @@ export async function offerOpenShellInstall({
   const needs = platform === 'darwin' ? 'OpenRod needs it to build sandbox images.' : "OpenShell's gateway won't start without it."
   if (docker === 'missing') log.info(`Docker isn't installed. ${needs}`)
   else if (!docker) log.info(`Docker isn't running. ${needs}`)
-  const answer = await ask(`Install OpenShell ${OPENSHELL_VERSION} now? ${platform === 'darwin' ? 'It uses Homebrew and runs sandboxes in VMs.' : 'It uses sudo and may ask for your password.'} [Y/n] `)
+  let answer = await ask(`Install OpenShell ${OPENSHELL_VERSION} now? ${platform === 'darwin' ? 'It uses Homebrew and runs sandboxes in VMs.' : 'It uses sudo and may ask for your password.'} [Y/n] `)
+  // Anything but yes or no (a key from another keyboard layout, say) asks again.
+  for (let tries = 0; answer !== null && !['', 'y', 'yes', 'n', 'no'].includes(answer.trim().toLowerCase()) && tries < 3; tries++) answer = await ask('Please answer y or n. [Y/n] ')
   if (answer === null) return 'cancelled'
   if (!['', 'y', 'yes'].includes(answer.trim().toLowerCase())) { manual('Skipped. To install it later, run:'); return 'skipped' }
 

package/server/remote-gateway.js

@@ -8,7 +8,7 @@ import { randomUUID } from 'node:crypto'
 import { Transform } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
 import { setTimeout as delay } from 'node:timers/promises'
-import { CONFIG_DIR, clearConsoleContext, contextConfigured, contextSelection, defaultContextSelection, localGateways, gatewayWorkspaces, selectConsoleContext } from './gateway.js'
+import { CONFIG_DIR, clearConsoleContext, contextConfigured, contextSelection, defaultContextSelection, localGateways, gatewayWorkspaces, selectConsoleContext, unchosenCliGateway } from './gateway.js'
 import { stateDirectory } from './paths.js'
 import { fail, findExecutable, openshellBinary, runCli, sshBinary } from './openshell-cli.js'
 import { listSshHosts, probeHost, installDocker as installHostDocker, installRuntime, sshArgs } from './remote-hosts.js'
@@ -322,6 +322,13 @@ export function createRemoteConnections({ onSelected = () => {}, onDeselected =
       return { hosts: await listSshHosts(), locals: localGateways().map(({ name, endpoint }) => ({ name, endpoint })), active: view(connection), job: view(job), tools: { ssh: Boolean(sshBinary()), gateway: Boolean(findExecutable('openshell-gateway')), openshell: Boolean(openshellBinary()), installCommand: installCommand(process.platform) } }
     },
     changing: () => disconnecting || job?.status === 'working',
+    // A fresh console connects to the CLI's local gateway the way "Use this
+    // computer" does, but only once it answers; otherwise setup stays up.
+    async autoSelect() {
+      const name = unchosenCliGateway()
+      if (!name || job?.status === 'working' || !localGateways().some(target => target.name === name)) return false
+      try { await select(name); return true } catch { return false }
+    },
     architecture: () => active?.status === 'connected' ? active.architecture : null,
     begin,
     job: id => view(getJob(id)),