lnlink-server 1.0.4 → 1.0.6

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lnlink-server",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "private": false,
   "main": "index.js",
   "electron": "lnlink.js",

package/dist/public/css/initOwner.css

@@ -703,3 +703,64 @@ input:-webkit-autofill:active {
     padding: 20px;
   }
 }
+
+/* Tor Toggle Styles */
+.tor-toggle-wrapper {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.toggle-switch {
+  position: relative;
+  display: inline-block;
+  width: 50px;
+  height: 28px;
+  margin: 0;
+}
+
+.toggle-switch input {
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.toggle-slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: var(--input-bg);
+  border: 1px solid var(--border-color);
+  border-radius: 28px;
+  transition: 0.3s;
+}
+
+.toggle-slider:before {
+  position: absolute;
+  content: "";
+  height: 20px;
+  width: 20px;
+  left: 4px;
+  bottom: 3px;
+  background-color: white;
+  border-radius: 50%;
+  transition: 0.3s;
+}
+
+.toggle-switch input:checked + .toggle-slider {
+  background-color: var(--lime-primary);
+  border-color: var(--lime-primary);
+}
+
+.toggle-switch input:checked + .toggle-slider:before {
+  transform: translateX(22px);
+  background-color: var(--bg-dark);
+}
+
+.toggle-label {
+  color: var(--text-secondary);
+  font-size: 0.9rem;
+}

package/dist/public/js/init.js

@@ -65,7 +65,8 @@ async function fetchNetworkConfigs() {
           bitcoindZmqBlock: item.bitcoindZmqBlock,
           bitcoindZmqRawTx: item.bitcoindZmqRawTx,
           network: networkKey,
-          nostrRelays: item.nostrRelays ? [item.nostrRelays] : [],
+          // nostrRelays: item.nostrRelays ? [item.nostrRelays] : [],
+          nostrRelays: ["wss://relay.snort.social"],
           officialLndPeer: item.lndPeerId,
           officialLndPeerHost: item.lndPeerHost,
           officialNostrPubKey: item.nostrPubkey,
@@ -204,17 +205,6 @@ async function getInfo(showLoading = true) {
           // Fetch network configs only when needed for configuration
           await fetchNetworkConfigs()
 
-          fetch("https://api.example.com/login", {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-              "Authorization": "Bearer your-token-here", // 可选
-            },
-            body: JSON.stringify({
-              username: "test",
-              password: "123456",
-            }),
-          })
           renderConfigurationForm(res.data)
         }
       }
