Spaces:

AUXteam
/

wppconnect-api

Paused

App Files Files Community

AUXteam commited on Apr 1

Commit

aa2e717

verified ·

1 Parent(s): 85d94e0

Upload folder using huggingface_hub

Browse files

Files changed (2) hide show

Dockerfile +20 -3
src/app.ts +116 -47

Dockerfile CHANGED Viewed

@@ -1,20 +1,37 @@
 FROM node:22
 RUN apt-get update && apt-get install -y \
     chromium \
-    procps \
-    libxss1 \
     --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
-    PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
 WORKDIR /app
 COPY package*.json ./
 RUN node -e "const fs = require('fs'); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.scripts.prepare = ''; pkg.scripts.start = 'node dist/app.js'; pkg.dependencies.express = '^4.18.2'; pkg.devDependencies['@types/express'] = '^4.17.17'; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2));"
 RUN npm install --legacy-peer-deps
 COPY . .
 RUN npm run build
 EXPOSE 7860
 CMD ["node", "dist/app.js"]

 FROM node:22
+# Install dependencies and Chromium
 RUN apt-get update && apt-get install -y \
     chromium \
+    fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf \
+    procps libxss1 \
     --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
+# Set environment variables
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
+    PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium \
+    PORT=7860
 WORKDIR /app
+# Copy package files
 COPY package*.json ./
+# Prepare package.json: ensure dependencies are present and scripts are safe for container
 RUN node -e "const fs = require('fs'); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.scripts.prepare = ''; pkg.scripts.start = 'node dist/app.js'; pkg.dependencies.express = '^4.18.2'; pkg.devDependencies['@types/express'] = '^4.17.17'; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2));"
+# Install dependencies
 RUN npm install --legacy-peer-deps
+# Copy all source
 COPY . .
+# Build
 RUN npm run build
+# Expose port
 EXPOSE 7860
+# Start
 CMD ["node", "dist/app.js"]

src/app.ts CHANGED Viewed

@@ -1,69 +1,127 @@
 import express from 'express';
 import * as wppconnect from './index';
 import { Resolver } from 'dns';
 const app = express();
 const port = process.env.PORT || 7860;
 let whatsappClient: wppconnect.Whatsapp | null = null;
 let lastQR: string | null = null;
-let logs: string[] = [];
 let isReady = false;
 const log = (msg: string) => {
   const entry = `${new Date().toISOString()} - ${msg}`;
   console.log(entry);
-  logs.push(entry);
-  if (logs.length > 500) logs.shift();
 };
 app.use(express.json());
