gologin 1.0.37 → 1.0.40

package/README.md

@@ -65,15 +65,16 @@ const GoLogin = require('gologin');
 
 - `options` <[Object]> Options for profile
     - `autoUpdateBrowser` <[boolean]> do not ask whether download new browser version (default false)
-	- `token` <[string]> your API <a href="https://gologin.com/#/personalArea/TokenApi" target="_blank">token</a>
-	- `profile_id` <[string]> profile ID
-	- `executablePath` <[string]> path to executable Orbita file. Orbita will be downloaded automatically if not specified.
+    - `token` <[string]> your API <a href="https://gologin.com/#/personalArea/TokenApi" target="_blank">token</a>
+    - `profile_id` <[string]> profile ID
+    - `executablePath` <[string]> path to executable Orbita file. Orbita will be downloaded automatically if not specified.
     - `remote_debugging_port` <[int]> port for remote debugging
-	- `vncPort` <[integer]> port of VNC server if you using it
+    - `vncPort` <[integer]> port of VNC server if you using it
     - `tmpdir` <[string]> path to temporary directore for saving profiles
     - `extra_params` arrayof <[string]> extra params for browser orbita (ex. extentions etc.)
     - `uploadCookiesToServer` <[boolean]> upload cookies to server after profile stopping (default false)
     - `writeCookesFromServer` <[boolean]> download cookies from server and write to profile cookies file (default true)
