@take-out/scripts 0.1.15 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -29,11 +29,11 @@
   },
   "dependencies": {
     "@clack/prompts": "^0.8.2",
-    "@take-out/helpers": "0.1.15",
+    "@take-out/helpers": "0.1.16",
     "picocolors": "^1.1.1"
   },
   "peerDependencies": {
-    "vxrn": "^1.6.13"
+    "vxrn": "^1.6.16"
   },
   "peerDependenciesMeta": {
     "vxrn": {
@@ -41,6 +41,6 @@
     }
   },
   "devDependencies": {
-    "vxrn": "1.6.13"
+    "vxrn": "1.6.16"
   }
 }

package/src/exec-with-env.ts

@@ -37,7 +37,7 @@ export async function execWithEnvironment(
     ...(USE_LOCAL_SERVER && {
       ONE_SERVER_URL: devEnv?.ONE_SERVER_URL,
       // vite reads from .env.production for us unless defined into process.env
-      VITE_ZERO_HOST: 'start.chat',
+      VITE_ZERO_HOSTNAME: 'start.chat',
     }),
   } as any as Record<string, string>
 

package/src/helpers/deploy-lock.ts

@@ -0,0 +1,58 @@
+/**
+ * deploy lock helper — prevents concurrent deploys with auto-expiry
+ * shared across repos via @take-out/scripts/helpers/deploy-lock
+ *
+ * uses mkdir for atomic lock acquisition (no race window)
+ */
+
+import { run } from './run'
+
+const DEFAULT_LOCK_PATH = '/tmp/deploy.lock'
+const DEFAULT_MAX_AGE_MIN = 15
+
+interface DeployLockOptions {
+  path?: string
+  maxAgeMin?: number
+}
+
+export async function acquireDeployLock(
+  ssh: string,
+  opts?: DeployLockOptions
+): Promise<void> {
+  const lockPath = opts?.path || DEFAULT_LOCK_PATH
+  const maxAge = opts?.maxAgeMin || DEFAULT_MAX_AGE_MIN
+
+  // mkdir is atomic — if two deploys race, only one succeeds
+  const lockCmd = [
+    // clean stale locks first
+    `find ${lockPath} -maxdepth 0 -mmin +${maxAge} -exec rm -rf {} \\; 2>/dev/null || true`,
+    // atomic acquire via mkdir (fails if dir already exists)
+    `mkdir ${lockPath} 2>/dev/null && echo "OK" || echo "LOCKED"`,
+  ].join('; ')
+
+  const { stdout } = await run(`${ssh} "${lockCmd}"`, {
+    captureOutput: true,
+    silent: true,
+  })
+  const result = stdout.trim()
+
+  if (result === 'LOCKED') {
+    throw new Error(
+      `another deploy is in progress (${lockPath} exists on server). ` +
+        `if stale, it will auto-expire after ${maxAge} minutes, ` +
+        `or remove manually: ${ssh} "rm -rf ${lockPath}"`
+    )
+  }
+}
+
+export async function releaseDeployLock(
+  ssh: string,
+  opts?: DeployLockOptions
+): Promise<void> {
+  const lockPath = opts?.path || DEFAULT_LOCK_PATH
+  try {
+    await run(`${ssh} "rm -rf ${lockPath}"`, { silent: true })
+  } catch {
+    // best-effort, lock will auto-expire
+  }
+}

package/src/helpers/get-test-env.ts

@@ -29,6 +29,9 @@ export async function getTestEnv() {
       ZERO_LOG_LEVEL: 'warn',
     }),
     DO_NOT_TRACK: '1',
+    // force localhost urls so cross-subdomain cookies don't activate in test
+    BETTER_AUTH_URL: `http://localhost:${appPort}`,
+    ONE_SERVER_URL: `http://localhost:${appPort}`,
     ZERO_MUTATE_URL: `http://${dockerHost}:${appPort}/api/zero/push`,
     ZERO_QUERY_URL: `http://${dockerHost}:${appPort}/api/zero/pull`,
     ZERO_UPSTREAM_DB: `${dockerDbBase}/postgres`,

package/src/helpers/uncloud-deploy.ts

@@ -1,8 +1,10 @@
 /**
  * generic uncloud deployment helpers for ci/cd
+ * shared across repos via @take-out/scripts/helpers/uncloud-deploy
  */
 
-import fs from 'node:fs'
+import { existsSync } from 'node:fs'
+import { mkdir, writeFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 
@@ -82,26 +84,47 @@ export async function installUncloudCLI(version = '0.16.0') {
   }
 }
 
