@kaikybrofc/omnizap-system 2.2.6 → 2.2.7

package/README.md

@@ -53,26 +53,26 @@ Atualização em cache: **30 minutos** por padrão (`README_SUMMARY_CACHE_SECOND
 <!-- README_SNAPSHOT:START -->
 ### Snapshot do Sistema
 
-> Atualizado em `2026-02-28T06:26:02.459Z` | cache `1800s`
+> Atualizado em `2026-02-28T09:29:12.922Z` | cache `1800s`
 
 | Métrica | Valor |
 | --- | ---: |
 | Usuários (lid_map) | 5.504 |
 | Grupos | 116 |
-| Packs | 293 |
-| Stickers | 6.775 |
-| Mensagens registradas | 440.765 |
+| Packs | 295 |
+| Stickers | 6.811 |
+| Mensagens registradas | 441.124 |
 
 #### Tipos de mensagem mais usados (amostra: 25.000)
 | Tipo | Total |
 | --- | ---: |
-| `texto` | 16.279 |
-| `figurinha` | 4.721 |
-| `reacao` | 1.504 |
-| `imagem` | 1.290 |
-| `outros` | 757 |
-| `video` | 228 |
-| `audio` | 216 |
+| `texto` | 16.180 |
+| `figurinha` | 4.806 |
+| `reacao` | 1.502 |
+| `imagem` | 1.298 |
+| `outros` | 769 |
+| `video` | 227 |
+| `audio` | 213 |
 | `documento` | 5 |
 
 <details><summary>Comandos disponíveis (62)</summary>

package/app/observability/metrics.js

@@ -1,10 +1,6 @@
 import 'dotenv/config';
 
-import http from 'node:http';
-import { randomUUID } from 'node:crypto';
-import { URL } from 'node:url';
 import client from 'prom-client';
-import logger from '../utils/logger/loggerModule.js';
 
 const parseEnvBool = (value, fallback) => {
   if (value === undefined || value === null || value === '') return fallback;
@@ -39,23 +35,12 @@ const QUERY_THRESHOLDS_MS = parseThresholds(process.env.DB_QUERY_ALERT_THRESHOLD
 
 const registry = new client.Registry();
 let metrics = null;
-let server = null;
-let serverStarted = false;
-let stickerCatalogModulePromise = null;
 
 const normalizeLabel = (value, fallback = 'unknown') => {
   if (value === undefined || value === null || value === '') return fallback;
   return String(value);
 };
 
-const normalizeRequestId = (value) => {
-  const token = String(value || '')
-    .trim()
-    .replace(/[^a-zA-Z0-9._:-]/g, '')
-    .slice(0, 120);
-  return token || randomUUID();
-};
-
 const normalizeHttpMethod = (method) => {
   const normalized = String(method || '').trim().toUpperCase();
   if (!normalized) return 'UNKNOWN';
@@ -70,7 +55,7 @@ const toStatusClass = (statusCode) => {
   return `${head}xx`;
 };
 
-const resolveRouteGroup = ({ pathname, metricsPath, catalogConfig = null } = {}) => {
+export const resolveRouteGroup = ({ pathname, metricsPath, catalogConfig = null } = {}) => {
   if (pathname?.startsWith(metricsPath)) return 'metrics';
   if (pathname === '/sitemap.xml') return 'sitemap';
   if (pathname === '/api/marketplace/stats') return 'marketplace_stats';
@@ -390,137 +375,23 @@ const ensureMetrics = () => {
   return metrics;
 };
 
-const loadStickerCatalogModule = async () => {
-  if (!stickerCatalogModulePromise) {
-    stickerCatalogModulePromise = import('../modules/stickerPackModule/stickerPackCatalogHttp.js');
-  }
-  return stickerCatalogModulePromise;
-};
-
 export const isMetricsEnabled = () => METRICS_ENABLED;
 
-export const startMetricsServer = () => {
-  if (!METRICS_ENABLED || serverStarted) return;
-  ensureMetrics();
-  server = http.createServer(async (req, res) => {
-    const requestStartedAt = Date.now();
-    const requestId = normalizeRequestId(req.headers['x-request-id']);
-    res.setHeader('X-Request-Id', requestId);
-
-    const host = req.headers.host || `${METRICS_HOST}:${METRICS_PORT}`;
-    let parsedUrl;
-    try {
-      parsedUrl = new URL(req.url || '/', `http://${host}`);
-    } catch {
-      parsedUrl = new URL(req.url || '/', 'http://localhost');
-    }
-    const pathname = parsedUrl.pathname;
-    let routeGroup = resolveRouteGroup({
-      pathname,
-      metricsPath: METRICS_PATH,
-      catalogConfig: null,
-    });
-
-    res.once('finish', () => {
-      recordHttpRequest({
-        durationMs: Date.now() - requestStartedAt,
-        method: req.method,
-        statusCode: res.statusCode,
-        routeGroup,
-      });
-    });
-
-    try {
-      const stickerCatalogModule = await loadStickerCatalogModule();
-      const catalogConfig =
-        typeof stickerCatalogModule.getStickerCatalogConfig === 'function'
-          ? stickerCatalogModule.getStickerCatalogConfig()
-          : null;
-      routeGroup = resolveRouteGroup({
-        pathname,
-        metricsPath: METRICS_PATH,
-        catalogConfig,
-      });
-      const handledByCatalog = await stickerCatalogModule.maybeHandleStickerCatalogRequest(req, res, {
-        pathname,
-        url: parsedUrl,
-      });
+export const getMetricsServerConfig = () => ({
+  enabled: METRICS_ENABLED,
+  host: METRICS_HOST,
+  port: METRICS_PORT,
+  path: METRICS_PATH,
+});
 
-      if (handledByCatalog) {
-        return;
-      }
-    } catch (error) {
-      logger.error('Erro ao inicializar rotas web de sticker packs.', {
-        error: error.message,
-      });
-    }
-
-    if (!pathname.startsWith(METRICS_PATH)) {
-      res.statusCode = 404;
-      res.end('Not Found');
-      return;
-    }
-
-    try {
-      const body = await registry.metrics();
-      res.statusCode = 200;
-      res.setHeader('Content-Type', registry.contentType);
-      res.end(body);
-    } catch (error) {
-      res.statusCode = 500;
-      res.end('Metrics error');
-      logger.error('Erro ao gerar /metrics', { error: error.message });
-    }
-  });
-
-  server.listen(METRICS_PORT, METRICS_HOST, () => {
-    serverStarted = true;
-    logger.info('Servidor /metrics iniciado', {
-      host: METRICS_HOST,
-      port: METRICS_PORT,
-      path: METRICS_PATH,
-    });
-
-    loadStickerCatalogModule()
-      .then((module) => {
-        const config = typeof module.getStickerCatalogConfig === 'function' ? module.getStickerCatalogConfig() : null;
-        if (!config?.enabled) return;
-        logger.info('Catalogo web de sticker packs habilitado', {
-          web_path: config.webPath,
-          api_base_path: config.apiBasePath,
-          orphan_api_path: config.orphanApiPath,
-          data_public_path: config.dataPublicPath,
-          data_public_dir: config.dataPublicDir,
-          host: METRICS_HOST,
-          port: METRICS_PORT,
-        });
-      })
-      .catch((error) => {
-        logger.warn('Nao foi possivel carregar configuracao do catalogo de sticker packs.', {
-          error: error.message,
-        });
-      });
-  });
-
-  server.on('error', (error) => {
-    logger.error('Falha ao iniciar servidor /metrics', { error: error.message });
-  });
-};
-
-export const stopMetricsServer = async () => {
-  if (!serverStarted || !server) return;
-  const current = server;
-  server = null;
-  serverStarted = false;
-  await new Promise((resolve, reject) => {
-    current.close((error) => {
-      if (error) {
-        reject(error);
-        return;
-      }
-      resolve();
-    });
-  });
+export const getMetricsPayload = async () => {
+  if (!METRICS_ENABLED) return null;
+  ensureMetrics();
+  const body = await registry.metrics();
+  return {
+    body,
+    contentType: registry.contentType,
+  };
 };
 
 export const recordError = (scope = 'app') => {

package/index.js

@@ -3,7 +3,7 @@
  *
  * Responsabilidades principais:
  * - Inicializar o banco (garantindo DB e tabelas).
- * - Subir servidor de métricas.
+ * - Subir servidor HTTP (catálogo web + endpoint de métricas).
  * - Rodar backfill do lid_map (opcional, em background).
  * - Conectar ao WhatsApp (Baileys).
  * - Iniciar serviços auxiliares (ex: broadcast de notícias).
@@ -25,7 +25,7 @@ import {
   stopNewsBroadcastService,
 } from './app/services/newsBroadcastService.js';
 import initializeDatabase from './database/init.js';
-import { startMetricsServer, stopMetricsServer } from './app/observability/metrics.js';
+import { startHttpServer, stopHttpServer } from './server/index.js';
 import {
   startStickerClassificationBackground,
   stopStickerClassificationBackground,
@@ -198,7 +198,7 @@ async function closeDatabasePool() {
  *
  * Fluxo de startup:
  * 1) Inicializa DB (cria/verifica DB/tabelas)
- * 2) Sobe servidor de métricas
+ * 2) Sobe servidor HTTP (catálogo + métricas)
  * 3) Inicia backfill (opcional) em background
  * 4) Conecta no WhatsApp
  * 5) Inicia serviços auxiliares (news broadcast)
