bot-mwsm 3.0.1 → 3.0.2

package/.github/workflows/Mwsm.yml

@@ -1,188 +1,249 @@
-name: 🔄 Mwsm Version & Badge Sync
+name: 🔄 Mwsm Version Sync
 
-# 🔐 Permite push com token pessoal
 permissions:
   contents: write
+  id-token: write   # Necessário para publicação via Trusted Publisher (OIDC)
 
 on:
+  push:
+    branches: [ main ]
+    paths:
+      - "fonts/**"
+      - "icon.png"
+      - "index.html"
+      - "jquery.js"
+      - "mwsm.db"
+      - "mwsm.js"
+      - "mwsm.json"
+      - "nodemon.json"
+      - "package.json"
+      - "script.js"
+      - "socket.io.js"
+      - "style.css"
+      - "version.json"
+      - "mwsm.py"
   release:
-    types: [published, edited]  # também dispara se a release for editada
+    types: [published, edited]
   workflow_dispatch:
 
+concurrency:
+  group: mwsm-version-sync
+  cancel-in-progress: false
+
 jobs:
   sync:
     runs-on: ubuntu-latest
+    # evita loops criados pelo próprio bot
+    if: ${{ !startsWith(github.event.head_commit.message, '🔄 Bot-Mwsm') }}
 
     steps:
-      - name: 📥 Clonar repositório
+      - name: 🧩 Checkout do repositório
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          persist-credentials: false  # desativa o token padrão
+          persist-credentials: false
           ref: main
 
-      - name: 📦 Instalar dependências
-        run: sudo apt-get install -y jq
+      - name: ⚙️ Instalar utilitários
+        run: sudo apt-get update && sudo apt-get install -y jq curl gh
 
-      - name: 🔍 Detectar e atualizar versões
+      - name: 📂 Verificar arquivos modificados
         id: detect
+        run: |
+          set -euo pipefail
+          echo "📂 Verificando arquivos modificados..."
+          git fetch origin main --no-tags
+
+          # lidar com repositório com apenas 1 commit ou em runners onde HEAD^ pode não existir
+          if git rev-parse --verify HEAD^ >/dev/null 2>&1; then
+            CHANGED_FILES=$(git diff --name-only HEAD^ HEAD || echo "")
+          else
+            # fallback: usa a lista de arquivos do último commit
+            CHANGED_FILES=$(git diff --name-only HEAD || git ls-files)
+          fi
+
+          echo "$CHANGED_FILES"
+          if echo "$CHANGED_FILES" | grep -q "mwsm.db"; then
+            echo "DB_CHANGED=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "DB_CHANGED=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: 🔢 Atualizar version.json e package.json (sincroniza com último release e calcula incremento)
+        id: version
         env:
-          GITHUB_API_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
+          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         run: |
           set -euo pipefail
+          PATCH=$(TZ="America/Sao_Paulo" date +"%Y-%m-%d %H:%M:%S")
 
-          # 1) Tenta extrair tag do event JSON (robusto tanto em release event quanto em workflow_dispatch)
-          EVENT_FILE="${GITHUB_EVENT_PATH:-/dev/null}"
-          TAG_RELEASE=$(jq -r '.release.tag_name // ""' "$EVENT_FILE" 2>/dev/null || echo "")
-          TAG_RELEASE="${TAG_RELEASE##v}"  # remove "v" no início (ex: v2.0.55 → 2.0.55)
-
-          # 2) Se estiver vazio, busca a última release via API (autenticada)
-          if [ -z "$TAG_RELEASE" ]; then
-            echo "🔎 Nenhuma tag presente no evento — buscando última release publicada via API..."
-            if [ -z "${GITHUB_API_TOKEN:-}" ]; then
-              echo "⚠️ PERSONAL_TOKEN não encontrado — fazendo chamada não autenticada (pode rate-limit)."
-              TAG_RELEASE=$(curl -s "https://api.github.com/repos/${{ github.repository }}/releases/latest" | jq -r '.tag_name // empty')
-            else
-              TAG_RELEASE=$(curl -s -H "Authorization: Bearer ${GITHUB_API_TOKEN}" -H "Accept: application/vnd.github+json" \
-                "https://api.github.com/repos/${{ github.repository }}/releases/latest" | jq -r '.tag_name // empty')
-            fi
-            TAG_RELEASE="${TAG_RELEASE##v}"
+          if [ "${GITHUB_EVENT_NAME}" = "release" ]; then
+            LATEST_TAG="${GITHUB_REF_NAME:-$(jq -r '.release.tag_name' "$GITHUB_EVENT_PATH" 2>/dev/null || true)}"
+          else
+            LATEST_TAG=$(gh release list --limit 1 --json tagName -q '.[0].tagName' 2>/dev/null || true)
           fi
 