-export async function setupSSHKey() {
-  if (!process.env.DEPLOY_SSH_KEY) {
+export interface SetupSSHKeyOptions {
+  // env var containing the key path or content (default: DEPLOY_SSH_KEY)
+  envVar?: string
+  // filename to write in ~/.ssh/ (default: uncloud_deploy)
+  keyName?: string
+  // host to add to known_hosts (default: process.env.DEPLOY_HOST)
+  host?: string
+}
+
+/**
+ * resolve an ssh key from env - handles both file paths (local) and
+ * raw/base64 key content (CI). writes to ~/.ssh/{keyName} and updates
+ * the env var to point to the file.
+ */
+export async function setupSSHKey(options: SetupSSHKeyOptions = {}) {
+  const envVar = options.envVar || 'DEPLOY_SSH_KEY'
+  const keyName = options.keyName || 'uncloud_deploy'
+  const host = options.host || process.env.DEPLOY_HOST
+
+  if (!process.env[envVar]) {
     return
   }
 
-  const sshKeyValue = process.env.DEPLOY_SSH_KEY
+  // expand ~ to home directory (node doesn't do this automatically)
+  const sshKeyValue = process.env[envVar]!.replace(/^~/, homedir())
 
   // check if it's a path to an existing file (local usage) or key content (CI usage)
-  if (fs.existsSync(sshKeyValue)) {
+  if (existsSync(sshKeyValue)) {
+    // local usage - ensure env has resolved path (not ~ prefix)
+    process.env[envVar] = sshKeyValue
     console.info(`  using ssh key from: ${sshKeyValue}`)
     return
   }
 
-  // CI usage - DEPLOY_SSH_KEY contains the actual key content
+  // CI usage - env var contains the actual key content
   console.info('🔑 setting up ssh key from environment...')
   const sshDir = join(homedir(), '.ssh')
-  const keyPath = join(sshDir, 'uncloud_deploy')
+  const keyPath = join(sshDir, keyName)
 
-  if (!fs.existsSync(sshDir)) {
-    await fs.promises.mkdir(sshDir, { recursive: true })
+  if (!existsSync(sshDir)) {
+    await mkdir(sshDir, { recursive: true })
   }
 
   // decode base64-encoded keys (github secrets often store keys as base64)
@@ -119,13 +142,13 @@ export async function setupSSHKey() {
     keyContent += '\n'
   }
 
-  await fs.promises.writeFile(keyPath, keyContent, { mode: 0o600 })
+  await writeFile(keyPath, keyContent, { mode: 0o600 })
 
   // add host to known_hosts
-  if (process.env.DEPLOY_HOST) {
+  if (host) {
     try {
       await run(
-        `ssh-keyscan -H ${process.env.DEPLOY_HOST} >> ${join(sshDir, 'known_hosts')}`,
+        `ssh-keyscan -H ${host} >> ${join(sshDir, 'known_hosts')}`,
         { silent: true, timeout: time.ms.seconds(10) }
       )
     } catch {
@@ -134,6 +157,6 @@ export async function setupSSHKey() {
   }
 
   // override env var to point to the file we created
-  process.env.DEPLOY_SSH_KEY = keyPath
+  process.env[envVar] = keyPath
   console.info(`  ssh key written to ${keyPath}`)
 }

package/src/run.ts

@@ -261,7 +261,7 @@ const runScript = async (
   prefixLabel: string = name,
   restarts = 0,
   extraArgs: string[] = [],
-  managedIndex?: number,
+  managedIndex?: number
 ) => {
   const index = managedIndex ?? managedProcesses.length
 
@@ -389,9 +389,7 @@ function computeShortcuts() {
   const lengths = new Array(managedProcesses.length).fill(1) as number[]
 
   for (let round = 0; round < 5; round++) {
-    const shortcuts = initials.map(
-      (init, i) => init.slice(0, lengths[i]) || init
-    )
+    const shortcuts = initials.map((init, i) => init.slice(0, lengths[i]) || init)
 
     let hasCollision = false
     const groups = new Map<string, number[]>()
@@ -457,7 +455,9 @@ async function killProcess(index: number) {
   if (!managed) return
 
   if (managed.killing) {
-    console.info(`\x1b[2m  ${managed.shortcut} ${managed.prefixLabel} already stopped\x1b[0m`)
+    console.info(
+      `\x1b[2m  ${managed.shortcut} ${managed.prefixLabel} already stopped\x1b[0m`
+    )
     return
   }
 
@@ -518,7 +518,9 @@ function setupKeyboardShortcuts() {
     for (const managed of managedProcesses) {
       const color = colors[managed.index % colors.length]
       const stopped = managed.killing ? `${dim} (stopped)` : ''
-      console.info(`${dim}  ${reset}${color}${managed.shortcut}${reset}${dim} ${managed.prefixLabel}${stopped}${reset}`)
+      console.info(
+        `${dim}  ${reset}${color}${managed.shortcut}${reset}${dim} ${managed.prefixLabel}${stopped}${reset}`
+      )
     }
     console.info()
   }
@@ -615,7 +617,9 @@ function printShortcutHint() {
   if (managedProcesses.length === 0) return
 
   const dim = '\x1b[2m'
-  console.info(`${dim}  ctrl+r restart · ctrl+k kill · ctrl+l clear · ctrl+c exit${reset}`)
+  console.info(
+    `${dim}  ctrl+r restart · ctrl+k kill · ctrl+l clear · ctrl+c exit${reset}`
+  )
   console.info()
 }