@open-wa/wa-automate 4.33.8 → 4.34.2

package/dist/api/Client.d.ts

@@ -101,6 +101,7 @@ export declare class Client {
      */
     getConfig(): ConfigObject;
     private pup;
+    private responseWrap;
     /**
      * ////////////////////////  LISTENERS
      */
@@ -700,7 +701,7 @@ export declare class Client {
      * Returns a PNG DataURL screenshot of the session
      * @returns `Promise<DataURL>`
      */
-    getSnapshot(): Promise<DataURL>;
+    getSnapshot(chatId?: ChatId): Promise<DataURL>;
     /**
      * Returns an array of group ids where the host account is admin
      */

package/dist/api/Client.js

@@ -487,36 +487,39 @@ class Client {
             if (_t && logging) {
                 logging_1.log.info(`OUT ${invocation_id}: ${Date.now() - _t}ms`, { res });
             }
-            if (this._createConfig.onError && typeof res == "string" && (res.startsWith("Error") || res.startsWith("ERROR"))) {
-                const e = this._createConfig.onError;
-                /**
-                 * Log error
-                 */
-                if (e == model_1.OnError.LOG_AND_FALSE ||
-                    e == model_1.OnError.LOG_AND_STRING ||
-                    res.includes("get.openwa.dev"))
-                    console.error(res);
-                /**
-                 * Return res
-                 */
-                if (e == model_1.OnError.AS_STRING ||
-                    e == model_1.OnError.NOTHING ||
-                    e == model_1.OnError.LOG_AND_STRING)
-                    return res;
-                /**
-                 * Return false
-                 */
-                if (e == model_1.OnError.LOG_AND_FALSE ||
-                    e == model_1.OnError.RETURN_FALSE)
-                    return false;
-                if (e == model_1.OnError.RETURN_ERROR)
-                    return new Error(res);
-                if (e == model_1.OnError.THROW)
-                    throw new Error(res);
-            }
-            return res;
+            return this.responseWrap(res);
         });
     }
+    responseWrap(res) {
+        if (this._createConfig.onError && typeof res == "string" && (res.startsWith("Error") || res.startsWith("ERROR"))) {
+            const e = this._createConfig.onError;
+            /**
+             * Log error
+             */
+            if (e == model_1.OnError.LOG_AND_FALSE ||
+                e == model_1.OnError.LOG_AND_STRING ||
+                res.includes("get.openwa.dev"))
+                console.error(res);
+            /**
+             * Return res
+             */
+            if (e == model_1.OnError.AS_STRING ||
+                e == model_1.OnError.NOTHING ||
+                e == model_1.OnError.LOG_AND_STRING)
+                return res;
+            /**
+             * Return false
+             */
+            if (e == model_1.OnError.LOG_AND_FALSE ||
+                e == model_1.OnError.RETURN_FALSE)
+                return false;
+            if (e == model_1.OnError.RETURN_ERROR)
+                return new Error(res);
+            if (e == model_1.OnError.THROW)
+                throw new Error(res);
+        }
+        return res;
+    }
     /**
      * ////////////////////////  LISTENERS
      */
@@ -1223,10 +1226,9 @@ class Client {
             if (err.includes(res)) {
                 let msg = res;
                 if (res == err[1])
-                    msg = `\n${res}. Unlock this feature and support open-wa by getting a license: ${yield this.link()}\n`;
-                console.error(msg);
-                if (this._createConfig.onError == model_1.OnError.THROW)
-                    throw new errors_1.CustomError(errors_1.ERROR_NAME.SENDTEXT_FAILURE, msg);
+                    msg = `ERROR: ${res}. Unlock this feature and support open-wa by getting a license: ${yield this.link()}`;
+                console.error(`\n${msg}\n`);
+                return this.responseWrap(msg);
             }
             return (err.includes(res) ? false : res);
         });
@@ -1690,9 +1692,10 @@ class Client {
      * Returns a PNG DataURL screenshot of the session
      * @returns `Promise<DataURL>`
      */
-    getSnapshot() {
+    getSnapshot(chatId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const screenshot = yield this.getPage().screenshot({
+            const snapshotElement = chatId ? yield this._page.evaluateHandle(({ chatId }) => WAPI.getSnapshotElement(chatId), { chatId }) : this.getPage();
+            const screenshot = yield snapshotElement.screenshot({
                 type: "png",
                 encoding: "base64"
             });
@@ -3009,8 +3012,8 @@ class Client {
                     if ((a === null || a === void 0 ? void 0 : a.stickerMetadata) && typeof (a === null || a === void 0 ? void 0 : a.stickerMetadata) !== "object")
                         throw new errors_1.CustomError(errors_1.ERROR_NAME.BAD_STICKER_METADATA, `Received ${typeof (a === null || a === void 0 ? void 0 : a.stickerMetadata)}: ${a === null || a === void 0 ? void 0 : a.stickerMetadata}`);
                 }
-                if (((_a = a === null || a === void 0 ? void 0 : a.stickerMetadata) === null || _a === void 0 ? void 0 : _a.discord) && ((_b = this._createConfig) === null || _b === void 0 ? void 0 : _b.discord)) {
-                    a.stickerMetadata = { discord: this._createConfig.discord };
+                if (a.stickerMetadata && ((_a = this._createConfig) === null || _a === void 0 ? void 0 : _a.discord)) {
+                    a.stickerMetadata = Object.assign(Object.assign({}, (a.stickerMetadata || {})), { discord: `${((_b = a.stickerMetadata) === null || _b === void 0 ? void 0 : _b.discord) || this._createConfig.discord}` });
                 }
                 try {
                     const { data } = yield axios_1.default.post(`${((fallback ? pkg.stickerUrl : 'https://sticker-api.openwa.dev') || this._createConfig.stickerServerEndpoint).replace(/\/$/, '')}/${func}`, Object.assign(Object.assign({}, a), { sessionInfo, config: this.getConfig() }), {

package/dist/controllers/initializer.js

@@ -378,8 +378,6 @@ function create(config = {}) {
                     config.skipBrokenMethodsCheck = true;
                     // config.skipPatches = true;
                 }
-                debugInfo.NUM = yield waPage.evaluate(`(window.localStorage['last-wid'] || '').replace('@c.us','').replace(/"/g,"").slice(-4)`);
-                debugInfo.NUM_HASH = (0, crypto_1.createHash)('md5').update(yield waPage.evaluate(`(window.localStorage['last-wid'] || '').replace('@c.us','').replace(/"/g,"")`), 'utf8').digest('hex');
                 if (config === null || config === void 0 ? void 0 : config.hostNotificationLang) {
                     yield waPage.evaluate(`window.hostlang="${config.hostNotificationLang}"`);
                 }
@@ -388,6 +386,9 @@ function create(config = {}) {
                     yield (0, patch_manager_1.getAndInjectLivePatch)(waPage, spinner, yield patchPromise, config, debugInfo);
                     debugInfo.OW_KEY = yield waPage.evaluate(`window.o()`);
                 }
+                const NUM = ((yield waPage.evaluate(`(window.moi() || "").replace('@c.us','').replace(/"/g,"")`)) || "");
+                debugInfo.NUM = NUM.slice(-4);
+                debugInfo.NUM_HASH = (0, crypto_1.createHash)('md5').update(NUM, 'utf8').digest('hex');
                 if ((config === null || config === void 0 ? void 0 : config.skipBrokenMethodsCheck) !== true)
                     yield (0, launch_checks_1.integrityCheck)(waPage, notifier, spinner, debugInfo);
                 const LAUNCH_TIME_MS = Date.now() - START_TIME;

package/package.json

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