@pixelbyte-software/pixcode 1.30.2 → 1.31.1

package/server/routes/telegram.js

@@ -0,0 +1,125 @@
+import express from 'express';
+
+import { telegramLinksDb } from '../database/db.js';
+import {
+  createPairingCode,
+  getBotState,
+  getPublicConfig,
+  removeBotConfig,
+  startBot,
+  stopBot,
+} from '../services/telegram/bot.js';
+import { SUPPORTED_LANGUAGES } from '../services/telegram/translations.js';
+
+const router = express.Router();
+
+const sanitizeLanguage = (raw) => {
+  if (typeof raw !== 'string') return 'en';
+  return SUPPORTED_LANGUAGES.includes(raw) ? raw : 'en';
+};
+
+// GET /api/telegram/status — combined bot + personal link state
+router.get('/status', (req, res) => {
+  try {
+    const bot = getBotState();
+    const config = getPublicConfig();
+    const link = telegramLinksDb.getByUserId(req.user.id);
+    res.json({
+      bot: { ...bot, ...config },
+      link: link
+        ? {
+            paired: Boolean(link.chat_id && link.verified_at),
+            telegramUsername: link.telegram_username,
+            language: link.language,
+            notificationsEnabled: Boolean(link.notifications_enabled),
+            bridgeEnabled: Boolean(link.bridge_enabled),
+            pairingCode: link.pairing_code,
+            pairingExpiresAt: link.pairing_code_expires_at,
+            verifiedAt: link.verified_at,
+          }
+        : null,
+    });
+  } catch (error) {
+    console.error('telegram/status failed:', error);
+    res.status(500).json({ error: 'Failed to read Telegram status' });
+  }
+});
+
+// POST /api/telegram/bot — save token and start the bot
+router.post('/bot', async (req, res) => {
+  const { token } = req.body || {};
+  if (typeof token !== 'string' || token.length < 10) {
+    return res.status(400).json({ error: 'A valid bot token is required' });
+  }
+  try {
+    const info = await startBot({ token });
+    res.json({ success: true, bot: { ...getBotState(), configured: true, username: info.username } });
+  } catch (error) {
+    console.error('telegram/bot start failed:', error);
+    const status = error?.code === 'INVALID_TOKEN' ? 400 : 502;
+    res.status(status).json({ error: error?.message || 'Failed to start bot' });
+  }
+});
+
+// DELETE /api/telegram/bot — stop and remove the configured bot
+router.delete('/bot', async (req, res) => {
+  try {
+    await removeBotConfig();
+    res.json({ success: true, bot: getBotState() });
+  } catch (error) {
+    console.error('telegram/bot remove failed:', error);
+    res.status(502).json({ error: 'Failed to remove bot' });
+  }
+});
+
+// POST /api/telegram/bot/stop — stop polling but keep the token
+router.post('/bot/stop', async (req, res) => {
+  try {
+    await stopBot();
+    res.json({ success: true, bot: getBotState() });
+  } catch (error) {
+    console.error('telegram/bot/stop failed:', error);
+    res.status(502).json({ error: 'Failed to stop bot' });
+  }
+});
+
+// POST /api/telegram/pairing-code — (re)generate a 6-digit code for this user
+router.post('/pairing-code', (req, res) => {
+  try {
+    const language = sanitizeLanguage(req.body?.language);
+    const { code, expiresAt } = createPairingCode(req.user.id, language);
+    res.json({ success: true, code, expiresAt, language });
+  } catch (error) {
+    console.error('telegram/pairing-code failed:', error);
+    res.status(500).json({ error: 'Failed to generate pairing code' });
+  }
+});
+
+// PATCH /api/telegram/link — update language / toggles on the user's link
+router.patch('/link', (req, res) => {
+  try {
+    const { language, notificationsEnabled, bridgeEnabled } = req.body || {};
+    const payload = {};
+    if (language !== undefined) payload.language = sanitizeLanguage(language);
+    if (notificationsEnabled !== undefined) payload.notificationsEnabled = Boolean(notificationsEnabled);
+    if (bridgeEnabled !== undefined) payload.bridgeEnabled = Boolean(bridgeEnabled);
+    telegramLinksDb.updatePreferences(req.user.id, payload);
+    res.json({ success: true, link: telegramLinksDb.getByUserId(req.user.id) });
+  } catch (error) {
+    console.error('telegram/link patch failed:', error);
+    res.status(500).json({ error: 'Failed to update link' });
+  }
+});
+
+// DELETE /api/telegram/link — unpair
+router.delete('/link', (req, res) => {
+  try {
+    telegramLinksDb.unlink(req.user.id);
+    res.json({ success: true });
+  } catch (error) {
+    console.error('telegram/link delete failed:', error);
+    res.status(500).json({ error: 'Failed to unpair' });
+  }
+});
+
+export default router;