-          if [ -z "$TAG_RELEASE" ] || [ "$TAG_RELEASE" = "null" ]; then
-            echo "❌ Nenhuma release encontrada. Abortando atualização para evitar sobrescrita de versões."
-            echo "updated=false" >> "$GITHUB_OUTPUT"
-            exit 0
+          LATEST_TAG=$(echo "$LATEST_TAG" | sed 's/^v//' || true)
+          FILE_VER=$(jq -r '.version[0].release // .version // empty' version.json 2>/dev/null || echo "")
+
+          if [ -n "$LATEST_TAG" ]; then
+            BASE="$LATEST_TAG"
+          elif [ -n "$FILE_VER" ]; then
+            BASE="$FILE_VER"
+          else
+            BASE="3.0.0"
           fi
 
-          echo "🔎 Release detectada: $TAG_RELEASE"
+          BASE="$(echo "$BASE" | tr -d '[:space:]')"
+          IFS='.' read -r MAJ MIN PAT <<< "$(echo "$BASE")"
+          MAJ=${MAJ:-0}; MIN=${MIN:-0}; PAT=${PAT:-0}
 
-          # valores atuais
-          PKG_VER=$(jq -r '.version' package.json)
-          JSON_REL=$(jq -r '.version[0].release' version.json)
-          JSON_PATCH=$(jq -r '.version[0].patch' version.json || true)
+          echo "🔍 Base de versão: ${MAJ}.${MIN}.${PAT}"
 
-          echo "📦 package.json.version = $PKG_VER"
-          echo "🧩 version.json.release = $JSON_REL"
-          echo "🕒 version.json.patch   = $JSON_PATCH"
+          if [ "${{ steps.detect.outputs.DB_CHANGED }}" = "true" ]; then
+            echo "🔼 mwsm.db mudou — incrementando versão."
+            if [ "$PAT" -lt 99 ]; then
+              PAT=$((PAT + 1))
+            else
+              PAT=0
+              if [ "$MIN" -lt 99 ]; then
+                MIN=$((MIN + 1))
+              else
+                MIN=0
+                MAJ=$((MAJ + 1))
+              fi
+            fi
+          fi
 
-          PATCH=$(TZ="America/Sao_Paulo" date +"%Y-%m-%d %H:%M:%S")
+          NEW_VER="${MAJ}.${MIN}.${PAT}"
 
-          # 4) Atualiza somente se houver tag válida (não grava vazios)
-          jq --arg v "$TAG_RELEASE" --arg d "$PATCH" \
+          jq --arg v "$NEW_VER" --arg d "$PATCH" \
             '.version[0].release=$v | .version[0].patch=$d' version.json > version.tmp && mv version.tmp version.json
 
-          jq --arg v "$TAG_RELEASE" '.version=$v' package.json > package.tmp && mv package.tmp package.json
+          # normaliza o package.json: força name para 'bot-mwsm' (resolverá o 403 do npm por case)
+          jq --arg v "$NEW_VER" --arg name "bot-mwsm" \
+            '.version=$v | .name=$name' package.json > package.tmp && mv package.tmp package.json
 
