thepopebot 1.2.78 → 1.2.81

package/api/index.js

@@ -16,15 +16,8 @@ import { setAgentJobSecret } from '../lib/db/config.js';
 // ── Per-key lock for OAuth token refresh ────────────────────────────
 const _refreshLocks = new Map();
 
-// Bot token — resolved from DB/env
-let telegramBotToken = null;
-
-
 function getTelegramBotToken() {
-  if (!telegramBotToken) {
-    telegramBotToken = getConfig('TELEGRAM_BOT_TOKEN') || null;
-  }
-  return telegramBotToken;
+  return getConfig('TELEGRAM_BOT_TOKEN') || null;
 }
 
 

package/lib/chat/actions.js

@@ -287,9 +287,7 @@ export async function createOAuthToken(tokenType, name, token) {
   const user = await requireAdmin();
   try {
     const { createOAuthToken: dbCreate } = await import('../db/oauth-tokens.js');
-    const { invalidateConfigCache } = await import('../config.js');
     const result = dbCreate(tokenType, name || 'OAuth Token', token, user.id);
-    invalidateConfigCache();
     return result;
   } catch (err) {
     console.error('Failed to create OAuth token:', err);
@@ -322,9 +320,7 @@ export async function deleteOAuthToken(id) {
   await requireAdmin();
   try {
     const { deleteOAuthTokenById } = await import('../db/oauth-tokens.js');
-    const { invalidateConfigCache } = await import('../config.js');
     deleteOAuthTokenById(id);
-    invalidateConfigCache();
     return { success: true };
   } catch (err) {
     console.error('Failed to delete OAuth token:', err);
@@ -793,7 +789,6 @@ export async function updateCodingAgentConfig(agent, config) {
   await requireAdmin();
   try {
     const { setConfigValue } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
 
     if (agent === 'claude-code') {
       if (config.enabled !== undefined) setConfigValue('CODING_AGENT_CLAUDE_CODE_ENABLED', String(config.enabled));
@@ -823,7 +818,6 @@ export async function updateCodingAgentConfig(agent, config) {
       return { error: 'Invalid agent' };
     }
 
-    invalidateConfigCache();
     if (agent === 'claude-code' && config.backend !== undefined) {
       await syncLitellmConfig();
     }
@@ -842,9 +836,7 @@ export async function setCodingAgentDefault(agent) {
   await requireAdmin();
   try {
     const { setConfigValue } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
     setConfigValue('CODING_AGENT', agent);
-    invalidateConfigCache();
     return { success: true };
   } catch (err) {
     console.error('Failed to set default coding agent:', err);
@@ -893,9 +885,7 @@ export async function setModeDefault(mode, field, value) {
     const stored = field === 'autoRun' ? (value ? 'true' : 'false') : value;
 
     const { setConfigValue } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
     setConfigValue(key, stored);
-    invalidateConfigCache();
     return { success: true };
   } catch (err) {
     console.error('Failed to set mode default:', err);
@@ -937,9 +927,7 @@ export async function updateGeneralSetting(key, value) {
   }
   try {
     const { setConfigValue } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
     setConfigValue(key, value);
-    invalidateConfigCache();
     return { success: true };
   } catch (err) {
     console.error('Failed to update general setting:', err);
@@ -985,7 +973,6 @@ export async function updateApiKeySetting(key, value) {
   }
   try {
     const { setConfigSecret, deleteConfigSecret } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
 
     if (value) {
       setConfigSecret(key, value, user.id);
@@ -993,7 +980,6 @@ export async function updateApiKeySetting(key, value) {
       deleteConfigSecret(key);
     }
 
-    invalidateConfigCache();
     return { success: true };
   } catch (err) {
     console.error('Failed to update API key setting:', err);
@@ -1013,9 +999,7 @@ export async function regenerateWebhookSecret(key) {
     const { randomBytes } = await import('crypto');
     const secret = randomBytes(32).toString('hex');
     const { setConfigSecret } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
     setConfigSecret(key, secret, user.id);
-    invalidateConfigCache();
     return { success: true };
   } catch (err) {
     console.error('Failed to regenerate webhook secret:', err);
@@ -1100,7 +1084,7 @@ export async function registerTelegramWebhook() {
   const user = await requireAdmin();
   try {
     const { getConfigSecret, setConfigSecret } = await import('../db/config.js');
-    const { invalidateConfigCache, getConfig } = await import('../config.js');
+    const { getConfig } = await import('../config.js');
     const { setTelegramWebhook, generateWebhookSecret } = await import('../tools/telegram.js');
 
     const botToken = getConfigSecret('TELEGRAM_BOT_TOKEN');
@@ -1112,7 +1096,6 @@ export async function registerTelegramWebhook() {
     const webhookUrl = `${appUrl.replace(/\/$/, '')}/api/telegram/webhook`;
     const secret = generateWebhookSecret();
     setConfigSecret('TELEGRAM_WEBHOOK_SECRET', secret, user.id);
-    invalidateConfigCache();
 
     const result = await setTelegramWebhook(botToken, webhookUrl, secret);
     if (!result.ok) {
@@ -1180,13 +1163,11 @@ export async function updateProviderCredential(credentialKey, value) {
       return { error: 'Invalid credential key' };
     }
     const { setConfigSecret, deleteConfigSecret } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
     if (value) {
       setConfigSecret(credentialKey, value, user.id);
     } else {
       deleteConfigSecret(credentialKey);
     }
-    invalidateConfigCache();
     await syncLitellmConfig();
     return { success: true };
   } catch (err) {
@@ -1257,11 +1238,9 @@ export async function addCustomProvider(config) {
   const user = await requireAdmin();
   try {
     const { setCustomProvider } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
     // Generate slug from name
     const slug = config.name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
     setCustomProvider(slug, config, user.id);
-    invalidateConfigCache();
     await syncLitellmConfig();
     return { success: true, key: slug };
   } catch (err) {
@@ -1277,9 +1256,7 @@ export async function updateCustomProvider(key, config) {
   const user = await requireAdmin();
   try {
     const { setCustomProvider } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
     setCustomProvider(key, config, user.id);
-    invalidateConfigCache();
     await syncLitellmConfig();
     return { success: true };
   } catch (err) {
@@ -1295,9 +1272,7 @@ export async function removeCustomProvider(key) {
   const user = await requireAdmin();
   try {
     const { deleteCustomProvider } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
     deleteCustomProvider(key);
-    invalidateConfigCache();
     await syncLitellmConfig();
     return { success: true };
   } catch (err) {
@@ -1313,11 +1288,9 @@ export async function setActiveLlm(provider, model, maxTokens) {
   const user = await requireAdmin();
   try {
     const { setConfigValue } = await import('../db/config.js');
-    const { invalidateConfigCache } = await import('../config.js');
     setConfigValue('LLM_PROVIDER', provider, user.id);
     setConfigValue('LLM_MODEL', model, user.id);
     if (maxTokens) setConfigValue('LLM_MAX_TOKENS', maxTokens, user.id);
-    invalidateConfigCache();
     return { success: true };
   } catch (err) {
     console.error('Failed to set active LLM:', err);

package/lib/config.js

@@ -87,23 +87,12 @@ const DEFAULTS = {
   CODE_MODE_AUTO_RUN: 'false',
 };
 
-// In-memory cache on globalThis to survive Next.js webpack chunk duplication.
-// Server actions and route handlers may be bundled into separate chunks, each
-// with their own copy of module-level variables. globalThis is shared across all chunks.
-const _cache = (globalThis.__popebotConfigCache ??= new Map());
-
 /**
  * Get a config value. Resolution: DB → default.
  * @param {string} key
  * @returns {string|undefined}
  */
 export function getConfig(key) {
-  // Check cache first
-  const cached = _cache.get(key);
-  if (cached) {
-    return cached.value;
-  }
-
   let value;
 
   // OAuth tokens: multi-token support with LRU rotation
@@ -154,14 +143,5 @@ export function getConfig(key) {
     value = getDefaultModel(provider);
   }
 
-  // Cache and return
-  _cache.set(key, { value });
   return value;
 }
-
-/**
- * Invalidate the config cache. Call after any config write.
- */
-export function invalidateConfigCache() {
-  _cache.clear();
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.78",
+  "version": "1.2.81",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {