gologin 1.0.26 → 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,11 +1,13 @@
 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',
-        extra_params: ['--headless'],
+        extra_params: ['--headless', '--no-sandbox'],
     });
     const {status, wsUrl} = await GL.start(); 
     const browser = await puppeteer.connect({
@@ -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

@@ -8,7 +8,7 @@ const rimraf = util.promisify(require('rimraf'));
 const exec = util.promisify(require('child_process').exec);
 const { spawn, execFile } = require('child_process');
 const FormData = require('form-data');
-const socks5Http = require('socks5-https-client');
+const ProxyAgent = require('simple-proxy-agent');
 const decompress = require('decompress');
 const decompressUnzip = require('decompress-unzip');
 const path = require('path');
@@ -18,6 +18,7 @@ const BrowserChecker = require('./browser-checker');
 const { BrowserUserDataManager } = require('./browser-user-data-manager');
 const { CookiesManager } = require('./cookies-manager');
 const fontsCollection = require('./fonts');
+const https = require('https');
 
 const SEPARATOR = path.sep;
 const API_URL = 'https://api.gologin.com';
@@ -46,7 +47,6 @@ class GoLogin {
     this.browserChecker = new BrowserChecker();
     this.uploadCookiesToServer = options.uploadCookiesToServer || false;
     this.writeCookesFromServer = options.writeCookesFromServer || true;
-    this.cookiesFilePath = path.join(os.tmpdir(), `gologin_profile_${this.profile_id}`, 'Default', 'Cookies');
     this.remote_debugging_port = options.remote_debugging_port || 0;
     this.timezone = options.timezone;
 
@@ -58,6 +58,7 @@ class GoLogin {
       }
     }
 
+    this.cookiesFilePath = path.join(this.tmpdir, `gologin_profile_${this.profile_id}`, 'Default', 'Cookies');
     this.profile_zip_path = path.join(this.tmpdir, `gologin_${this.profile_id}.zip`);
     debug('INIT GOLOGIN', this.profile_id);
   }
@@ -66,6 +67,7 @@ class GoLogin {
 
   async setProfileId(profile_id) {
     this.profile_id = profile_id;
+    this.cookiesFilePath = path.join(this.tmpdir, `gologin_profile_${this.profile_id}`, 'Default', 'Cookies');
     this.profile_zip_path = path.join(this.tmpdir, `gologin_${this.profile_id}.zip`);
   }
 
@@ -122,7 +124,7 @@ class GoLogin {
   	})
     debug(profileResponse.body);
   	if (profileResponse.statusCode !== 200) {
-  		throw new Error(`Gologin /browser/${id} response error ${profileResponse.statusCode}`);
+  		throw new Error(`Gologin /browser/${id} response error ${profileResponse.statusCode} INVALID TOKEN OR PROFILE NOT FOUND`);
   	}
 
     if(profileResponse.statusCode == 401){
@@ -357,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;
     }
@@ -384,6 +391,8 @@ class GoLogin {
       publicIP: _.get(profile, 'webRTC.fillBasedOnIp') ? this._tz.ip : _.get(profile, 'webRTC.publicIp'),
       localIps: _.get(profile, 'webRTC.localIps', []),
     };
+    
+    debug('profile.webRtc=', profile.webRtc);
 
     const audioContext = profile.audioContext || {};
     const { mode: audioCtxMode = 'off', noise: audioCtxNoise } = audioContext;
@@ -497,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;
@@ -504,51 +514,47 @@ 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);
     return this._tz.timezone;
   }
 