-          echo "release=$TAG_RELEASE" >> "$GITHUB_OUTPUT"
+          echo "version=$NEW_VER" >> "$GITHUB_OUTPUT"
           echo "patch=$PATCH" >> "$GITHUB_OUTPUT"
-          echo "updated=true" >> "$GITHUB_OUTPUT"
 
-      - name: 🕒 Converter patch (americano → brasileiro)
-        id: datefmt
+      - name: 🪶 Atualizar badges no README.md
         run: |
-          PATCH="${{ steps.detect.outputs.patch }}"
-          if [ -n "$PATCH" ]; then
-            DATE_BR=$(date -d "$PATCH" +"%d/%m/%Y %H:%M")
-            echo "formatted=$DATE_BR" >> $GITHUB_OUTPUT
-          else
-            echo "formatted=" >> $GITHUB_OUTPUT
-          fi
-
-      - name: 📝 Atualizar badges no README.md
-        if: steps.detect.outputs.updated == 'true'
-        run: |
-          # -------------------------------
-          # 🔹 Carrega versão e data formatada
-          # -------------------------------
-          RELEASE="${{ steps.detect.outputs.release }}"
-          [ -z "$RELEASE" ] && RELEASE=$(jq -r '.version' package.json)
-
-          DATE_BR="${{ steps.datefmt.outputs.formatted }}"
+          VERSION="${{ steps.version.outputs.version }}"
+          PATCH="${{ steps.version.outputs.patch }}"
+          DATE_BR=$(date -d "$PATCH" +"%d/%m/%Y %H:%M")
           DATE_URL=${DATE_BR//\//%2F}
           DATE_URL=${DATE_URL// /%20}
 
-          echo "🪶 Atualizando badges -> BUILD-${RELEASE} / UPDATE-${DATE_BR}"
-
-          # -------------------------------
-          # 🔹 Atualiza badges de BUILD e UPDATE
-          # -------------------------------
-          sed -i -E "s|https://img.shields.io/badge/[Bb][Uu][Ii][Ll][Dd]-[^\" >]*|https://img.shields.io/badge/Build-${RELEASE}-blue|gI" README.md
-          sed -i -E "s|https://img.shields.io/badge/[Uu][Pp][Dd][Aa][Tt][Ee]-[^\" >]*|https://img.shields.io/badge/Update-${DATE_URL}-green|gI" README.md
-
-          # -------------------------------
-          # 🔧 Corrige apenas src de badges (mantendo HTML e indentação)
-          # -------------------------------
-          # -------------------------------
-          # 🔧 Corrige badges mantendo HTML, espaçamento e evita duplicações
-          # -------------------------------
-          awk '
-            match($0, /src="([^"]*img\.shields\.io[^"]*)"/, m) {
-              url = m[1]
-
-              # Normaliza o URL (remove duplicações, erros, etc.)
-              gsub(/\?style=for-the-badge/, "", url)
-              gsub(/&style=for-the-badge/, "", url)
-
-              # Corrige escapes comuns
-              gsub(/\\\?/, "?", url)
-              gsub(/\\&/, "&", url)
-              gsub(/\\%2F/, "%2F", url)
-              gsub(/\\%20/, "%20", url)
-
-              # Se o style não existe, adiciona corretamente
-              if (url !~ /\?/) {
-                url = url "?style=for-the-badge"
-              } else if (url !~ /[?&]style=for-the-badge/) {
-                url = url "&style=for-the-badge"
-              }
-
-              # Garante que não repita
-              gsub(/\?style=for-the-badge\?style=for-the-badge/, "?style=for-the-badge", url)
-              gsub(/&style=for-the-badge&style=for-the-badge/, "&style=for-the-badge", url)
-
-              # Reconstrói a linha preservando indentação (10 espaços fixos)
-              prefix = substr($0, 1, match($0, /<img/) - 1)
-              printf "%10s<img src=\"%s\" alt=\"%s\">\n", "", url, "Badge"
-              next
-            }
-            { print }
-          ' README.md > README.tmp && mv README.tmp README.md
-
-      - name: ⏱️ Delay de segurança
-        if: steps.detect.outputs.updated == 'true'
-        run: |
-          echo "⏳ Aguardando 10 segundos antes do commit/push..."
-          sleep 10
-
-      - name: 🔍 Verificar resultado final
-        run: |
-          echo "🧾 Trecho atualizado do README:"
-          grep "img.shields.io" README.md | head -n 10
+          sed -i -E "s|https://img.shields.io/badge/Build-[^\" >]*|https://img.shields.io/badge/Build-${VERSION}-blue?style=for-the-badge|gI" README.md
+          sed -i -E "s|https://img.shields.io/badge/Update-[^\" >]*|https://img.shields.io/badge/Update-${DATE_URL}-green?style=for-the-badge|gI" README.md
 
       - name: 💾 Commit e push das alterações
-        if: steps.detect.outputs.updated == 'true'
         env:
           PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         run: |
           set -e
-          echo "💾 Preparando commit..."
           git config --global user.name "Bot-Mwsm 🤖"
           git config --global user.email "143403919+MKCodec@users.noreply.github.com"
           git config --global commit.gpgsign false
 
-          # Evita erro de rebase (unstaged changes)
-          git stash --include-untracked || true
-          git pull --rebase origin main || true
-          git stash pop || true
-
-          git add README.md package.json version.json
+          git add README.md package.json version.json || true
 
           if git diff --cached --quiet; then
-            echo "✅ Nenhuma alteração detectada — encerrando."
+            echo "✅ Nenhuma alteração detectada — nada a commitar."
           else
-            echo "🔄 Commitando e enviando alterações..."
             git commit -m "🔄 Bot-Mwsm"
             git push https://x-access-token:${PERSONAL_TOKEN}@github.com/${{ github.repository }}.git main
           fi
 
+      - name: 🚀 Criar release/tag automática (se banco mudou)
+        if: steps.detect.outputs.DB_CHANGED == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
+        run: |
+          TAG="v${{ steps.version.outputs.version }}"
+          gh release create "$TAG" --title "$TAG" --notes "Release automático do Bot-Mwsm" || echo "⚠️ Release já existente — ignorando."
+
+      - name: 🔄 Garantir sincronismo antes do publish
+        run: |
+          git pull origin main --rebase || true
+          echo "Versão package.json:" $(jq -r .version package.json)
+          echo "Versão version.json:" $(jq -r '.version[0].release // .version' version.json)
+
+      - name: 🧩 Verificar autenticação NPM (OIDC ping)
+        run: |
+          set -e
+          echo "🔍 Verificando conectividade com registry (OIDC test via npm ping)..."
+          if npm ping >/dev/null 2>&1; then
+            echo "✅ npm ping ok (pode usar OIDC se configurado)."
+          else
+            echo "⚠️ npm ping falhou — verifique Trusted Publisher no npmjs.com."
+            # não falha aqui; deixamos o publish tentar e fallback por token cuidar do resto
+          fi
+
+      - name: ⚙️ Setup Node (garante npm atualizado e registry)
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: 🔍 Mostrar versões antes do publish
+        run: |
+          node --version
+          npm --version
+          echo "package.json version:" $(jq -r .version package.json)
+          echo "version.json release:" $(jq -r '.version[0].release // .version' version.json)
+
+      - name: 📦 Publicar no NPM (Trusted Publisher - OIDC)
+        id: publish_oidc
+        continue-on-error: true
+        run: |
+          set -e
+          echo "📦 Tentando publicar via OIDC (Trusted Publisher)..."
+          VERSION=$(jq -r '.version[0].release // .version' version.json)
+          # já normalizamos name e version no passo anterior
+          jq --arg v "$VERSION" '.version=$v' package.json > package.tmp && mv package.tmp package.json
+
+          # instalar dependências caso necessário para build (não deve afetar publish)
+          npm ci --no-audit --no-fund || true
+
+          PUBLISHED=$(npm view bot-mwsm version 2>/dev/null || echo "")
+          if [ "$PUBLISHED" = "$VERSION" ]; then
+            echo "⚠️ Versão $VERSION já está publicada no npm — pulando publish."
+            exit 0
+          fi
+
+          # publish: se trusted publisher estiver configurado no npm, o runner usará OIDC
+          npm publish --provenance --access public
+
+      - name: 📦 Fallback publish via NPM_TOKEN (se OIDC falhar)
+        if: ${{ steps.publish_oidc.outcome == 'failure' }}
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          set -e
+          echo "⚠️ Publicação via OIDC falhou — tentando fallback com NPM_TOKEN..."
+          VERSION=$(jq -r '.version[0].release // .version' version.json)
+
+          if [ -z "${NPM_TOKEN:-}" ]; then
+            echo "❌ NPM_TOKEN não encontrado nas secrets. Aborting."
+            exit 1
+          fi
+
+          # configura token para registry
+          npm config set //registry.npmjs.org/:_authToken "${NPM_TOKEN}"
+
+          # re-check published just in case
+          PUBLISHED=$(npm view bot-mwsm version 2>/dev/null || echo "")
+          if [ "$PUBLISHED" = "$VERSION" ]; then
+            echo "⚠️ Versão $VERSION já publicada (detected after fallback check) — nada a fazer."
+            exit 0
+          fi
+
+          echo "🔁 Publicando versão $VERSION via token..."
+          npm publish --access public || {
+            echo "❌ Falha total no publish, mesmo com fallback."
+            exit 1
+          }
+          echo "✅ Publicação via token concluída com sucesso!"
+

package/README.md

@@ -1,10 +1,10 @@
 <h1 align="center">📦 MkAuth WhatsApp Send Message (Mwsm)</h1>
 <p align="center">
   <a href="javascript:void(0)">
-          <img src="https://img.shields.io/badge/Build-3.0.1-blue?style=for-the-badge" alt="Badge">
+          <img src="https://img.shields.io/badge/Build-3.0.2-blue?style=for-the-badge" alt="Badge">
   </a>
   <a href="javascript:void(0)">
-          <img src="https://img.shields.io/badge/Update-14%2F10%2F2025%2020:44-green?style=for-the-badge" alt="Badge">
+          <img src="https://img.shields.io/badge/Update-15%2F10%2F2025%2013:20-green?style=for-the-badge" alt="Badge">
   </a>
   <a href="https://github.com/MKCodec/Mwsm">
           <img src="https://img.shields.io/github/stars/MKCodec/Mwsm?style=for-the-badge" alt="Badge">

package/mwsm.py

@@ -37,10 +37,6 @@ logging.basicConfig(
     level=logging.INFO,
     format="%(asctime)s - %(message)s",
 )
-
-# =========================================
-# CONFIGURAÇÃO HUGGINGFACE
-# =========================================
 if not os.environ.get("HF_ENDPOINT"):
     os.environ["HF_ENDPOINT"] = "https://huggingface.co"
 os.environ["HF_HUB_OFFLINE"] = "0"
@@ -52,10 +48,6 @@ constants.HUGGINGFACE_CO_URL_TEMPLATE = f"{os.environ['HF_ENDPOINT']}/{{repo_id}
 log("Endpoint Hugging Face: https://huggingface.co")
 log(f"_CACHED_API_URL: {fd._CACHED_API_URL}")
 log(f"HUGGINGFACE_CO_URL_TEMPLATE: {constants.HUGGINGFACE_CO_URL_TEMPLATE}")
-
-# =========================================
-# CARREGAMENTO DO MODELO
-# =========================================
 log("Loading SentenceTransformer model...")
 try:
     model = SentenceTransformer("sentence-transformers/all-MiniLM-L6-v2")
@@ -63,16 +55,10 @@ try:
 except Exception as e:
     log(f"Model loading failed: {e}", level="error")
     sys.exit(1)
-
-# =========================================
-# SERVIDOR FLASK
-# =========================================
 app = Flask(__name__)
-
 @app.route("/", methods=["GET"])
 def home():
     return jsonify({"status": "online", "model": "all-MiniLM-L6-v2"}), 200
-
 @app.route("/embed", methods=["POST"])
 def embed():
     data = request.json or {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bot-mwsm",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Bot-Mwsm: based on Whatsapp API",
   "main": "mwsm.js",
   "scripts": {
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "axios": "^1.6.8",
-    "Emoji-API": "git+https://github.com/MKCodec/Emoji-API.git",
+    "Emoji-API": "git+https://github.com/MKCodec/Emoji-API",
     "express": "^4.19.2",
     "express-fileupload": "^1.5.0",
     "express-validator": "^7.0.1",
@@ -43,20 +43,13 @@
     "node-cron": "^3.0.3",
     "qrcode": "^1.5.3",
     "socket.io": "^2.5.0",
-    "Url2PDF": "git+https://github.com/MKCodec/Url2PDF.git",
+    "Url2PDF": "git+https://github.com/MKCodec/Url2PDF",
     "util": "^0.12.5",
-    "whatsapp-web.js": "latest"
+    "whatsapp-web.js": "^1.34.1"
   },
   "devDependencies": {
     "better-sqlite3": "^9.4.3",
     "nodemon": "^3.1.0",
     "sqlite3": "^5.1.7"
-  },
-  "directories": {
-    "doc": "docs"
-  },
-  "bugs": {
-    "url": "https://github.com/MKCodec/Mwsm/issues"
-  },
-  "homepage": "https://github.com/MKCodec/Mwsm#readme"
+  }
 }

package/version.json

@@ -1,8 +1,9 @@
 {
   "version": [
     {
-      "release": "3.0.1",
-      "patch": "2025-10-14 20:44:00"
+      "release": "3.0.2",
+      "patch": "2025-10-15 13:20:07"
     }
-  ]
+  ],
+  "patch": "2025-10-15 13:01:26"
 }

