H

AGENTS.md

@@ -1,11 +1,11 @@
 # Project: WhatsApp-Telegram Bot
 
 ## Stack
-- **Runtime**: Node.js 22, pnpm v10, Docker (HF Spaces)
-- **WhatsApp**: `@whiskeysockets/baileys` (WebSocket, no browser)
-- **Telegram**: `@mtproto/core` (MTProto, **NOT** Bot API — HTTPS to `api.telegram.org` is blocked on HF Spaces)
-- **Server**: Express on port 7860 (HF Spaces health check)
-- **Storage**: `/data/` directory for sessions (must be enabled in HF Spaces settings)
+- **Runtime**: Node.js 22, pnpm v10, Docker
+- **WhatsApp**: `whatsapp-web.js` (Puppeteer + Chrome)
+- **Telegram**: `@mtproto/core` (MTProto, **NOT** Bot API)
+- **Server**: Express on port 7860 (health check)
+- **Storage**: `/data/` directory for sessions
 
 ## File Structure
 - `index.js` — main app
@@ -18,7 +18,7 @@
 
 ## Connection Architecture
 ```
-WhatsApp (user) → @whiskeysockets/baileys → index.js → @mtproto/core → Telegram (admin)
+WhatsApp (user) → whatsapp-web.js (Puppeteer/Chrome) → index.js → @mtproto/core → Telegram (admin)
 Telegram (admin) → @mtproto/core → index.js → WhatsApp → WhatsApp (user)
 ```
 
@@ -36,11 +36,12 @@ The library (`@mtproto/core`) has schemas for: `replyKeyboardMarkup`, `keyboardB
 `parseMarkdown()` handles `*bold*`, `_italic_`, `` `code` `` — converts to message entities.
 
 ## WhatsApp Constraints
-- Uses `@whiskeysockets/baileys` — no browser needed
-- Auth stored in `/data/baileys_auth/` (multi-file JSON)
-- `useMultiFileAuthState()` for persistence
+- Uses `whatsapp-web.js` — requires Chrome (Puppeteer)
+- Auth stored in `/data/wwebjs_auth/` (LocalAuth)
+- `LocalAuth` for session persistence
 - Auto-reconnect on disconnect (unless logged out)
-- Events: `connection.update`, `messages.upsert`, `creds.update`
+- Events: `qr`, `ready`, `disconnected`, `message`
+- Media: `msg.downloadMedia()` returns base64 data; use `Buffer.from(data, 'base64')`
 
 ## Telegram Constraints
 - `@mtproto/core` v6.3.0, layer 158
@@ -63,9 +64,9 @@ The library (`@mtproto/core`) has schemas for: `replyKeyboardMarkup`, `keyboardB
 - CORS headers allow all origins
 
 ## Important Notes
-- `web.whatsapp.com` HTTPS times out via Node.js but Chrome connects via Puppeteer
+- web.whatsapp.com loads in Chrome (Puppeteer) — no raw WebSocket needed
 - No emojis in code unless user asks
 - Comments should NOT be added unless asked
 - Keep responses short and direct
 - Always check syntax with `node -c index.js` before committing
-- Baileys ref: `sock.sendMessage(jid, { text, image, document })`, `downloadContentFromMessage()`, `DisconnectReason.loggedOut`
+- wwebjs ref: `client.sendMessage(jid, text)`, `msg.downloadMedia()`, `msg.getContact()`, `client.sendSeen(jid)`

Dockerfile

@@ -2,6 +2,14 @@ FROM node:22-slim
 
 RUN corepack enable && corepack prepare pnpm@10 --activate
 
+RUN apt-get update && apt-get install -y \
+    chromium \
+    libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 libcups2 \
+    libdrm2 libdbus-1-3 libxkbcommon0 libxcomposite1 libxdamage1 \
+    libxfixes3 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 \
+    --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
 WORKDIR /app
 
 COPY package.json pnpm-lock.yaml ./
@@ -11,4 +19,4 @@ COPY . .
 
 EXPOSE 7860
 
-CMD ["node", "index.js"]
+CMD ["node", "index.js"]

index.js

