@open-wa/wa-automate 4.50.0 → 4.50.2

package/dist/api/Client.d.ts

@@ -713,7 +713,7 @@ export declare class Client {
      * @param hideTags boolean default: false [INSIDERS] set this to try silent tag someone in the caption
      * @returns `Promise <boolean | MessageId>` This will either return true or the id of the message. It will return true after 10 seconds even if waitForId is true
      */
-    sendFile(to: ChatId, file: AdvancedFile, filename: string, caption: Content, quotedMsgId?: MessageId, waitForId?: boolean, ptt?: boolean, withoutPreview?: boolean, hideTags?: boolean, viewOnce?: boolean): Promise<MessageId | boolean>;
+    sendFile(to: ChatId, file: AdvancedFile, filename: string, caption: Content, quotedMsgId?: MessageId, waitForId?: boolean, ptt?: boolean, withoutPreview?: boolean, hideTags?: boolean, viewOnce?: boolean, requestConfig?: any): Promise<MessageId | boolean>;
     /**
      * {@license:insiders@}
      *

package/dist/api/Client.js

@@ -307,7 +307,7 @@ class Client {
                     yield ((_q = (_o = this._queues) === null || _o === void 0 ? void 0 : _o.onLogout) === null || _q === void 0 ? void 0 : _q.onIdle());
                     yield (0, browser_1.invalidateSesssionData)(this._createConfig);
                     if ((_r = this._createConfig) === null || _r === void 0 ? void 0 : _r.deleteSessionDataOnLogout)
-                        (0, browser_1.deleteSessionData)(this._createConfig);
+                        yield (0, browser_1.deleteSessionData)(this._createConfig);
                     if ((_s = this._createConfig) === null || _s === void 0 ? void 0 : _s.killClientOnLogout) {
                         console.log("Session logged out. Killing client");
                         logging_1.log.warn("Session logged out. Killing client");
@@ -1781,9 +1781,9 @@ class Client {
      * @param hideTags boolean default: false [INSIDERS] set this to try silent tag someone in the caption
      * @returns `Promise <boolean | MessageId>` This will either return true or the id of the message. It will return true after 10 seconds even if waitForId is true
      */
-    sendFile(to, file, filename, caption, quotedMsgId, waitForId, ptt, withoutPreview, hideTags, viewOnce) {
+    sendFile(to, file, filename, caption, quotedMsgId, waitForId, ptt, withoutPreview, hideTags, viewOnce, requestConfig) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.sendImage(to, file, filename, caption, quotedMsgId, waitForId, ptt, withoutPreview, hideTags, viewOnce);
+            return this.sendImage(to, file, filename, caption, quotedMsgId, waitForId, ptt, withoutPreview, hideTags, viewOnce, requestConfig);
         });
     }
     /**
@@ -1909,8 +1909,7 @@ class Client {
      */
     sendFileFromUrl(to, url, filename, caption, quotedMsgId, requestConfig = {}, waitForId, ptt, withoutPreview, hideTags, viewOnce) {
         return __awaiter(this, void 0, void 0, function* () {
-            const base64 = yield (0, tools_1.getDUrl)(url, requestConfig);
-            return yield this.sendFile(to, base64, filename, caption, quotedMsgId, waitForId, ptt, withoutPreview, hideTags, viewOnce);
+            return yield this.sendFile(to, url, filename, caption, quotedMsgId, waitForId, ptt, withoutPreview, hideTags, viewOnce, requestConfig);
         });
     }
     /**

package/dist/controllers/browser.d.ts

@@ -4,9 +4,9 @@ import { ConfigObject } from '../api/model';
 import { QRManager } from './auth';
 export declare let BROWSER_START_TS: number;
 export declare function initPage(sessionId?: string, config?: ConfigObject, qrManager?: QRManager, customUserAgent?: string, spinner?: Spin, _page?: Page, skipAuth?: boolean): Promise<Page>;
-export declare const deleteSessionData: (config: ConfigObject) => boolean;
-export declare const invalidateSesssionData: (config: ConfigObject) => boolean;
-export declare const getSessionDataFilePath: (sessionId: string, config: ConfigObject) => string | false;
+export declare const deleteSessionData: (config: ConfigObject) => Promise<boolean>;
+export declare const invalidateSesssionData: (config: ConfigObject) => Promise<boolean>;
+export declare const getSessionDataFilePath: (sessionId: string, config: ConfigObject) => Promise<string | false>;
 export declare const addScript: (page: Page, js: string) => Promise<unknown>;
 export declare function injectPreApiScripts(page: Page, spinner?: Spin): Promise<Page>;
 export declare function injectWapi(page: Page, spinner?: Spin, force?: boolean): Promise<Page>;

package/dist/controllers/browser.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.kill = exports.injectApi = exports.injectWapi = exports.injectPreApiScripts = exports.addScript = exports.getSessionDataFilePath = exports.invalidateSesssionData = exports.deleteSessionData = exports.initPage = exports.BROWSER_START_TS = void 0;
 const path = __importStar(require("path"));
-const fs = __importStar(require("fs"));
+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");
@@ -181,7 +181,7 @@ function initPage(sessionId, config, qrManager, customUserAgent, spinner, _page,
              * AUTH
              */
             spinner === null || spinner === void 0 ? void 0 : spinner.info('Loading session data');