package/.github/workflows/publish.yml

@@ -1,62 +0,0 @@
-name: 📦 Mwsm Publish Sync
-
-on:
-  push:
-    branches: [ main ]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  id-token: write   # necessário para OIDC / Trusted Publisher
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🧩 Checkout do repositório
-        uses: actions/checkout@v4
-
-      - name: ⚙️ Instalar jq (para editar package.json)
-        run: sudo apt-get update && sudo apt-get install -y jq
-
-      - name: 🧱 Corrigir nome do pacote temporariamente
-        run: |
-          cp package.json package_original.json
-          NAME=$(jq -r '.name' package.json)
-          LOWER=$(echo "$NAME" | tr '[:upper:]' '[:lower:]')
-          if [ "$NAME" != "$LOWER" ]; then
-            echo "🔧 Corrigindo nome do pacote: $NAME → $LOWER"
-            jq --arg name "$LOWER" '.name = $name' package.json > tmp.json && mv tmp.json package.json
-          else
-            echo "✅ Nome já está em minúsculas: $NAME"
-          fi
-          jq '.name' package.json
-
-      - name: ⚙️ Configurar Node.js (Trusted Publisher)
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: 'https://registry.npmjs.org/'
-          always-auth: true
-
-      - name: 📦 Instalar dependências
-        run: |
-          if [ -f package-lock.json ]; then
-            npm ci --no-audit --no-fund
-          else
-            npm install --no-audit --no-fund
-          fi
-
-      - name: 🚀 Publicar no npm (via OIDC / Trusted Publisher)
-        run: |
-          echo "🛰️ Publicando pacote via OIDC..."
-          npm publish --access public
-        continue-on-error: false
-
-      - name: ♻️ Restaurar package.json original
-        if: always()
-        run: |
-          if [ -f package_original.json ]; then
-            mv -f package_original.json package.json
-            echo "♻️ package.json restaurado ao original"
-          fi