ocremote 1.3.2 → 1.3.3

package/README.md

@@ -1,4 +1,14 @@
-# oc-remote companion
+# oc-remote
+
+> **Plataformas.** El companion es Node puro (>= 20) y funciona en macOS, Linux y
+> Windows: `npx ocremote --pair` en cualquiera de los tres. Solo en macOS:
+> `--daemon` (LaunchAgent) y mDNS (`--no-mdns` lo desactiva; en otros sistemas ni
+> se intenta). En Linux, para tenerlo siempre activo usa una unidad de usuario de
+> systemd ejecutando `npx ocremote --pair`; en Windows, una tarea del Programador
+> de tareas al iniciar sesión. Los túneles (`--tunnel cloudflare`) descargan
+> `cloudflared` para la plataforma correcta. Windows está corregido en código
+> (rutas, `.exe`, `;` en PATH, cloudflared .exe) pero no verificado en una máquina
+> Windows real. companion
 
 Proceso Node sin dependencias externas (solo APIs nativas de Node 22+) que
 convierte un Mac en un host de **opencode** accesible desde la app iOS

package/oc-remote.mjs

@@ -17,9 +17,12 @@ import { b64 } from './lib/crypto.mjs'
 
 const require = createRequire(import.meta.url)
 const NAME = 'oc-remote'
-const VERSION = '1.3.2'
+const VERSION = '1.3.3'
 const LAUNCH_LABEL = 'com.raul.ocremote'
-const LOG_PATH = path.join(os.homedir(), 'Library', 'Logs', 'oc-remote.log')
+const LOG_PATH =
+  process.platform === 'darwin'
+    ? path.join(os.homedir(), 'Library', 'Logs', 'oc-remote.log')
+    : path.join(os.homedir(), '.config', 'oc-remote', 'oc-remote.log')
 const STARTED_AT = Date.now()
 const HERE = path.dirname(fileURLToPath(import.meta.url))
 const LOOPBACK = '127.0.0.1'
@@ -82,6 +85,7 @@ Options:
   --no-auth                 Disable token auth (DANGEROUS, LAN becomes open)
   --opencode <path>         opencode binary (default: ~/.opencode/bin/opencode)
   --no-mdns                 Do not publish _ocremote._tcp via Bonjour
+                            (macOS only; enabled there by default)
   --print-qr                Print pairing QR at startup (default)
   --no-print-qr             Do not print the pairing QR
   --help                    Show this help
@@ -103,7 +107,7 @@ const VALUE_FLAGS = new Set([
   'relay',
   'device-name',
 ])
-const BOOL_FLAGS = new Set(['new-token', 'no-auth', 'no-mdns', 'print-qr', 'no-print-qr', 'help', 'pair', 'daemon'])
+const BOOL_FLAGS = new Set(['new-token', 'no-auth', 'mdns', 'no-mdns', 'print-qr', 'no-print-qr', 'help', 'pair', 'daemon'])
 const TUNNEL_MODES = new Set(['auto', 'funnel', 'cloudflare', 'tailscale', 'none'])
 const ALLOWED_METHODS = new Set(['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'])
 
@@ -129,6 +133,7 @@ let funnelMonitorTimer = null
 let transportTimer = null
 let cachedTailscaleIp = null
 let endpointTimer = null
+let inviteRefreshTimer = null
 let lastBeaconKey = ''
 let watchdogTimer = null
 let watchdogFailures = 0
