gologin 1.0.24 → 1.0.28

package/cookies-manager.js

@@ -32,9 +32,9 @@ class CookiesManager {
       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 : unixToLDAP(todayUnix);
-        let expirationDate = cookie.session ? 0 : unixToLDAP(cookie.expirationDate);
-        const encryptedValue = Buffer.concat([Buffer.from('v11'), Buffer.from(encrypt(cookie.value), 'binary')]);
+        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 =
           cookie.name.startsWith('__Host-') || cookie.name.startsWith('__Secure-') ? 1 : Number(cookie.secure);

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/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){
@@ -520,35 +522,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 +556,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;
@@ -697,7 +695,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;
     }
@@ -1060,12 +1058,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gologin",
-  "version": "1.0.24",
+  "version": "1.0.28",
   "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"
   },