gologin 1.0.56 → 1.0.58

package/browser-checker.js

@@ -13,24 +13,24 @@ const readline = require('readline');
 const PLATFORM = process.platform;
 
 const VERSION_FILE = 'latest-version.txt';
-const MAC_VERSION_FILE_URL = `https://orbita-browser-mac.gologin.com/${VERSION_FILE}`;
-const DEB_VERSION_FILE_URL = `https://orbita-browser-linux.gologin.com/${VERSION_FILE}`;
-const WIN_VERSION_FILE_URL = `https://orbita-browser-windows.gologin.com/${VERSION_FILE}`;
+const MAC_VERSION_FILE_URL = `https://orbita-browser-mac-wc.gologin.com/${VERSION_FILE}`;
+const DEB_VERSION_FILE_URL = `https://orbita-browser-linux-wc.gologin.com/${VERSION_FILE}`;
+const WIN_VERSION_FILE_URL = `https://orbita-browser-windows-wc.gologin.com/${VERSION_FILE}`;
 
 const WIN_FOLDERSIZE_FILE = 'foldersize.txt';
 const WIN_FOLDERSIZE_FILE_LINK = `https://orbita-browser-windows.gologin.com/${WIN_FOLDERSIZE_FILE}`;
 
 const BROWSER_ARCHIVE_NAME = `orbita-browser-latest.${PLATFORM === 'win32' ? 'zip' : 'tar.gz'}`;
-const MAC_BROWSER_LINK = `https://orbita-browser-mac.gologin.com/${BROWSER_ARCHIVE_NAME}`;
-const DEB_BROWSER_LINK = `https://orbita-browser-linux.gologin.com/${BROWSER_ARCHIVE_NAME}`;
-const WIN_BROWSER_LINK = `https://orbita-browser-windows.gologin.com/${BROWSER_ARCHIVE_NAME}`;
+const MAC_BROWSER_LINK = `https://orbita-browser-mac-wc.gologin.com/${BROWSER_ARCHIVE_NAME}`;
+const DEB_BROWSER_LINK = `https://orbita-browser-linux-wc.gologin.com/${BROWSER_ARCHIVE_NAME}`;
+const WIN_BROWSER_LINK = `https://orbita-browser-windows-wc.gologin.com/${BROWSER_ARCHIVE_NAME}`;
 
 const MAC_HASH_FILE = 'hashfile.mtree';
 const DEB_HASH_FILE = 'hashfile.txt';
 const WIN_HASH_FILE = DEB_HASH_FILE;
-const MAC_HASHFILE_LINK = `https://orbita-browser-mac.gologin.com/${MAC_HASH_FILE}`;
-const DEB_HASHFILE_LINK = `https://orbita-browser-linux.gologin.com/${DEB_HASH_FILE}`;
-const WIN_HASHFILE_LINK = `https://orbita-browser-windows.gologin.com/${WIN_HASH_FILE}`;
+const MAC_HASHFILE_LINK = `https://orbita-browser-mac-wc.gologin.com/${MAC_HASH_FILE}`;
+const DEB_HASHFILE_LINK = `https://orbita-browser-linux-wc.gologin.com/${DEB_HASH_FILE}`;
+const WIN_HASHFILE_LINK = `https://orbita-browser-windows-wc.gologin.com/${WIN_HASH_FILE}`;
 
 const FAIL_SUM_MATCH_MESSAGE = 'hash_sum_not_matched';
 const EXTRACTED_FOLDER = 'extracted-browser';
@@ -55,7 +55,7 @@ class BrowserChecker {
     this.#executableFilePath = executableFilePath;
     // console.log('executableFilePath:', executableFilePath);
   }
-  
+
   async checkBrowser(autoUpdateBrowser = false) {
     const browserFolderExists = await access(this.#executableFilePath).then(() => true).catch(() => false);
 
@@ -106,7 +106,7 @@ class BrowserChecker {
     } else if (PLATFORM === 'darwin') {
       link = MAC_BROWSER_LINK;
     }
-    
+
     await this.downloadBrowserArchive(link, pathStr);
     await this.checkBrowserArchive(pathStr);
     await this.extractBrowser();
@@ -116,7 +116,7 @@ class BrowserChecker {
     await this.deleteOldArchives();
     console.log('Orbita updated successfully');
   }
-  
+
   downloadBrowserArchive(link, pathStr) {
     return new Promise((resolve, reject) => {
       const writableStream = fs.createWriteStream(pathStr);
@@ -287,7 +287,7 @@ class BrowserChecker {
       targetBrowserPath
     );
   }
-  
+
   async deleteOldArchives(deleteCurrentBrowser = false) {
     if (deleteCurrentBrowser) {
       return this.deleteDir(path.join(this.#browserPath));

package/gologin.js

@@ -44,6 +44,10 @@ class GoLogin {
     this.is_stopping = false;
     this.differentOs = false;
     this.profileOs = 'lin';
+    this.waitWebsocket = true;
+    if(options.waitWebsocket === false){
+      this.waitWebsocket = false;
+    }
     this.tmpdir = os.tmpdir();
     this.autoUpdateBrowser = !!options.autoUpdateBrowser;
     this.browserChecker = new BrowserChecker(options.skipOrbitaHashChecking);
@@ -848,14 +852,17 @@ class GoLogin {
       debug('SPAWN CMD', ORBITA_BROWSER, params.join(" "));
     }
 
-    debug('GETTING WS URL FROM BROWSER');
 
-    let data = await requests.get(`http://127.0.0.1:${remote_debugging_port}/json/version`, {json: true});
+    if(this.waitWebsocket){
+      debug('GETTING WS URL FROM BROWSER');
+      let data = await requests.get(`http://127.0.0.1:${remote_debugging_port}/json/version`, {json: true});
 
-    debug('WS IS', _.get(data, 'body.webSocketDebuggerUrl', ''))
-    this.is_active = true;
+      debug('WS IS', _.get(data, 'body.webSocketDebuggerUrl', ''))
+      this.is_active = true;
 
-    return _.get(data, 'body.webSocketDebuggerUrl', '');
+      return _.get(data, 'body.webSocketDebuggerUrl', '');
+    }
+    return '';
   }
 
   async createStartupAndSpawnBrowser() {
@@ -933,6 +940,8 @@ class GoLogin {
       `${SEPARATOR}oofiananboodjbbmdelgdommihjbkfag`,
       `${SEPARATOR}SafetyTips`,
       `${SEPARATOR}fonts`,
+      `${SEPARATOR}BrowserMetrics`,
+      `${SEPARATOR}BrowserMetrics-spare.pma`,
     ];
     const that = this;
 
@@ -1065,11 +1074,11 @@ class GoLogin {
       json,
     });
 
-    if (response.body.statusCode === 400) {
+    if (response.statusCode === 400) {
       throw new Error(`gologin failed account creation with status code, ${response.statusCode} DATA  ${JSON.stringify(response.body.message)}`);
     }
 
-    if (response.body.statusCode === 500) {
+    if (response.statusCode === 500) {
       throw new Error(`gologin failed account creation with status code, ${response.statusCode}`);
     }
     debug(JSON.stringify(response.body));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gologin",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "description": "A high-level API to control Orbita browser over GoLogin API",
   "main": "./gologin.js",
   "repository": {