tunli 0.0.25 → 0.0.26

package/README.md

@@ -126,6 +126,8 @@ Tunli relies on the following packages:
 
 For development purposes, you can start the application using nodemon to automatically restart it on file changes:
 
+_$ TUNLI_API_SERVER_URL=http://127.0.0.1:10000/api TUNLI_DASHBOARD=off TUNLI_SERVER=http://127.0.0.1:10000  TUNLI_PROXY_URL='http://127.0.0.1:10000/proxy/{{ uuid }}' node client.js register -f
+
 ```bash
 npm run dev
 ```

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tunli",
   "description": "Node.js application for creating HTTP tunnels to make local software projects accessible over the internet.",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "main": "bin/tunli",
   "bin": {
     "tunli": "bin/tunli"
@@ -24,14 +24,14 @@
   },
   "type": "module",
   "dependencies": {
-    "axios": "^1.7.2",
+    "axios": "^1.11.0",
     "blessed": "^0.1.81",
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "socket.io-client": "^4.7.5"
+    "chalk": "^5.5.0",
+    "commander": "^14.0.0",
+    "socket.io-client": "^4.8.1"
   },
   "devDependencies": {
-    "nodemon": "^3.1.3"
+    "nodemon": "^3.1.10"
   },
   "repository": {
     "type": "git",

package/src/lib/Flow/proxyUrl.js

@@ -1,5 +1,6 @@
 import {securedHttpClient} from "#lib/HttpClient";
-import {SERVER_HOST} from "#lib/defs";
+import {TUNLI_PROXY_URL} from "#lib/defs";
+import {replaceTemplatePlaceholders} from "#src/utils/stringFunctions";
 
 export const requestNewProxyUrl = async (token) => {
 
@@ -10,7 +11,9 @@ export const requestNewProxyUrl = async (token) => {
     process.exit(1)
   }
 
-  return `https://${data}.${SERVER_HOST}`
+  return replaceTemplatePlaceholders(TUNLI_PROXY_URL, {
+    uuid: data
+  })
 }
 
 export const renewProxyUrlRegistration = async (proxyUrl, token) => {

package/src/lib/defs.js

@@ -2,9 +2,12 @@ import {resolve} from "path";
 import {homedir} from "os";
 
 export const SERVER_HOST = 'tunli.app'
+
+export const TUNLI_PROXY_URL = process.env.TUNLI_PROXY_URL ?? 'https://{{ uuid }}.tunli.app'
+
 export const CONFIG_DIR_NAME = '.tunli'
 
-export const AUTH_SERVER_URL = 'https://api.tunli.app'
+export const AUTH_SERVER_URL = process.env.TUNLI_API_SERVER_URL ?? 'https://api.tunli.app'
 
 export const GLOBAL_CONFIG_DIR = resolve(homedir(), CONFIG_DIR_NAME);
 export const CONFIG_FILENAME = 'default.json'

package/src/utils/stringFunctions.js

@@ -32,3 +32,28 @@ export const padEndIgnoreControlChars = (string, maxLength, fillString = ' ', au
   const padding = ''.padEnd(maxLength - stringWithoutCC.length, fillString)
   return `${string}${padding}`
 }
+
+/**
+ * Replaces template placeholders in a string with corresponding values from a replacements object.
+ *
+ * @param {string} template - The string containing placeholders in the format {{ placeholder }}.
+ * @param {object} replacements - The object containing replacement values. Nested placeholders can be accessed using dot notation.
+ */
+export const replaceTemplatePlaceholders = (template, replacements) => {
+
+  return template.replace(/{{\s*([^{}|]+)\s*(\|[^{}]+)*\s*}}/ig, (match, placeholder) => {
+
+    placeholder = placeholder.trim()
+    const keys = placeholder.split('.')
+
+    let value = replacements
+    for (const part of keys) {
+      if (!value) {
+        break
+      }
+      value = value [part]
+    }
+
+    return value ?? ''
+  })
+}