gologin 2.0.10 → 2.0.12

package/examples/example-create-custom-profile.js

@@ -0,0 +1,33 @@
+import GoLogin from '../src/gologin.js';
+
+(async () => {
+  const GL = new GoLogin({
+    token: 'yU0token',
+  });
+
+  const profileId = await GL.createCustom({
+    os: 'win', // required param ('lin', 'mac', 'win', 'android'), for macM1 write (os: 'mac') and add property 'isM1'
+    // isM1: true,
+    name: 'testName',
+    fingerprint: {
+      autoLang: true,
+      resolution: '800x400',
+      language: 'de',
+      dns: 'testDNS',
+      hardwareConcurrency: 8,
+      deviceMemory: 4, // 0.5, 1, 2, 4, 6, 8
+      startUrl: 'https://testurl.com',
+      googleServicesEnabled: true,
+      lockEnabled: true,
+      proxy: {
+        mode: 'http',
+        host: '123.12.123.12',
+        port: 1234,
+        username: 'user',
+        password: 'password',
+      },
+    },
+  });
+
+  console.log('profile id=', profileId);
+})();

package/examples/example-create-profile.js

@@ -1,4 +1,4 @@
-import GoLogin from '../gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const delay = ms => new Promise(res => setTimeout(res, ms));
 

package/examples/example-startremote.js

@@ -3,7 +3,7 @@
 
 // your token api (located in the settings, api)
 // https://github.com/gologinapp/gologin#usage
-import GoLogin from '../gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const GOLOGIN_API_TOKEN = process.argv[2];
 // your profile id

package/examples/example-stopremote.js

@@ -3,7 +3,7 @@
 
 // your token api (located in the settings, api)
 // https://github.com/gologinapp/gologin#usage
-import GoLogin from '../gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const GOLOGIN_API_TOKEN = process.argv[2];
 // your profile id

package/package.json

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

package/src/bookmarks/utils.js

@@ -0,0 +1,16 @@
+import { promises as _promises } from 'fs';
+
+const { readFile } = _promises;
+
+export const getCurrentProfileBookmarks = async (pathToBookmarks) => {
+  const currentBookmarksFileData = await readFile(pathToBookmarks, { encoding: 'utf-8' });
+
+  let bookmarks = {};
+  try {
+    bookmarks = JSON.parse(currentBookmarksFileData);
+  } catch (error) {
+    console.log(error);
+  }
+
+  return bookmarks;
+};

package/src/browser/browser-api.js

@@ -69,3 +69,27 @@ export const updateProfileProxy = (profileId, ACCESS_TOKEN, browserProxyData) =>
 
     return { body: [] };
   });
+
+/**
+  * @param {string} profileId
+  * @param {string} ACCESS_TOKEN
+  * @param {Object} bookmarks
+*/
+export const updateProfileBookmarks = async (profileIds, ACCESS_TOKEN, bookmarks) => {
+  const params = {
+    profileIds,
+    bookmarks,
+  };
+
+  return requestretry.patch(`${API_URL}/browser/bookmarks/many`, {
+    headers: {
+      Authorization: `Bearer ${ACCESS_TOKEN}`,
+      'user-agent': 'gologin-api',
+    },
+    json: params,
+    maxAttempts: 3,
+    retryDelay: 2000,
+    timeout: 10 * 1000,
+  }).catch((error) => console.log(error));
+};
+

package/src/gologin.js

@@ -11,15 +11,17 @@ import rimraf from 'rimraf';
 import ProxyAgent from 'simple-proxy-agent';
 
 import { fontsCollection } from '../fonts.js';
-import { updateProfileProxy, updateProfileResolution, updateProfileUserAgent } from './browser/browser-api.js';
+import { getCurrentProfileBookmarks } from './bookmarks/utils.js';
+import { updateProfileBookmarks, updateProfileProxy, updateProfileResolution, updateProfileUserAgent } from './browser/browser-api.js';
 import BrowserChecker from './browser/browser-checker.js';
 import { composeFonts, downloadCookies, setExtPathsAndRemoveDeleted, 
   setOriginalExtPaths, uploadCookies } from './browser/browser-user-data-manager.js';
 import { getChunckedInsertValues, getDB, loadCookiesFromFile } from './cookies/cookies-manager.js';
 import ExtensionsManager from './extensions/extensions-manager.js';
 import { archiveProfile } from './profile/profile-archiver.js';