@@ -216,8 +216,8 @@ async function startApp() {
     await withTimeout(initializeDatabase(), DB_INIT_TIMEOUT_MS, 'Inicializacao do banco');
     logger.info('Banco de dados pronto.');
 
-    logger.info('Inicializando servidor de metricas...');
-    startMetricsServer();
+    logger.info('Inicializando servidor HTTP...');
+    startHttpServer();
     if (isStickerWorkerPipelineEnabled()) {
       startStickerWorkerPipeline();
     } else {
@@ -274,7 +274,7 @@ startApp();
  * - serviço de notícias (se stop existir)
  * - aguarda backfill (com timeout curto)
  * - encerra socket do WhatsApp
- * - encerra servidor de métricas
+ * - encerra servidor HTTP
  * - encerra pool do MySQL
  *
  * Regras:
@@ -339,14 +339,14 @@ async function shutdown(signal, error) {
       }
     }
 
-    // 4) Encerrar servidor de métricas
-    if (typeof stopMetricsServer === 'function') {
+    // 4) Encerrar servidor HTTP
+    if (typeof stopHttpServer === 'function') {
       try {
-        logger.info('Encerrando servidor de metricas...');
-        await withTimeout(stopMetricsServer(), 8000, 'Encerramento metricas');
-        logger.info('Servidor de metricas encerrado.');
-      } catch (metricsError) {
-        logger.warn('Falha ao encerrar servidor de metricas.', { error: metricsError.message });
+        logger.info('Encerrando servidor HTTP...');
+        await withTimeout(stopHttpServer(), 8000, 'Encerramento HTTP');
+        logger.info('Servidor HTTP encerrado.');
+      } catch (httpError) {
+        logger.warn('Falha ao encerrar servidor HTTP.', { error: httpError.message });
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaikybrofc/omnizap-system",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "Sistema profissional de automação WhatsApp com tecnologia Baileys",
   "main": "index.js",
   "publishConfig": {

package/server/controllers/metricsController.js

@@ -0,0 +1,21 @@
+import logger from '../../app/utils/logger/loggerModule.js';
+import { getMetricsPayload } from '../../app/observability/metrics.js';
+
+export const sendMetricsResponse = async (res) => {
+  try {
+    const payload = await getMetricsPayload();
+    if (!payload) {
+      res.statusCode = 404;
+      res.end('Not Found');
+      return;
+    }
+
+    res.statusCode = 200;
+    res.setHeader('Content-Type', payload.contentType);
+    res.end(payload.body);
+  } catch (error) {
+    res.statusCode = 500;
+    res.end('Metrics error');
+    logger.error('Erro ao gerar /metrics', { error: error?.message });
+  }
+};

package/{app/modules/stickerPackModule/stickerPackCatalogHttp.js → server/controllers/stickerCatalogController.js}

@@ -4,14 +4,18 @@ import { createHash, randomBytes, randomUUID, scryptSync, timingSafeEqual } from
 import { URL, URLSearchParams } from 'node:url';
 import axios from 'axios';
 
-import { executeQuery, pool, TABLES } from '../../../database/index.js';
-import { getJidUser, normalizeJid, resolveBotJid } from '../../config/baileysConfig.js';
-import { getAdminPhone, getAdminRawValue, resolveAdminJid } from '../../config/adminIdentity.js';
-import { getActiveSocket } from '../../services/socketState.js';
-import { extractUserIdInfo, resolveUserId } from '../../services/lidMapService.js';
-import { resolveWhatsAppOwnerJidFromLoginPayload, toWhatsAppOwnerJid, toWhatsAppPhoneDigits } from '../../services/whatsappLoginLinkService.js';
-import logger from '../../utils/logger/loggerModule.js';
-import { getSystemMetrics } from '../../utils/systemMetrics/systemMetricsModule.js';
+import { executeQuery, pool, TABLES } from '../../database/index.js';
+import { getJidUser, normalizeJid, resolveBotJid } from '../../app/config/baileysConfig.js';
+import { getAdminPhone, getAdminRawValue, resolveAdminJid } from '../../app/config/adminIdentity.js';
+import { getActiveSocket } from '../../app/services/socketState.js';
+import { extractUserIdInfo, resolveUserId } from '../../app/services/lidMapService.js';
+import {
+  resolveWhatsAppOwnerJidFromLoginPayload,
+  toWhatsAppOwnerJid,
+  toWhatsAppPhoneDigits,
+} from '../../app/services/whatsappLoginLinkService.js';
+import logger from '../../app/utils/logger/loggerModule.js';
+import { getSystemMetrics } from '../../app/utils/systemMetrics/systemMetricsModule.js';
 import {
   listStickerPacksForCatalog,
   findStickerPackByPackKey,
@@ -20,7 +24,7 @@ import {
   findStickerPackByOwnerAndIdentifier,
   softDeleteStickerPack,
   updateStickerPackFields,
-} from './stickerPackRepository.js';
+} from '../../app/modules/stickerPackModule/stickerPackRepository.js';
 import {
   listStickerPackItems,
   countStickerPackItemRefsByStickerId,
@@ -28,23 +32,23 @@ import {
   getStickerPackItemByStickerId,
   removeStickerPackItemByStickerId,
   removeStickerPackItemsByPackId,
-} from './stickerPackItemRepository.js';
+} from '../../app/modules/stickerPackModule/stickerPackItemRepository.js';
 import {
   listClassifiedStickerAssetsWithoutPack,
   listStickerAssetsWithoutPack,
   deleteStickerAssetById,
   findStickerAssetsByIds,
-} from './stickerAssetRepository.js';
+} from '../../app/modules/stickerPackModule/stickerAssetRepository.js';
 import {
   deleteStickerAssetClassificationByAssetId,
   findStickerClassificationByAssetId,
   listStickerClassificationsByAssetIds,
-} from './stickerAssetClassificationRepository.js';
+} from '../../app/modules/stickerPackModule/stickerAssetClassificationRepository.js';
 import {
   decoratePackClassificationSummary,
   decorateStickerClassification,
   getPackClassificationSummaryByAssetIds,
-} from './stickerClassificationService.js';
+} from '../../app/modules/stickerPackModule/stickerClassificationService.js';
 import {
   getEmptyStickerPackEngagement,
   getStickerPackEngagementByPackId,
@@ -52,21 +56,21 @@ import {
   incrementStickerPackLike,
   incrementStickerPackOpen,
   listStickerPackEngagementByPackIds,
-} from './stickerPackEngagementRepository.js';
+} from '../../app/modules/stickerPackModule/stickerPackEngagementRepository.js';
 import {
   createStickerPackInteractionEvent,
   listStickerPackInteractionStatsByPackIds,
   listViewerRecentPackIds,
-} from './stickerPackInteractionEventRepository.js';
+} from '../../app/modules/stickerPackModule/stickerPackInteractionEventRepository.js';
 import {
   buildCreatorRanking,
   buildIntentCollections,
   buildPersonalizedRecommendations,
   buildViewerTagAffinity,
   computePackSignals,
-} from './stickerPackMarketplaceService.js';
-import { listStickerPackScoreSnapshotsByPackIds } from './stickerPackScoreSnapshotRepository.js';
-import { createCatalogApiRouter } from './catalogRouter.js';
+} from '../../app/modules/stickerPackModule/stickerPackMarketplaceService.js';
+import { listStickerPackScoreSnapshotsByPackIds } from '../../app/modules/stickerPackModule/stickerPackScoreSnapshotRepository.js';
+import { createCatalogApiRouter } from '../routes/stickerCatalog/catalogRouter.js';
 import {
   buildAdminMenu,
   buildAiMenu,
@@ -76,19 +80,19 @@ import {
   buildQuoteMenu,
   buildStatsMenu,
   buildStickerMenu,
-} from '../menuModule/common.js';
-import { getMarketplaceDriftSnapshot } from './stickerMarketplaceDriftService.js';
+} from '../../app/modules/menuModule/common.js';
+import { getMarketplaceDriftSnapshot } from '../../app/modules/stickerPackModule/stickerMarketplaceDriftService.js';
 import {
   getStickerAssetExternalUrl,
   getStickerStorageConfig,
   readStickerAssetBuffer,
   saveStickerAssetFromBuffer,
-} from './stickerStorageService.js';
-import { convertToWebp } from '../stickerModule/convertToWebp.js';
-import { sanitizeText } from './stickerPackUtils.js';
-import stickerPackService from './stickerPackServiceRuntime.js';
-import { STICKER_PACK_ERROR_CODES, StickerPackError } from './stickerPackErrors.js';
-import { isFeatureEnabled } from '../../services/featureFlagService.js';
+} from '../../app/modules/stickerPackModule/stickerStorageService.js';
+import { convertToWebp } from '../../app/modules/stickerModule/convertToWebp.js';
+import { sanitizeText } from '../../app/modules/stickerPackModule/stickerPackUtils.js';
+import stickerPackService from '../../app/modules/stickerPackModule/stickerPackServiceRuntime.js';
+import { STICKER_PACK_ERROR_CODES, StickerPackError } from '../../app/modules/stickerPackModule/stickerPackErrors.js';
+import { isFeatureEnabled } from '../../app/services/featureFlagService.js';
 
 const parseEnvBool = (value, fallback) => {
   if (value === undefined || value === null || value === '') return fallback;
@@ -539,7 +543,9 @@ const getCookieValuesFromRequest = (req, cookieName) => {
     let decodedValue = encodedValue;
     try {
       decodedValue = decodeURIComponent(encodedValue);
-    } catch {}
+    } catch (_error) {
+      decodedValue = encodedValue;
+    }
     const normalizedValue = String(decodedValue || '').trim();
     if (!normalizedValue) continue;
     if (!values.includes(normalizedValue)) values.push(normalizedValue);

package/server/http/httpServer.js

@@ -0,0 +1,121 @@
+import http from 'node:http';
+import logger from '../../app/utils/logger/loggerModule.js';
+import {
+  getMetricsServerConfig,
+  isMetricsEnabled,
+  recordHttpRequest,
+  resolveRouteGroup,
+} from '../../app/observability/metrics.js';
+import { parseRequestUrl, normalizeRequestId } from './requestContext.js';
+import { maybeHandleMetricsRoute } from '../routes/metricsRoute.js';
+import {
+  getStickerCatalogRouteConfig,
+  maybeHandleStickerCatalogRoute,
+} from '../routes/stickerCatalogRoute.js';
+
+let server = null;
+let serverStarted = false;
+
+export const startHttpServer = () => {
+  if (!isMetricsEnabled() || serverStarted) return;
+
+  const { host, port, path: metricsPath } = getMetricsServerConfig();
+  server = http.createServer(async (req, res) => {
+    const requestStartedAt = Date.now();
+    const requestId = normalizeRequestId(req.headers['x-request-id']);
+    res.setHeader('X-Request-Id', requestId);
+
+    const parsedUrl = parseRequestUrl(req, host, port);
+    const pathname = parsedUrl.pathname;
+    let routeGroup = resolveRouteGroup({
+      pathname,
+      metricsPath,
+      catalogConfig: null,
+    });
+
+    res.once('finish', () => {
+      recordHttpRequest({
+        durationMs: Date.now() - requestStartedAt,
+        method: req.method,
+        statusCode: res.statusCode,
+        routeGroup,
+      });
+    });
+
+    try {
+      const catalogConfig = await getStickerCatalogRouteConfig();
+      routeGroup = resolveRouteGroup({
+        pathname,
+        metricsPath,
+        catalogConfig,
+      });
+      const handledByCatalog = await maybeHandleStickerCatalogRoute(req, res, {
+        pathname,
+        url: parsedUrl,
+      });
+      if (handledByCatalog) return;
+    } catch (error) {
+      logger.error('Erro ao inicializar rotas web de sticker packs.', {
+        error: error?.message,
+      });
+    }
+
+    const handledMetrics = await maybeHandleMetricsRoute(req, res, {
+      pathname,
+      metricsPath,
+    });
+    if (handledMetrics) return;
+
+    res.statusCode = 404;
+    res.end('Not Found');
+  });
+
+  server.listen(port, host, () => {
+    serverStarted = true;
+    logger.info('Servidor HTTP iniciado', {
+      host,
+      port,
+      metrics_path: metricsPath,
+    });
+
+    getStickerCatalogRouteConfig()
+      .then((config) => {
+        if (!config?.enabled) return;
+        logger.info('Catalogo web de sticker packs habilitado', {
+          web_path: config.webPath,
+          api_base_path: config.apiBasePath,
+          orphan_api_path: config.orphanApiPath,
+          data_public_path: config.dataPublicPath,
+          data_public_dir: config.dataPublicDir,
+          host,
+          port,
+        });
+      })
+      .catch((error) => {
+        logger.warn('Nao foi possivel carregar configuracao do catalogo de sticker packs.', {
+          error: error?.message,
+        });
+      });
+  });
+
+  server.on('error', (error) => {
+    logger.error('Falha ao iniciar servidor HTTP', { error: error?.message });
+  });
+};
+
+export const stopHttpServer = async () => {
+  if (!serverStarted || !server) return;
+
+  const current = server;
+  server = null;
+  serverStarted = false;
+  await new Promise((resolve, reject) => {
+    current.close((error) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+      resolve();
+    });
+  });
+};