@@ -243,12 +233,16 @@ async function getInfo(showLoading = true) {
 
 // Render configured view
 function renderConfiguredView(basicData, settings) {
+  console.log("renderConfiguredView called with:", { basicData, settings })
   const mainContent = document.getElementById("main-content")
 
   // Extract Node ID (Nostr PubKey)
   const nodeId
     = settings.officialNostrPubKey || basicData.officialNostrPubKey || "Unknown"
 
+  // Get Tor status from basicData
+  const enableTor = basicData.enableTor !== undefined ? basicData.enableTor : true
+
   // Determine Service Status
   // We check basicData for status indicators or default to design mocks if not present
   // Assuming keys might exist, otherwise using placeholders for the design requirement
@@ -305,6 +299,18 @@ function renderConfiguredView(basicData, settings) {
           </div>
         </div>
         
+        <!-- Tor Network Toggle -->
+        <div class="read-only-input-group" style="margin-top: 1rem;">
+          <label class="card-label">Tor Network</label>
+          <div class="tor-toggle-wrapper">
+            <label class="toggle-switch">
+              <input type="checkbox" id="torToggle" ${enableTor ? "checked" : ""} onchange="handleTorToggle(this)">
+              <span class="toggle-slider"></span>
+            </label>
+            <span class="toggle-label" id="torToggleLabel">${enableTor ? "Enabled" : "Disabled"} - Enhanced privacy</span>
+          </div>
+        </div>
+        
         <!-- Service Status -->
         <div class="service-status-section">
           <label class="card-label">Service Status</label>
@@ -347,6 +353,118 @@ function renderConfiguredView(basicData, settings) {
   // Store data globally for modal use
   window.currentSettings = settings
   window.currentBasicData = basicData
+
+  // Update button state based on service status
+  updateManageButtonState(isRgbRunning || isLitdRunning, isRgbRunning && isLitdRunning)
+}
+
+// Update Manage My Node button state
+function updateManageButtonState(anyRunning, allRunning) {
+  const manageBtn = document.querySelector(".manage-btn")
+  if (!manageBtn)
+    return
+
+  if (allRunning) {
+    // All services running - enable button
+    manageBtn.disabled = false
+    manageBtn.classList.remove("loading-state")
+    manageBtn.innerHTML = "Manage My Node <i class=\"fas fa-arrow-right\"></i>"
+  }
+  else if (anyRunning) {
+    // Some services starting - show loading
+    manageBtn.disabled = true
+    manageBtn.classList.add("loading-state")
+    manageBtn.innerHTML = "<span class=\"loading\"></span> Starting Services..."
+  }
+  else {
+    // No services running - show normal but disabled
+    manageBtn.disabled = true
+    manageBtn.classList.remove("loading-state")
+    manageBtn.innerHTML = "Services Stopped"
+  }
+}
+
+// Poll service status until both services are running
+async function pollServiceStatus() {
+  console.log("pollServiceStatus started")
+  const maxAttempts = 30 // Poll for up to 30 seconds
+  let attempts = 0
+
+  // Immediately update button to loading state
+  updateManageButtonState(true, false)
+
+  const checkStatus = async () => {
+    console.log(`Polling attempt ${attempts + 1}/${maxAttempts}`)
+    try {
+      const response = await fetch("/api/lnd/info")
+      const result = await response.json()
+
+      if (result.code === 200 && result.data) {
+        const rgbRunning = result.data.rgb === "Running"
+        const litdRunning = result.data.litd === "Running"
+
+        // Update UI - find status boxes by iterating
+        const statusBoxes = document.querySelectorAll(".status-box")
+        let rgbStatusEl, litdStatusEl, rgbDotEl, litdDotEl
+
+        statusBoxes.forEach((box) => {
+          const nameEl = box.querySelector(".status-name")
+          if (nameEl && nameEl.textContent.includes("RGB")) {
+            rgbStatusEl = box.querySelector(".status-value")
+            rgbDotEl = box.querySelector(".status-dot")
+          }
+          else if (nameEl && nameEl.textContent.includes("LITD")) {
+            litdStatusEl = box.querySelector(".status-value")
+            litdDotEl = box.querySelector(".status-dot")
+          }
+        })
+
+        if (rgbStatusEl) {
+          rgbStatusEl.textContent = result.data.rgb || "Stopped"
+          rgbStatusEl.className = `status-value ${rgbRunning ? "running" : "stopped"}`
+        }
+        if (litdStatusEl) {
+          litdStatusEl.textContent = result.data.litd || "Stopped"
+          litdStatusEl.className = `status-value ${litdRunning ? "running" : "stopped"}`
+        }
+        if (rgbDotEl) {
+          rgbDotEl.className = `status-dot ${rgbRunning ? "running" : "stopped"}`
+        }
+        if (litdDotEl) {
+          litdDotEl.className = `status-dot ${litdRunning ? "running" : "stopped"}`
+        }
+
+        // Update button state
+        updateManageButtonState(rgbRunning || litdRunning, rgbRunning && litdRunning)
+
+        // If both services are running, stop polling
+        if (rgbRunning && litdRunning) {
+          console.log("All services running, polling stopped")
+          return
+        }
+      }
+
+      // Continue polling if not all services are running and within max attempts
+      attempts++
+      if (attempts < maxAttempts) {
+        setTimeout(checkStatus, 1000)
+      }
+      else {
+        console.log("Service status polling timed out")
+        // Re-enable button even if services didn't start
+        updateManageButtonState(false, false)
+      }
+    }
+    catch (error) {
+      console.error("Error polling service status:", error)
+      attempts++
+      if (attempts < maxAttempts) {
+        setTimeout(checkStatus, 2000)
+      }
+    }
+  }
+
+  checkStatus()
 }
 
 // Navigate to manage URL with loading state
@@ -563,6 +681,18 @@ function renderConfigurationForm(basicData) {
           <input type="hidden" id="network" name="network" value="regtest">
         </div>
 
+        <!-- Tor Configuration -->
+        <div class="config-group mt-4">
+          <label class="form-label text-muted">Tor Network</label>
+          <div class="tor-toggle-wrapper">
+            <label class="toggle-switch">
+              <input type="checkbox" id="enableTor" name="enableTor">
+              <span class="toggle-slider"></span>
+            </label>
+            <span class="toggle-label">Enable Tor for enhanced privacy</span>
+          </div>
+        </div>
+
         <!-- Advanced Toggle -->
         <div class="mt-3 mb-3 d-flex align-items-center justify-content-between">
             <a href="javascript:void(0)" class="advanced-toggle text-decoration-none text-lime" onclick="toggleAdvanced()">
@@ -828,10 +958,10 @@ async function handleConfigFormSubmit(event) {
   // Extract owner
   const owner = formData.get("owner")
 
-  // Build settings object (exclude owner)
+  // Build settings object (exclude owner and enableTor)
   const settings = {}
   for (const [key, value] of formData.entries()) {
-    if (key === "owner")
+    if (key === "owner" || key === "enableTor")
       continue
 
     if (key === "nostrRelays") {
@@ -846,9 +976,14 @@ async function handleConfigFormSubmit(event) {
     }
   }
 
+  // Get enableTor checkbox value (default to true if checkbox not found)
+  const enableTorCheckbox = document.getElementById("enableTor")
+  const enableTor = enableTorCheckbox ? enableTorCheckbox.checked : false
+
   const raw = JSON.stringify({
     owner,
     settings,
+    enableTor,
   })
 
   const requestOptions = {
@@ -863,8 +998,11 @@ async function handleConfigFormSubmit(event) {
     const result = await response.json()
 
     if (result.code === 200) {
-      await getInfo(false)
+      // Backend has already waited for services to start
       showSuccessModal("Complete configuration saved successfully!")
+
+      // Refresh page data to show running services
+      await getInfo(false)
     }
     else {
       showErrorModal(result.message || "Configuration failed")
@@ -881,6 +1019,91 @@ async function handleConfigFormSubmit(event) {
   }
 }
 
+// Handle Tor toggle
+async function handleTorToggle(checkbox) {
+  const enable = checkbox.checked
+  const label = document.getElementById("torToggleLabel")
+  const originalText = label.textContent
+
+  try {
+    // Disable checkbox during request
+    checkbox.disabled = true
+    label.textContent = enable ? "Enabling..." : "Disabling..."
+
+    const response = await fetch("/api/lnd/tor/toggle", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({ enable }),
+    })
+
+    const result = await response.json()
+
+    if (result.code === 200) {
+      label.textContent = `${enable ? "Enabled" : "Disabled"} - Enhanced privacy`
+
+      // Show success message
+      showToast(`Tor ${enable ? "enabled" : "disabled"} successfully. Litd is restarting...`, "success")
+
+      // Poll service status to update UI
+      await pollServiceStatus()
+    }
+    else {
+      throw new Error(result.message || "Failed to toggle Tor")
+    }
+  }
+  catch (error) {
+    console.error("Error toggling Tor:", error)
+    // Revert checkbox state on error
+    checkbox.checked = !enable
+    label.textContent = originalText
+    showToast(`Failed to toggle Tor: ${error.message}`, "error")
+  }
+  finally {
+    checkbox.disabled = false
+  }
+}
+
+// Show toast notification
+function showToast(message, type = "info") {
+  // Create toast element if it doesn't exist
+  let toast = document.getElementById("toast-notification")
+  if (!toast) {
+    toast = document.createElement("div")
+    toast.id = "toast-notification"
+    toast.style.cssText = `
+      position: fixed;
+      top: 20px;
+      right: 20px;
+      padding: 15px 20px;
+      border-radius: 8px;
+      color: white;
+      font-size: 14px;
+      z-index: 10000;
+      box-shadow: 0 4px 12px rgba(0,0,0,0.3);
+      transition: opacity 0.3s;
+    `
+    document.body.appendChild(toast)
+  }
+
+  // Set background color based on type
+  const colors = {
+    success: "#10b981",
+    error: "#ef4444",
+    info: "#3b82f6",
+  }
+  toast.style.backgroundColor = colors[type] || colors.info
+  toast.textContent = message
+  toast.style.opacity = "1"
+
+  // Auto hide after 3 seconds
+  setTimeout(() => {
+    toast.style.opacity = "0"
+    setTimeout(() => toast.remove(), 300)
+  }, 3000)
+}
+
 // Page initialization
 document.addEventListener("DOMContentLoaded", async () => {
   // Get information

package/dist/setting.regtest.json

@@ -8,8 +8,7 @@
   "bitcoindZmqRawTx": "tcp://regtest.lnfi.network:28335",
   "network": "regtest",
   "nostrRelays": [
-    "wss://relay01.lnfi.network",
-    "wss://relay02.lnfi.network"
+    "wss://relay.snort.social"
   ],
   "officialLndPeer": "03b24a4bf911ffd26ac1d5e5f2440a3c2f6974e4cc85d2ef54e17ee6d3717433d3",
   "officialLndPeerHost": "34.84.66.29:7739",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lnlink-server",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "private": false,
   "main": "dist/index.js",
   "files": [

package/dist/node_modules/debug/.coveralls.yml

@@ -1 +0,0 @@
-repo_token: SIAeZjKYlHK74rbcFvNHMUzjRiMpflxve

package/dist/node_modules/debug/.eslintrc

@@ -1,11 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "node": true
-  },
-  "rules": {
-    "no-console": 0,
-    "no-empty": [1, { "allowEmptyCatch": true }]
-  },
-  "extends": "eslint:recommended"
-}

package/dist/node_modules/debug/.travis.yml

@@ -1,14 +0,0 @@
-
-language: node_js
-node_js:
-  - "6"
-  - "5"
-  - "4"
-
-install:
-  - make node_modules
-
-script:
-  - make lint
-  - make test
-  - make coveralls