-import { get, isPortReachable } from './utils/utils.js';
+import { checkAutoLang } from './utils/browser.js';
 import { API_URL } from './utils/common.js';
+import { get, isPortReachable } from './utils/utils.js';
 
 const { access, unlink, writeFile, readFile } = _promises;
 
@@ -32,6 +34,7 @@ const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));
 
 export class GoLogin {
   constructor(options = {}) {
+    this.browserLang = 'en-US';
     this.is_remote = options.remote || false;
     this.access_token = options.token;
     this.profile_id = options.profile_id;
@@ -69,6 +72,7 @@ export class GoLogin {
 
     this.cookiesFilePath = join(this.tmpdir, `gologin_profile_${this.profile_id}`, 'Default', 'Network', 'Cookies');
     this.profile_zip_path = join(this.tmpdir, `gologin_${this.profile_id}.zip`);
+    this.bookmarksFilePath = join(this.tmpdir, `gologin_profile_${this.profile_id}`, 'Default', 'Bookmarks');
     debug('INIT GOLOGIN', this.profile_id);
   }
 
@@ -255,8 +259,13 @@ export class GoLogin {
       preferences.hardwareConcurrency = get(preferences, 'navigator.hardwareConcurrency');
     }
 
+    if (get(preferences, 'navigator.deviceMemory')) {
+      preferences.deviceMemory = get(preferences, 'navigator.deviceMemory')*1024;
+    }
+
     if (get(preferences, 'navigator.language')) {
-      preferences.language = get(preferences, 'navigator.language');
+      preferences.langHeader = get(preferences, 'navigator.language');
+      preferences.languages = get(preferences, 'navigator.language').replace(/;|q=[\d\.]+/img, '');
     }
 
     if (get(preferences, 'navigator.maxTouchPoints')) {
@@ -290,6 +299,12 @@ export class GoLogin {
       audioOutputs: preferences.mediaDevices.audioOutputs,
     };
 
+    preferences.webRtc = {
+      ...preferences.webRtc,
+      fill_based_on_ip: !!get(preferences, 'webRTC.fillBasedOnIp'),
+      local_ip_masking: !!get(preferences, 'webRTC.local_ip_masking'),
+    };
+
     return preferences;
   }
 
@@ -584,19 +599,32 @@ export class GoLogin {
       }
     }
 
-    const languages = this.language.replace(/;|q=[\d\.]+/img, '')
+    const languages = this.language.replace(/;|q=[\d\.]+/img, '');
 
     if (preferences.gologin==null) {
       preferences.gologin = {};
     }
 
-    preferences.gologin.langHeader = gologin.language;
+    preferences.gologin.langHeader = gologin.navigator.language;
     preferences.gologin.language = languages;
 
+    const [splittedLangs] = gologin.navigator.language.split(';');
+    const [browserLang] = splittedLangs.split(',');
+    gologin.browserLang = browserLang;
+
+    const isMAC = OS_PLATFORM === 'darwin';
+    const checkAutoLangResult = checkAutoLang(gologin, this._tz);
+    this.browserLang = isMAC ? 'en-US' : checkAutoLangResult;
+
     await writeFile(join(profilePath, 'Default', 'Preferences'), JSON.stringify(Object.assign(preferences, {
       gologin,
     })));
 
+    const bookmarksParsedData = await getCurrentProfileBookmarks(this.bookmarksFilePath);
+    const bookmarksFromDb = profile.bookmarks?.bookmark_bar;
+    bookmarksParsedData.roots = bookmarksFromDb ? profile.bookmarks : bookmarksParsedData.roots;
+    await writeFile(this.bookmarksFilePath, JSON.stringify(bookmarksParsedData));
+
     debug('Profile ready. Path: ', profilePath, 'PROXY', JSON.stringify(get(preferences, 'gologin.proxy')));
 
     return profilePath;
@@ -820,18 +848,13 @@ export class GoLogin {
         { env },
       );
     } else {
-      const [splittedLangs] = this.language.split(';');
-      let [browserLang] = splittedLangs.split(',');
-      if (process.platform === 'darwin') {
-        browserLang = 'en-US';
-      }
 
       let params = [
         `--remote-debugging-port=${remote_debugging_port}`,
         `--user-data-dir=${profile_path}`,
         '--password-store=basic',
         `--tz=${tz}`,
-        `--lang=${browserLang}`,
+        `--lang=${this.browserLang}`,
       ];
 
       if (this.extensionPathsToInstall.length) {
@@ -922,6 +945,8 @@ export class GoLogin {
       await this.uploadProfileCookiesToServer();
     }
 
+    await this.saveBookmarksToDb();
+
     this.is_stopping = true;
     await this.sanitizeProfile();
 
@@ -1120,6 +1145,29 @@ export class GoLogin {
     return response.body.id;
   }
 
+  async createCustom(options) {
+    debug('createCustomProfile', options);
+    const response = await requests.post(`${API_URL}/browser/custom`, {
+      headers: {
+        'Authorization': `Bearer ${this.access_token}`,
+        'User-Agent': 'gologin-api',
+      },
+      json: options,
+    });
+
+    if (response.statusCode === 400) {
+      throw new Error(`gologin failed account creation with status code, ${response.statusCode} DATA  ${JSON.stringify(response.body.message)}`);
+    }
+
+    if (response.statusCode === 500) {
+      throw new Error(`gologin failed account creation with status code, ${response.statusCode}`);
+    }
+
+    debug(JSON.stringify(response));
+
+    return response.body.id;
+  }
+
   async delete(pid) {
     const profile_id = pid || this.profile_id;
     await requests.delete(`${API_URL}/browser/${profile_id}`, {
@@ -1250,6 +1298,12 @@ export class GoLogin {
     return this.postCookies(this.profile_id, cookies);
   }
 
+  async saveBookmarksToDb() {
+    const bookmarksData = await getCurrentProfileBookmarks(this.bookmarksFilePath);
+    const bookmarks = bookmarksData.roots || {};
+    await updateProfileBookmarks([this.profile_id], this.access_token, bookmarks);
+  }
+
   async start() {
     if (this.is_remote) {
       return this.startRemote();

package/src/utils/browser.js

@@ -0,0 +1,62 @@
+export const checkAutoLang = (profileData, timezoneCheckResult) => {
+  if (!profileData.autoLang) {
+    return checkBrowserLang(profileData);
+  }
+
+  let timezoneLang = '';
+  const { country: timezoneCountry = '', languages } = timezoneCheckResult || {};
+  if (languages) {
+    const [firstDetectedLangLocale] = languages.split(',');
+    timezoneLang = `${firstDetectedLangLocale}-${timezoneCountry}` || '';
+
+    let resultLangsArr = [];
+    const [lang = '', country = ''] = timezoneLang.split('-');
+    if (country) {
+      resultLangsArr.push([lang, country].join('-'));
+    }
+
+    resultLangsArr.push(lang, 'en-US', 'en');
+    resultLangsArr = [...new Set(resultLangsArr)];
+
+    const gologinLangsArr = [];
+    const result = resultLangsArr.reduce((acc, cur, index) => {
+      if (!index) {
+        acc += `${cur},`;
+        gologinLangsArr.push(cur);
+
+        return acc;
+      }
+
+      const qualityParam = 10-index;
+      if (qualityParam > 0) {
+        const separator = (resultLangsArr.length - index) < 2 ? '' : ',';
+        gologinLangsArr.push(cur);
+        acc += `${cur};q=${Number(qualityParam * 0.1).toFixed(1)}${separator}`;
+      }
+
+      return acc;
+    }, '');
+
+    [profileData.browserLang] = resultLangsArr;
+    profileData.languages = gologinLangsArr.join(',');
+    profileData.langHeader = result;
+    profileData.navigator.language = result;
+
+    return profileData.browserLang;
+  }
+
+  return checkBrowserLang(profileData);
+};
+
+const checkBrowserLang = (profileData, defaultLocale = 'en-US') => {
+  if (profileData.langHeader) {
+    return profileData.browserLang;
+  }
+
+  profileData.browserLang = defaultLocale;
+  profileData.languages = defaultLocale;
+  profileData.langHeader = defaultLocale;
+  profileData.navigator.language = defaultLocale;
+
+  return defaultLocale;
+};