@rpcbase/cli 0.25.0 → 0.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"
@@ -15,7 +15,6 @@
     "dotenv": "16.0.1",
     "picocolors": "1.0.0",
     "semver": "7.3.7",
-    "tunnelmole": "2.1.2",
     "validator": "13.7.0",
     "yargs": "17.6.2"
   }

package/src/helpers/get_root_dir.js

@@ -0,0 +1,19 @@
+/* @flow */
+const path = require("path")
+
+const get_root_dir = (run_configs) => {
+  let project_root_dir
+  if (run_configs[0].type === "server") {
+    project_root_dir = path.join(run_configs[0].working_dir, "../../")
+  } else if (run_configs[0].type === "client") {
+    project_root_dir = path.join(run_configs[0].working_dir, "../")
+  }
+
+  if (!project_root_dir) {
+    throw new Error("unable to find project root dir")
+  }
+
+  return project_root_dir
+}
+
+module.exports = get_root_dir

package/src/helpers/tailscale_tunnel.js

@@ -0,0 +1,44 @@
+/* @flow */
+const path = require("path")
+const fs = require("fs")
+const dotenv = require("dotenv")
+const {execSync} = require("child_process")
+
+const get_root_dir = require("./get_root_dir")
+
+
+const TAILSCALE_PATH = "/Applications/Tailscale.app/Contents/MacOS/Tailscale"
+
+const get_port = (run_configs) => {
+  const project_root_dir = get_root_dir(run_configs)
+
+  const server_env_path = path.join(project_root_dir, "./server/server/.env")
+
+  const server_env_buf = fs.readFileSync(server_env_path)
+  const parsed_env = dotenv.parse(server_env_buf)
+
+  const server_port = parsed_env.SERVER_PORT
+  const wss_port = parsed_env.WSS_PORT
+
+  return {server_port, wss_port}
+}
+
+
+const start = (run_configs) => {
+  const {server_port, wss_port} = get_port(run_configs)
+
+  execSync(`${TAILSCALE_PATH} serve https:443 /wss http://127.0.0.1:${wss_port}`, {stdio: "inherit"})
+  execSync(`${TAILSCALE_PATH} serve https:443 / http://127.0.0.1:${server_port}`, {stdio: "inherit"})
+  execSync(`${TAILSCALE_PATH} funnel 443 on`, {stdio: "inherit"})
+}
+
+
+const stop = (run_configs) => {
+  const {server_port, wss_port} = get_port(run_configs)
+
+  execSync(`${TAILSCALE_PATH} serve https:443 /socket http://127.0.0.1:${wss_port} off`, {stdio: "inherit"})
+  execSync(`${TAILSCALE_PATH} serve https:443 / http://127.0.0.1:${server_port} off`, {stdio: "inherit"})
+  execSync(`${TAILSCALE_PATH} funnel 443 off`, {stdio: "inherit"})
+}
+
+module.exports = {start, stop}

package/src/start_command.js

@@ -4,10 +4,12 @@ const path = require("path")
 const fs = require("fs")
 const colors = require("picocolors")
 const concurrently = require("concurrently")
+const {exec} = require("child_process")
 
 const docker_runtime_check = require("./helpers/docker_runtime_check")
 const exit_with_message = require("./helpers/exit_with_message")
 const get_run_configs = require("./helpers/get_run_configs")
+const tailscale_tunnel = require("./helpers/tailscale_tunnel")
 const verify_project = require("./verify_project")
 
 // TODO: nuke this
@@ -73,13 +75,9 @@ const start_command = async(args) => {
   }
 
   // check if we should run the tunnel
+  // uses tailscale
   if (has_server) {
-    run_commands.push({
-      name: "tunnel",
-      command: "./node_modules/.bin/tunnelmole 80",
-      prefixColor: "#F00",
-      cwd: process.cwd(),
-    })
+    tailscale_tunnel.start(run_configs)
   }
 
   let project_errors
@@ -116,6 +114,16 @@ const start_command = async(args) => {
       c.kill()
     })
   }
+
+
+  // server cmd to stop tailscale serve
+  const server_command = commands.find((c) => c.name === "server")
+  if (server_command) {
+    server_command.process.on("close", () => {
+      tailscale_tunnel.stop(run_configs)
+    })
+  }
+
 }
 
 module.exports = start_command

package/src/verify_project/index.js

@@ -1,28 +1,13 @@
 /* @flow */
-const path = require("path")
-const _ = require("lodash")
+const _flatten = require("lodash/flatten")
 const colors = require("picocolors")
 const Promise = require("bluebird")
 
+const get_root_dir = require("../helpers/get_root_dir")
+
 const verify_packages_installed = require("./verify_packages_installed")
 const verify_env = require("./verify_env")
 
-const get_root_dir = (run_configs) => {
-  let project_root_dir
-  if (run_configs[0].type === "server") {
-    project_root_dir = path.join(run_configs[0].working_dir, "../../")
-  } else if (run_configs[0].type === "client") {
-    project_root_dir = path.join(run_configs[0].working_dir, "../")
-  }
-
-  if (!project_root_dir) {
-    throw new Error("unable to find project root dir")
-  }
-
-  return project_root_dir
-}
-
-
 const verify_project = async(run_configs) => {
   let result_errors = []
 
@@ -33,7 +18,7 @@ const verify_project = async(run_configs) => {
   const project_root_dir = get_root_dir(run_configs)
 
   // check if all installed packages match semver in package json file
-  const deps_errors = _.flatten(
+  const deps_errors = _flatten(
     await Promise.map(run_configs.map(({working_dir}) => working_dir), verify_packages_installed(project_root_dir))
   )