tunli 0.0.25 → 0.0.27

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.27",
   "main": "bin/tunli",
   "bin": {
     "tunli": "bin/tunli"
@@ -24,14 +24,15 @@
   },
   "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",
+    "qrcode": "^1.5.4",
+    "socket.io-client": "^4.8.1"
   },
   "devDependencies": {
-    "nodemon": "^3.1.3"
+    "nodemon": "^3.1.10"
   },
   "repository": {
     "type": "git",

package/src/cli-app/Dashboard.js

@@ -6,6 +6,7 @@ import chalk from "chalk";
 import {getLatestVersion} from "#lib/Flow/getLatestVersion";
 import {exec} from 'child_process'
 import {checkGlobalInstallation, checkLocalInstallation} from "#src/utils/npmFunctions";
+import QRCode from 'qrcode'
 
 export class Dashboard {
 
@@ -82,6 +83,13 @@ export class Dashboard {
     const lastBlockedIp = ref('')
     const availableUpdate = ref('')
 
+    screen.key('C-q', () => {
+      QRCode.toString(forwardingUrl.value, {type: 'terminal'}, (err, url) => {
+        if (err) throw err
+        screen.newFullScreenModal(url)
+      })
+    })
+
     getLatestVersion().then((version) => {
       if (version && version !== packageJson.version) {
         availableUpdate.value = chalk.yellow(`update available (version ${version}, Ctrl-U to update)`)
@@ -182,6 +190,7 @@ export class Dashboard {
     infoList.row(chalk.yellow('Update'), availableUpdate).if(() => availableUpdate)
     infoList.row('Profile', config.profile)
     infoList.row('Config', config.configPath)
+    infoList.row('QR-Code', 'Ctrl-Q')
 
     if (allowedCidr || deniedCidr) infoList.row('')
     if (allowedCidr) infoList.row('Allowed', allowedCidr)

package/src/cli-app/Screen/FullScreenModal.js

@@ -0,0 +1,63 @@
+import blessed from "blessed";
+
+const centerContent = (text, boxWidth) => {
+  const lines = text.split('\n')
+  return lines.map(line => {
+    const pad = Math.floor((boxWidth - line.length) / 2)
+    return ' '.repeat(Math.max(pad, 0)) + line
+  }).join('\n')
+}
+export const newFullScreenModal = (screen, text) => {
+  // Backdrop zum Blocken von Inputs „unter“ dem Modal
+  const backdrop = blessed.box({
+    top: 0, left: 0, width: '100%', height: '100%',
+    style: {bg: 'black'},
+    mouse: true, clickable: true
+  })
+
+  // Größe anhand des Inhalts bestimmen (mit Padding & Border)
+  const lines = text.split('\n')
+  const contentWidth = Math.max(...lines.map(l => l.length))
+  const contentHeight = lines.length
+  const boxWidth = Math.min(contentWidth + 4, screen.width - 2)
+  //const centeredQr = centerContent(text, screen.width - 2) // -2 wegen Padding/Border
+
+  const qrBox = blessed.box({
+    top: 'center',
+    left: 'center',
+    width: boxWidth,
+    height: Math.min(contentHeight + 2, screen.height - 2),
+    padding: {left: 1, right: 1},
+    tags: false,
+    scrollable: true,
+    content: text,
+    border: 'line',
+    style: {
+      fg: 'white',
+      bg: 'black',
+      border: {fg: 'cyan'}
+    },
+    keys: true,
+    mouse: true,
+    alwaysScroll: true
+  })
+
+  // Einfügen und nach vorne bringen
+  screen.append(backdrop)
+  screen.append(qrBox)
+  qrBox.focus()
+  screen.render()
+
+  const close = () => {
+    backdrop.detach()
+    qrBox.detach()
+    screen.render()
+  }
+
+  // Schließen über Tastatur/Click
+  qrBox.key(['escape', 'q', 'C-q'], close)
+  backdrop.on('click', close)
+
+  // Bei Resize neu zentriert blessed automatisch; nur neu rendern
+  screen.on('resize', () => screen.render())
+}

package/src/cli-app/Screen.js

@@ -4,6 +4,7 @@ import {Row} from "#src/cli-app/elements/Row";
 import {ElementNode} from "#src/cli-app/elements/ElementNode";
 import {arrayRemoveEntry} from "#src/utils/arrayFunctions";
 import {Line} from "#src/cli-app/elements/Line";
+import {newFullScreenModal} from "#src/cli-app/Screen/FullScreenModal";
 
 export class Screen extends EventEmitter {
 
@@ -52,6 +53,10 @@ export class Screen extends EventEmitter {
     return this.#screen.height
   }
 
+  newFullScreenModal(text) {
+    return newFullScreenModal(this, text)
+  }
+
   /**
    * @param {string|array} key
    * @param {keypressEventListener} callback

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 ?? ''
+  })
+}