package/server/routes/user.js

@@ -1,123 +1,123 @@
-import express from 'express';
-import { userDb } from '../database/db.js';
-import { authenticateToken } from '../middleware/auth.js';
-import { getSystemGitConfig } from '../utils/gitConfig.js';
-import { spawn } from 'child_process';
-
-const router = express.Router();
-
-function spawnAsync(command, args, options = {}) {
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, args, { ...options, shell: false });
-    let stdout = '';
-    let stderr = '';
-    child.stdout.on('data', (data) => { stdout += data.toString(); });
-    child.stderr.on('data', (data) => { stderr += data.toString(); });
-    child.on('error', (error) => { reject(error); });
-    child.on('close', (code) => {
-      if (code === 0) { resolve({ stdout, stderr }); return; }
-      const error = new Error(`Command failed: ${command} ${args.join(' ')}`);
-      error.code = code;
-      error.stdout = stdout;
-      error.stderr = stderr;
-      reject(error);
-    });
-  });
-}
-
-router.get('/git-config', authenticateToken, async (req, res) => {
-  try {
-    const userId = req.user.id;
-    let gitConfig = userDb.getGitConfig(userId);
-
-    // If database is empty, try to get from system git config
-    if (!gitConfig || (!gitConfig.git_name && !gitConfig.git_email)) {
-      const systemConfig = await getSystemGitConfig();
-
-      // If system has values, save them to database for this user
-      if (systemConfig.git_name || systemConfig.git_email) {
-        userDb.updateGitConfig(userId, systemConfig.git_name, systemConfig.git_email);
-        gitConfig = systemConfig;
-        console.log(`Auto-populated git config from system for user ${userId}: ${systemConfig.git_name} <${systemConfig.git_email}>`);
-      }
-    }
-
-    res.json({
-      success: true,
-      gitName: gitConfig?.git_name || null,
-      gitEmail: gitConfig?.git_email || null
-    });
-  } catch (error) {
-    console.error('Error getting git config:', error);
-    res.status(500).json({ error: 'Failed to get git configuration' });
-  }
-});
-
-// Apply git config globally via git config --global
-router.post('/git-config', authenticateToken, async (req, res) => {
-  try {
-    const userId = req.user.id;
-    const { gitName, gitEmail } = req.body;
-
-    if (!gitName || !gitEmail) {
-      return res.status(400).json({ error: 'Git name and email are required' });
-    }
-
-    // Validate email format
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    if (!emailRegex.test(gitEmail)) {
-      return res.status(400).json({ error: 'Invalid email format' });
-    }
-
-    userDb.updateGitConfig(userId, gitName, gitEmail);
-
-    try {
-      await spawnAsync('git', ['config', '--global', 'user.name', gitName]);
-      await spawnAsync('git', ['config', '--global', 'user.email', gitEmail]);
-      console.log(`Applied git config globally: ${gitName} <${gitEmail}>`);
-    } catch (gitError) {
-      console.error('Error applying git config:', gitError);
-    }
-
-    res.json({
-      success: true,
-      gitName,
-      gitEmail
-    });
-  } catch (error) {
-    console.error('Error updating git config:', error);
-    res.status(500).json({ error: 'Failed to update git configuration' });
-  }
-});
-
-router.post('/complete-onboarding', authenticateToken, async (req, res) => {
-  try {
-    const userId = req.user.id;
-    userDb.completeOnboarding(userId);
-
-    res.json({
-      success: true,
-      message: 'Onboarding completed successfully'
-    });
-  } catch (error) {
-    console.error('Error completing onboarding:', error);
-    res.status(500).json({ error: 'Failed to complete onboarding' });
-  }
-});
-
-router.get('/onboarding-status', authenticateToken, async (req, res) => {
-  try {
-    const userId = req.user.id;
-    const hasCompleted = userDb.hasCompletedOnboarding(userId);
-
-    res.json({
-      success: true,
-      hasCompletedOnboarding: hasCompleted
-    });
-  } catch (error) {
-    console.error('Error checking onboarding status:', error);
-    res.status(500).json({ error: 'Failed to check onboarding status' });
-  }
-});
-
-export default router;
+import express from 'express';
+import { userDb } from '../database/db.js';
+import { authenticateToken } from '../middleware/auth.js';
+import { getSystemGitConfig } from '../utils/gitConfig.js';
+import { spawn } from 'child_process';
+
+const router = express.Router();
+
+function spawnAsync(command, args, options = {}) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, args, { ...options, shell: false });
+    let stdout = '';
+    let stderr = '';
+    child.stdout.on('data', (data) => { stdout += data.toString(); });
+    child.stderr.on('data', (data) => { stderr += data.toString(); });
+    child.on('error', (error) => { reject(error); });
+    child.on('close', (code) => {
+      if (code === 0) { resolve({ stdout, stderr }); return; }
+      const error = new Error(`Command failed: ${command} ${args.join(' ')}`);
+      error.code = code;
+      error.stdout = stdout;
+      error.stderr = stderr;
+      reject(error);
+    });
+  });
+}
+
+router.get('/git-config', authenticateToken, async (req, res) => {
+  try {
+    const userId = req.user.id;
+    let gitConfig = userDb.getGitConfig(userId);
+
+    // If database is empty, try to get from system git config
+    if (!gitConfig || (!gitConfig.git_name && !gitConfig.git_email)) {
+      const systemConfig = await getSystemGitConfig();
+
+      // If system has values, save them to database for this user
+      if (systemConfig.git_name || systemConfig.git_email) {
+        userDb.updateGitConfig(userId, systemConfig.git_name, systemConfig.git_email);
+        gitConfig = systemConfig;
+        console.log(`Auto-populated git config from system for user ${userId}: ${systemConfig.git_name} <${systemConfig.git_email}>`);
+      }
+    }
+
+    res.json({
+      success: true,
+      gitName: gitConfig?.git_name || null,
+      gitEmail: gitConfig?.git_email || null
+    });
+  } catch (error) {
+    console.error('Error getting git config:', error);
+    res.status(500).json({ error: 'Failed to get git configuration' });
+  }
+});
+
+// Apply git config globally via git config --global
+router.post('/git-config', authenticateToken, async (req, res) => {
+  try {
+    const userId = req.user.id;
+    const { gitName, gitEmail } = req.body;
+
+    if (!gitName || !gitEmail) {
+      return res.status(400).json({ error: 'Git name and email are required' });
+    }
+
+    // Validate email format
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailRegex.test(gitEmail)) {
+      return res.status(400).json({ error: 'Invalid email format' });
+    }
+
+    userDb.updateGitConfig(userId, gitName, gitEmail);
+
+    try {
+      await spawnAsync('git', ['config', '--global', 'user.name', gitName]);
+      await spawnAsync('git', ['config', '--global', 'user.email', gitEmail]);
+      console.log(`Applied git config globally: ${gitName} <${gitEmail}>`);
+    } catch (gitError) {
+      console.error('Error applying git config:', gitError);
+    }
+
+    res.json({
+      success: true,
+      gitName,
+      gitEmail
+    });
+  } catch (error) {
+    console.error('Error updating git config:', error);
+    res.status(500).json({ error: 'Failed to update git configuration' });
+  }
+});
+
+router.post('/complete-onboarding', authenticateToken, async (req, res) => {
+  try {
+    const userId = req.user.id;
+    userDb.completeOnboarding(userId);
+
+    res.json({
+      success: true,
+      message: 'Onboarding completed successfully'
+    });
+  } catch (error) {
+    console.error('Error completing onboarding:', error);
+    res.status(500).json({ error: 'Failed to complete onboarding' });
+  }
+});
+
+router.get('/onboarding-status', authenticateToken, async (req, res) => {
+  try {
+    const userId = req.user.id;
+    const hasCompleted = userDb.hasCompletedOnboarding(userId);
+
+    res.json({
+      success: true,
+      hasCompletedOnboarding: hasCompleted
+    });
+  } catch (error) {
+    console.error('Error checking onboarding status:', error);
+    res.status(500).json({ error: 'Failed to check onboarding status' });
+  }
+});
+
+export default router;

