@rpcbase/cli 0.49.0 → 0.58.0

package/.wireit/6170706c792d76657273696f6e/fingerprint

@@ -0,0 +1 @@
+{"fullyTracked":false,"platform":"linux","arch":"x64","nodeVersion":"v18.19.0","command":"node ../../scripts/prflow/apply-prerelease-versions.js $BRANCH_NAME","extraArgs":[],"clean":true,"files":{},"output":[],"dependencies":{},"env":{}}

package/bin.js

@@ -13,6 +13,7 @@ const print_versions = require("./src/print_versions")
 const start_command = require("./src/start_command")
 const sync_dotenv = require("./src/sync-dotenv")
 const update = require("./src/update")
+const wait_for = require("./src/wait-for")
 
 
 yargs(hideBin(process.argv))
@@ -81,6 +82,10 @@ yargs(hideBin(process.argv))
     if (argv.version) return print_versions()
     await sync_dotenv(argv.source_env, argv.dest_env)
   })
+  // wait-for
+  .command("wait-for", "", () => {}, (argv) => {
+    wait_for()
+  })
   // Ping
   .command("ping", "Ping", () => {}, (argv) => {
     if (argv.version) return print_versions()

package/package.json

@@ -1,13 +1,38 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.49.0",
+  "version": "0.58.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "scripts": {
     "test": "echo \"no test specified exiting with code 0\" && exit 0"
   },
+  "wireit": {
+    "apply-version": {
+      "command": "node ../../scripts/prflow/apply-prerelease-versions.js $BRANCH_NAME"
+    },
+    "release": {
+      "command": "npm publish --tag $NPM_RELEASE_CHANNEL | tee publish-output.txt",
+      "dependencies": [
+        "apply-version"
+      ],
+      "files": [
+        "package.json"
+      ],
+      "output": [
+        "publish-output.txt"
+      ],
+      "env": {
+        "NPM_RELEASE_CHANNEL": {
+          "external": true
+        }
+      }
+    }
+  },
   "dependencies": {
     "bluebird": "3.7.2",
     "concurrently": "8.2.1",

package/src/helpers/get_run_configs.js

@@ -52,6 +52,7 @@ const get_run_configs = (args) => {
       ]
     } else {
       console.log("TODO: server get_run_configs:handle edge case here")
+      console.log("process.cwd:", process.cwd())
     }
   }
 

package/src/helpers/tailscale_tunnel.js

@@ -2,15 +2,19 @@
 const path = require("path")
 const fs = require("fs")
 const dotenv = require("dotenv")
-const {execSync} = require("child_process")
+const child_process = require("child_process")
+const util = require("util")
 
 const get_root_dir = require("./get_root_dir")
 
 
+const exec = util.promisify(child_process.exec)
+
 const TAILSCALE_PATH = "/Applications/Tailscale.app/Contents/MacOS/Tailscale"
 
 const has_tailscale = process.platform === "darwin" && fs.existsSync(TAILSCALE_PATH)
 
