@open-wa/wa-automate 4.54.0 → 4.54.2

package/dist/api/Client.d.ts

@@ -40,6 +40,7 @@ export declare class Client {
     private _currentlyBeingKilled;
     private _refreshing;
     private _loaded;
+    private _hostAccountNumber;
     private _prio;
     private _pageListeners;
     private _registeredPageListeners;
@@ -1914,7 +1915,7 @@ export declare class Client {
      *
      * For example, if you have a session with id  `host` if you set useSessionIdInPath to true, then all requests will need to be prefixed with the path `host`. E.g `localhost:8082/sendText` becomes `localhost:8082/host/sendText`
      */
-    middleware: (useSessionIdInPath?: boolean) => (req: Request, res: Response, next: NextFunction) => Promise<any>;
+    middleware: (useSessionIdInPath?: boolean, PORT?: number) => (req: Request, res: Response, next: NextFunction) => Promise<any>;
     /**
      * Retreives an array of webhook objects
      */

package/dist/api/Client.js

@@ -190,10 +190,42 @@ class Client {
          *
          * For example, if you have a session with id  `host` if you set useSessionIdInPath to true, then all requests will need to be prefixed with the path `host`. E.g `localhost:8082/sendText` becomes `localhost:8082/host/sendText`
          */
-        this.middleware = (useSessionIdInPath = false) => (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+        this.middleware = (useSessionIdInPath = false, PORT) => (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             if (useSessionIdInPath && !req.path.includes(this._createConfig.sessionId) && this._createConfig.sessionId !== 'session')
                 return next();
             const methodFromPath = this._createConfig.sessionId && this._createConfig.sessionId !== 'session' && req.path.includes(this._createConfig.sessionId) ? req.path.replace(`/${this._createConfig.sessionId}/`, '') : req.path.replace('/', '');
+            if (req.get('owa-check-property') && req.get('owa-check-value')) {
+                const checkProp = req.get('owa-check-property');
+                const checkValue = req.get('owa-check-value');
+                const sessionId = this._createConfig.sessionId;
+                const hostAccountNumber = yield this.getHostNumber();
+                let checkPassed = false;
+                switch (checkProp) {
+                    case 'session':
+                        checkPassed = sessionId === checkValue;
+                        break;
+                    case 'number':
+                        checkPassed = hostAccountNumber.includes(checkValue);
+                        break;
+                }
+                if (!checkPassed) {
+                    if (PORT)
+                        (0, tools_1.processSendData)({ port: PORT });
+                    return res.status(412).send({
+                        success: false,
+                        error: {
+                            name: 'CHECK_FAILED',
+                            message: `Check FAILED - Are you sure you meant to send the request to this session?`,
+                            data: {
+                                incomingCheckProperty: checkProp,
+                                incomingCheckValue: checkValue,
+                                sessionId,
+                                hostAccountNumber: `${hostAccountNumber.substr(-4)}`
+                            }
+                        }
+                    });
+                }
+            }
             if (req.method === 'POST') {
                 const rb = (req === null || req === void 0 ? void 0 : req.body) || {};
                 let { args } = rb;
@@ -2229,7 +2261,9 @@ class Client {
      */
     getHostNumber() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.pup(() => WAPI.getHostNumber());
+            if (!this._hostAccountNumber)
+                this._hostAccountNumber = (yield this.pup(() => WAPI.getHostNumber()));
+            return this._hostAccountNumber;
         });
     }
     /**

package/dist/cli/index.js

@@ -173,7 +173,7 @@ function start() {
                 if (createConfig.messagePreprocessor === "AUTO_DECRYPT_SAVE") {
                     (0, server_1.setupMediaMiddleware)();
                 }
-                server_1.app.use(client.middleware((cliConfig && cliConfig.useSessionIdInPath)));
+                server_1.app.use(client.middleware((cliConfig && cliConfig.useSessionIdInPath), PORT));
                 if (cliConfig.socket) {
                     spinner.info("Setting up socket");
                     yield (0, server_1.setupSocketServer)(cliConfig, client);

package/dist/controllers/browser.js

@@ -41,6 +41,7 @@ const fs = __importStar(require("fs/promises"));
 const death_1 = __importDefault(require("death"));
 // import puppeteer from 'puppeteer-extra';
 const puppeteer_config_1 = require("../config/puppeteer.config");
+const puppeteer_1 = require("puppeteer");
 const events_1 = require("./events");
 const pico_s3_1 = require("pico-s3");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -457,6 +458,11 @@ function initBrowser(sessionId, config = {}, spinner) {
                 browserDownloadSpinner.succeed('Something went wrong while downloading the browser');
             }
         }
+        /**
+         * Explicit fallback due to pptr 19
+         */
+        if (!config.executablePath)
+            config.executablePath = (0, puppeteer_1.executablePath)();
         if (((_a = config === null || config === void 0 ? void 0 : config.proxyServerCredentials) === null || _a === void 0 ? void 0 : _a.address) && (config === null || config === void 0 ? void 0 : config.useNativeProxy))
             puppeteer_config_1.puppeteerConfig.chromiumArgs.push(`--proxy-server=${config.proxyServerCredentials.address}`);
         if (config === null || config === void 0 ? void 0 : config.browserWsEndpoint)

package/package.json

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