gologin 2.0.20 → 2.0.22

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

package/src/gologin.js

@@ -59,6 +59,7 @@ export class GoLogin {
       this.waitWebsocket = false;
     }
 
+    this.isCloudHeadless = options.isCloudHeadless || true;
     this.isNewCloudBrowser = true;
     if (options.isNewCloudBrowser === false) {
       this.isNewCloudBrowser = false;
@@ -73,6 +74,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 +98,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 +748,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 +775,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 +930,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,6 +1014,25 @@ 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`,
@@ -1438,7 +1462,7 @@ export class GoLogin {
 
     const profileResponse = await requests.post(`${API_URL}/browser/${this.profile_id}/web`, {
       headers: { 'Authorization': `Bearer ${this.access_token}` },
-      json: { isNewCloudBrowser: this.isNewCloudBrowser },
+      json: { isNewCloudBrowser: this.isNewCloudBrowser, isHeadless: this.isCloudHeadless },
     });
 
     debug('profileResponse', profileResponse.statusCode, profileResponse.body);