@pixelbyte-software/pixcode 1.35.2 → 1.35.4

package/server/routes/telegram.js

@@ -1,125 +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;
+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,125 @@
-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 { spawn } from 'child_process';
+
+import express from 'express';
+
+import { userDb } from '../database/db.js';
+import { authenticateToken } from '../middleware/auth.js';
+import { getSystemGitConfig } from '../utils/gitConfig.js';
+
+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;