-  async getTimezoneWithSocks(proxy) {
-    const { host, port, username, password } = proxy;
+  async getTimezoneWithSocks(params) {
+    const { mode = 'http', host, port, username = '', password = '' } = params;
     let body;
 
-    const checkData = await new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        req.abort();
-        reject(new Error('Timeout exceeded'));
-      }, 10000);
-
-      const req = socks5Http.get({
-        hostname: 'time.gologin.com',
-        path: '/timezone',
-        socksHost: host,
-        socksPort: port,
-        socksUsername: username || '',
-        socksPassword: password || '',
-      }, (res) => {
-        res.setEncoding('utf8');
+    let proxy = mode + '://';
+    if (username) {
+      const resultPassword = password ? ':' + password + '@' : '@';
+      proxy += username + resultPassword;
+    }
+    proxy += host + ':' + port;
+
+    const agent = new ProxyAgent(proxy, { tunnel: true, timeout: 10000 });
 
+    const checkData = await new Promise((resolve, reject) => {
+      https.get('https://time.gologin.com/timezone', { agent }, (res) => {
         let resultResponse = '';
         res.on('data', (data) => resultResponse += data);
 
         res.on('end', () => {
-          clearTimeout(timer);
           let parsedData;
           try {
             parsedData = JSON.parse(resultResponse);
-          } catch (e) {}
+          } catch (e) {
+            reject(e);
+          }
 
           resolve({
             ...res,
@@ -558,14 +564,13 @@ class GoLogin {
       }).on('error', (err) => reject(err));
     });
 
-    console.log('checkData:', checkData);
+    // console.log('checkData:', checkData);
     body = checkData.body || {};
     if (!body.ip && checkData.statusCode.toString().startsWith('4')) {
       throw checkData;
     }
     debug('getTimeZone finish', body.body);
     this._tz = body;
-
     return this._tz.timezone;
   }
 
@@ -697,7 +702,7 @@ class GoLogin {
     await rimraf(path.join(this.tmpdir, `gologin_${this.profile_id}_upload.zip`));
   }
 
-  async stopAndCommit(options, local= false) {
+  async stopAndCommit(options, local = false) {
     if (this.is_stopping) {
       return true;
     }
@@ -1037,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();
@@ -1060,12 +1071,12 @@ class GoLogin {
       return this.stopRemote();
     }
 
-    await this.stopAndCommit(false, {});
+    await this.stopAndCommit({ posting: false }, false);
   }
 
   async stopLocal(options) {
-    const opts = options || {posting: false};
-    await this.stopAndCommit(true, opts.posting);
+    const opts = options || { posting: false };
+    await this.stopAndCommit(options, true);
   }
 
   async waitDebuggingUrl(delay_ms, try_count=0) {
@@ -1112,6 +1123,28 @@ class GoLogin {
     }
     
     if (profileResponse.body === 'ok') {
+      const profile = await this.getProfile();
+      const { navigator = {}, fonts, os: profileOs  } = profile;
+      this.fontsMasking = fonts?.enableMasking;
+      this.profileOs = profileOs;
+      this.differentOs =
+        profileOs !== 'android' && (
+          OS_PLATFORM === 'win32' && profileOs !== 'win' ||
+          OS_PLATFORM === 'darwin' && profileOs !== 'mac' ||
+          OS_PLATFORM === 'linux' && profileOs !== 'lin'
+        );
+
+      const {
+        resolution = '1920x1080',
+        language = 'en-US,en;q=0.9',
+      } = navigator;
+      this.language = language;
+      const [screenWidth, screenHeight] = resolution.split('x');
+      this.resolution = {
+        width: parseInt(screenWidth, 10),
+        height: parseInt(screenHeight, 10),
+      };
+
       let wsUrl = await this.waitDebuggingUrl(delay_ms);
       return { 'status': 'success', wsUrl }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gologin",
-  "version": "1.0.26",
+  "version": "1.0.30",
   "description": "A high-level API to control Orbita browser over GoLogin API",
   "main": "./gologin.js",
   "repository": {
@@ -27,7 +27,7 @@
     "rimraf": "^3.0.2",
     "selenium-webdriver": "^4.0.0-alpha.7",
     "shelljs": "^0.8.4",
-    "socks5-https-client": "^1.2.1",
+    "simple-proxy-agent": "^1.1.0",
     "sqlite": "^4.0.23",
     "sqlite3": "^5.0.2"
   },

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)