package/server/http/requestContext.js

@@ -0,0 +1,20 @@
+import { randomUUID } from 'node:crypto';
+import { URL } from 'node:url';
+
+export const normalizeRequestId = (value) => {
+  const token = String(value || '')
+    .trim()
+    .replace(/[^a-zA-Z0-9._:-]/g, '')
+    .slice(0, 120);
+  return token || randomUUID();
+};
+
+export const parseRequestUrl = (req, host, port) => {
+  const fallbackHost = `${host}:${port}`;
+  const requestHost = req.headers.host || fallbackHost;
+  try {
+    return new URL(req.url || '/', `http://${requestHost}`);
+  } catch {
+    return new URL(req.url || '/', 'http://localhost');
+  }
+};

package/server/index.js

@@ -0,0 +1 @@
+export { startHttpServer, stopHttpServer } from './http/httpServer.js';

package/server/routes/metricsRoute.js

@@ -0,0 +1,7 @@
+import { sendMetricsResponse } from '../controllers/metricsController.js';
+
+export const maybeHandleMetricsRoute = async (req, res, { pathname, metricsPath }) => {
+  if (!pathname.startsWith(metricsPath)) return false;
+  await sendMetricsResponse(res);
+  return true;
+};

package/server/routes/stickerCatalogRoute.js

@@ -0,0 +1,20 @@
+let stickerCatalogControllerPromise = null;
+
+const loadStickerCatalogController = async () => {
+  if (!stickerCatalogControllerPromise) {
+    stickerCatalogControllerPromise = import('../controllers/stickerCatalogController.js');
+  }
+  return stickerCatalogControllerPromise;
+};
+
+export const getStickerCatalogRouteConfig = async () => {
+  const controller = await loadStickerCatalogController();
+  if (typeof controller.getStickerCatalogConfig !== 'function') return null;
+  return controller.getStickerCatalogConfig();
+};
+
+export const maybeHandleStickerCatalogRoute = async (req, res, { pathname, url }) => {
+  const controller = await loadStickerCatalogController();
+  if (typeof controller.maybeHandleStickerCatalogRequest !== 'function') return false;
+  return controller.maybeHandleStickerCatalogRequest(req, res, { pathname, url });
+};