gologin 2.0.19 → 2.0.21

package/.eslintrc.json

@@ -104,9 +104,10 @@
         ],
         "no-unused-vars": [
           "warn", { 
-            "vars": "all", 
-            "args": "after-used", 
-            "ignoreRestSiblings": false 
+            "vars": "all",
+            "args": "after-used",
+            "ignoreRestSiblings": false,
+            "varsIgnorePattern": "^_"
             }
         ],
         "keyword-spacing": [

package/examples/{example-amazon-goless.js → example-amazon-cloud-browser.js}

@@ -1,17 +1,22 @@
-import puppeteer from 'puppeteer-core';
+// Usage example: in the terminal enter
+// node example-amazon-cloud-browser.js yU0token yU0Pr0f1leiD
+
+// your token api (located in the settings, api)
+// https://github.com/gologinapp/gologin#usage
 
-import GoLogin from '../src/gologin.js';
+import GoLogin from 'gologin';
+import puppeteer from 'puppeteer-core';
 
-const { connect } = puppeteer;
+const [_execPath, _filePath, GOLOGIN_API_TOKEN, GOLOGIN_PROFILE_ID] = process.argv;
 
 (async () => {
   const GL = new GoLogin({
-    token: 'yU0token',
-    profile_id: 'yU0Pr0f1leiD',
+    token: GOLOGIN_API_TOKEN,
+    profile_id: GOLOGIN_PROFILE_ID,
   });
 
-  const { status, wsUrl } = await GL.startRemote();
-  const browser = await connect({
+  const { _status, wsUrl } = await GL.startRemote();
+  const browser = await puppeteer.connect({
     browserWSEndpoint: wsUrl,
     ignoreHTTPSErrors: true,
   });

package/examples/example-amazon-headless.js

@@ -1,20 +1,25 @@
-import puppeteer from 'puppeteer-core';
+// Usage example: in the terminal enter
+// node example-amazon-headless.js yU0token yU0Pr0f1leiD
+
+// your token api (located in the settings, api)
+// https://github.com/gologinapp/gologin#usage
 
-import GoLogin from '../src/gologin.js';
+import GoLogin from 'gologin';
+import puppeteer from 'puppeteer-core';
 
-const { connect } = puppeteer;
+const [_execPath, _filePath, GOLOGIN_API_TOKEN, GOLOGIN_PROFILE_ID] = process.argv;
 
 const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));
 
 (async () => {
   const GL = new GoLogin({
-    token: 'yU0token',
-    profile_id: 'yU0Pr0f1leiD',
+    token: GOLOGIN_API_TOKEN,
+    profile_id: GOLOGIN_PROFILE_ID,
     extra_params: ['--headless', '--no-sandbox'],
   });
 
-  const { status, wsUrl } = await GL.start();
-  const browser = await connect({
+  const { _status, wsUrl } = await GL.start();
+  const browser = await puppeteer.connect({
     browserWSEndpoint: wsUrl.toString(),
     ignoreHTTPSErrors: true,
   });
@@ -30,7 +35,6 @@ const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));
   await session.detach();
 
   await page.goto('https://www.amazon.com/-/dp/B0771V1JZX');
-
   const content = await page.content();
   const matchData = content.match(/'initial': (.*)}/);
   if (matchData === null || matchData.length === 0){

package/examples/example-amazon.js

@@ -1,17 +1,22 @@
-import puppeteer from 'puppeteer-core';
+// Usage example: in the terminal enter
+// node example-amazon.js yU0token yU0Pr0f1leiD
+
+// your token api (located in the settings, api)
+// https://github.com/gologinapp/gologin#usage
 
-import GoLogin from '../src/gologin.js';
+import GoLogin from 'gologin';
+import puppeteer from 'puppeteer-core';
 
-const { connect } = puppeteer;
+const [_execPath, _filePath, GOLOGIN_API_TOKEN, GOLOGIN_PROFILE_ID] = process.argv;
 
 (async () => {
   const GL = new GoLogin({
-    token: 'yU0token',
-    profile_id: 'yU0Pr0f1leiD',
+    token: GOLOGIN_API_TOKEN,
+    profile_id: GOLOGIN_PROFILE_ID,
   });
 
-  const { status, wsUrl } = await GL.start();
-  const browser = await connect({
+  const { _status, wsUrl } = await GL.start();
+  const browser = await puppeteer.connect({
     browserWSEndpoint: wsUrl.toString(),
     ignoreHTTPSErrors: true,
   });

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

@@ -1,9 +1,15 @@
-import GoLogin from '../src/gologin.js';
+// Usage example: in the terminal enter
+// node example-create-custom-profile.js yU0token
+
+// your token api (located in the settings, api)
+// https://github.com/gologinapp/gologin#usage
+
+import GoLogin from 'gologin';
+
+const [_execPath, _filePath, GOLOGIN_API_TOKEN] = process.argv;
 
 (async () => {
-  const GL = new GoLogin({
-    token: 'yU0token',
-  });
+  const GL = new GoLogin({ token: GOLOGIN_API_TOKEN });
 
   const profileId = await GL.createCustom({
     os: 'win', // required param ('lin', 'mac', 'win', 'android'), for macM1 write (os: 'mac') and add property 'isM1'

package/examples/example-create-profile.js

@@ -1,14 +1,17 @@
-import GoLogin from '../src/gologin.js';
+// Usage example: in the terminal enter
+// node example-create-profile.js yU0token
 
-const delay = ms => new Promise(res => setTimeout(res, ms));
+// your token api (located in the settings, api)
+// https://github.com/gologinapp/gologin#usage
 
-(async () => {
-  const GL = new GoLogin({
-    token: 'yU0token',
-  });
+import GoLogin from 'gologin';
+
+const [_execPath, _filePath, GOLOGIN_API_TOKEN] = process.argv;
 
-  // next parameters are required for creating
+(async () => {
+  const GL = new GoLogin({ token: GOLOGIN_API_TOKEN });
 
+  // the following parameters are required for profile creation
   const profile_id = await GL.create({
     name: 'profile_mac',
     os: 'mac', // 'win', 'lin', 'android'
@@ -25,14 +28,12 @@ const delay = ms => new Promise(res => setTimeout(res, ms));
   });
 
   console.log('profile id=', profile_id);
-
   await GL.update({
     id: profile_id,
     name: 'profile_mac2',
   });
 
   const profile = await GL.getProfile(profile_id);
-
   console.log('new profile name=', profile.name);
 
   // await GL.delete(profile_id);

package/package.json

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

package/src/browser/browser-checker.js

@@ -12,14 +12,16 @@ import util from 'util';
 import { findLatestBrowserVersionDirectory } from '../utils/utils.js';
 
 const exec = util.promisify(execNonPromise);
-const { access, mkdir, readdir, rmdir, unlink, copyFile, readlink, symlink, lstat } = _promises;
+const { access, mkdir, readdir, rmdir, unlink, copyFile, readlink, symlink, lstat, rename, writeFile } = _promises;
 
 const PLATFORM = process.platform;
+const ARCH = process.arch;
 
 const VERSION_FILE = 'latest-version.txt';
 const MAC_VERSION_FILE_URL = `https://orbita-browser-mac.gologin.com/${VERSION_FILE}`;
 const DEB_VERSION_FILE_URL = `https://orbita-browser-linux.gologin.com/${VERSION_FILE}`;
 const WIN_VERSION_FILE_URL = `https://orbita-browser-windows.gologin.com/${VERSION_FILE}`;
+const MAC_ARM_VERSION_FILE_URL = `https://orbita-browser-mac-arm.gologin.com/${VERSION_FILE}`;
 
 const WIN_FOLDERSIZE_FILE = 'foldersize.txt';
 const WIN_FOLDERSIZE_FILE_LINK = `https://orbita-browser-windows.gologin.com/${WIN_FOLDERSIZE_FILE}`;
@@ -28,6 +30,7 @@ const BROWSER_ARCHIVE_NAME = `orbita-browser-latest.${PLATFORM === 'win32' ? 'zi
 const MAC_BROWSER_LINK = `https://orbita-browser-mac.gologin.com/${BROWSER_ARCHIVE_NAME}`;
 const DEB_BROWSER_LINK = `https://orbita-browser-linux.gologin.com/${BROWSER_ARCHIVE_NAME}`;
 const WIN_BROWSER_LINK = `https://orbita-browser-windows.gologin.com/${BROWSER_ARCHIVE_NAME}`;
+const MAC_ARM_BROWSER_LINK = `https://orbita-browser-mac-arm.gologin.com/${BROWSER_ARCHIVE_NAME}`;
 
 const MAC_HASH_FILE = 'hashfile.mtree';
 const DEB_HASH_FILE = 'hashfile.txt';
@@ -35,6 +38,7 @@ const WIN_HASH_FILE = DEB_HASH_FILE;
 const MAC_HASHFILE_LINK = `https://orbita-browser-mac.gologin.com/${MAC_HASH_FILE}`;
 const DEB_HASHFILE_LINK = `https://orbita-browser-linux.gologin.com/${DEB_HASH_FILE}`;
 const WIN_HASHFILE_LINK = `https://orbita-browser-windows.gologin.com/${WIN_HASH_FILE}`;
+const MAC_ARM_HASHFILE_LINK = `https://orbita-browser-mac-arm.gologin.com/${MAC_HASH_FILE}`;
 
 const FAIL_SUM_MATCH_MESSAGE = 'hash_sum_not_matched';
 const EXTRACTED_FOLDER = 'extracted-browser';
@@ -69,11 +73,12 @@ export class BrowserChecker {
   async checkBrowser(autoUpdateBrowser = false) {
     const browserFolderExists = await access(this.#executableFilePath).then(() => true).catch(() => false);
 
+    const browserLatestVersion = await this.getLatestBrowserVersion();
     if (!browserFolderExists) {
-      return this.downloadBrowser();
+      return this.downloadBrowser(browserLatestVersion);
     }
 
-    const browserLatestVersion = await this.getLatestBrowserVersion();
+
     const currentVersionReq = await this.getCurrentVersion();
     const currentVersion = (currentVersionReq?.stdout || '').replace(/(\r\n|\n|\r)/gm, '');
 
@@ -82,7 +87,7 @@ export class BrowserChecker {
     }
 
     if (autoUpdateBrowser) {
-      return this.downloadBrowser();
+      return this.downloadBrowser(browserLatestVersion);
     }
 
     return new Promise(resolve => {
@@ -96,7 +101,7 @@ export class BrowserChecker {
         clearTimeout(timeout);
         rl.close();
         if (answer && answer[0].toString().toLowerCase() === 'y') {
-          return this.downloadBrowser().then(() => resolve());
+          return this.downloadBrowser(browserLatestVersion).then(() => resolve());
         }
 
         console.log(`Continue with current ${currentVersion} version.`);
@@ -105,7 +110,7 @@ export class BrowserChecker {
     });
   }
 
-  async downloadBrowser() {
+  async downloadBrowser(latestVersion) {
     await this.deleteOldArchives(true);
     await mkdir(this.#browserPath, { recursive: true });
 
@@ -115,6 +120,10 @@ export class BrowserChecker {
       link = WIN_BROWSER_LINK;
     } else if (PLATFORM === 'darwin') {
       link = MAC_BROWSER_LINK;
+
+      if (ARCH === 'arm64') {
+        link = MAC_ARM_BROWSER_LINK;
+      }
     }
 
     await this.downloadBrowserArchive(link, pathStr);
@@ -123,10 +132,16 @@ export class BrowserChecker {
     await this.checkBrowserSum();
     console.log('Orbita hash checked successfully');
     await this.replaceBrowser();
+    await this.addLatestVersion(latestVersion).catch(() => null);
     await this.deleteOldArchives();
     console.log('Orbita updated successfully');
   }
 
+  addLatestVersion(latestVersion) {
+    return mkdir(join(this.#browserPath, 'orbita-browser', 'version'), { recursive: true })
+      .then(() => writeFile(join(this.#browserPath, 'orbita-browser', 'version', 'latest-version.txt'), latestVersion));
+  }
+
   downloadBrowserArchive(link, pathStr) {
     return new Promise((resolve, reject) => {
       const writableStream = createWriteStream(pathStr);
@@ -207,6 +222,9 @@ export class BrowserChecker {
     let resultPath = join(this.#browserPath, DEB_HASH_FILE);
     if (PLATFORM === 'darwin') {
       hashLink = MAC_HASHFILE_LINK;
+      if (ARCH === 'arm64') {
+        hashLink = MAC_ARM_HASHFILE_LINK;
+      }
       resultPath = join(this.#browserPath, MAC_HASH_FILE);
     }
 
@@ -279,17 +297,7 @@ export class BrowserChecker {
   async replaceBrowser() {
     console.log('Copy Orbita to target path');
     if (PLATFORM === 'darwin') {
-      await this.deleteDir(join(this.#browserPath, 'Orbita-Browser.app'));
-
-      const files = await readdir(join(this.#browserPath, EXTRACTED_FOLDER));
-      const promises = [];
-      files.forEach((filename) => {
-        if (filename.match(/.*\.dylib$/)) {
-          promises.push(copyFile(join(this.#browserPath, EXTRACTED_FOLDER, filename), join(this.#browserPath, filename)));
-        }
-      });
-
-      return Promise.all(promises);
+      return rename(join(this.#browserPath, EXTRACTED_FOLDER), join(this.#browserPath, 'orbita-browser'))
     }
 
     const targetBrowserPath = join(this.#browserPath, 'orbita-browser');
@@ -303,7 +311,7 @@ export class BrowserChecker {
 
   async deleteOldArchives(deleteCurrentBrowser = false) {
     if (deleteCurrentBrowser) {
-      return this.deleteDir(join(this.#browserPath));
+      return this.deleteDir(join(this.#browserPath, 'orbita-browser'));
     }
 
     await this.deleteDir(join(this.#browserPath, EXTRACTED_FOLDER));
@@ -347,7 +355,7 @@ export class BrowserChecker {
     if (PLATFORM === 'win32') {
       command = `if exist "${join(this.#browserPath, 'orbita-browser', 'version')}" (type "${join(this.#browserPath, 'orbita-browser', 'version')}") else (echo 0.0.0)`;
     } else if (PLATFORM === 'darwin') {
-      command = `if [ -f ${join(this.#browserPath, 'version', VERSION_FILE)} ]; then cat ${join(this.#browserPath, 'version', VERSION_FILE)}; else echo 0.0.0; fi`;
+      command = `if [ -f ${join(this.#browserPath, 'orbita-browser', 'version', VERSION_FILE)} ]; then cat ${join(this.#browserPath, 'orbita-browser', 'version', VERSION_FILE)}; else echo 0.0.0; fi`;
     }
 
     return exec(command);
@@ -359,6 +367,10 @@ export class BrowserChecker {
       url = WIN_VERSION_FILE_URL;
     } else if (PLATFORM === 'darwin') {
       url = MAC_VERSION_FILE_URL;
+
+      if (ARCH === 'arm64') {
+        url = MAC_ARM_VERSION_FILE_URL;
+      }
     }
 
     return new Promise(resolve => get(url,

package/src/gologin.js

@@ -73,6 +73,8 @@ export class GoLogin {
     this.timezone = options.timezone;
     this.extensionPathsToInstall = [];
     this.restoreLastSession = options.restoreLastSession || false;
+    this.processSpawned = null;
+    this.processKillTimeout = 1 * 1000;
 
     if (options.tmpdir) {
       this.tmpdir = options.tmpdir;
@@ -95,6 +97,7 @@ export class GoLogin {
     this.profile_id = profile_id;
     this.cookiesFilePath = await getCookiesFilePath(profile_id, this.tmpdir);
     this.profile_zip_path = join(this.tmpdir, `gologin_${this.profile_id}.zip`);
+    this.bookmarksFilePath = join(this.tmpdir, `gologin_profile_${this.profile_id}`, 'Default', 'Bookmarks');
   }
 
   async getToken(username, password) {
@@ -744,10 +747,10 @@ export class GoLogin {
       }
 
       const proxyUrl = `${proxy.mode}://${proxy.username}:${proxy.password}@${proxy.host}:${proxy.port}`;
-      debug('getTimeZone start https://time.gologin.com/timezone', proxyUrl);
-      data = await requests.get('https://time.gologin.com/timezone', { proxy: proxyUrl, timeout: 20 * 1000, maxAttempts: 5 });
+      debug('getTimeZone start https://ipgeo.gologin.com', proxyUrl);
+      data = await requests.get('https://ipgeo.gologin.com', { proxy: proxyUrl, timeout: 20 * 1000, maxAttempts: 5 });
     } else {
-      data = await requests.get('https://time.gologin.com/timezone', { timeout: 20 * 1000, maxAttempts: 5 });
+      data = await requests.get('https://ipgeo.gologin.com', { timeout: 20 * 1000, maxAttempts: 5 });
     }
 
     debug('getTimeZone finish', data.body);
@@ -771,7 +774,7 @@ export class GoLogin {
     const agent = new ProxyAgent(proxy, { tunnel: true, timeout: 10000 });
 
     const checkData = await new Promise((resolve, reject) => {
-      _get('https://time.gologin.com/timezone', { agent }, (res) => {
+      _get('https://ipgeo.gologin.com', { agent }, (res) => {
         let resultResponse = '';
         res.on('data', (data) => resultResponse += data);
 
@@ -926,6 +929,7 @@ export class GoLogin {
 
       console.log(params);
       const child = execFile(ORBITA_BROWSER, params, { env });
+      this.processSpawned = child;
       // const child = spawn(ORBITA_BROWSER, params, { env, shell: true });
       child.stdout.on('data', (data) => debug(data.toString()));
       debug('SPAWN CMD', ORBITA_BROWSER, params.join(' '));
@@ -1009,12 +1013,36 @@ export class GoLogin {
     debug('browser killed');
   }
 
+  killBrowser() {
+    if (!this.processSpawned.pid) {
+      return;
+    }
+
+    try {
+      this.processSpawned.kill();
+      debug('browser killed');
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  async killAndCommit(options, local = false) {
+    this.killBrowser();
+    await delay(this.processKillTimeout);
+    await this.stopAndCommit(options, local).catch(console.error);
+  }
+
   async sanitizeProfile() {
     const remove_dirs = [
       `${SEPARATOR}Default${SEPARATOR}Cache`,
-      `${SEPARATOR}Default${SEPARATOR}Service Worker${SEPARATOR}CacheStorage`,
+      `${SEPARATOR}Default${SEPARATOR}Service Worker`,
       `${SEPARATOR}Default${SEPARATOR}Code Cache`,
       `${SEPARATOR}Default${SEPARATOR}GPUCache`,
+      `${SEPARATOR}Default${SEPARATOR}Extensions`,
+      `${SEPARATOR}Default${SEPARATOR}IndexedDB`,
+      `${SEPARATOR}Default${SEPARATOR}GPUCache`,
+      `${SEPARATOR}Default${SEPARATOR}DawnCache`,
+      `${SEPARATOR}Default${SEPARATOR}fonts_config`,
       `${SEPARATOR}GrShaderCache`,
       `${SEPARATOR}ShaderCache`,
       `${SEPARATOR}biahpgbdmdkfgndcmfiipgcebobojjkp`,

package/src/profile/profile-directories-to-remove.js

@@ -11,7 +11,7 @@ const DEFAULT_FOLDER_USELESS_FILE = [
   },
   {
     name: 'Service Worker',
-    subs: ['CacheStorage', 'ScriptCache'],
+    subs: [],
     isDirectory: true,
   },
   {
@@ -19,6 +19,26 @@ const DEFAULT_FOLDER_USELESS_FILE = [
     subs: [],
     isDirectory: true,
   },
+  {
+    name: 'Extensions',
+    subs: [],
+    isDirectory: true,
+  },
+  {
+    name: 'IndexedDB',
+    subs: [],
+    isDirectory: true,
+  },
+  {
+    name: 'fonts_config',
+    subs: [],
+    isDirectory: true,
+  },
+  {
+    name: 'DawnCache',
+    subs: [],
+    isDirectory: true,
+  },
   {
     name: 'GPUCache',
     subs: [],