package/server/services/external-access.js

@@ -0,0 +1,240 @@
+import { spawn } from 'node:child_process';
+import { createRequire } from 'node:module';
+
+const requireCjs = createRequire(import.meta.url);
+
+// nat-upnp is CommonJS and callback-based. We wrap it in promises and keep
+// one shared client per process. The client is lazily created so importing
+// this module does not try to bind SSDP sockets at boot.
+let upnpClient = null;
+const getUpnpClient = () => {
+  if (!upnpClient) {
+    const nat = requireCjs('nat-upnp');
+    upnpClient = nat.createClient();
+  }
+  return upnpClient;
+};
+
+let upnpState = {
+  mapped: false,
+  port: null,
+  externalIp: null,
+  externalUrl: null,
+  error: null,
+};
+
+// A UPnP mapping request can hang forever if the router never answers SSDP.
+// Cap every call so the HTTP endpoint doesn't dangle — we surface a clean
+// failure and the user can try tunnel mode instead.
+const withTimeout = (promise, ms, label) =>
+  Promise.race([
+    promise,
+    new Promise((_, reject) => setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms)),
+  ]);
+
+const promisifyUpnp = (method, arg) =>
+  new Promise((resolve, reject) => {
+    const client = getUpnpClient();
+    const cb = (err, result) => (err ? reject(err) : resolve(result));
+    if (arg === undefined) {
+      client[method](cb);
+    } else {
+      client[method](arg, cb);
+    }
+  });
+
+export const enableUpnp = async ({ port }) => {
+  upnpState = { ...upnpState, error: null };
+  try {
+    await withTimeout(
+      promisifyUpnp('portMapping', {
+        public: port,
+        private: port,
+        // ttl:0 is documented as "never expire" — routers honor it differently,
+        // but it's the least surprising default. We leave renewal to the user
+        // clicking "enable" again if the router drops the lease.
+        ttl: 0,
+        description: 'Pixcode',
+        protocol: 'tcp',
+      }),
+      8000,
+      'UPnP portMapping',
+    );
+    const externalIp = await withTimeout(promisifyUpnp('externalIp'), 5000, 'UPnP externalIp');
+    upnpState = {
+      mapped: true,
+      port,
+      externalIp,
+      externalUrl: externalIp ? `http://${externalIp}:${port}` : null,
+      error: null,
+    };
+    return upnpState;
+  } catch (err) {
+    upnpState = {
+      mapped: false,
+      port,
+      externalIp: null,
+      externalUrl: null,
+      error: err?.message || String(err),
+    };
+    throw err;
+  }
+};
+
+export const disableUpnp = async ({ port }) => {
+  try {
+    await withTimeout(promisifyUpnp('portUnmapping', { public: port, protocol: 'tcp' }), 5000, 'UPnP portUnmapping');
+  } catch (err) {
+    upnpState = { ...upnpState, error: err?.message || String(err) };
+    throw err;
+  }
+  upnpState = { mapped: false, port: null, externalIp: null, externalUrl: null, error: null };
+  return upnpState;
+};
+
+export const getUpnpState = () => upnpState;
+
+// ============================================================================
+// Tunnel: detect cloudflared / ngrok and spawn; extract the public URL from
+// stdout. We keep a single live tunnel per process — starting a new one
+// stops the previous one to avoid dangling child processes.
+// ============================================================================
+
+let tunnelProc = null;
+let tunnelState = {
+  running: false,
+  binary: null, // 'cloudflared' | 'ngrok'
+  url: null,
+  error: null,
+  log: [],
+};
+
+const appendLog = (line) => {
+  // Tunnels can be noisy. Cap the tail we retain so a long-running tunnel
+  // doesn't grow the log into an OOM risk.
+  tunnelState.log.push(line);
+  if (tunnelState.log.length > 200) tunnelState.log.shift();
+};
+
+const detectBinary = async () => {
+  const candidates = ['cloudflared', 'ngrok'];
+  for (const name of candidates) {
+    try {
+      // `which` isn't guaranteed on Windows; we probe with `--version` instead
+      // so the same code path works on Unix and Windows Command Prompt.
+      await new Promise((resolve, reject) => {
+        const child = spawn(name, ['--version'], { stdio: 'ignore' });
+        child.on('error', reject);
+        child.on('exit', (code) => (code === 0 ? resolve() : reject(new Error(`exit ${code}`))));
+      });
+      return name;
+    } catch {
+      // try next
+    }
+  }
+  return null;
+};
+
+const cloudflareUrlRegex = /https?:\/\/[a-z0-9.-]+trycloudflare\.com/i;
+const ngrokUrlRegex = /https?:\/\/[a-z0-9.-]+\.ngrok(-free)?\.(app|io)/i;
+
+const buildTunnelArgs = (binary, port) => {
+  if (binary === 'cloudflared') return ['tunnel', '--url', `http://localhost:${port}`];
+  if (binary === 'ngrok') return ['http', String(port), '--log', 'stdout', '--log-format', 'logfmt'];
+  throw new Error(`Unsupported tunnel binary: ${binary}`);
+};
+
+const extractUrl = (binary, text) => {
+  if (binary === 'cloudflared') return text.match(cloudflareUrlRegex)?.[0] ?? null;
+  if (binary === 'ngrok') return text.match(ngrokUrlRegex)?.[0] ?? null;
+  return null;
+};
+
+export const startTunnel = async ({ port }) => {
+  if (tunnelProc) {
+    // Already running — tell the caller to stop it first rather than silently
+    // replacing, which would orphan the old child and lie about state.
+    throw new Error('Tunnel already running; stop it first');
+  }
+
+  const binary = await detectBinary();
+  if (!binary) {
+    tunnelState = { running: false, binary: null, url: null, error: 'No tunnel binary found', log: [] };
+    const err = new Error('No tunnel binary found (tried cloudflared, ngrok)');
+    err.code = 'ENOENT_TUNNEL';
+    throw err;
+  }
+
+  const args = buildTunnelArgs(binary, port);
+  const child = spawn(binary, args, { stdio: ['ignore', 'pipe', 'pipe'] });
+  tunnelProc = child;
+  tunnelState = { running: true, binary, url: null, error: null, log: [] };
+
+  const handleChunk = (chunk) => {
+    const text = chunk.toString();
+    text.split(/\r?\n/).filter(Boolean).forEach(appendLog);
+    if (!tunnelState.url) {
+      const url = extractUrl(binary, text);
+      if (url) tunnelState.url = url;
+    }
+  };
+
+  child.stdout.on('data', handleChunk);
+  child.stderr.on('data', handleChunk);
+  child.on('exit', (code) => {
+    tunnelProc = null;
+    tunnelState = {
+      running: false,
+      binary,
+      url: null,
+      error: code === 0 ? null : `Tunnel exited with code ${code}`,
+      log: tunnelState.log,
+    };
+  });
+
+  // Wait up to 15s for the public URL to appear in the log. We don't block
+  // indefinitely — if the binary is hanging on login/auth, the UI should see
+  // a clear failure instead of a spinner that never resolves.
+  const start = Date.now();
+  while (Date.now() - start < 15000) {
+    if (tunnelState.url) return tunnelState;
+    if (!tunnelProc) break; // process died early
+    // eslint-disable-next-line no-await-in-loop
+    await new Promise((r) => setTimeout(r, 250));
+  }
+
+  if (!tunnelState.url) {
+    // If we never captured a URL, kill the child so we don't leak it.
+    try { child.kill(); } catch { /* ignore */ }
+    tunnelProc = null;
+    tunnelState = { ...tunnelState, running: false, error: 'Tunnel did not report a public URL' };
+    throw new Error(tunnelState.error);
+  }
+
+  return tunnelState;
+};
+
+export const stopTunnel = async () => {
+  if (!tunnelProc) {
+    tunnelState = { running: false, binary: null, url: null, error: null, log: [] };
+    return tunnelState;
+  }
+  try {
+    tunnelProc.kill();
+  } catch {
+    // already dead
+  }
+  tunnelProc = null;
+  tunnelState = { running: false, binary: null, url: null, error: null, log: [] };
+  return tunnelState;
+};
+
+export const getTunnelState = () => tunnelState;
+
+// Explicit cleanup so the server process can shut down without leaking the
+// child tunnel process.
+process.on('exit', () => {
+  if (tunnelProc) {
+    try { tunnelProc.kill(); } catch { /* ignore */ }
+  }
+});