gologin 1.0.29 → 1.0.30

package/README.md

@@ -18,7 +18,7 @@ for running example.js install puppeteer-core
 Where is token? API token is <a href="https://app.gologin.com/#/personalArea/TokenApi" target="_blank">here</a>.
 To have an access to the page below you need <a href="https://app.gologin.com/#/createUser" target="_blank">register</a> GoLogin account.
 
-![Token API in Settings](https://user-images.githubusercontent.com/62306291/78453427-53220100-769a-11ea-9465-0aae3ae602b7.jpg)
+![Token API in Settings](https://user-images.githubusercontent.com/12957968/146891933-c3b60b4d-c850-47a5-8adf-bc8c37372664.gif)
 
 ### Example
 

package/examples/example-amazon-headless.js

@@ -1,7 +1,9 @@
 const puppeteer = require('puppeteer-core');
 const GoLogin = require('../gologin');
 
-(async () =>{
+const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));
+
+(async () =>{    
     const GL = new GoLogin({
         token: 'yU0token',
         profile_id: 'yU0Pr0f1leiD',
@@ -14,6 +16,7 @@ const GoLogin = require('../gologin');
     });
 
     const page = await browser.newPage();
+    await delay(300);
 
     const viewPort = GL.getViewPort();
     await page.setViewport({ width: Math.round(viewPort.width * 0.994), height: Math.round(viewPort.height * 0.92) });

package/gologin.js

@@ -359,6 +359,11 @@ class GoLogin {
       profile.proxy.password = _.get(profile, 'autoProxyPassword');
     }
     // console.log('proxy=', proxy);
+    
+    if (proxy.mode === 'geolocation') {
+      proxy.mode = 'http';
+    }
+
     if (proxy.mode === 'none') {
       proxy = null;
     }
@@ -501,6 +506,7 @@ class GoLogin {
   }
 
   async getTimeZone(proxy) {
+    debug('getting timeZone proxy=', proxy);
     if(this.timezone){
       debug('getTimeZone from options', this.timezone);
       this._tz = this.timezone;
@@ -508,16 +514,16 @@ class GoLogin {
     }
 
     let data = null;
-    if (proxy) {
+    if (proxy!==null && proxy.mode !== "none") {
       if (proxy.mode.includes('socks')) {
         return this.getTimezoneWithSocks(proxy);
       }
 
       const proxyUrl = `${proxy.mode}://${proxy.username}:${proxy.password}@${proxy.host}:${proxy.port}`;
       debug('getTimeZone start https://time.gologin.com', proxyUrl);
-      data = await requests.get('https://time.gologin.com', { proxy: proxyUrl, timeout: 10 * 1000, maxAttempts: 2 });
+      data = await requests.get('https://time.gologin.com', { proxy: proxyUrl, timeout: 20 * 1000, maxAttempts: 5 });
     } else {
-      data = await requests.get('https://time.gologin.com', { timeout: 10 * 1000, maxAttempts: 2 });
+      data = await requests.get('https://time.gologin.com', { timeout: 20 * 1000, maxAttempts: 5 });
     }
     debug('getTimeZone finish', data.body);
     this._tz = JSON.parse(data.body);
@@ -1036,6 +1042,12 @@ class GoLogin {
     if (!this.executablePath) {
      await this.checkBrowser();
     }
+    
+    const ORBITA_BROWSER = this.executablePath || this.browserChecker.getOrbitaPath;
+
+    if(!fs.existsSync(ORBITA_BROWSER)){
+      throw new Error(`Orbita browser is not exists on path ${ORBITA_BROWSER}, check executablePath param`);
+    }
 
     await this.createStartup();
     // await this.createBrowserExtension();

package/package.json

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

package/selenium/gologin.py

@@ -45,7 +45,7 @@ class GoLogin(object):
         proxy = self.proxy
         proxy_host = ''
         if proxy:
-            if proxy.get('mode')==None:
+            if proxy.get('mode')==None or proxy.get('mode')=='geolocation':
                 proxy['mode'] = 'http'
             proxy_host = proxy.get('host')            
             proxy = self.formatProxyUrl(proxy)