-app.get('/health', (req, res) => {
-  res.json({
-    status: 'UP',
-    connected: !!whatsappClient,
-    ready: isReady,
-    hasQR: !!lastQR,
-    uptime: process.uptime(),
-    logs
-  });
-});
 app.get('/', (req, res) => {
   if (lastQR) {
     res.send(`
       <html>
-        <head><title>WPPConnect QR</title><meta http-equiv="refresh" content="30"></head>
-        <body style="background:#111; color:#eee; display:flex; flex-direction:column; align-items:center; justify-content:center; height:100vh; margin:0; font-family:sans-serif;">
           <h2>Scan with WhatsApp</h2>
-          <div style="background:white; padding:20px; border-radius:10px;">
-            <pre style="font-size: 8px; line-height: 1; color: black; margin:0;">${lastQR}</pre>
           </div>
-          <p>Last updated: ${new Date().toLocaleTimeString()}</p>
-          <p>Status: ${isReady ? 'READY' : 'Waiting for scan...'}</p>
         </body>
       </html>
     `);
   } else if (isReady) {
-    res.send('<h1>WhatsApp Connected and Ready!</h1><p>Check <a href="/api-docs">API Docs</a>.</p>');
   } else {
-    res.send('<h1>Initializing...</h1><p>Please wait 1-2 minutes. Check <a href="/health">Health</a> for status.</p><script>setTimeout(()=>location.reload(), 10000)</script>');
   }
 });
 app.get('/api-docs', (req, res) => {
   res.json({
     endpoints: {
-      '/health': 'Status and logs',
-      '/send-poll': 'POST { telnumber, name, choices: [] }',
-      '/send-message': 'POST { telnumber, message }'
     }
   });
 });
 app.post('/send-poll', async (req, res) => {
   const { telnumber, name, choices } = req.body;
-  if (!whatsappClient) return res.status(503).json({ error: 'Not ready' });
   try {
     const result = await whatsappClient.sendPollMessage(`${telnumber}@c.us`, name, choices);
     res.json({ success: true, result });
@@ -72,57 +130,68 @@ app.post('/send-poll', async (req, res) => {
   }
 });
-async function getIP(host: string): Promise<string | null> {
   const resolver = new Resolver();
   resolver.setServers(['8.8.8.8', '1.1.1.1']);
   try {
     const addrs = await new Promise<string[]>((resolve, reject) => {
-      resolver.resolve4(host, (err, addresses) => err ? reject(err) : resolve(addresses));
     });
-    return addrs[0];
   } catch (e) {
-    log(`Failed to resolve ${host}: ${e.message}`);
-    return null;
   }
-}
-async function init() {
-  log('Init starting...');
-  const waIP = await getIP('web.whatsapp.com');
   const resolverRule = waIP ? `--host-resolver-rules="MAP web.whatsapp.com ${waIP}"` : '';
-  if (waIP) log(`Using DNS bypass: web.whatsapp.com -> ${waIP}`);
   try {
     whatsappClient = await wppconnect.create({
       session: 'hf-session',
-      catchQR: (b64, ascii) => { lastQR = ascii; log('QR updated'); },
       statusFind: (status) => {
-        log('Status: ' + status);
-        if (status === 'inChat') { isReady = true; lastQR = null; }
       },
       headless: true,
-      useChrome: true,
       puppeteerOptions: {
-        executablePath: process.env.PUPPETEER_EXECUTABLE_PATH,
         args: [
           '--no-sandbox',
           '--disable-setuid-sandbox',
           '--disable-dev-shm-usage',
           '--disable-gpu',
           resolverRule
         ].filter(Boolean),
       },
       autoClose: 0,
     });
-    log('Init success');
   } catch (e) {
-    log('Init error: ' + e.message);
-    setTimeout(init, 60000);
   }
 }
 app.listen(port, () => {
-  log('API on ' + port);
-  setTimeout(init, 30000);
 });

 import express from 'express';
 import * as wppconnect from './index';
+import dns from 'dns';
 import { Resolver } from 'dns';
+// Configure global DNS for Node.js
+try {
+  dns.setServers(['8.8.8.8', '1.1.1.1']);
+  console.log('Global DNS set to 8.8.8.8');
+} catch (e) {
+  console.warn('Could not set global DNS:', e.message);
+}
 const app = express();
 const port = process.env.PORT || 7860;
 let whatsappClient: wppconnect.Whatsapp | null = null;
 let lastQR: string | null = null;
+let statusMsg: string = 'Initializing...';
+let appLogs: string[] = [];
 let isReady = false;
 const log = (msg: string) => {
   const entry = `${new Date().toISOString()} - ${msg}`;
   console.log(entry);
+  appLogs.push(entry);
+  if (appLogs.length > 500) appLogs.shift();
 };
 app.use(express.json());
+// Main status page
 app.get('/', (req, res) => {
   if (lastQR) {
     res.send(`
       <html>
+        <head>
+          <title>WPPConnect QR</title>
+          <meta http-equiv="refresh" content="30">
+          <style>
+            body { background: #121212; color: #eee; font-family: sans-serif; display: flex; flex-direction: column; align-items: center; justify-content: center; min-height: 100vh; margin: 0; }
+            .qr-container { background: white; padding: 20px; border-radius: 8px; box-shadow: 0 4px 15px rgba(0,0,0,0.5); }
+            pre { font-size: 8px; line-height: 1; color: black; margin: 0; }
+            .status { margin-top: 20px; font-weight: bold; color: #4caf50; }
+            .logs { width: 80%; max-height: 200px; overflow-y: auto; background: #000; padding: 10px; font-size: 12px; margin-top: 20px; border: 1px solid #333; }
+          </style>
+        </head>
+        <body>
           <h2>Scan with WhatsApp</h2>
+          <div class="qr-container">
+            <pre>${lastQR}</pre>
           </div>
+          <p class="status">Status: ${statusMsg}</p>
+          <div class="logs">${appLogs.join('<br>') }</div>
         </body>
       </html>
     `);
   } else if (isReady) {
+    res.send(`
+      <html>
+        <head><title>WPPConnect Connected</title></head>
+        <body style="background: #121212; color: #eee; font-family: sans-serif; text-align: center; padding-top: 50px;">
+          <h1 style="color: #4caf50;">WhatsApp Connected!</h1>
+          <p>The API is ready for use.</p>
+          <a href="/api-docs" style="color: #2196f3;">View API Docs</a>
+          <div style="text-align: left; margin: 20px auto; width: 80%; background: #000; padding: 10px; font-size: 12px;">
+            ${appLogs.join('<br>')}
+          </div>
+        </body>
+      </html>
+    `);
   } else {
+    res.send(`
+      <html>
+        <head><title>WPPConnect Starting</title><meta http-equiv="refresh" content="10"></head>
+        <body style="background: #121212; color: #eee; font-family: sans-serif; text-align: center; padding-top: 50px;">
+          <h1>Initializing WPPConnect...</h1>
+          <p>${statusMsg}</p>
+          <p>Please wait a few moments. This page will refresh automatically.</p>
+          <div style="text-align: left; margin: 20px auto; width: 80%; background: #000; padding: 10px; font-size: 12px;">
+            ${appLogs.join('<br>')}
+          </div>
+        </body>
+      </html>
+    `);
   }
 });
+app.get('/health', (req, res) => {
+  res.json({
+    status: 'UP',
+    connected: !!whatsappClient,
+    ready: isReady,
+    uptime: process.uptime(),
+    whatsappStatus: statusMsg
+  });
+});
 app.get('/api-docs', (req, res) => {
   res.json({
+    name: "WPPConnect API",
     endpoints: {
+      "/": "GET - Web Interface / QR Code",
+      "/health": "GET - JSON health status",
+      "/send-message": "POST - { telnumber, message }",
+      "/send-poll": "POST - { telnumber, name, choices: [] }"
     }
   });
 });
+app.post('/send-message', async (req, res) => {
+  const { telnumber, message } = req.body;
+  if (!whatsappClient || !isReady) return res.status(503).json({ error: 'WhatsApp not ready' });
+  try {
+    const result = await whatsappClient.sendText(`${telnumber}@c.us`, message);
+    res.json({ success: true, result });
+  } catch (e) {
+    res.status(500).json({ error: e.message });
+  }
+});
 app.post('/send-poll', async (req, res) => {
   const { telnumber, name, choices } = req.body;
+  if (!whatsappClient || !isReady) return res.status(503).json({ error: 'WhatsApp not ready' });
   try {
     const result = await whatsappClient.sendPollMessage(`${telnumber}@c.us`, name, choices);
     res.json({ success: true, result });
   }
 });
+async function start() {
+  log('Starting WPPConnect with DNS bypass strategy...');
+  // Try to resolve WA IP manually to bypass system DNS issues
   const resolver = new Resolver();
   resolver.setServers(['8.8.8.8', '1.1.1.1']);
+  let waIP = null;
   try {
     const addrs = await new Promise<string[]>((resolve, reject) => {
+      resolver.resolve4('web.whatsapp.com', (err, addresses) => err ? reject(err) : resolve(addresses));
     });
+    waIP = addrs[0];
+    log(`Resolved web.whatsapp.com to ${waIP}`);
   } catch (e) {
+    log(`DNS resolution failed even with 8.8.8.8: ${e.message}`);
   }
   const resolverRule = waIP ? `--host-resolver-rules="MAP web.whatsapp.com ${waIP}"` : '';
   try {
     whatsappClient = await wppconnect.create({
       session: 'hf-session',
+      catchQR: (b64, ascii) => {
+        lastQR = ascii;
+        statusMsg = 'Waiting for scan';
+        log('New QR generated');
+      },
       statusFind: (status) => {
+        statusMsg = status;
+        log('WhatsApp Status: ' + status);
+        if (status === 'inChat') {
+          isReady = true;
+          lastQR = null;
+        }
       },
       headless: true,
+      useChrome: false,
       puppeteerOptions: {
+        executablePath: '/usr/bin/chromium',
         args: [
           '--no-sandbox',
           '--disable-setuid-sandbox',
           '--disable-dev-shm-usage',
           '--disable-gpu',
+          '--no-zygote',
+          '--single-process',
+          '--dns-servers=8.8.8.8,1.1.1.1',
           resolverRule
         ].filter(Boolean),
       },
       autoClose: 0,
+      updatesLog: false,
     });
+    log('WPPConnect client initialized');
   } catch (e) {
+    log('Initialization Failed: ' + e.message);
+    setTimeout(start, 30000);
   }
 }
 app.listen(port, () => {
+  log(`API Server running on port ${port}`);
+  // Start init with a small delay to ensure express is serving /health
+  setTimeout(start, 5000);
 });