nport 2.0.3 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nport",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Free & open source ngrok alternative - Tunnel HTTP/HTTPS connections via Cloudflare Edge with custom subdomains",
   "type": "module",
   "main": "index.js",
@@ -63,7 +63,7 @@
     }
   ],
   "scripts": {
-    "postinstall": "node bin-manager.js",
+    "postinstall": "node src/bin-manager.js",
     "start": "node index.js"
   },
   "dependencies": {
@@ -73,9 +73,9 @@
   },
   "files": [
     "index.js",
-    "analytics.js",
-    "bin-manager.js",
+    "src/",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
   "os": [

package/{analytics.js → src/analytics.js}

@@ -11,7 +11,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = path.dirname(path.dirname(__filename));
 
 // Firebase/GA4 Configuration (from website/home.html)
 // Full Firebase config for reference (if needed for future features)
@@ -36,7 +36,7 @@ const ANALYTICS_CONFIG = {
   enabled: true, // Can be disabled by environment variable
   debug: process.env.NPORT_DEBUG === "true",
   timeout: 2000, // Don't block CLI for too long
-  userIdFile: path.join(os.homedir(), ".nport-analytics"),
+  userIdFile: path.join(os.homedir(), ".nport", "analytics-id"),
 };
 
 // ============================================================================
@@ -92,6 +92,12 @@ class AnalyticsManager {
    */
   async getUserId() {
     try {
+      // Ensure .nport directory exists
+      const configDir = path.join(os.homedir(), ".nport");
+      if (!fs.existsSync(configDir)) {
+        fs.mkdirSync(configDir, { recursive: true });
+      }
+
       // Try to read existing user ID
       if (fs.existsSync(ANALYTICS_CONFIG.userIdFile)) {
         const userId = fs.readFileSync(ANALYTICS_CONFIG.userIdFile, "utf8").trim();

package/src/api.js

@@ -0,0 +1,87 @@
+import axios from "axios";
+import chalk from "chalk";
+import { CONFIG } from "./config.js";
+import { state } from "./state.js";
+
+/**
+ * API Client
+ * Handles communication with the NPort backend service
+ */
+export class APIClient {
+  static async createTunnel(subdomain) {
+    try {
+      const { data } = await axios.post(CONFIG.BACKEND_URL, { subdomain });
+
+      if (!data.success) {
+        throw new Error(data.error || "Unknown error from backend");
+      }
+
+      return {
+        tunnelId: data.tunnelId,
+        tunnelToken: data.tunnelToken,
+        url: data.url,
+      };
+    } catch (error) {
+      throw this.handleError(error, subdomain);
+    }
+  }
+
+  static async deleteTunnel(subdomain, tunnelId) {
+    await axios.delete(CONFIG.BACKEND_URL, {
+      data: { subdomain, tunnelId },
+    });
+  }
+
+  static handleError(error, subdomain) {
+    if (error.response?.data?.error) {
+      const errorMsg = error.response.data.error;
+
+      // Check for subdomain in use (active tunnel)
+      if (
+        errorMsg.includes("SUBDOMAIN_IN_USE:") ||
+        errorMsg.includes("currently in use") ||
+        errorMsg.includes("already exists and is currently active")
+      ) {
+        return new Error(
+          chalk.red(`✗ Subdomain "${subdomain}" is already in use!\n\n`) +
+            chalk.yellow(`💡 This subdomain is currently being used by another active tunnel.\n\n`) +
+            chalk.white(`Choose a different subdomain:\n`) +
+            chalk.gray(`   1. Add a suffix:     `) +
+            chalk.cyan(`nport ${state.port || CONFIG.DEFAULT_PORT} -s ${subdomain}-2\n`) +
+            chalk.gray(`   2. Try a variation:  `) +
+            chalk.cyan(`nport ${state.port || CONFIG.DEFAULT_PORT} -s my-${subdomain}\n`) +
+            chalk.gray(`   3. Use random name:  `) +
+            chalk.cyan(`nport ${state.port || CONFIG.DEFAULT_PORT}\n`)
+        );
+      }
+
+      // Check for duplicate tunnel error (other Cloudflare errors)
+      if (
+        errorMsg.includes("already have a tunnel") ||
+        errorMsg.includes("[1013]")
+      ) {
+        return new Error(
+          `Subdomain "${subdomain}" is already taken or in use.\n\n` +
+            chalk.yellow(`💡 Try one of these options:\n`) +
+            chalk.gray(`   1. Choose a different subdomain: `) +
+            chalk.cyan(`nport ${state.port || CONFIG.DEFAULT_PORT} -s ${subdomain}-v2\n`) +
+            chalk.gray(`   2. Use a random subdomain:       `) +
+            chalk.cyan(`nport ${state.port || CONFIG.DEFAULT_PORT}\n`) +
+            chalk.gray(
+              `   3. Wait a few minutes and retry if you just stopped a tunnel with this name`
+            )
+        );
+      }
+
+      return new Error(`Backend Error: ${errorMsg}`);
+    }
+
+    if (error.response) {
+      const errorMsg = JSON.stringify(error.response.data, null, 2);
+      return new Error(`Backend Error: ${errorMsg}`);
+    }
+
+    return error;
+  }
+}
+

package/src/args.js

@@ -0,0 +1,83 @@
+import { CONFIG } from "./config.js";
+
+/**
+ * Command Line Argument Parser
+ * Handles parsing of CLI arguments for port, subdomain, and language
+ */
+export class ArgumentParser {
+  static parse(argv) {
+    const port = this.parsePort(argv);
+    const subdomain = this.parseSubdomain(argv);
+    const language = this.parseLanguage(argv);
+    return { port, subdomain, language };
+  }
+
+  static parsePort(argv) {
+    const portArg = parseInt(argv[0]);
+    return portArg || CONFIG.DEFAULT_PORT;
+  }
+
+  static parseSubdomain(argv) {
+    // Try all subdomain formats
+    const formats = [
+      () => this.findFlagWithEquals(argv, "--subdomain="),
+      () => this.findFlagWithEquals(argv, "-s="),
+      () => this.findFlagWithValue(argv, "--subdomain"),
+      () => this.findFlagWithValue(argv, "-s"),
+    ];
+
+    for (const format of formats) {
+      const subdomain = format();
+      if (subdomain) return subdomain;
+    }
+
+    return this.generateRandomSubdomain();
+  }
+
+  static parseLanguage(argv) {
+    // Check if --language flag exists without value (to trigger prompt)
+    if (argv.includes('--language') || argv.includes('--lang') || argv.includes('-l')) {
+      const langIndex = argv.indexOf('--language') !== -1 ? argv.indexOf('--language') :
+                        argv.indexOf('--lang') !== -1 ? argv.indexOf('--lang') :
+                        argv.indexOf('-l');
+      
+      // If flag is present but next arg is another flag or doesn't exist, return 'prompt'
+      const nextArg = argv[langIndex + 1];
+      if (!nextArg || nextArg.startsWith('-')) {
+        return 'prompt';
+      }
+    }
+
+    // Try language flag formats: --language=en, --lang=en, -l en
+    const formats = [
+      () => this.findFlagWithEquals(argv, "--language="),
+      () => this.findFlagWithEquals(argv, "--lang="),
+      () => this.findFlagWithEquals(argv, "-l="),
+      () => this.findFlagWithValue(argv, "--language"),
+      () => this.findFlagWithValue(argv, "--lang"),
+      () => this.findFlagWithValue(argv, "-l"),
+    ];
+
+    for (const format of formats) {
+      const language = format();
+      if (language) return language;
+    }
+
+    return null; // No language specified
+  }
+
+  static findFlagWithEquals(argv, flag) {
+    const arg = argv.find((a) => a.startsWith(flag));
+    return arg ? arg.split("=")[1] : null;
+  }
+
+  static findFlagWithValue(argv, flag) {
+    const index = argv.indexOf(flag);
+    return index !== -1 && argv[index + 1] ? argv[index + 1] : null;
+  }
+
+  static generateRandomSubdomain() {
+    return `${CONFIG.SUBDOMAIN_PREFIX}${Math.floor(Math.random() * 10000)}`;
+  }
+}
+

package/{bin-manager.js → src/bin-manager.js}

@@ -11,7 +11,7 @@ import { fileURLToPath } from "url";
 
 // Fix for __dirname in ES modules
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = path.dirname(path.dirname(__filename));
 
 // Binary configuration
 const BIN_DIR = path.join(__dirname, "bin");
@@ -376,3 +376,4 @@ async function main() {
 if (process.argv[1] === __filename) {
   main();
 }
+

package/src/binary.js

@@ -0,0 +1,88 @@
+import { spawn } from "child_process";
+import chalk from "chalk";
+import fs from "fs";
+import { LOG_PATTERNS } from "./config.js";
+import { state } from "./state.js";
+import { UI } from "./ui.js";
+import { lang } from "./lang.js";
+
+/**
+ * Binary Manager
+ * Handles cloudflared binary validation, spawning, and process management
+ */
+export class BinaryManager {
+  static validate(binaryPath) {
+    if (fs.existsSync(binaryPath)) {
+      return true;
+    }
+
+    console.error(
+      chalk.red(`\n❌ Error: Cloudflared binary not found at: ${binaryPath}`)
+    );
+    console.error(
+      chalk.yellow(
+        "👉 Please run 'npm install' again to download the binary.\n"
+      )
+    );
+    return false;
+  }
+
+  static spawn(binaryPath, token, port) {
+    return spawn(binaryPath, [
+      "tunnel",
+      "run",
+      "--token",
+      token,
+      "--url",
+      `http://localhost:${port}`,
+    ]);
+  }
+
+  static attachHandlers(process, spinner = null) {
+    process.stderr.on("data", (chunk) => this.handleStderr(chunk));
+    process.on("error", (err) => this.handleError(err, spinner));
+    process.on("close", (code) => this.handleClose(code));
+  }
+
+  static handleStderr(chunk) {
+    const msg = chunk.toString();
+
+    // Skip harmless warnings
+    if (LOG_PATTERNS.IGNORE.some((pattern) => msg.includes(pattern))) {
+      return;
+    }
+
+    // Show success messages with connection count
+    if (LOG_PATTERNS.SUCCESS.some((pattern) => msg.includes(pattern))) {
+      const count = state.incrementConnection();
+      
+      if (count === 1) {
+        console.log(chalk.green(lang.t("connection1")));
+      } else if (count === 4) {
+        console.log(chalk.green(lang.t("connection2")));
+        // Display footer after tunnel is fully active
+        UI.displayFooter(state.updateInfo);
+      }
+      return;
+    }
+
+    // Show critical errors only
+    if (LOG_PATTERNS.ERROR.some((pattern) => msg.includes(pattern))) {
+      console.error(chalk.red(`[Cloudflared] ${msg.trim()}`));
+    }
+  }
+
+  static handleError(err, spinner) {
+    if (spinner) {
+      spinner.fail("Failed to spawn cloudflared process.");
+    }
+    console.error(chalk.red(`Process Error: ${err.message}`));
+  }
+
+  static handleClose(code) {
+    if (code !== 0 && code !== null) {
+      console.log(chalk.red(`Tunnel process exited with code ${code}`));
+    }
+  }
+}
+

package/src/config.js

@@ -0,0 +1,58 @@
+import path from "path";
+import { fileURLToPath } from "url";
+import { createRequire } from "module";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(path.dirname(__filename));
+const require = createRequire(import.meta.url);
+const packageJson = require("../package.json");
+
+// Application constants
+export const CONFIG = {
+  PACKAGE_NAME: packageJson.name,
+  CURRENT_VERSION: packageJson.version,
+  BACKEND_URL: "https://nport.tuanngocptn.workers.dev",
+  DEFAULT_PORT: 8080,
+  SUBDOMAIN_PREFIX: "user-",
+  TUNNEL_TIMEOUT_HOURS: 4,
+  UPDATE_CHECK_TIMEOUT: 3000,
+};
+
+// Platform-specific configuration
+export const PLATFORM = {
+  IS_WINDOWS: process.platform === "win32",
+  BIN_NAME: process.platform === "win32" ? "cloudflared.exe" : "cloudflared",
+};
+
+// Paths
+export const PATHS = {
+  BIN_DIR: path.join(__dirname, "bin"),
+  BIN_PATH: path.join(__dirname, "bin", PLATFORM.BIN_NAME),
+};
+
+// Log patterns for filtering cloudflared output
+export const LOG_PATTERNS = {
+  SUCCESS: ["Registered tunnel connection"],
+  ERROR: ["ERR", "error"],
+  IGNORE: [
+    "Cannot determine default origin certificate path",
+    "No file cert.pem",
+    "origincert option",
+    "TUNNEL_ORIGIN_CERT",
+    "context canceled",
+    "failed to run the datagram handler",
+    "failed to serve tunnel connection",
+    "Connection terminated",
+    "no more connections active and exiting",
+    "Serve tunnel error",
+    "accept stream listener encountered a failure",
+    "Retrying connection",
+    "icmp router terminated",
+    "use of closed network connection",
+    "Application error 0x0",
+  ],
+};
+
+// Computed constants
+export const TUNNEL_TIMEOUT_MS = CONFIG.TUNNEL_TIMEOUT_HOURS * 60 * 60 * 1000;
+

package/src/lang.js

@@ -0,0 +1,279 @@
+import fs from "fs";
+import path from "path";
+import os from "os";
+import readline from "readline";
+
+// ============================================================================
+// Language Translations
+// ============================================================================
+
+const TRANSLATIONS = {
+  en: {
+    // Header
+    header: "N P O R T  ⚡️  Free & Open Source from Vietnam",
+    
+    // Spinners
+    creatingTunnel: "Creating tunnel for port {port}...",
+    checkingUpdates: "Checking for updates...",
+    
+    // Success messages
+    tunnelLive: "🚀 WE LIVE BABY!",
+    connection1: "   ✔ [1/2] Connection established...",
+    connection2: "   ✔ [2/2] Compression enabled...",
+    timeRemaining: "⏱️  Time:     {hours}h remaining",
+    
+    // Footer
+    footerTitle: "🔥 KEEP THE VIBE ALIVE?",
+    footerSubtitle: "(Made with ❤️ in Vietnam)",
+    dropStar: "⭐️  Drop a Star:   ",
+    sendCoffee: "☕️  Buy Coffee:    ",
+    newVersion: "🚨 NEW VERSION (v{version}) detected!",
+    updateCommand: "> npm install -g nport@latest",
+    
+    // Cleanup
+    tunnelShutdown: "🛑 TUNNEL SHUTDOWN.",
+    cleaningUp: "Cleaning up... ",
+    cleanupDone: "Done.",
+    cleanupFailed: "Failed.",
+    subdomainReleased: "Subdomain...   Released. 🗑️",
+    serverBusy: "(Server might be down or busy)",
+    
+    // Goodbye
+    goodbyeTitle: "👋 BEFORE YOU GO...",
+    goodbyeMessage: "Thanks for using NPort!",
+    website: "🌐 Website:     ",
+    author: "👤 Author:      ",
+    changeLanguage: "🌍 Language:    ",
+    changeLanguageHint: "nport --language",
+    
+    // Version
+    versionTitle: "NPort v{version}",
+    versionSubtitle: "Free & open source ngrok alternative",
+    versionLatest: "✔ You're running the latest version!",
+    versionAvailable: "🚨 New version available: v{version}",
+    versionUpdate: "Update now: ",
+    learnMore: "Learn more: ",
+    
+    // Language selection
+    languagePrompt: "\n🌍 Language Selection / Chọn ngôn ngữ\n",
+    languageQuestion: "Choose your language (1-2): ",
+    languageEnglish: "1. English",
+    languageVietnamese: "2. Tiếng Việt (Vietnamese)",
+    languageInvalid: "Invalid choice. Using English by default.",
+    languageSaved: "✔ Language preference saved!",
+  },
+  
+  vi: {
+    // Header
+    header: "N P O R T  ⚡️  Việt Nam Mãi Đỉnh ❤️",
+    
+    // Spinners
+    creatingTunnel: "🛠️ Đang khởi động cổng {port}... Chuẩn bị bay nào!",
+    checkingUpdates: "🔍 Đang dò la bản cập nhật mới... Đợi tí sắp có quà!",
+    
+    // Success messages
+    tunnelLive: "🚀 BẬT MODE TỐC HÀNH! ĐANG BAY RỒI NÈ!",
+    connection1: "   ✔ [1/2] Đang cắm dây mạng vũ trụ...",
+    connection2: "   ✔ [2/2] Đang bơm siêu nén khí tốc độ ánh sáng...",
+    timeRemaining: "⏱️  Tăng tốc thần sầu: Còn {hours}h để quẩy!",
+    
+    // Footer
+    footerTitle: "🔥 LƯU DANH SỬ SÁCH! KHÔNG QUÊN STAR",
+    footerSubtitle: "(Made in Việt Nam, chuẩn không cần chỉnh! ❤️)",
+    dropStar: "⭐️  Thả Star: ",
+    sendCoffee: "☕️  Tặng Coffee: ",
+    newVersion: "🚀 BẢN MỚI (v{version}) vừa hạ cánh!",
+    updateCommand: "💡 Gõ liền: npm install -g nport@latest",
+    
+    // Cleanup
+    tunnelShutdown: "🛑 Đã tới giờ 'chốt' deal rồi cả nhà ơi...",
+    cleaningUp: "Đang dọn dẹp chiến trường... 🧹",
+    cleanupDone: "Xịn xò! Đã dọn xong rồi nè.",
+    cleanupFailed: "Oằn trời, dọn không nổi!",
+    subdomainReleased: "Subdomain...   Xí xoá! Tạm biệt nhé 🗑️✨",
+    serverBusy: "(Có thể server đang bận order trà sữa)",
+    
+    // Goodbye
+    goodbyeTitle: "👋 GẶP LẠI BẠN Ở ĐƯỜNG BĂNG KHÁC...",
+    goodbyeMessage: "Cảm ơn đã quẩy NPort! Lần sau chơi tiếp nha 😘",
+    website: "🌐 Sân chơi chính: ",
+    author: "👤 Nhà tài trợ chương trình: ",
+    changeLanguage: "🌍 Đổi ngôn ngữ: ",
+    changeLanguageHint: "nport --language",
+    
+    // Version
+    versionTitle: "NPort v{version}",
+    versionSubtitle: "Hơn cả Ngrok - Ma-de in Ziệt Nam",
+    versionLatest: "🎉 Chúc mừng! Đang cùng server với bản mới nhất!",
+    versionAvailable: "🌟 Vèo vèo: Có bản mới v{version} vừa cập bến!",
+    versionUpdate: "Update khẩn trương lẹ làng: ",
+    learnMore: "Khám phá thêm cho nóng: ",
+    
+    // Language selection
+    languagePrompt: "\n🌍 Chọn lựa ngôn ngữ ngay bên dưới nào!\n",
+    languageQuestion: "Chớp lấy một lựa chọn nha (1-2): ",
+    languageEnglish: "1. English (Chuẩn quốc tế!)",
+    languageVietnamese: "2. Tiếng Việt (Đỉnh của chóp)",
+    languageInvalid: "Ơ hơ, chọn sai rồi! Mặc định Tiếng Việt luôn cho nóng.",
+    languageSaved: "🎯 Xong rồi! Lưu ngôn ngữ thành công!",
+  }
+};
+
+// ============================================================================
+// Language Manager
+// ============================================================================
+
+class LanguageManager {
+  constructor() {
+    this.currentLanguage = "en";
+    this.configDir = path.join(os.homedir(), ".nport");
+    this.configFile = path.join(this.configDir, "lang");
+    this.availableLanguages = ["en", "vi"];
+  }
+
+  /**
+   * Get translation string with variable substitution
+   * @param {string} key - Translation key
+   * @param {object} vars - Variables to substitute
+   * @returns {string} Translated string
+   */
+  t(key, vars = {}) {
+    const translations = TRANSLATIONS[this.currentLanguage] || TRANSLATIONS.en;
+    let text = translations[key] || TRANSLATIONS.en[key] || key;
+    
+    // Replace variables like {port}, {version}, etc.
+    Object.keys(vars).forEach(varKey => {
+      text = text.replace(`{${varKey}}`, vars[varKey]);
+    });
+    
+    return text;
+  }
+
+  /**
+   * Load saved language preference
+   * @returns {string|null} Saved language code or null
+   */
+  loadLanguagePreference() {
+    try {
+      if (fs.existsSync(this.configFile)) {
+        const lang = fs.readFileSync(this.configFile, "utf8").trim();
+        if (this.availableLanguages.includes(lang)) {
+          return lang;
+        }
+      }
+    } catch (error) {
+      // Ignore errors, will prompt user
+    }
+    return null;
+  }
+
+  /**
+   * Save language preference
+   * @param {string} lang - Language code to save
+   */
+  saveLanguagePreference(lang) {
+    try {
+      // Ensure .nport directory exists
+      if (!fs.existsSync(this.configDir)) {
+        fs.mkdirSync(this.configDir, { recursive: true });
+      }
+      fs.writeFileSync(this.configFile, lang, "utf8");
+    } catch (error) {
+      // Silently fail if can't save
+      console.warn("Warning: Could not save language preference");
+    }
+  }
+
+  /**
+   * Set current language
+   * @param {string} lang - Language code
+   */
+  setLanguage(lang) {
+    if (this.availableLanguages.includes(lang)) {
+      this.currentLanguage = lang;
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Get current language
+   * @returns {string} Current language code
+   */
+  getLanguage() {
+    return this.currentLanguage;
+  }
+
+  /**
+   * Prompt user to select language
+   * @returns {Promise<string>} Selected language code
+   */
+  async promptLanguageSelection() {
+    return new Promise((resolve) => {
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+
+      console.log(this.t("languagePrompt"));
+      console.log(`   ${this.t("languageEnglish")}`);
+      console.log(`   ${this.t("languageVietnamese")}\n`);
+
+      rl.question(`${this.t("languageQuestion")}`, (answer) => {
+        rl.close();
+        
+        const choice = answer.trim();
+        let selectedLang = "en";
+        
+        if (choice === "1") {
+          selectedLang = "en";
+        } else if (choice === "2") {
+          selectedLang = "vi";
+        } else {
+          console.log(`\n${this.t("languageInvalid")}\n`);
+        }
+        
+        this.setLanguage(selectedLang);
+        this.saveLanguagePreference(selectedLang);
+        console.log(`${this.t("languageSaved")}\n`);
+        
+        resolve(selectedLang);
+      });
+    });
+  }
+
+  /**
+   * Initialize language - load from config or prompt user
+   * @param {string|null} cliLanguage - Language from CLI argument (or 'prompt' to force prompt)
+   * @returns {Promise<string>} Selected language code
+   */
+  async initialize(cliLanguage = null) {
+    // Priority 1: CLI argument with value (e.g., --language en)
+    if (cliLanguage && cliLanguage !== 'prompt' && this.setLanguage(cliLanguage)) {
+      this.saveLanguagePreference(cliLanguage);
+      return cliLanguage;
+    }
+
+    // Priority 2: Force prompt if --language flag without value
+    if (cliLanguage === 'prompt') {
+      return await this.promptLanguageSelection();
+    }
+
+    // Priority 3: Saved preference
+    const savedLang = this.loadLanguagePreference();
+    if (savedLang) {
+      this.setLanguage(savedLang);
+      return savedLang;
+    }
+
+    // Priority 4: Prompt user on first run
+    return await this.promptLanguageSelection();
+  }
+}
+
+// ============================================================================
+// Export singleton instance
+// ============================================================================
+
+export const lang = new LanguageManager();
+