@rpcbase/cli 0.57.0 → 0.59.0-upgradenode20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.57.0",
+  "version": "0.59.0-upgradenode20.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"
@@ -8,6 +8,10 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
+  "files": [
+    "src/",
+    "!src/**/*.test.js"
+  ],
   "scripts": {
     "test": "echo \"no test specified exiting with code 0\" && exit 0"
   },

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/.wireit/6170706c792d76657273696f6e/fingerprint

@@ -1 +0,0 @@
-{"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":{}}