-            let sessionjson = getSessionDataFromFile(sessionId, config, spinner);
+            let sessionjson = yield getSessionDataFromFile(sessionId, config, spinner);
             if (!sessionjson && sessionjson !== "" && config.sessionDataBucketAuth) {
                 try {
                     spinner === null || spinner === void 0 ? void 0 : spinner.info('Unable to find session data file locally, attempting to find session data in cloud storage..');
@@ -255,17 +255,17 @@ function initPage(sessionId, config, qrManager, customUserAgent, spinner, _page,
     });
 }
 exports.initPage = initPage;
-const getSessionDataFromFile = (sessionId, config, spinner) => {
+const getSessionDataFromFile = (sessionId, config, spinner) => __awaiter(void 0, void 0, void 0, function* () {
     if ((config === null || config === void 0 ? void 0 : config.sessionData) == "NUKE")
         return '';
     //check if [session].json exists in __dirname
-    const sessionjsonpath = (0, exports.getSessionDataFilePath)(sessionId, config);
+    const sessionjsonpath = yield (0, exports.getSessionDataFilePath)(sessionId, config);
     let sessionjson = '';
     const sd = process.env[`${sessionId.toUpperCase()}_DATA_JSON`] ? JSON.parse(process.env[`${sessionId.toUpperCase()}_DATA_JSON`]) : config === null || config === void 0 ? void 0 : config.sessionData;
     sessionjson = (typeof sd === 'string' && sd !== "") ? JSON.parse(Buffer.from(sd, 'base64').toString('ascii')) : sd;
-    if (sessionjsonpath && typeof sessionjsonpath == 'string' && fs.existsSync(sessionjsonpath)) {
+    if (sessionjsonpath && typeof sessionjsonpath == 'string' && (yield (0, tools_1.pathExists)(sessionjsonpath))) {
         spinner.succeed(`Found session data file: ${sessionjsonpath}`);
-        const s = fs.readFileSync(sessionjsonpath, "utf8");
+        const s = yield fs.readFile(sessionjsonpath, "utf8");
         try {
             sessionjson = JSON.parse(s);
         }
@@ -288,53 +288,48 @@ const getSessionDataFromFile = (sessionId, config, spinner) => {
         spinner.succeed(`No session data file found for session : ${sessionId}`);
     }
     return sessionjson;
-};
-const deleteSessionData = (config) => {
-    const sessionjsonpath = (0, exports.getSessionDataFilePath)((config === null || config === void 0 ? void 0 : config.sessionId) || 'session', config);
-    if (typeof sessionjsonpath == 'string' && fs.existsSync(sessionjsonpath)) {
+});
+const deleteSessionData = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    const sessionjsonpath = yield (0, exports.getSessionDataFilePath)((config === null || config === void 0 ? void 0 : config.sessionId) || 'session', config);
+    if (typeof sessionjsonpath == 'string' && (yield (0, tools_1.pathExists)(sessionjsonpath))) {
         const l = `logout detected, deleting session data file: ${sessionjsonpath}`;
         console.log(l);
         logging_1.log.info(l);
-        fs.unlinkSync(sessionjsonpath);
+        yield fs.unlink(sessionjsonpath);
     }
-    const mdDir = config['userDataDir'];
-    if (mdDir) {
+    const mdDir = yield (0, tools_1.pathExists)(config['userDataDir']);
+    if (config['userDataDir'] && mdDir) {
         logging_1.log.info(`Deleting MD session directory: ${mdDir}`);
-        //@ts-ignore
-        fs.rmdirSync(mdDir, { force: true, recursive: true });
+        yield fs.rm(mdDir, { force: true, recursive: true });
+        logging_1.log.info(`MD directory ${mdDir} deleted: ${!(yield (0, tools_1.pathExists)(mdDir, true))}`);
     }
     return true;
-};
+});
 exports.deleteSessionData = deleteSessionData;
-const invalidateSesssionData = (config) => {
-    const sessionjsonpath = (0, exports.getSessionDataFilePath)((config === null || config === void 0 ? void 0 : config.sessionId) || 'session', config);
-    if (typeof sessionjsonpath == 'string' && fs.existsSync(sessionjsonpath)) {
+const invalidateSesssionData = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    const sessionjsonpath = yield (0, exports.getSessionDataFilePath)((config === null || config === void 0 ? void 0 : config.sessionId) || 'session', config);
+    if (typeof sessionjsonpath == 'string' && (yield (0, tools_1.pathExists)(sessionjsonpath))) {
         const l = `logout detected, invalidating session data file: ${sessionjsonpath}`;
         console.log(l);
         logging_1.log.info(l);
-        fs.writeFile(sessionjsonpath, "LOGGED OUT", (err) => {
-            if (err) {
-                console.error(err);
-                return;
-            }
-        });
+        fs.writeFile(sessionjsonpath, "LOGGED OUT");
     }
     return true;
-};
+});
 exports.invalidateSesssionData = invalidateSesssionData;
-const getSessionDataFilePath = (sessionId, config) => {
+const getSessionDataFilePath = (sessionId, config) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const p = ((_a = require === null || require === void 0 ? void 0 : require.main) === null || _a === void 0 ? void 0 : _a.path) || ((_b = process === null || process === void 0 ? void 0 : process.mainModule) === null || _b === void 0 ? void 0 : _b.path);
     const sessionjsonpath = ((config === null || config === void 0 ? void 0 : config.sessionDataPath) && (config === null || config === void 0 ? void 0 : config.sessionDataPath.includes('.data.json'))) ? path.join(path.resolve(process.cwd(), (config === null || config === void 0 ? void 0 : config.sessionDataPath) || '')) : path.join(path.resolve(process.cwd(), (config === null || config === void 0 ? void 0 : config.sessionDataPath) || ''), `${sessionId || 'session'}.data.json`);
     const altSessionJsonPath = p ? ((config === null || config === void 0 ? void 0 : config.sessionDataPath) && (config === null || config === void 0 ? void 0 : config.sessionDataPath.includes('.data.json'))) ? path.join(path.resolve(p, (config === null || config === void 0 ? void 0 : config.sessionDataPath) || '')) : path.join(path.resolve(p, (config === null || config === void 0 ? void 0 : config.sessionDataPath) || ''), `${sessionId || 'session'}.data.json`) : false;
-    if (fs.existsSync(sessionjsonpath)) {
+    if ((0, tools_1.pathExists)(sessionjsonpath)) {
         return sessionjsonpath;
     }
-    else if (p && altSessionJsonPath && fs.existsSync(altSessionJsonPath)) {
+    else if (p && altSessionJsonPath && (yield (0, tools_1.pathExists)(altSessionJsonPath))) {
         return altSessionJsonPath;
     }
     return false;
-};
+});
 exports.getSessionDataFilePath = getSessionDataFilePath;
 const addScript = (page, js) => __awaiter(void 0, void 0, void 0, function* () { return page.evaluate(yield script_preloader_1.scriptLoader.getScript(js)).catch(e => logging_1.log.error(`Injection error: ${js}`, e)); });
 exports.addScript = addScript;
@@ -453,9 +448,9 @@ function initBrowser(sessionId, config = {}, spinner) {
         }
         if (config === null || config === void 0 ? void 0 : config.corsFix)
             args.push('--disable-web-security');
-        if (config["userDataDir"] && !fs.existsSync(config["userDataDir"])) {
+        if (config["userDataDir"] && !(yield (0, tools_1.pathExists)(config["userDataDir"]))) {
             spinner === null || spinner === void 0 ? void 0 : spinner.info(`Data dir doesnt exist, creating...: ${config["userDataDir"]}`);
-            fs.mkdirSync(config["userDataDir"], { recursive: true });
+            fs.mkdir(config["userDataDir"], { recursive: true });
         }
         const browser = (config === null || config === void 0 ? void 0 : config.browserWSEndpoint) ? yield puppeteer.connect(Object.assign({}, config)) : yield puppeteer.launch(Object.assign(Object.assign({ headless: true, args }, config), { devtools: false }));
         exports.BROWSER_START_TS = Date.now();

package/dist/controllers/initializer.js

@@ -251,7 +251,7 @@ function create(config = {}) {
                 spinner.fail("Session data most likely expired due to manual host account logout. Please re-authenticate this session.");
                 yield (0, browser_1.kill)(waPage);
                 if (config === null || config === void 0 ? void 0 : config.deleteSessionDataOnLogout)
-                    (0, browser_1.deleteSessionData)(config);
+                    yield (0, browser_1.deleteSessionData)(config);
                 if (config === null || config === void 0 ? void 0 : config.throwOnExpiredSessionData) {
                     throw new index_1.SessionExpiredError();
                 }

package/dist/utils/tools.d.ts

@@ -117,3 +117,19 @@ export declare function rmFileAsync(file: string): Promise<unknown>;
  * @param requestConfig optional axios config if file parameter is a url
  */
 export declare const assertFile: (file: AdvancedFile | Buffer, outfileName: string, desiredOutputType: keyof typeof FileOutputTypes, requestConfig?: any) => Promise<string | Buffer | Readable>;
+/**
+ * Checks if a given path exists.
+ *
+ * If exists, returns the resolved absolute path. Otherwise returns false.
+ *
+ * @param _path a relative, absolute or homedir path to a folder or a file
+ * @param failSilent If you're expecting for the file to not exist and just want the `false` response then set this to true to prevent false-positive error messages in the logs.
+ * @returns string | false
+ */
+export declare const pathExists: (_path: string, failSilent?: boolean) => Promise<string | false>;
+/**
+ * Returns an absolute file path reference
+ * @param _path a relative, absolute or homedir path to a folder or a file
+ * @returns string
+ */
+export declare const fixPath: (_path: string) => string;

package/dist/utils/tools.js

@@ -42,18 +42,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertFile = exports.rmFileAsync = exports.FileOutputTypes = exports.FileInputTypes = exports.ensureDUrl = exports.generateGHIssueLink = exports.processSendData = exports.timePromise = exports.now = exports.perf = exports.processSend = exports.base64MimeType = exports.getDUrl = exports.isDataURL = exports.isBase64 = exports.camelize = exports.without = exports.getConfigFromProcessEnv = exports.smartUserAgent = exports.timeout = void 0;
+exports.fixPath = exports.pathExists = exports.assertFile = exports.rmFileAsync = exports.FileOutputTypes = exports.FileInputTypes = exports.ensureDUrl = exports.generateGHIssueLink = exports.processSendData = exports.timePromise = exports.now = exports.perf = exports.processSend = exports.base64MimeType = exports.getDUrl = exports.isDataURL = exports.isBase64 = exports.camelize = exports.without = exports.getConfigFromProcessEnv = exports.smartUserAgent = exports.timeout = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const fs = __importStar(require("fs"));
+const fsp = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const datauri_1 = __importDefault(require("datauri"));
 const is_url_superb_1 = __importDefault(require("is-url-superb"));
 const model_1 = require("../api/model");
 const axios_1 = __importDefault(require("axios"));
 const child_process_1 = require("child_process");
+const os_1 = require("os");
 const perf_hooks_1 = require("perf_hooks");
 const mime_1 = __importDefault(require("mime"));
-const os_1 = require("os");
+const os_2 = require("os");
 const stream_1 = require("stream");
 const logging_1 = require("../logging/logging");
 //@ts-ignore
@@ -367,7 +369,7 @@ const assertFile = (file, outfileName, desiredOutputType, requestConfig) => __aw
             /**
              * Create a temp file in tempdir, return the tempfile.
              */
-            const tempFilePath = path.join((0, os_1.tmpdir)(), `${crypto_1.default.randomBytes(6).readUIntLE(0, 6).toString(36)}.${outfileName}`);
+            const tempFilePath = path.join((0, os_2.tmpdir)(), `${crypto_1.default.randomBytes(6).readUIntLE(0, 6).toString(36)}.${outfileName}`);
             logging_1.log.info(`Saved temporary file to ${tempFilePath}`);
             if (inputType != exports.FileInputTypes.BUFFER) {
                 file = yield (0, exports.ensureDUrl)(file, requestConfig, outfileName);
@@ -392,3 +394,36 @@ const assertFile = (file, outfileName, desiredOutputType, requestConfig) => __aw
     return file;
 });
 exports.assertFile = assertFile;
+/**
+ * Checks if a given path exists.
+ *
+ * If exists, returns the resolved absolute path. Otherwise returns false.
+ *
+ * @param _path a relative, absolute or homedir path to a folder or a file
+ * @param failSilent If you're expecting for the file to not exist and just want the `false` response then set this to true to prevent false-positive error messages in the logs.
+ * @returns string | false
+ */
+const pathExists = (_path, failSilent) => __awaiter(void 0, void 0, void 0, function* () {
+    _path = (0, exports.fixPath)(_path);
+    try {
+        yield fsp.access(_path, fsp.constants.R_OK | fsp.constants.W_OK);
+        return _path;
+    }
+    catch (error) {
+        if (!failSilent)
+            logging_1.log.error('Given check path threw an error', error);
+        return false;
+    }
+});
+exports.pathExists = pathExists;
+/**
+ * Returns an absolute file path reference
+ * @param _path a relative, absolute or homedir path to a folder or a file
+ * @returns string
+ */
+const fixPath = (_path) => {
+    _path = _path.replace("~", (0, os_1.homedir)());
+    _path = _path.includes('./') ? path.join(process.cwd(), _path) : _path;
+    return _path;
+};
+exports.fixPath = fixPath;

package/package.json

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