gologin 2.0.11 → 2.0.13

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: {  // uncomment and check input if you need to use proxy
+      //   mode: 'http', // 'socks4', 'socks5'
+      //   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));
 
@@ -11,17 +11,17 @@ const delay = ms => new Promise(res => setTimeout(res, ms));
 
   const profile_id = await GL.create({
     name: 'profile_mac',
-    os: 'mac',
+    os: 'mac', // 'win', 'lin', 'android'
+    // isM1: true, // for Mac M1
     navigator: {
-      language: 'enUS',
+      language: 'en-US,en;q=0.9',
       userAgent: 'random', // get random user agent for selected os
       resolution: '1024x768',
-      platform: 'mac',
     },
     proxyEnabled: false,
     proxy: {
       mode: 'none',
-    }
+    },
   });
 
   console.log('profile id=', profile_id);

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.11",
+  "version": "2.0.13",
   "description": "A high-level API to control Orbita browser over GoLogin API",
   "main": "./src/gologin.js",
   "repository": {

package/src/gologin.js

@@ -19,6 +19,7 @@ import { composeFonts, downloadCookies, setExtPathsAndRemoveDeleted,
 import { getChunckedInsertValues, getDB, loadCookiesFromFile } from './cookies/cookies-manager.js';
 import ExtensionsManager from './extensions/extensions-manager.js';
 import { archiveProfile } from './profile/profile-archiver.js';
+import { checkAutoLang } from './utils/browser.js';
 import { API_URL } from './utils/common.js';
 import { get, isPortReachable } from './utils/utils.js';
 
@@ -33,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;
@@ -597,15 +599,23 @@ 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,
     })));
@@ -838,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) {
@@ -1060,7 +1065,12 @@ export class GoLogin {
       os = options.os;
     }
 
-    const fingerprint = await requests.get(`${API_URL}/browser/fingerprint?os=${os}`,{
+    let url = `${API_URL}/browser/fingerprint?os=${os}`;
+    if (options.isM1) {
+      url += '&isM1=true';
+    }
+
+    const fingerprint = await requests.get(url,{
       headers: {
         'Authorization': `Bearer ${this.access_token}`,
         'User-Agent': 'gologin-api',
@@ -1111,12 +1121,20 @@ export class GoLogin {
 
     const user_agent = options.navigator?.userAgent;
     const orig_user_agent = json.navigator.userAgent;
-    Object.keys(options).map((e) => {
-      json[e] = options[e];
+    Object.keys(options).forEach((key) => {
+      if (typeof json[key] === 'object') {
+        json[key] = { ...json[key], ...options[key] };
+
+        return;
+      }
+
+      json[key] = options[key];
     });
+
     if (user_agent === 'random') {
       json.navigator.userAgent = orig_user_agent;
     }
+
     // console.log('profileOptions', json);
 
     const response = await requests.post(`${API_URL}/browser`, {
@@ -1140,6 +1158,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}`, {

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;
+};