@open-wa/wa-automate 4.44.0 → 4.44.3

package/dist/cli/integrations/chatwoot.js

@@ -51,7 +51,7 @@ const chatwootMiddleware = (cliConfig, client) => {
                 const sendAttachment = (attachment, c) => __awaiter(void 0, void 0, void 0, function* () { return client.sendImage(to, attachment.data_url, attachment.data_url.substring(attachment.data_url.lastIndexOf('/') + 1), c || '', null, true); });
                 //send the text as the caption with the first message only
                 promises.push(sendAttachment(firstAttachment, content));
-                restAttachments.map(sendAttachment).map(promises.push);
+                (restAttachments || []).map(sendAttachment).map(promises.push);
             }
             else {
                 //no attachments

package/dist/cli/server.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import http from 'http';
+import http from 'node:http';
 import { Client } from '..';
 export declare const app: import("express-serve-static-core").Express;
 export declare let server: http.Server;

package/dist/cli/server.js

@@ -34,7 +34,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSocketServer = exports.setupBotPressHandler = exports.setupChatwoot = exports.setupTwilioCompatibleWebhook = exports.setupMediaMiddleware = exports.listListeners = exports.getCommands = exports.setupRefocusDisengageMiddleware = exports.setupSwaggerStatsMiddleware = exports.setupApiDocs = exports.setupAuthenticationLayer = exports.enableCORSRequests = exports.setUpExpressApp = exports.setupHttpServer = exports.server = exports.app = void 0;
 //@ts-ignore
 const express_1 = __importDefault(require("express"));
-const http_1 = __importDefault(require("http"));
+const node_https_1 = __importDefault(require("node:https"));
+const node_http_1 = __importDefault(require("node:http"));
 const collections_1 = require("./collections");
 const express_robots_txt_1 = __importDefault(require("express-robots-txt"));
 const swagger_ui_express_1 = __importDefault(require("swagger-ui-express"));
@@ -48,7 +49,7 @@ const chatwoot_1 = require("./integrations/chatwoot");
 const express_ipfilter_1 = require("express-ipfilter");
 const helmet_1 = __importDefault(require("helmet"));
 exports.app = (0, express_1.default)();
-exports.server = http_1.default.createServer(exports.app);
+exports.server = node_http_1.default.createServer(exports.app);
 const trimChatId = (chatId) => chatId.replace("@c.us", "").replace("@g.us", "");
 const socketListenerCallbacks = {};
 // const existingListeners = () => Object.keys(Object.keys(socketListenerCallbacks).flatMap(id=>Object.keys(socketListenerCallbacks[id])).reduce((acc,curr)=>{acc[curr]=true;return acc},{}))
@@ -60,7 +61,25 @@ const setupHttpServer = (cliConfig) => {
         let allowIps = cliConfig.allowIps;
         if (!Array.isArray(cliConfig.allowIps))
             allowIps = [cliConfig.allowIps];
-        exports.app.use((0, express_ipfilter_1.IpFilter)(allowIps, { mode: 'allow' }));
+        if (Array.isArray(allowIps) && allowIps.length > 0 && allowIps[0]) {
+            console.log("Allowed IPs", allowIps);
+            let allowIpsOptions = {
+                mode: 'allow',
+                forbidden: 'You are not authorized to access this page.',
+                log: false
+            };
+            if (cliConfig.verbose)
+                allowIpsOptions = Object.assign(Object.assign({}, allowIpsOptions), { logLevel: 'deny', log: true });
+            exports.app.use((0, express_ipfilter_1.IpFilter)(allowIps, allowIpsOptions));
+            exports.app.use((err, req, res, next) => {
+                if (err instanceof express_ipfilter_1.IpDeniedError) {
+                    res.status(401);
+                    res.send("Access Denied");
+                    return;
+                }
+                next();
+            });
+        }
     }
     if (cliConfig.helmet) {
         //@ts-ignore
@@ -69,15 +88,22 @@ const setupHttpServer = (cliConfig) => {
     const privkey = `${process.env.PRIV || cliConfig.privkey || ""}`;
     const cert = `${process.env.CERT || cliConfig.cert || ""}`;
     if (privkey && cert) {
+        console.log("HTTPS Mode:", privkey, cert);
         const privContents = fs.readFileSync(privkey);
         const certContents = fs.readFileSync(cert);
+        exports.app.use((req, res, next) => {
+            if (!req.secure && req.get('x-forwarded-proto') !== 'https' && process.env.NODE_ENV !== "development") {
+                return res.redirect('https://' + req.get('host') + req.url);
+            }
+            next();
+        });
         if (privContents && certContents) {
             const options = { key: privContents, cert: certContents };
-            exports.server = http_1.default.createServer(options, exports.app);
+            exports.server = node_https_1.default.createServer(options, exports.app);
             return;
         }
     }
-    exports.server = http_1.default.createServer(exports.app);
+    exports.server = node_http_1.default.createServer(exports.app);
 };
 exports.setupHttpServer = setupHttpServer;
 const setUpExpressApp = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.44.0",
+  "version": "4.44.3",
   "licenseCheckUrl": "https://funcs.openwa.dev/license-check",
   "brokenMethodReportUrl": "https://funcs.openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",