+    - `skipOrbitaHashChecking` <[boolean]> skip hash checking for Orbita after downloading process (default false)
 
 ```js
 const GoLogin = require('gologin');

package/browser-checker.js

@@ -39,8 +39,10 @@ class BrowserChecker {
   #homedir;
   #browserPath;
   #executableFilePath;
+  #skipOrbitaHashChecking = false;
 
-  constructor() {
+  constructor(skipOrbitaHashChecking) {
+    this.#skipOrbitaHashChecking = skipOrbitaHashChecking;
     this.#homedir = os.homedir();
     this.#browserPath = path.join(this.#homedir, '.gologin', 'browser');
 
@@ -221,6 +223,10 @@ class BrowserChecker {
   }
 
   async checkBrowserSum() {
+    if (this.#skipOrbitaHashChecking) {
+      return Promise.resolve();
+    }
+
     console.log('Orbita hash checking');
     if (PLATFORM === 'win32') {
       return Promise.resolve();

package/browser-user-data-manager.js

@@ -58,9 +58,9 @@ class BrowserUserDataManager {
     const fontsToDownload = fontsList.filter(font => !files.includes(font));
 
     let promises = fontsToDownload.map(font => request.get(FONTS_URL + font, {
-      maxAttempts: 3,
+      maxAttempts: 5,
       retryDelay: 2000,
-      timeout: 10 * 1000,
+      timeout: 30 * 1000,
     })
       .pipe(createWriteStream(path.join(browserFontsPath, font)))
     );

package/gologin.js

@@ -8,7 +8,6 @@ const rimraf = util.promisify(require('rimraf'));
 const { access, unlink, writeFile, readFile } = require('fs').promises;
 const exec = util.promisify(require('child_process').exec);
 const { spawn, execFile } = require('child_process');
-const FormData = require('form-data');
 const ProxyAgent = require('simple-proxy-agent');
 const decompress = require('decompress');
 const decompressUnzip = require('decompress-unzip');
@@ -30,7 +29,7 @@ const OS_PLATFORM = process.platform;
 const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));
 
 class GoLogin {
-  constructor(options) {
+  constructor(options = {}) {
     this.is_remote = options.remote || false;
     this.access_token = options.token;
     this.profile_id = options.profile_id;
@@ -45,7 +44,7 @@ class GoLogin {
     this.profileOs = 'lin';
     this.tmpdir = os.tmpdir();
     this.autoUpdateBrowser = !!options.autoUpdateBrowser;
-    this.browserChecker = new BrowserChecker();
+    this.browserChecker = new BrowserChecker(options.skipOrbitaHashChecking);
     this.uploadCookiesToServer = options.uploadCookiesToServer || false;
     this.writeCookesFromServer = options.writeCookesFromServer || true;
     this.remote_debugging_port = options.remote_debugging_port || 0;
@@ -123,12 +122,17 @@ class GoLogin {
   			'Authorization': `Bearer ${this.access_token}`
   		}
   	})
-    debug(profileResponse.body);
+    debug("profileResponse", profileResponse.statusCode, profileResponse.body);
+    
     
     if (profileResponse.statusCode === 404) {
       throw new Error(JSON.parse(profileResponse.body).message);
     }   
 
+    if (profileResponse.statusCode === 403) {
+      throw new Error(JSON.parse(profileResponse.body).message);
+    }   
+
   	if (profileResponse.statusCode !== 200) {
   		throw new Error(`Gologin /browser/${id} response error ${profileResponse.statusCode} INVALID TOKEN OR PROFILE NOT FOUND`);
   	}
@@ -221,7 +225,7 @@ class GoLogin {
 
   async emptyProfileFolder() {
     debug('get emptyProfileFolder');
-    const profile = await readFile(path.resolve(__dirname, 'gologin_zeroprofile.zip'));
+    const profile = await readFile(path.resolve(__dirname, 'zero_profile.zip'));
     debug('emptyProfileFolder LENGTH ::', profile.length);
     return profile;
   }
@@ -282,10 +286,6 @@ class GoLogin {
     );
   }
 
-  async checkLocalProfile() {
-
-  }
-
   async createStartup(local=false) {
     const profilePath = path.join(this.tmpdir, `gologin_profile_${this.profile_id}`);
     let profile;
@@ -337,8 +337,15 @@ class GoLogin {
 
     debug('Cleaning up..', profilePath);
 
-    await this.extractProfile(profilePath, this.profile_zip_path);
-    debug('extraction done');
+    try {
+      await this.extractProfile(profilePath, this.profile_zip_path);
+      debug('extraction done');
+    } catch(e) {
+      console.trace(e);
+      profile_folder = await this.emptyProfileFolder();
+      await writeFile(this.profile_zip_path, profile_folder);      
+      await this.extractProfile(profilePath, this.profile_zip_path);
+    }
 
     const singletonLockPath = path.join(profilePath, 'SingletonLock');
     const singletonLockExists = await access(singletonLockPath).then(() => true).catch(() => false);
@@ -357,7 +364,7 @@ class GoLogin {
     }
 
     const preferences_raw = await readFile(pref_file_name);
-    let preferences = JSON.parse(preferences_raw.toString());
+    let preferences = JSON.parse(preferences_raw.toString());    
     let proxy = _.get(profile, 'proxy');
     let name = _.get(profile, 'name');
 
@@ -453,10 +460,19 @@ class GoLogin {
         throw new Error('No fonts list provided');
       }
 
-      await BrowserUserDataManager.composeFonts(families, profilePath, this.differentOs);
+      try{
+        await BrowserUserDataManager.composeFonts(families, profilePath, this.differentOs);
+      } catch (e) {
+        console.trace(e);
+      }
     }
 
     const [languages] = this.language.split(';');
+    
+    if(preferences.gologin==null){
+      preferences.gologin = {};
+    }
+    
     preferences.gologin.langHeader = gologin.language;
     preferences.gologin.languages = languages;
 
@@ -1142,25 +1158,28 @@ class GoLogin {
 
   async startRemote(delay_ms = 10000) {
     debug(`startRemote ${this.profile_id}`);
+
+    /*
+    if (profileResponse.statusCode !== 202) {
+      return {'status': 'failure', 'code':  profileResponse.statusCode};
+    }
+    */
+    
+    // if (profileResponse.body === 'ok') {
+    const profile = await this.getProfile();
+
     const profileResponse = await requests.post(`https://api.gologin.com/browser/${this.profile_id}/web`, {
       headers: {
         'Authorization': `Bearer ${this.access_token}`
       }
     });
+    
+    debug('profileResponse', profileResponse.statusCode, profileResponse.body);
 
     if (profileResponse.statusCode === 401){
       throw new Error("invalid token");
     }
 
-    debug('profileResponse', profileResponse.statusCode, profileResponse.body);
-    /*
-    if (profileResponse.statusCode !== 202) {
-      return {'status': 'failure', 'code':  profileResponse.statusCode};
-    }
-    */
-    
-    // if (profileResponse.body === 'ok') {
-    const profile = await this.getProfile();
     const { navigator = {}, fonts, os: profileOs  } = profile;
     this.fontsMasking = fonts?.enableMasking;
     this.profileOs = profileOs;

package/package.json

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