+
 const get_port = (run_configs) => {
   const project_root_dir = get_root_dir(run_configs)
 
@@ -26,29 +30,48 @@ const get_port = (run_configs) => {
 }
 
 
-const start = (run_configs) => {
+const check_status = async() => {
+  try {
+    const {stdout, stderr} = await exec(`${TAILSCALE_PATH} funnel status --json`)
+    const out = JSON.parse(stdout)
+    return typeof out === "object"
+  } catch (err) {
+    //
+  }
+  return false
+}
+
+const start = async(run_configs) => {
   if (!has_tailscale) return
 
+  const should_ts_start = await check_status()
+
+  if (!should_ts_start) return
+
   const {server_port, wss_port} = get_port(run_configs)
   try {
-    execSync(`${TAILSCALE_PATH} funnel --bg --set-path /wss --https=${wss_port} http://127.0.0.1:${wss_port}`, {stdio: "inherit"})
-    execSync(`${TAILSCALE_PATH} funnel --bg --set-path / --https=443 http://127.0.0.1:${server_port}`, {stdio: "inherit"})
+    await exec(`${TAILSCALE_PATH} funnel --bg --set-path / --https=443 http://127.0.0.1:${server_port}`, {stdio: "inherit"})
+    if (wss_port) {
+      await exec(`${TAILSCALE_PATH} funnel --bg --set-path /wss --https=${wss_port} http://127.0.0.1:${wss_port}`, {stdio: "inherit"})
+    }
   } catch (err) {
     console.log("error starting tailscale, is the tailscale app running ?")
   }
 }
 
 
-const stop = (run_configs) => {
+const stop = async(run_configs) => {
   if (!has_tailscale) return
 
   const {server_port, wss_port} = get_port(run_configs)
   try {
-    execSync(`${TAILSCALE_PATH} funnel --https=${wss_port} off`, {stdio: "inherit"})
-    execSync(`${TAILSCALE_PATH} funnel --https=443 off`, {stdio: "inherit"})
+    await exec(`${TAILSCALE_PATH} funnel --https=443 off`, {stdio: "inherit"})
+    if (wss_port) {
+      await exec(`${TAILSCALE_PATH} funnel --https=${wss_port} off`)
+    }
   } catch (err) {
     // console.log("TAILSCALE ERR", err)
-    console.log("error stopping tailscale, it probably wasn't initally running. you can probably ignore it")
+    console.log("error stopping tailscale, it probably wasn't initally running. you can ignore it")
   }
 }
 

package/src/wait-for/index.js

@@ -0,0 +1,21 @@
+/* @flow */
+const path = require("path")
+const {execSync} = require("child_process");
+
+const wait_for = () => {
+  process.title = "rb-wait-for"
+
+  const args = process.argv.slice(3).join(" ")
+
+  const script_path = path.join(__dirname, "./wait-for.sh")
+
+  const command = `${script_path} ${args}`
+
+  try {
+    execSync(command, {stdio: "inherit"})
+  } catch (error) {
+    console.error(`wait-for execution failed: ${error}`)
+  }
+}
+
+module.exports = wait_for

package/src/wait-for/wait-for.sh

@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# original script: https://github.com/eficode/wait-for/blob/master/wait-for
+
+TIMEOUT=120
+QUIET=0
+
+echoerr() {
+  if [ "$QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi
+}
+
+usage() {
+  exitcode="$1"
+  cat << USAGE >&2
+Usage:
+  $cmdname host:port [-t timeout] [-- command args]
+  -q | --quiet                        Do not output any status messages
+  -t TIMEOUT | --timeout=timeout      Timeout in seconds, zero for no timeout
+  -- COMMAND ARGS                     Execute command with args after the test finishes
+USAGE
+  exit "$exitcode"
+}
+
+wait_for() {
+  for i in `seq $TIMEOUT` ; do
+    nc -z "$HOST" "$PORT" > /dev/null 2>&1
+
+    result=$?
+    if [ $result -eq 0 ] ; then
+      if [ $# -gt 0 ] ; then
+        exec "$@"
+      fi
+      exit 0
+    fi
+    sleep 1
+  done
+  echo "wait-for::Operation timed out" >&2
+  exit 1
+}
+
+while [ $# -gt 0 ]
+do
+  case "$1" in
+    *:* )
+    HOST=$(printf "%s\n" "$1"| cut -d : -f 1)
+    PORT=$(printf "%s\n" "$1"| cut -d : -f 2)
+    shift 1
+    ;;
+    -q | --quiet)
+    QUIET=1
+    shift 1
+    ;;
+    -t)
+    TIMEOUT="$2"
+    if [ "$TIMEOUT" = "" ]; then break; fi
+    shift 2
+    ;;
+    --timeout=*)
+    TIMEOUT="${1#*=}"
+    shift 1
+    ;;
+    --)
+    shift
+    break
+    ;;
+    --help)
+    usage 0
+    ;;
+    *)
+    echoerr "Unknown argument: $1"
+    usage 1
+    ;;
+  esac
+done
+
+if [ "$HOST" = "" -o "$PORT" = "" ]; then
+  echoerr "Error: you need to provide a host and port to test."
+  usage 2
+fi
+
+wait_for "$@"

package/src/sync-dotenv/test.js

@@ -1,8 +0,0 @@
-/* @flow */
-
-const {syncEnv} = require("./index")
-
-
-const res = syncEnv(".env", ".env.sample")
-
-// console.log("FNDE", res)