gologin 1.0.23 → 1.0.27

package/cookies-manager.js

@@ -29,10 +29,11 @@ class CookiesManager {
     const chunckedCookiesArr = this.chunk(cookiesArr, MAX_SQLITE_VARIABLES);
 
     return chunckedCookiesArr.map((cookies) => {
-      const queryPlaceholders = cookies.map(() => '(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)').join(', ');
-      const query = `insert or replace into cookies (creation_utc, host_key, name, value, path, expires_utc, is_secure, is_httponly, last_access_utc, is_persistent, encrypted_value, samesite, has_expires) values ${queryPlaceholders}`;
+      const queryPlaceholders = cookies.map(() => '(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)').join(', ');
+      const query = `insert or replace into cookies (creation_utc, top_frame_site_key, host_key, name, value, path, expires_utc, is_secure, is_httponly, last_access_utc, is_persistent, encrypted_value, samesite, has_expires) values ${queryPlaceholders}`;
       const queryParams = cookies.flatMap((cookie) => {
         const creationDate = cookie.creationDate ? cookie.creationDate : this.unixToLDAP(todayUnix);
+        let expirationDate = cookie.session ? 0 : this.unixToLDAP(cookie.expirationDate);
         const encryptedValue = cookie.value;
         const samesite = Object.keys(SAME_SITE).find((key) => SAME_SITE[key] === (cookie.sameSite || '-1'));
         const isSecure =
@@ -40,7 +41,6 @@ class CookiesManager {
         let isPersistent = [undefined, null].includes(cookie.session)
           ? Number(expirationDate !== 0)
           : Number(!cookie.session);
-        let expirationDate = cookie.session ? 0 : this.unixToLDAP(cookie.expirationDate);
 
         if (/^(\.)?mail.google.com$/.test(cookie.domain) && cookie.name === 'COMPASS') {
           expirationDate = 0;
@@ -49,6 +49,7 @@ class CookiesManager {
 
         return [
           creationDate,
+          '', // top_frame_site_key
           cookie.domain,
           cookie.name,
           '', // value

package/examples/example-amazon-headless.js

@@ -5,7 +5,7 @@ const GoLogin = require('../gologin');
     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({

package/examples/example-create-profile.js

@@ -15,7 +15,7 @@ const delay = ms => new Promise(res => setTimeout(res, ms));
         os: 'mac',
         navigator: {
             language: 'enUS',
-            userAgent: 'MyUserAgent',
+            userAgent: 'random', // get random user agent for selected os
             resolution: '1024x768',
             platform: 'mac',
         }
@@ -31,6 +31,6 @@ const delay = ms => new Promise(res => setTimeout(res, ms));
     const profile = await GL.getProfile(profile_id);
 
     console.log('new profile name=', profile.name);
-
+    
     //await GL.delete(profile_id);
 })();

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';
@@ -122,7 +123,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){
@@ -520,35 +521,31 @@ class GoLogin {
     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,7 +555,7 @@ 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;
@@ -879,9 +876,12 @@ class GoLogin {
         mode: 'alerted',
       },
     };
-
+    let user_agent = options.navigator?.userAgent;
+    let orig_user_agent = json.navigator.userAgent;
     Object.keys(options).map((e)=>{ json[e] = options[e] });
-
+    if(user_agent=='random'){
+      json.navigator.userAgent = orig_user_agent;
+    }
     // console.log('profileOptions', json);
 
     const response = await requests.post(`${API_URL}/browser`, {
@@ -891,7 +891,15 @@ class GoLogin {
       },
       json,
     });
-    // console.log(JSON.stringify(response.body));
+
+    if(response.body.statusCode==400){
+      throw new Error(`gologin failed account creation with status code, ${data.statusCode} DATA  ${JSON.stringify(response.body.message)}`);
+    }
+
+    if(response.body.statusCode==500){
+      throw new Error(`gologin failed account creation with status code, ${data.statusCode}`);
+    }
+    debug(JSON.stringify(response.body));
     return response.body.id;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gologin",
-  "version": "1.0.23",
+  "version": "1.0.27",
   "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-create-profile.py

@@ -0,0 +1,30 @@
+from gologin import GoLogin
+
+
+gl = GoLogin({
+	"token": "yU0token",
+	})
+
+profile_id = gl.create({
+    "name": 'profile_mac',
+    "os": 'mac',
+    "navigator": {
+        "language": 'enUS',
+        "userAgent": 'MyUserAgent', 
+        "resolution": '1024x768',
+        "platform": 'mac',
+    }
+});
+
+print('profile id=', profile_id);
+
+gl.update({
+    "id": profile_id,
+    "name": 'profile_mac2',
+});
+
+profile = gl.getProfile(profile_id);
+
+print('new profile name=', profile.get("name"));
+
+gl.delete(profile_id)

package/selenium/gologin.py

@@ -422,9 +422,12 @@ class GoLogin(object):
     def update(self, options):
         self.profile_id = options.get('id')
         profile = self.getProfile()
+        #print("profile", profile)
         for k,v in options.items():
             profile[k] = v
-        return json.loads(requests.put(API_URL + '/browser/' + self.profile_id, headers=self.headers(), json=profile).content.decode('utf-8'))
+        resp = requests.put(API_URL + '/browser/' + self.profile_id, headers=self.headers(), json=profile).content.decode('utf-8')
+        #print("update", resp)
+        #return json.loads(resp)
 
     def waitDebuggingUrl(self, delay_s, try_count=3):
         url = 'https://' + self.profile_id + '.orbita.gologin.com/json/version'