gologin 2.0.3 → 2.0.6

package/README.md

@@ -25,7 +25,7 @@ To have an access to the page below you need <a href="https://app.gologin.com/#/
 ```js
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const { connect } = puppeteer;
 
@@ -82,7 +82,7 @@ const { connect } = puppeteer;
     - `skipOrbitaHashChecking` <[boolean]> skip hash checking for Orbita after downloading process (default false)
 
 ```js
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 const GL = new GoLogin({
     token: 'yU0token',
     profile_id: 'yU0Pr0f1leiD',
@@ -130,7 +130,7 @@ stop current browser without removing archived profile
 ```js
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const { connect } = puppeteer;
 

package/example.js

@@ -1,11 +1,14 @@
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from './src/gologin.js';
+
+const token = 'yU0token';
+const profile_id = 'yU0Pr0f1leiD';
 
 (async () => {
   const GL = new GoLogin({
-    token: 'yU0token',
-    profile_id: 'yU0Pr0f1leiD',
+    token,
+    profile_id,
   });
 
   const { status, wsUrl } = await GL.start().catch((e) => {

package/examples/example-amazon-goless.js

@@ -1,6 +1,6 @@
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const { connect } = puppeteer;
 

package/examples/example-amazon-headless.js

@@ -1,6 +1,6 @@
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const { connect } = puppeteer;
 

package/examples/example-amazon.js

@@ -1,6 +1,6 @@
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const { connect } = puppeteer;
 

package/examples/example-fast-profile-settings.js

@@ -0,0 +1,69 @@
+import puppeteer from 'puppeteer-core';
+
+import { updateProfileProxy, updateProfileResolution, updateProfileUserAgent } from '../src/browser/browser-api.js';
+import GoLogin from '../src/gologin.js';
+
+const token = 'yU0token';
+const profile_id = 'yU0Pr0f1leiD';
+
+(async () => {
+  const GL = new GoLogin({
+    token,
+    profile_id,
+  });
+
+  const { status, wsUrl } = await GL.start().catch((e) => {
+    console.trace(e);
+
+    return { status: 'failure' };
+  });
+
+  if (status !== 'success') {
+    console.log('Invalid status');
+
+    return;
+  }
+
+  const browser = await puppeteer.connect({
+    browserWSEndpoint: wsUrl.toString(),
+    ignoreHTTPSErrors: true,
+  });
+
+  const page = await browser.newPage();
+  await page.goto('https://myip.link/mini');
+  console.log(await page.content());
+
+  /**
+   * @see updateProfileProxy
+   */
+  const proxyData = {
+    mode: 'none',
+  };
+
+  await GL.changeProfileProxy(proxyData);
+
+  await GL.changeProfileResolution('1920x1080');
+
+  const userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.5359.71 Safari/537.36';
+  await GL.changeProfileUserAgent(userAgent);
+
+  await browser.close();
+  await GL.stop();
+})();
+
+(async () => {
+
+  /**
+   * @see updateProfileProxy
+   */
+  const proxyData = {
+    mode: 'none',
+  };
+
+  await updateProfileProxy(profile_id, token, proxyData);
+
+  await updateProfileResolution(profile_id, token, '1920x1080');
+
+  const userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.5359.71 Safari/537.36';
+  await updateProfileUserAgent(profile_id, token, userAgent);
+})();

package/examples/example-gmail.js

@@ -1,6 +1,6 @@
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const { connect } = puppeteer;
 

package/examples/example-local-profile.js

@@ -1,6 +1,6 @@
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const { connect } = puppeteer;
 

package/examples/example-login-walmart.js

@@ -1,6 +1,6 @@
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const { connect } = puppeteer;
 

package/examples/example-timezone.js

@@ -1,6 +1,6 @@
 import puppeteer from 'puppeteer-core';
 
-import GoLogin from './gologin.js';
+import GoLogin from '../src/gologin.js';
 
 const { connect } = puppeteer;
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "gologin",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "description": "A high-level API to control Orbita browser over GoLogin API",
-  "main": "./gologin.js",
+  "main": "./src/gologin.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/gologinapp/gologin.git"
@@ -20,7 +20,6 @@
     "decompress": "^4.2.1",
     "decompress-unzip": "^4.0.1",
     "form-data": "^3.0.0",
-    "lodash": "^4.17.15",
     "progress": "^2.0.3",
     "puppeteer-core": "^2.1.1",
     "request": "^2.88.2",

package/src/browser/browser-api.js

@@ -0,0 +1,71 @@
+import requestretry from 'requestretry';
+
+import { API_URL } from '../utils/common.js';
+
+/**
+  * @param {string} profileId
+  * @param {string} ACCESS_TOKEN
+  * @param {string} resolution
+*/
+export const updateProfileResolution = (profileId, ACCESS_TOKEN, resolution) =>
+  requestretry.patch(`${API_URL}/browser/${profileId}/resolution`, {
+    headers: {
+      Authorization: `Bearer ${ACCESS_TOKEN}`,
+      'user-agent': 'gologin-api',
+    },
+    json: { resolution },
+    maxAttempts: 3,
+    retryDelay: 2000,
+    timeout: 10 * 1000,
+  }).catch((e) => {
+    console.log(e);
+
+    return { body: [] };
+  });
+
+/**
+  * @param {string} profileId
+  * @param {string} ACCESS_TOKEN
+  * @param {string} userAgent
+*/
+export const updateProfileUserAgent = (profileId, ACCESS_TOKEN, userAgent) =>
+  requestretry.patch(`${API_URL}/browser/${profileId}/ua`, {
+    headers: {
+      Authorization: `Bearer ${ACCESS_TOKEN}`,
+      'user-agent': 'gologin-api',
+    },
+    json: { userAgent },
+    maxAttempts: 3,
+    retryDelay: 2000,
+    timeout: 10 * 1000,
+  }).catch((e) => {
+    console.log(e);
+
+    return { body: [] };
+  });
+
+/**
+  * @param {string} profileId
+  * @param {string} ACCESS_TOKEN
+  * @param {Object} browserProxyData
+  * @param {'http' | 'socks4' | 'socks5' | 'none'} browserProxyData.mode
+  * @param {string} [browserProxyData.host]
+  * @param {string} [browserProxyData.port]
+  * @param {string} [browserProxyData.username]
+  * @param {string} [browserProxyData.password]
+*/
+export const updateProfileProxy = (profileId, ACCESS_TOKEN, browserProxyData) =>
+  requestretry.patch(`${API_URL}/browser/${profileId}/proxy`, {
+    headers: {
+      Authorization: `Bearer ${ACCESS_TOKEN}`,
+      'user-agent': 'gologin-api',
+    },
+    json: browserProxyData,
+    maxAttempts: 3,
+    retryDelay: 2000,
+    timeout: 10 * 1000,
+  }).catch((e) => {
+    console.log(e);
+
+    return { body: [] };
+  });

package/{browser-user-data-manager.js → src/browser/browser-user-data-manager.js}

@@ -1,13 +1,17 @@
 import { createHash } from 'crypto';
 import { createWriteStream, promises as _promises, rmdirSync } from 'fs';
 import { homedir, tmpdir } from 'os';
-import { join, resolve, sep } from 'path';
+import { join, resolve, sep, dirname } from 'path';
+import { fileURLToPath } from 'url';
 import requestretry from 'requestretry';
 
-import { fontsCollection } from './fonts.js';
+import { fontsCollection } from '../../fonts.js';
 
 const { access, readFile, writeFile, mkdir, readdir, copyFile, rename } = _promises;
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
 const FONTS_URL = 'https://fonts.gologin.com/';
 const FONTS_DIR_NAME = 'fonts';
 
@@ -115,7 +119,7 @@ export const copyFontsConfigFile = async (profilePath) => {
     return;
   }
 
-  const fileContent = await readFile(resolve(__dirname, 'fonts_config'), 'utf-8');
+  const fileContent = await readFile(resolve(__dirname, '..', '..', 'fonts_config'), 'utf-8');
   const result = fileContent.replace(/\$\$GOLOGIN_FONTS\$\$/g, join(profilePath, FONTS_DIR_NAME));
 
   const defaultFolderPath = join(profilePath, 'Default');

package/{extensions-manager.js → src/extensions/extensions-manager.js}

@@ -2,13 +2,13 @@ import { createWriteStream, promises as _promises } from 'fs';
 import { join, sep } from 'path';
 import request from 'requestretry';
 
-import { CHROME_EXTENSIONS_PATH, composeExtractionPromises, USER_EXTENSIONS_PATH } from './common.js';
+import { CHROME_EXTENSIONS_PATH, composeExtractionPromises, USER_EXTENSIONS_PATH } from '../utils/common.js';
 import UserExtensionsManager from './user-extensions-manager.js';
 
 const { mkdir, readdir, rmdir, unlink } = _promises;
 
-
-const EXTENSION_URL = 'https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&x=id%3D{ext_id}%26uc&prodversion=97.0.4692.71';
+const EXTENSION_URL =
+  'https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&x=id%3D{ext_id}%26uc&prodversion=97.0.4692.71';
 
 export class ExtensionsManager extends UserExtensionsManager {
   #existedChromeExtensions = [];

package/{user-extensions-manager.js → src/extensions/user-extensions-manager.js}

@@ -2,7 +2,7 @@ import { createWriteStream, promises as _promises } from 'fs';
 import { join, sep } from 'path';
 import request from 'requestretry';
 
-import { CHROME_EXTENSIONS_PATH, composeExtractionPromises, USER_EXTENSIONS_PATH } from './common.js';
+import { CHROME_EXTENSIONS_PATH, composeExtractionPromises, USER_EXTENSIONS_PATH } from '../utils/common.js';
 
 const { readdir, readFile, stat, mkdir, copyFile } = _promises;
 

package/{gologin.js → src/gologin.js}

@@ -4,7 +4,6 @@ import decompress from 'decompress';
 import decompressUnzip from 'decompress-unzip';
 import { existsSync, mkdirSync, promises as _promises } from 'fs';
 import { get as _get } from 'https';
-import lodash from 'lodash';
 import { tmpdir } from 'os';
 import { join, resolve as _resolve,sep } from 'path';
 import requests from 'requestretry';
@@ -12,21 +11,22 @@ import rimraf from 'rimraf';
 import ProxyAgent from 'simple-proxy-agent';
 import util from 'util';
 
-import BrowserChecker from './browser-checker.js';
-import { composeFonts, downloadCookies, setExtPathsAndRemoveDeleted, setOriginalExtPaths, uploadCookies } from './browser-user-data-manager.js';
-import { getChunckedInsertValues, getDB, loadCookiesFromFile } from './cookies-manager.js';
-import ExtensionsManager from './extensions-manager.js';
-import { fontsCollection } from './fonts.js';
-import { archiveProfile } from './profile-archiver.js';
+import { fontsCollection } from '../fonts.js';
+import { 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 { API_URL } from './utils/common.js';
+import { get } from './utils/utils.js';
 
 const exec = util.promisify(execNonPromise);
 
 const { access, unlink, writeFile, readFile } = _promises;
-const { get, merge } = lodash;
 
 const SEPARATOR = sep;
-const API_URL = 'https://api.gologin.com';
-// const API_URL = 'http://localhost:3002';
 const OS_PLATFORM = process.platform;
 
 // process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
@@ -596,14 +596,10 @@ export class GoLogin {
     preferences.gologin.langHeader = gologin.language;
     preferences.gologin.languages = languages;
     // debug("convertedPreferences=", preferences.gologin)
-    await writeFile(join(profilePath, 'Default', 'Preferences'), JSON.stringify(merge(preferences, {
+    await writeFile(join(profilePath, 'Default', 'Preferences'), JSON.stringify(Object.assign(preferences, {
       gologin,
     })));
 
-    // console.log('gologin=', _.merge(preferences, {
-    //   gologin
-    // }));
-
     debug('Profile ready. Path: ', profilePath, 'PROXY', JSON.stringify(get(preferences, 'gologin.proxy')));
 
     return profilePath;
@@ -1379,7 +1375,7 @@ export class GoLogin {
     };
 
     const wsUrl = await this.waitDebuggingUrl(delay_ms);
-    if (wsUrl!='') {
+    if (wsUrl !== '') {
       return { 'status': 'success', wsUrl };
     }
 
@@ -1405,6 +1401,18 @@ export class GoLogin {
       .filter(elem => elem.fileNames)
       .map(elem => elem.name);
   }
+
+  async changeProfileResolution(resolution) {
+    return updateProfileResolution(this.profile_id, this.access_token, resolution);
+  }
+
+  async changeProfileUserAgent(userAgent) {
+    return updateProfileUserAgent(this.profile_id, this.access_token, userAgent);
+  }
+
+  async changeProfileProxy(proxyData) {
+    return updateProfileProxy(this.profile_id, this.access_token, proxyData);
+  }
 }
 
 export default GoLogin;

package/{common.js → src/utils/common.js}

@@ -1,7 +1,9 @@
 import { homedir } from 'os';
 import { join, sep } from 'path';
 
-import { deleteExtensionArchive, extractExtension } from './extensions-extractor.js';
+import { deleteExtensionArchive, extractExtension } from '../extensions/extensions-extractor.js';
+
+export const API_URL = 'https://api.gologin.com';
 
 const HOMEDIR = homedir();
 const CHROME_EXT_DIR_NAME = 'chrome-extensions';

package/src/utils/utils.js

@@ -0,0 +1,11 @@
+export const get = (value, path, defaultValue) =>
+  String(path).split('.').reduce((acc, v) => {
+    try {
+      acc = acc[v] ? acc[v] : defaultValue;
+    } catch (e) {
+      return defaultValue;
+    }
+
+    return acc;
+  }, value);
+