@@ -1,4 +1,4 @@
-const { makeWASocket, useMultiFileAuthState, DisconnectReason, downloadContentFromMessage, getContentFromMessage } = require('@whiskeysockets/baileys');
+const { Client, LocalAuth } = require('whatsapp-web.js');
 const qrcode = require('qrcode');
 const qrcodeTerminal = require('qrcode-terminal');
 const MTProto = require('@mtproto/core');
@@ -14,8 +14,6 @@ const API_ID = parseInt(process.env.API_ID || '1344311', 10);
 const API_HASH = process.env.API_HASH || '95778042101cb549a4ca6235d7cf87e1';
 const BOT_TOKEN = process.env.BOT_TOKEN || '903567266:AAFS-juBV5QYL_kKNkc7ovqp-i6eVwTOX-U';
 
-
-
 const app = express();
 app.use((req, res, next) => {
   res.setHeader('Access-Control-Allow-Origin', '*');
@@ -362,107 +360,89 @@ pollUpdates();
 
 console.log('🚀 جاري تشغيل البوت...');
 
-let sock = null;
+let waClient = null;
 
 async function startWhatsApp() {
-  console.log('🔵 بدء تشغيل واتساب (Baileys)...');
-  const { state, saveCreds } = await useMultiFileAuthState(`${DATA_DIR}/baileys_auth`);
-
-  const sockConfig = {
-    auth: state,
-    browser: ['WhatsApp Bot', 'Chrome', '1.0'],
-    syncFullHistory: false,
-    markOnlineOnConnect: false,
-    connectTimeoutMs: 120000,
-  };
-
-  const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY || process.env.ALL_PROXY;
-  if (proxyUrl) {
-    const { HttpsProxyAgent } = require('https-proxy-agent');
-    sockConfig.agent = new HttpsProxyAgent(proxyUrl);
-    console.log('🔵 باستخدام بروكسي:', proxyUrl);
-  }
-
-  sock = makeWASocket(sockConfig);
+  console.log('🔵 بدء تشغيل واتساب (whatsapp-web.js)...');
+  waClient = new Client({
+    authStrategy: new LocalAuth({ dataPath: `${DATA_DIR}/wwebjs_auth` }),
+    puppeteer: {
+      headless: true,
+      args: [
+        '--no-sandbox',
+        '--disable-setuid-sandbox',
+        '--disable-dev-shm-usage',
+        '--disable-accelerated-2d-canvas',
+        '--no-first-run',
+        '--no-zygote',
+        '--single-process',
+        '--disable-gpu',
+      ],
+    },
+  });
 
-  sock.ev.on('creds.update', saveCreds);
+  waClient.on('qr', (qr) => {
+    qrcodeTerminal.generate(qr, { small: true });
+    qrcode.toFile('whatsapp-qr.png', qr, { width: 400 }, (err) => {
+      if (err) console.error('خطأ في حفظ QR:', err);
+      else {
+        console.log('📸 تم حفظ QR كصورة: whatsapp-qr.png');
+        if (telegramChatId) tgSendPhoto(telegramChatId, 'whatsapp-qr.png', '📱 امسح رمز QR باستخدام واتساب');
+      }
+    });
+    console.log('📱 امسح رمز QR باستخدام واتساب');
+  });
 
-  sock.ev.on('connection.update', async (update) => {
-    const { connection, lastDisconnect, qr } = update;
+  waClient.on('ready', () => {
+    whatsappConnected = true;
+    console.log('✅ واتساب جاهز');
+  });
 
-    if (qr) {
-      qrcodeTerminal.generate(qr, { small: true });
-      qrcode.toFile('whatsapp-qr.png', qr, { width: 400 }, (err) => {
-        if (err) console.error('خطأ في حفظ QR:', err);
-        else {
-          console.log('📸 تم حفظ QR كصورة: whatsapp-qr.png');
-          if (telegramChatId) tgSendPhoto(telegramChatId, 'whatsapp-qr.png', '📱 امسح رمز QR باستخدام واتساب');
-        }
-      });
-      console.log('📱 امسح رمز QR باستخدام واتساب');
+  waClient.on('disconnected', (reason) => {
+    console.log('❌ واتساب فصل:', reason);
+    if (telegramChatId) tgSend(telegramChatId, `❌ واتساب فصل: ${reason}`);
+    whatsappConnected = false;
+    if (reason !== 'LOGGED_OUT') {
+      console.log('🔄 إعادة الاتصال بعد 5 ثواني...');
+      setTimeout(startWhatsApp, 5000);
     }
+  });
 
-    if (connection === 'open') {
-      whatsappConnected = true;
-      console.log('✅ واتساب جاهز');
-    }
+  waClient.on('message', async (msg) => {
+    if (msg.fromMe) return;
+    if (!botEnabled) return;
 
-    if (connection === 'close') {
-      const shouldReconnect = lastDisconnect?.error?.output?.statusCode !== DisconnectReason.loggedOut;
-      const reason = lastDisconnect?.error?.message || 'غير معروف';
-      console.log('❌ واتساب فصل:', reason);
-      if (telegramChatId) tgSend(telegramChatId, `❌ واتساب فصل: ${reason}`);
-      whatsappConnected = false;
-      if (shouldReconnect) {
-        console.log('🔄 إعادة الاتصال بعد 5 ثواني...');
-        setTimeout(startWhatsApp, 5000);
-      }
+    const jid = msg.from;
+    const waNum = jid.split('@')[0];
+
+    let pushName = waNum;
+    try {
+      const contact = await msg.getContact();
+      pushName = contact.pushname || contact.name || waNum;
+    } catch (_) {}
+
+    let msgText = msg.body || '';
+
+    if (msg.hasMedia && telegramChatId) {
+      try {
+        const media = await msg.downloadMedia();
+        if (media && media.data) {
+          const buf = Buffer.from(media.data, 'base64');
+          await tgSendMedia(telegramChatId, buf, media.filename || 'file', media.mimetype);
+        }
+      } catch (e) { console.error('❌ خطأ بتحميل الميديا:', e.message); }
     }
-  });
 
-  sock.ev.on('messages.upsert', async ({ messages, type }) => {
-    if (type !== 'notify') return;
-    for (const msg of messages) {
-      if (msg.key.fromMe || !msg.message) continue;
-      if (!botEnabled) return;
-
-      const jid = msg.key.remoteJid;
-      const pushName = msg.pushName || jid.split('@')[0];
-      const waNum = jid.split('@')[0];
-
-      let msgText = '';
-      let hasMedia = false;
-      let mediaBuffer = null;
-      let mediaMime = '';
-      let mediaName = '';
-
-      if (msg.message.conversation) msgText = msg.message.conversation;
-      else if (msg.message.extendedTextMessage?.text) msgText = msg.message.extendedTextMessage.text;
-      else if (msg.message.imageMessage) { hasMedia = true; mediaMime = 'image/jpeg'; mediaName = msg.message.imageMessage.caption || 'image'; }
-      else if (msg.message.videoMessage) { hasMedia = true; mediaMime = 'video/mp4'; mediaName = msg.message.videoMessage.caption || 'video'; }
-      else if (msg.message.documentMessage) { hasMedia = true; mediaMime = msg.message.documentMessage.mimetype || 'application/octet-stream'; mediaName = msg.message.documentMessage.fileName || 'file'; }
-
-      await sock.readMessages([msg.key]);
-      await sock.sendMessage(jid, { text: '✅ تم استلام رسالتك' });
-
-      if (hasMedia && telegramChatId) {
-        try {
-          const stream = await downloadContentFromMessage(
-            msg.message.imageMessage || msg.message.videoMessage || msg.message.documentMessage,
-            msg.message.imageMessage ? 'image' : msg.message.videoMessage ? 'video' : 'document'
-          );
-          const chunks = [];
-          for await (const chunk of stream) chunks.push(chunk);
-          mediaBuffer = Buffer.concat(chunks);
-          await tgSendMedia(telegramChatId, mediaBuffer, mediaName, mediaMime);
-        } catch (e) { console.error('❌ خطأ بتحميل الميديا:', e.message); }
-      }
+    await waClient.sendSeen(jid);
 
-      if (msgText && telegramChatId) {
-        await tgSend(telegramChatId, `📩 من: ${pushName}\nرقم: ${waNum}\nالرسالة: ${msgText}`);
-      }
+    await waClient.sendMessage(jid, '✅ تم استلام رسالتك');
+
+    if (msgText && telegramChatId) {
+      await tgSend(telegramChatId, `📩 من: ${pushName}\nرقم: ${waNum}\nالرسالة: ${msgText}`);
     }
   });
+
+  waClient.initialize();
 }
 
 startWhatsApp();

memory.md

@@ -2,7 +2,7 @@
 
 ## Current State
 - Telegram connected via MTProto (DC 1) — working
-- WhatsApp Connection — BLOCKED on HF Spaces (WebSocket handshake timeout)
+- WhatsApp Connection — using whatsapp-web.js (Puppeteer + Chrome)
 - Bot forwards WhatsApp messages to Telegram admin (when connected)
 - Bot responds to `/start`, `/toggle`, button presses from Telegram
 
@@ -13,18 +13,15 @@
 
 3. **Keyboard format**: `replyKeyboardMarkup` requires `{ _: 'keyboardButtonRow', buttons: [...] }` format. Using `one_time` instead of `single_use` causes errors.
 
-4. **Migrated from `whatsapp-web.js` to `@whiskeysockets/baileys`**: Removed Chrome/Puppeteer dependency. Baileys connects via WebSocket directly — no browser needed.
+4. **Migrated from `@whiskeysockets/baileys` to `whatsapp-web.js`**: Uses Puppeteer + Chrome instead of raw WebSocket. Requires Chromium installed in Docker.
 
-5. **Proxy support added**: `startWhatsApp` checks `HTTPS_PROXY` env var first; if unset, auto-fetches free proxies from `proxyscrape.com` on first failure and rotates through them on each reconnect.
+5. **Markdown parsing**: Custom `parseMarkdown()` converts `*bold*`, `_italic_`, `` `code` `` to Telegram message entities.
 
-6. **Markdown parsing**: Custom `parseMarkdown()` converts `*bold*`, `_italic_`, `` `code` `` to Telegram message entities.
-
-7. **QR auto-send**: QR image sent to Telegram via `upload.saveFilePart` + `messages.sendMedia` when generated.
+6. **QR auto-send**: QR image sent to Telegram via `upload.saveFilePart` + `messages.sendMedia` when generated.
 
 ## Pending Issues
-- WhatsApp WebSocket handshake times out from HF Spaces (`web.whatsapp.com` blocked at network level)
-- Free proxies from proxyscrape may not support WebSocket CONNECT tunneling — rotation may fail
-- `/data/` storage must be enabled in HF Spaces for session persistence (user created `Whatsappbot-storage` bucket)
+- wwebjs requires Chrome — Chrome must be installed in Docker (added to Dockerfile)
+- `/data/` storage for session persistence
 
 ## API Credentials
 - API_ID: 1344311
@@ -38,15 +35,4 @@
 - QR code sent to Telegram automatically when generated
 - Keyboard buttons preferred over text commands
 - No emojis in code
-- No comments in code unless asked
-
-## Hugging Face Space
-- URL: https://huggingface.co/spaces/hsoneabadi/Whatsappbot
-- Port: 7860 (health check)
-- Docker: node:22-slim (no Chrome)
-
-## Proxy Options (if free proxies fail)
-1. Set `HTTPS_PROXY` env var on HF Spaces with a working proxy
-2. Deploy Cloudflare Worker as WebSocket proxy (free, requires CF account)
-3. Run WhatsApp client locally on Windows, bridge to HF Spaces via WS
-4. Move whole bot to local Windows machine
+- No comments in code unless asked

package.json

@@ -6,12 +6,15 @@
     "start": "node index.js"
   },
   "type": "commonjs",
+  "pnpm": {
+    "onlyBuiltDependencies": ["puppeteer"]
+  },
   "dependencies": {
     "@mtproto/core": "^6.3.0",
-    "@whiskeysockets/baileys": "^6.7.0",
     "express": "^5.2.1",
-    "https-proxy-agent": "^7.0.6",
+    "puppeteer": "^24.0.0",
     "qrcode": "^1.5.4",
-    "qrcode-terminal": "^0.12.0"
+    "qrcode-terminal": "^0.12.0",
+    "whatsapp-web.js": "^1.26.0"
   }
 }

pnpm-workspace.yaml

@@ -0,0 +1,8 @@
+allowBuilds:
+  '[': true
+  ']': true
+  e: true
+  p: true
+  r: true
+  t: true
+  u: true