@take-out/scripts 0.0.46 → 0.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -24,7 +24,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@take-out/helpers": "0.0.46",
+    "@take-out/helpers": "workspace:*",
     "glob": "^11.0.0"
   },
   "devDependencies": {

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

@@ -4,14 +4,34 @@ import { loadEnv } from './env-load'
 import { getDockerHost } from './get-docker-host'
 import { getZeroVersion } from './zero-get-version'
 
+// extract the port from a postgres connection string
+function getPortFromConnectionString(url: string | undefined): string | undefined {
+  if (!url) return undefined
+  try {
+    // handle postgresql:// URLs
+    const match = url.match(/:(\d+)\//)
+    return match?.[1]
+  } catch {
+    return undefined
+  }
+}
+
 export async function getTestEnv() {
   const zeroVersion = getZeroVersion()
   const devEnv = await loadEnv('development')
   const dockerHost = getDockerHost()
   const serverEnvFallback = await import(join(process.cwd(), 'src/server/env-server'))
 
-  // explicit URLs required since vxrn loadEnv doesn't override existing env vars
-  const dockerDbBase = `postgresql://user:password@127.0.0.1:5433`
+  // determine db port from (in order of priority):
+  // 1. DOCKER_DB_PORT env var
+  // 2. port from ZERO_UPSTREAM_DB in devEnv
+  // 3. default 5432
+  const dbPort =
+    process.env.DOCKER_DB_PORT ||
+    getPortFromConnectionString(devEnv.ZERO_UPSTREAM_DB as string) ||
+    '5432'
+
+  const dockerDbBase = `postgresql://user:password@127.0.0.1:${dbPort}`
 
   return {
     ...serverEnvFallback,

package/src/release.ts

@@ -322,8 +322,8 @@ async function updateDownstreamRepos() {
       }
 
       // run upgrade
-      console.info(`  Running upgrade/takeout...`)
-      await run(`bun tko upgrade/takeout`, { cwd: repoPath })
+      console.info(`  Running upgrade takeout...`)
+      await run(`bun up takeout`, { cwd: repoPath })
 
       // run check:all
       console.info(`  Running check:all...`)

package/src/dev-tunnel-if-exist.ts

@@ -1,166 +0,0 @@
-#!/usr/bin/env bun
-
-import { spawn } from 'node:child_process'
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
-import { homedir } from 'node:os'
-import { join } from 'node:path'
-
-const TUNNEL_CONFIG_DIR = join(homedir(), '.onechat-tunnel')
-const TUNNEL_ID_FILE = join(TUNNEL_CONFIG_DIR, 'tunnel-id.txt')
-const TUNNEL_CONFIG_FILE = join(TUNNEL_CONFIG_DIR, 'config.yml')
-
-// check internet connectivity first
-async function checkInternetConnection(): Promise<boolean> {
-  return new Promise((resolve) => {
-    // try to ping cloudflare dns
-    const pingProcess = spawn('ping', ['-c', '1', '-W', '2', '1.1.1.1'], {
-      stdio: 'pipe',
-    })
-
-    pingProcess.on('error', () => {
-      resolve(false)
-    })
-
-    pingProcess.on('exit', (code) => {
-      resolve(code === 0)
-    })
-  })
-}
-
-// check connectivity before proceeding
-const isOnline = await checkInternetConnection()
-if (!isOnline) {
-  console.info('📵 Offline - skipping tunnel setup')
-  // Keep process alive for watch mode
-  await new Promise(() => {})
-}
-
-// ensure config dir exists
-if (!existsSync(TUNNEL_CONFIG_DIR)) {
-  mkdirSync(TUNNEL_CONFIG_DIR, { recursive: true })
-}
-
-// check if cloudflared is authenticated
-const certPath = join(homedir(), '.cloudflared', 'cert.pem')
-const hasCloudflaredAuth = existsSync(certPath)
-
-if (!hasCloudflaredAuth) {
-  console.info('☁️  Tunnel not set up. Run "bun dev:tunnel" to enable.')
-  // Keep process alive for watch mode
-  await new Promise(() => {})
-}
-
-// check if we have a tunnel id
-const hasTunnelId = existsSync(TUNNEL_ID_FILE)
-if (!hasTunnelId) {
-  console.info('☁️  No tunnel created. Run "bun dev:tunnel" once to set up.')
-  // Keep process alive for watch mode
-  await new Promise(() => {})
-}
-
-// check if cloudflared is installed
-const checkProcess = spawn('which', ['cloudflared'], {
-  shell: true,
-  stdio: 'pipe',
-})
-
-checkProcess.on('error', () => {
-  console.warn('⚠️  cloudflared not found - skipping tunnel setup')
-  // Keep process alive for watch mode
-  new Promise(() => {})
-})
-
-checkProcess.on('exit', async (code) => {
-  if (code === 0) {
-    const tunnelId = readFileSync(TUNNEL_ID_FILE, 'utf-8').trim()
-    const tunnelName = 'onechat-dev-n8' // your tunnel name
-    console.info(`🚇 Starting tunnel ${tunnelId}...`)
-
-    // The stable URL format for your domain
-    const tunnelDomain = `${tunnelName}.start.chat`
-
-    // Create config file with ingress rules
-    const tunnelConfig = `
-tunnel: ${tunnelId}
-credentials-file: ${join(homedir(), '.cloudflared', `${tunnelId}.json`)}
-
-ingress:
-  - hostname: ${tunnelDomain}
-    service: http://localhost:8081
-  - service: http_status:404
-`
-    writeFileSync(TUNNEL_CONFIG_FILE, tunnelConfig)
-
-    // Set up DNS route if needed (this is idempotent, safe to run multiple times)
-    const routeProcess = spawn(
-      'cloudflared',
-      ['tunnel', 'route', 'dns', tunnelId, tunnelDomain],
-      {
-        stdio: 'pipe',
-        shell: true,
-      }
-    )
-
-    await new Promise((resolve) => {
-      routeProcess.on('exit', resolve)
-    })
-
-    const tunnelUrl = `https://${tunnelDomain}`
-    const tunnelUrlFile = join(TUNNEL_CONFIG_DIR, 'tunnel-url.txt')
-    writeFileSync(tunnelUrlFile, tunnelUrl)
-    console.info(`🌐 Tunnel URL: ${tunnelUrl}`)
-
-    // Run tunnel with config file
-    const tunnelProcess = spawn(
-      'cloudflared',
-      ['tunnel', '--config', TUNNEL_CONFIG_FILE, 'run'],
-      {
-        stdio: ['inherit', 'pipe', 'pipe'],
-        shell: true,
-      }
-    )
-
-    // Track if we've shown the connection message
-    let hasShownConnected = false
-
-    // Process stdout to filter logs
-    tunnelProcess.stdout?.on('data', (data) => {
-      const output = data.toString()
-
-      // Only show first successful connection
-      if (!hasShownConnected && output.includes('Registered tunnel connection')) {
-        console.info('✅ Tunnel connected')
-        hasShownConnected = true
-      }
-    })
-
-    // Process stderr (where cloudflared logs go)
-    tunnelProcess.stderr?.on('data', (data) => {
-      const output = data.toString()
-
-      // Only show first successful connection
-      if (!hasShownConnected && output.includes('Registered tunnel connection')) {
-        console.info('✅ Tunnel connected')
-        hasShownConnected = true
-      }
-    })
-
-    // handle process termination
-    process.on('SIGINT', () => {
-      tunnelProcess.kill()
-      process.exit(0)
-    })
-
-    tunnelProcess.on('exit', (code) => {
-      if (code !== 0) {
-        console.warn(`⚠️  Tunnel process exited with code ${code}`)
-      }
-      // Keep process alive for watch mode
-      new Promise(() => {})
-    })
-  } else {
-    console.warn('⚠️  cloudflared not found - skipping tunnel setup')
-    // Keep process alive for watch mode
-    await new Promise(() => {})
-  }
-})