@omnizap-system/omnizap 2.6.2 → 2.6.3

package/scripts/new-whatsapp-session.sh

@@ -15,6 +15,14 @@ CONNECT_NOW=1
 RESET_AUTH=0
 CLEAR_AUTH_FILES=0
 ALLOW_REUSE=0
+PM2_SYNC=1
+PM2_TARGET_APP=""
+PM2_DRY_RUN=0
+RUN_HEALTHCHECK=1
+PM2_WAIT_TIMEOUT_SECONDS=45
+PM2_WAIT_INTERVAL_SECONDS=3
+HEALTHCHECK_WAIT_SECONDS=45
+HEALTHCHECK_INTERVAL_SECONDS=3
 
 log() {
   printf '[new-whatsapp-session] %s\n' "$*"
@@ -45,12 +53,17 @@ Opcoes:
   --reset-auth             Limpa credenciais atuais da sessao no MySQL antes do QR.
   --clear-auth-files       Junto com --reset-auth, remove app/connection/auth/*.json.
   --no-connect             Apenas atualiza .env (nao abre conexao para QR agora).
+  --no-pm2-sync            Nao sincroniza/reinicia app PM2 automaticamente.
+  --pm2-app <nome>         Nome do app PM2 alvo (padrao: <PM2_APP_NAME>-production).
+  --pm2-dry-run            Exibe a sincronizacao PM2 sem executar restart real.
+  --no-healthcheck         Nao executa healthcheck HTTP apos sincronizar PM2.
   --help                   Mostra esta ajuda.
 
 Exemplos:
   npm run new:work
   npm run new:work -- --session suporte_2 --primary
   bash scripts/new-whatsapp-session.sh --prefix operador --no-connect
+  bash scripts/new-whatsapp-session.sh --no-connect --pm2-app omnizap-system-production
 EOF
 }
 
@@ -124,6 +137,222 @@ is_valid_weight() {
   return 0
 }
 
+normalize_bool() {
+  local value
+  value="$(printf '%s' "${1:-}" | tr '[:upper:]' '[:lower:]' | xargs)"
+  if [[ -z "$value" ]]; then
+    printf 'unset'
+    return 0
+  fi
+  case "$value" in
+    1|true|yes|y|on)
+      printf 'true'
+      ;;
+    0|false|no|n|off)
+      printf 'false'
+      ;;
+    *)
+      printf 'unknown'
+      ;;
+  esac
+}
+
+pm2_get_status() {
+  local app_name="$1"
+  pm2 jlist 2>/dev/null | node -e "
+const appName = String(process.argv[1] || '').trim();
+let raw = '';
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', (chunk) => {
+  raw += chunk;
+});
+process.stdin.on('end', () => {
+  try {
+    const list = JSON.parse(raw || '[]');
+    const target = Array.isArray(list) ? list.find((entry) => String(entry?.name || '') === appName) : null;
+    if (!target) {
+      process.stdout.write('missing');
+      return;
+    }
+    const status = String(target?.pm2_env?.status || '').trim().toLowerCase();
+    process.stdout.write(status || 'unknown');
+  } catch {
+    process.stdout.write('error');
+  }
+});
+" "$app_name"
+}
+
+pm2_detect_app_name() {
+  local preferred="$1"
+  pm2 jlist 2>/dev/null | node -e "
+const preferred = String(process.argv[1] || '').trim();
+let raw = '';
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', (chunk) => {
+  raw += chunk;
+});
+process.stdin.on('end', () => {
+  try {
+    const list = JSON.parse(raw || '[]');
+    const names = (Array.isArray(list) ? list : [])
+      .map((entry) => String(entry?.name || '').trim())
+      .filter(Boolean);
+
+    if (preferred && names.includes(preferred)) {
+      process.stdout.write(preferred);
+      return;
+    }
+
+    if (names.includes('omnizap-production')) {
+      process.stdout.write('omnizap-production');
+      return;
+    }
+
+    const omnizapProduction = names.find((name) => /omnizap.*-production$/i.test(name));
+    if (omnizapProduction) {
+      process.stdout.write(omnizapProduction);
+      return;
+    }
+
+    const anyProduction = names.find((name) => /-production$/i.test(name));
+    if (anyProduction) {
+      process.stdout.write(anyProduction);
+      return;
+    }
+
+    process.stdout.write('');
+  } catch {
+    process.stdout.write('');
+  }
+});
+" "$preferred"
+}
+
+resolve_pm2_target_app() {
+  if [[ -n "$PM2_TARGET_APP" ]]; then
+    printf '%s' "$PM2_TARGET_APP"
+    return 0
+  fi
+
+  local pm2_base_name
+  pm2_base_name="${PM2_APP_NAME:-}"
+  if [[ -z "$pm2_base_name" ]]; then
+    pm2_base_name="$(read_env_value PM2_APP_NAME)"
+  fi
+  if [[ -n "$pm2_base_name" ]]; then
+    printf '%s' "${pm2_base_name}-production"
+    return 0
+  fi
+
+  printf '%s' "omnizap-production"
+}
+
+wait_pm2_online() {
+  local app_name="$1"
+  local waited=0
+
+  while (( waited <= PM2_WAIT_TIMEOUT_SECONDS )); do
+    local status
+    status="$(pm2_get_status "$app_name")"
+    if [[ "$status" == "online" ]]; then
+      log "PM2 app '$app_name' online."
+      return 0
+    fi
+    if [[ "$status" == "missing" ]]; then
+      fail "PM2 app '$app_name' nao encontrada durante sincronizacao."
+    fi
+    if [[ "$status" == "error" ]]; then
+      fail "Nao foi possivel consultar status do PM2 app '$app_name'."
+    fi
+
+    sleep "$PM2_WAIT_INTERVAL_SECONDS"
+    waited=$((waited + PM2_WAIT_INTERVAL_SECONDS))
+  done
+
+  fail "Timeout aguardando PM2 app '$app_name' ficar online."
+}
+
+run_http_healthcheck() {
+  local metrics_enabled_raw
+  metrics_enabled_raw="$(read_env_value METRICS_ENABLED)"
+  local metrics_enabled_state
+  metrics_enabled_state="$(normalize_bool "$metrics_enabled_raw")"
+  if [[ "$metrics_enabled_state" == "false" ]]; then
+    log "Healthcheck ignorado: METRICS_ENABLED=false."
+    return 0
+  fi
+
+  if ! command -v curl >/dev/null 2>&1; then
+    log "Healthcheck ignorado: comando 'curl' nao encontrado."
+    return 0
+  fi
+
+  local host port url
+  host="$(read_env_value METRICS_HOST)"
+  port="$(read_env_value METRICS_PORT)"
+  [[ -n "$host" ]] || host="127.0.0.1"
+  if [[ "$host" == "0.0.0.0" || "$host" == "::" ]]; then
+    host="127.0.0.1"
+  fi
+  if [[ ! "$port" =~ ^[0-9]+$ ]]; then
+    port="9102"
+  fi
+  url="http://${host}:${port}/healthz"
+
+  local waited=0
+  local last_code="000"
+  while (( waited <= HEALTHCHECK_WAIT_SECONDS )); do
+    local code
+    code="$(curl --silent --show-error --max-time 5 --output /dev/null --write-out '%{http_code}' "$url" || true)"
+    if [[ "$code" == "200" ]]; then
+      log "Healthcheck HTTP ok em $url."
+      return 0
+    fi
+    last_code="$code"
+    sleep "$HEALTHCHECK_INTERVAL_SECONDS"
+    waited=$((waited + HEALTHCHECK_INTERVAL_SECONDS))
+  done
+
+  fail "Healthcheck falhou em $url (ultimo HTTP: $last_code)."
+}
+
+sync_pm2_if_needed() {
+  if [[ "$PM2_SYNC" != "1" ]]; then
+    log "Sincronizacao PM2 desativada (--no-pm2-sync)."
+    return 0
+  fi
+
+  if ! command -v pm2 >/dev/null 2>&1; then
+    log "PM2 nao encontrado; sincronizacao automatica ignorada."
+    return 0
+  fi
+
+  local preferred_target
+  preferred_target="$(resolve_pm2_target_app)"
+  local app_target
+  app_target="$(pm2_detect_app_name "$preferred_target")"
+  if [[ -z "$app_target" ]]; then
+    log "Nenhum app PM2 de producao detectado para sincronizar."
+    return 0
+  fi
+
+  if [[ "$PM2_DRY_RUN" == "1" ]]; then
+    log "PM2 dry-run: executaria 'pm2 restart $app_target --update-env'."
+    return 0
+  fi
+
+  log "Sincronizando PM2 app '$app_target'..."
+  pm2 restart "$app_target" --update-env >/dev/null
+  wait_pm2_online "$app_target"
+
+  if [[ "$RUN_HEALTHCHECK" == "1" ]]; then
+    run_http_healthcheck
+  else
+    log "Healthcheck desativado (--no-healthcheck)."
+  fi
+}
+
 while [[ $# -gt 0 ]]; do
   case "$1" in
     --session)
@@ -161,6 +390,23 @@ while [[ $# -gt 0 ]]; do
       CONNECT_NOW=0
       shift
       ;;
+    --no-pm2-sync)
+      PM2_SYNC=0
+      shift
+      ;;
+    --pm2-app)
+      [[ $# -ge 2 ]] || fail "faltou valor para --pm2-app"
+      PM2_TARGET_APP="$2"
+      shift 2
+      ;;
+    --pm2-dry-run)
+      PM2_DRY_RUN=1
+      shift
+      ;;
+    --no-healthcheck)
+      RUN_HEALTHCHECK=0
+      shift
+      ;;
     -h|--help)
       usage
       exit 0
@@ -298,6 +544,7 @@ log "Sessao preparada com sucesso."
 log "session_id: $SESSION_ID"
 log "BAILEYS_SESSION_IDS: $session_ids_value"
 log "BAILEYS_PRIMARY_SESSION_ID: $current_primary_session_id"
+sync_pm2_if_needed
 
 if [[ "$CONNECT_NOW" == "1" ]]; then
   require_cmd node

package/server/controllers/admin/systemAdminController.js

@@ -4,14 +4,7 @@ import { timingSafeEqual } from 'node:crypto';
 import { URL } from 'node:url';
 
 import logger from '#logger';
-import {
-  forceSystemAdminGroupFailover,
-  listSystemAdminAssignmentHistory,
-  listSystemAdminAssignments,
-  listSystemAdminSessions,
-  setSystemAdminGroupPin,
-  triggerSystemAdminManualRebalance,
-} from '../system/systemController.js';
+import { forceSystemAdminGroupFailover, listSystemAdminAssignmentHistory, listSystemAdminAssignments, listSystemAdminSessions, setSystemAdminGroupPin, triggerSystemAdminManualRebalance } from '../system/systemController.js';
 
 const parseEnvBool = (value, fallback) => {
   if (value === undefined || value === null || value === '') return fallback;
@@ -48,9 +41,7 @@ const SITE_ORIGIN = String(process.env.SITE_ORIGIN || 'https://omnizap.shop')
 
 const USER_SYSTEMADM_TEMPLATE_PATH = path.join(process.cwd(), 'public', 'pages', 'user-systemadm.html');
 const LEGACY_STICKER_ADMIN_TEMPLATE_PATH = path.join(process.cwd(), 'public', 'pages', 'stickers-admin.html');
-const SYSTEM_ADMIN_OPS_TOKEN = String(
-  process.env.SYSTEM_ADMIN_OPS_TOKEN || process.env.USER_INTERNAL_API_TOKEN || process.env.ADMIN_TOKEN || process.env.ADMIN_API_TOKEN || '',
-).trim();
+const SYSTEM_ADMIN_OPS_TOKEN = String(process.env.SYSTEM_ADMIN_OPS_TOKEN || process.env.USER_INTERNAL_API_TOKEN || process.env.ADMIN_TOKEN || process.env.ADMIN_API_TOKEN || '').trim();
 
 let stickerCatalogControllerPromise = null;
 const loadStickerCatalogController = async () => {
@@ -151,9 +142,7 @@ const extractBearerToken = (req) => {
   return authHeader.slice(7).trim();
 };
 
-const resolveOpsTokenFromRequest = (req) =>
-  String(req?.headers?.['x-system-admin-token'] || req?.headers?.['x-internal-api-token'] || req?.headers?.['x-admin-token'] || '').trim() ||
-  extractBearerToken(req);
+const resolveOpsTokenFromRequest = (req) => String(req?.headers?.['x-system-admin-token'] || req?.headers?.['x-internal-api-token'] || req?.headers?.['x-admin-token'] || '').trim() || extractBearerToken(req);
 
 const hasValidOpsToken = (req) => {
   if (!SYSTEM_ADMIN_OPS_TOKEN) return true;
@@ -247,9 +236,7 @@ const requireSystemAdminOpsAccess = (req, res) => {
 const normalizeMultiSessionSubPath = (value) => {
   const raw = String(value || '/').trim();
   if (!raw || raw === '/') return '/';
-  return `/${raw
-    .replace(/^\/+/g, '')
-    .replace(/\/+$/g, '')}`;
+  return `/${raw.replace(/^\/+/g, '').replace(/\/+$/g, '')}`;
 };
 
 const handleMultiSessionOpsRequest = async (req, res, { pathname, url }) => {