@@ -298,22 +303,31 @@ function saveConfig(cfg) {
 function resolveOpencodeBin(flagValue) {
   if (flagValue) return flagValue
   if (process.env.OPENCODE_BIN) return process.env.OPENCODE_BIN
-  const homeBin = path.join(os.homedir(), '.opencode', 'bin', 'opencode')
-  if (fs.existsSync(homeBin)) return homeBin
+  const candidates = [path.join(os.homedir(), '.opencode', 'bin', 'opencode')]
+  if (process.platform === 'win32') {
+    candidates.unshift(path.join(os.homedir(), '.opencode', 'bin', 'opencode.exe'))
+  }
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) return candidate
+  }
   return 'opencode'
 }
 
 function locateBin(bin) {
-  if (bin.includes('/')) {
+  if (bin.includes('/') || bin.includes('\\')) {
     return fs.existsSync(bin) ? bin : null
   }
-  for (const dir of (process.env.PATH || '').split(':')) {
+  const suffixes = process.platform === 'win32' ? ['', '.exe', '.cmd', '.bat'] : ['']
+  const separator = process.platform === 'win32' ? ';' : ':'
+  for (const dir of (process.env.PATH || '').split(separator)) {
     if (!dir) continue
-    const candidate = path.join(dir, bin)
-    try {
-      fs.accessSync(candidate, fs.constants.X_OK)
-      return candidate
-    } catch {}
+    for (const suffix of suffixes) {
+      const candidate = path.join(dir, bin + suffix)
+      try {
+        fs.accessSync(candidate, fs.constants.X_OK)
+        return candidate
+      } catch {}
+    }
   }
   return null
 }
@@ -1205,10 +1219,15 @@ async function ensureCloudflared() {
   const existing = findCloudflared()
   if (existing) return existing
   const arch = process.arch === 'arm64' ? 'arm64' : 'amd64'
-  if (process.platform !== 'darwin' && process.platform !== 'linux') {
+  if (process.platform !== 'darwin' && process.platform !== 'linux' && process.platform !== 'win32') {
     throw new Error(`automatic cloudflared install is not supported on ${process.platform}; install it manually`)
   }
-  const asset = process.platform === 'darwin' ? `cloudflared-darwin-${arch}.tgz` : `cloudflared-linux-${arch}`
+  const asset =
+    process.platform === 'darwin'
+      ? `cloudflared-darwin-${arch}.tgz`
+      : process.platform === 'win32'
+        ? `cloudflared-windows-${arch}.exe`
+        : `cloudflared-linux-${arch}`
   const url = `https://github.com/cloudflare/cloudflared/releases/latest/download/${asset}`
   info(`downloading cloudflared (${asset}) ...`)
   fs.mkdirSync(configBinDir(), { recursive: true, mode: 0o700 })
@@ -1535,7 +1554,7 @@ function noteWatchdogFailure() {
   } catch {}
 }
 
-function printPairing() {
+function printPairing(options = {}) {
   for (const entry of allUrls) info(`url: ${entry.url}  [${entry.label}]`)
   info(`pairing token: ${remoteToken}`)
   const publicEntry = allUrls.find((entry) => entry.label === 'public' || entry.label === 'tunnel')
@@ -1549,8 +1568,12 @@ function printPairing() {
   } else {
     info('remote access: LAN only - run `oc-remote --tunnel funnel` (stable URL) or --tunnel cloudflare')
   }
+  if (opts.relay) {
+    info('pairing: relay mode, the invite QR below is the one to scan')
+    return
+  }
   info(`pairing deep link: ${pairLink()}`)
-  if (!opts.printQr) return
+  if (options.qr === false || !opts.printQr) return
   if (!qrcode) {
     warn('QR unavailable: companion/vendor/qrcode.cjs not found')
     return
@@ -1603,7 +1626,24 @@ async function startRelay() {
   const payload = await createInvitePayload()
   info(`relay: ${opts.relay}`)
   info(`pairing v2 link: ${payload.url}`)
+  if (payload.expiresAt) {
+    info(`invite expires at ${new Date(payload.expiresAt).toLocaleTimeString()} (15 minutes, single use)`)
+  }
   printInviteQr(payload.url)
+  if (opts.pair) {
+    clearInterval(inviteRefreshTimer)
+    inviteRefreshTimer = setInterval(async () => {
+      if (shuttingDown) return
+      try {
+        const fresh = await createInvitePayload()
+        info(`invite refreshed (previous one expired or about to): ${fresh.url}`)
+        printInviteQr(fresh.url)
+      } catch (err) {
+        warn(`could not refresh the invite: ${err.message}`)
+      }
+    }, 10 * 60_000)
+    inviteRefreshTimer.unref?.()
+  }
 }
 
 function printBanner(health) {
@@ -1616,14 +1656,14 @@ function printBanner(health) {
   if (opts.noAuth) info('pair page: disabled (--no-auth)')
   if (opts.relay) info(`relay: ${opts.relay} (device ${opts.deviceName || os.hostname()})`)
   info('self-check: oc-remote doctor')
-  printPairing()
+  printPairing({ qr: false })
 }
 
 function startMdns() {
   if (!opts.mdns) return
   const dnsSd = '/usr/bin/dns-sd'
   if (!fs.existsSync(dnsSd)) {
-    warn('mDNS: /usr/bin/dns-sd not found; skipping Bonjour registration')
+    if (opts.mdnsExplicit) warn('mDNS: /usr/bin/dns-sd not found; skipping Bonjour registration')
     return
   }
   const hostLabel = os.hostname().replace(/\.local\.?$/i, '')
@@ -1739,6 +1779,7 @@ function shutdown(signal) {
   info(`received ${signal}; shutting down`)
   clearTimeout(restartTimer)
   clearInterval(endpointTimer)
+  clearInterval(inviteRefreshTimer)
   clearInterval(watchdogTimer)
   clearInterval(funnelMonitorTimer)
   clearInterval(transportTimer)
@@ -1882,6 +1923,7 @@ function probeLocal(path, headers = {}, timeout = 3000) {
 }
 
 async function launchAgentState() {
+  if (process.platform !== 'darwin' || typeof process.getuid !== 'function') return 'not applicable (macOS only)'
   const result = await execCommand('launchctl', ['print', `gui/${process.getuid()}/${LAUNCH_LABEL}`], 5000)
   if (!result.ok) return 'not loaded'
   const match = /state = ([a-z]+)/.exec(result.stdout)
@@ -2028,6 +2070,10 @@ async function runSubcommand(name, argv) {
   }
 
   if (name === 'restart') {
+    if (process.platform !== 'darwin') {
+      out('the LaunchAgent only exists on macOS; run the companion in the foreground or use your service manager')
+      return 1
+    }
     const result = await execCommand('launchctl', ['kickstart', '-k', `gui/${process.getuid()}/${LAUNCH_LABEL}`], 8000)
     if (!result.ok) {
       error(`could not restart ${LAUNCH_LABEL}: ${result.stderr.trim() || 'agent not loaded'}`)
@@ -2206,7 +2252,8 @@ async function main() {
       ? Number(flags['utility-port'])
       : Number(cfg.utilityPort ?? 0) || null
   opts.noAuth = Boolean(flags['no-auth'])
-  opts.mdns = !flags['no-mdns']
+  opts.mdns = flags.mdns === true || (!flags['no-mdns'] && process.platform === 'darwin')
+  opts.mdnsExplicit = flags.mdns === true
   opts.printQr = flags['print-qr'] !== false
 
   if (!TUNNEL_MODES.has(opts.tunnel)) {
@@ -2378,6 +2425,7 @@ async function main() {
   startTransportWatcher()
   startWatchdog()
   await startTunnel()
+  if (!opts.relay) printPairing()
   await startRelay()
   return 0
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocremote",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Control opencode on your computer from the OpenCode Remote iOS app: supervisor, pairing QR, relay and tunnel transports",
   "type": "module",
   "bin": {