gologin 1.0.19 → 1.0.23

package/README.md

@@ -32,7 +32,15 @@ const GoLogin = require('gologin');
         profile_id: 'yU0Pr0f1leiD',
     });
 
-  const { status, wsUrl } = await GL.start();
+    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(), 

package/example.js

@@ -1,5 +1,5 @@
 const puppeteer = require('puppeteer-core');
-const GoLogin = require('gologin');
+const GoLogin = require('./gologin');
 
 (async () => {
   const GL = new GoLogin({
@@ -7,7 +7,16 @@ const GoLogin = require('gologin');
     profile_id: 'yU0Pr0f1leiD',
   });
 
-  const { status, wsUrl } = await GL.start();
+  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,

package/examples/example-amazon-goless.js

@@ -13,6 +13,13 @@ const GoLogin = require('../gologin');
     });
 
     const page = await browser.newPage();
+    const viewPort = GL.getViewPort();
+    await page.setViewport({ width: Math.round(viewPort.width * 0.994), height: Math.round(viewPort.height * 0.92) });
+    const session = await page.target().createCDPSession();
+    const { windowId } = await session.send('Browser.getWindowForTarget');
+    await session.send('Browser.setWindowBounds', { windowId, bounds: viewPort });
+    await session.detach();
+    
     await page.goto('https://www.amazon.com/-/dp/B0771V1JZX');   
     const content = await page.content();
     const matchData = content.match(/'initial': (.*)}/);

package/examples/example-gmail.js

@@ -0,0 +1,64 @@
+const puppeteer = require('puppeteer-core');
+const GoLogin = require('../gologin');
+
+const delay = ms => new Promise(res => setTimeout(res, ms));
+
+(async () =>{
+    const GL = new GoLogin({
+        token: 'yU0token',
+    });
+
+    const profile_id = await GL.create({
+        name: 'profile_gmail',
+        os: 'lin',
+        navigator: {
+            userAgent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.85 Safari/537.36',
+            resolution: '1280x720',
+            language: 'en-GB,en-US;q=0.9,en;q=0.8',
+            platform: 'Linux x86_64',
+            hardwareConcurrency: 8,
+            deviceMemory: 8,
+            maxTouchPoints: 5,
+        },
+        proxy: {
+            mode: 'http',
+            host: 'proxy_host',
+            port: 'proxy_port',
+            username: 'proxy_username',
+            password: 'proxy_password',
+        }
+    });
+
+    console.log('profile id=', profile_id);
+    GL.setProfileId(profile_id);
+
+    const {status, wsUrl} = await GL.start(); 
+    const browser = await puppeteer.connect({
+        browserWSEndpoint: wsUrl.toString(), 
+        ignoreHTTPSErrors: true,
+    });
+
+    const page = await browser.newPage();
+
+    const viewPort = GL.getViewPort();
+    await page.setViewport({ width: Math.round(viewPort.width * 0.994), height: Math.round(viewPort.height * 0.92) });
+    const session = await page.target().createCDPSession();
+    const { windowId } = await session.send('Browser.getWindowForTarget');
+    await session.send('Browser.setWindowBounds', { windowId, bounds: viewPort });
+    await session.detach();
+    
+    await page.goto('https://gmail.com');   
+    await delay(1000);
+    await page.goto('https://accounts.google.com/signup/v2?service=mail&continue=https%3A%2F%2Fmail.google.com%2Fmail%2F&flowName=GlifWebSignIn&flowEntry=SignUp');
+    await delay(3000);
+    await page.type('#firstName', 'first_name', { delay: 100 });
+    await page.type('#lastName', 'last_name', { delay: 100 });
+    await page.type('#username', 'username', { delay: 100 });
+    await page.type('[name=Passwd]', 'pa$$w0rd', { delay: 100 });
+    await page.type('[name=ConfirmPasswd]', 'pa$$w0rd', { delay: 100 });
+    await page.click('#accountDetailsNext > div > button');
+
+    await delay(60000)
+    await browser.close();
+    await GL.stop();
+})();

package/examples/example-local-profile.js

@@ -15,7 +15,7 @@ const GoLogin = require('../gologin');
     });
 
     const page = await browser.newPage();
-    await page.goto('https://myip.gologin.app/mini');   
+    await page.goto('https://myip.link');   
     console.log(await page.content());
     await browser.close();
     await GL.stopLocal({posting: false});

package/examples/example-timezone.js

@@ -0,0 +1,41 @@
+const puppeteer = require('puppeteer-core');
+const GoLogin = require('../gologin');
+
+const delay = ms => new Promise(res => setTimeout(res, ms));
+
+(async () =>{
+    const GL = new GoLogin({
+        token: 'yU0token',
+        profile_id: 'yU0Pr0f1leiD',
+        timezone: {
+            ip:'1.1.1.1',
+            timezone:'Europe/Amsterdam',
+            accuracy:100,
+            ll: ['52.3759','4.8975'],
+            country: 'NL',
+            city: 'Amsterdam',
+            stateProv:'',
+        }
+    });
+
+    const {status, wsUrl} = await GL.start(); 
+    const browser = await puppeteer.connect({
+        browserWSEndpoint: wsUrl.toString(), 
+        ignoreHTTPSErrors: true,
+    });
+
+    const page = await browser.newPage();
+
+    const viewPort = GL.getViewPort();
+    await page.setViewport({ width: Math.round(viewPort.width * 0.994), height: Math.round(viewPort.height * 0.92) });
+    const session = await page.target().createCDPSession();
+    const { windowId } = await session.send('Browser.getWindowForTarget');
+    await session.send('Browser.setWindowBounds', { windowId, bounds: viewPort });
+    await session.detach();
+
+    await page.goto('https://myip.link');   
+
+    await delay(60000)
+    await browser.close();
+    await GL.stop();
+})();

package/gologin.js

@@ -48,7 +48,8 @@ class GoLogin {
     this.writeCookesFromServer = options.writeCookesFromServer || true;
     this.cookiesFilePath = path.join(os.tmpdir(), `gologin_profile_${this.profile_id}`, 'Default', 'Cookies');
     this.remote_debugging_port = options.remote_debugging_port || 0;
-    
+    this.timezone = options.timezone;
+
     if (options.tmpdir) {
       this.tmpdir = options.tmpdir;
       if (!fs.existsSync(this.tmpdir)) {
@@ -81,10 +82,10 @@ class GoLogin {
   	}
   }
 
-  async getNewFingerPrint() {
+  async getNewFingerPrint(os) {
     debug('GETTING FINGERPRINT');
 
-    const fpResponse = await requests.get(`${API_URL}/browser/fingerprint?os=lin`, {
+    const fpResponse = await requests.get(`${API_URL}/browser/fingerprint?os=${os}`, {
       json: true,
       headers: {
         'Authorization': `Bearer ${this.access_token}`,
@@ -123,6 +124,11 @@ class GoLogin {
   	if (profileResponse.statusCode !== 200) {
   		throw new Error(`Gologin /browser/${id} response error ${profileResponse.statusCode}`);
   	}
+
+    if(profileResponse.statusCode == 401){
+      throw new Error("invalid token");
+    }    
+
   	return JSON.parse(profileResponse.body);
   }
 
@@ -356,7 +362,10 @@ class GoLogin {
     }
     this.proxy = proxy;
 
-    await this.getTimeZone(proxy);
+    await this.getTimeZone(proxy).catch((e) => {
+      console.error('Proxy Error. Check it and try again.');
+      throw e;
+    });
 
     const [latitude, longitude] = this._tz.ll;
     const accuracy = this._tz.accuracy;
@@ -488,6 +497,12 @@ class GoLogin {
   }
 
   async getTimeZone(proxy) {
+    if(this.timezone){
+      debug('getTimeZone from options', this.timezone);
+      this._tz = this.timezone;
+      return this._tz.timezone;
+    }
+
     let data = null;
     if (proxy) {
       if (proxy.mode.includes('socks')) {
@@ -496,9 +511,9 @@ class GoLogin {
 
       const proxyUrl = `${proxy.mode}://${proxy.username}:${proxy.password}@${proxy.host}:${proxy.port}`;
       debug('getTimeZone start https://time.gologin.com', proxyUrl);
-      data = await requests.get('https://time.gologin.com', { proxy: proxyUrl });
+      data = await requests.get('https://time.gologin.com', { proxy: proxyUrl, timeout: 10 * 1000, maxAttempts: 2 });
     } else {
-      data = await requests.get('https://time.gologin.com');
+      data = await requests.get('https://time.gologin.com', { timeout: 10 * 1000, maxAttempts: 2 });
     }
     debug('getTimeZone finish', data.body);
     this._tz = JSON.parse(data.body);
@@ -543,6 +558,7 @@ class GoLogin {
       }).on('error', (err) => reject(err));
     });
 
+    console.log('checkData:', checkData);
     body = checkData.body || {};
     if (!body.ip && checkData.statusCode.toString().startsWith('4')) {
       throw checkData;
@@ -563,7 +579,10 @@ class GoLogin {
     Object.keys(process.env).forEach((key) => {
       env[key] = process.env[key];
     });
-    const tz = await this.getTimeZone(this.proxy);
+    const tz = await this.getTimeZone(this.proxy).catch((e) => {
+      console.error('Proxy Error. Check it and try again.');
+      throw e;
+    });
     env['TZ'] = tz;
 
     let params = [`--proxy-server=${proxy}`, `--user-data-dir=${profile_path}`, `--password-store=basic`, `--tz=${tz}`, `--lang=en`]
@@ -579,7 +598,6 @@ class GoLogin {
   }
 
   async spawnBrowser() {
-
     let remote_debugging_port = this.remote_debugging_port;
     if(!remote_debugging_port){
       remote_debugging_port = await this.getRandomPort();
@@ -602,7 +620,10 @@ class GoLogin {
     Object.keys(process.env).forEach((key) => {
       env[key] = process.env[key];
     });
-    const tz = await this.getTimeZone(this.proxy);
+    const tz = await this.getTimeZone(this.proxy).catch((e) => {
+      console.error('Proxy Error. Check it and try again.');
+      throw e;
+    });
     env['TZ'] = tz;
 
     if (this.vnc_port) {
@@ -615,14 +636,17 @@ class GoLogin {
       );
     } else {
       const [splittedLangs] = this.language.split(';');
-      const browserLangs = splittedLangs.split(',');
-      const browserLang = browserLangs[browserLangs.length - 1];
+      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 || 'en'}`,
+        `--lang=${browserLang}`,
       ];
 
       if (this.fontsMasking) {
@@ -822,6 +846,15 @@ class GoLogin {
     debug('createProfile', options);
 
     const fingerprint = await this.getRandomFingerprint(options);
+    debug("fingerprint=", fingerprint)
+    
+    if(fingerprint.statusCode == 500){
+      throw new Error("no valid random fingerprint check os param");
+    }
+
+    if(fingerprint.statusCode == 401){
+      throw new Error("invalid token");
+    }
 
     const { navigator, fonts, webGLMetadata, webRTC } = fingerprint;
     let deviceMemory = navigator.deviceMemory || 2;
@@ -919,9 +952,17 @@ class GoLogin {
   };
 
   async postCookies(profileId, cookies) {
+    const formattedCookies = cookies.map(cookie => {
+      if (!['no_restriction', 'lax', 'strict', 'unspecified'].includes(cookie.sameSite)) {
+        cookie.sameSite = 'unspecified';
+      }
+
+      return cookie;
+    });
+
     const response = await BrowserUserDataManager.uploadCookies({
       profileId,
-      cookies,
+      cookies: formattedCookies,
       API_BASE_URL: API_URL,
       ACCESS_TOKEN: this.access_token,
     });
@@ -1049,6 +1090,11 @@ class GoLogin {
         'Authorization': `Bearer ${this.access_token}`
       }
     });
+
+    if(profileResponse.statusCode == 401){
+      throw new Error("invalid token");
+    }
+
     debug('profileResponse', profileResponse.statusCode, profileResponse.body);
     if (profileResponse.statusCode !== 202) {
       return {'status': 'failure', 'code':  profileResponse.statusCode};
@@ -1056,8 +1102,6 @@ class GoLogin {
     
     if (profileResponse.body === 'ok') {
       let wsUrl = await this.waitDebuggingUrl(delay_ms);
-      // const wsUrl = `wss://${this.profile_id}.orbita.gologin.app`
-      // const wsUrl = `wss://${this.profile_id}.orbita.gologin.com`
       return { 'status': 'success', wsUrl }
     }
 

package/package.json

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

package/selenium/example.js

@@ -28,5 +28,5 @@ chrome.setDefaultService(new chrome.ServiceBuilder('./chromedriver').build());
                  .setChromeOptions(chromeOptions)
                  .build();
 
-    await driver.get('https://myip.gologin.app/mini')
+    await driver.get('https://myip.link')
 })();

package/selenium/gologin-local.py

@@ -0,0 +1,30 @@
+import time
+from sys import platform
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+from gologin import GoLogin
+
+
+gl = GoLogin({
+	"token": "yU0token",
+	"profile_id": "yU0Pr0f1leiD",
+	"local": True,
+	"credentials_enable_service": False,
+	})
+
+if platform == "linux" or platform == "linux2":
+	chrome_driver_path = "./chromedriver"
+elif platform == "darwin":
+	chrome_driver_path = "./mac/chromedriver"
+elif platform == "win32":
+	chrome_driver_path = "chromedriver.exe"
+
+debugger_address = gl.start()
+chrome_options = Options()
+chrome_options.add_experimental_option("debuggerAddress", debugger_address)
+driver = webdriver.Chrome(executable_path=chrome_driver_path, options=chrome_options)
+driver.get("http://www.python.org")
+assert "Python" in driver.title
+driver.close()
+time.sleep(3)
+gl.stop()

package/selenium/gologin-selenium.py

@@ -6,16 +6,16 @@ from gologin import GoLogin
 
 
 gl = GoLogin({
-	'token': 'yU0token',
-	'profile_id': 'yU0Pr0f1leiD',
+	"token": "yU0token",
+	"profile_id": "yU0Pr0f1leiD",
 	})
 
 if platform == "linux" or platform == "linux2":
-	chrome_driver_path = './chromedriver'
+	chrome_driver_path = "./chromedriver"
 elif platform == "darwin":
-	chrome_driver_path = './mac/chromedriver'
+	chrome_driver_path = "./mac/chromedriver"
 elif platform == "win32":
-	chrome_driver_path = 'chromedriver.exe'
+	chrome_driver_path = "chromedriver.exe"
 
 debugger_address = gl.start()
 chrome_options = Options()

package/selenium/gologin.py

@@ -19,8 +19,10 @@ class GoLogin(object):
         self.tmpdir = options.get('tmpdir', tempfile.gettempdir())
         self.address = options.get('address', '127.0.0.1')
         self.extra_params = options.get('extra_params', [])
-        self.port = options.get('port', 3500)
+        self.port  = options.get('port', 3500)
+        self.local = options.get('local', False)
         self.spawn_browser = options.get('spawn_browser', True)
+        self.credentials_enable_service = options.get('credentials_enable_service')
 
         home = str(pathlib.Path.home())
         self.executablePath = options.get('executablePath', os.path.join(home, '.gologin/browser/orbita-browser/chrome'))
@@ -98,13 +100,17 @@ class GoLogin(object):
                     continue
                 if stat.S_ISSOCK(os.stat(path).st_mode):
                     continue
-                ziph.write(path, path.replace(self.profile_path, ''))
+                try:
+                    ziph.write(path, path.replace(self.profile_path, ''))
+                except:
+                    continue
 
     def stop(self):
         self.sanitizeProfile()
-        self.commitProfile()
-        os.remove(self.profile_zip_path_upload)
-        shutil.rmtree(self.profile_path)
+        if self.local==False:
+            self.commitProfile()
+            os.remove(self.profile_zip_path_upload)
+            shutil.rmtree(self.profile_path)
 
     def commitProfile(self):
         zipf = zipfile.ZipFile(self.profile_zip_path_upload, 'w', zipfile.ZIP_DEFLATED)
@@ -164,9 +170,9 @@ class GoLogin(object):
         proxy = self.proxy
         if proxy:            
             proxies = {proxy.get('mode'): self.formatProxyUrlPassword(proxy)}
-            data = requests.get('https://time.gologin.app', proxies=proxies)
+            data = requests.get('https://time.gologin.com', proxies=proxies)
         else:
-            data = requests.get('https://time.gologin.app')
+            data = requests.get('https://time.gologin.com')
         return json.loads(data.content.decode('utf-8'))
 
 
@@ -299,9 +305,8 @@ class GoLogin(object):
 
     def updatePreferences(self):
         pref_file = os.path.join(self.profile_path, 'Default/Preferences')
-        pfile = open(pref_file, 'r')
-        preferences = json.load(pfile)    
-        pfile.close()  
+        with open(pref_file, 'r', encoding="utf-8") as pfile:
+            preferences = json.load(pfile)    
         profile = self.profile
         proxy = self.profile.get('proxy')
         # print('proxy=', proxy)
@@ -338,15 +343,18 @@ class GoLogin(object):
             exit()
 
         gologin = self.convertPreferences(profile)
+        if self.credentials_enable_service!=None:
+            preferences['credentials_enable_service'] = self.credentials_enable_service
         preferences['gologin'] = gologin
         pfile = open(pref_file, 'w')
         json.dump(preferences, pfile)
 
     def createStartup(self):
-        if os.path.exists(self.profile_path):
+        if self.local==False and os.path.exists(self.profile_path):
             shutil.rmtree(self.profile_path)
         self.profile = self.getProfile()
-        self.downloadProfileZip()
+        if self.local==False:
+            self.downloadProfileZip()
         self.updatePreferences()
         return self.profile_path
 
@@ -416,7 +424,7 @@ class GoLogin(object):
         profile = self.getProfile()
         for k,v in options.items():
             profile[k] = v
-        return json.loads(requests.put(API_URL + '/browser/' + profile_id, headers=self.headers(), json=profile).content.decode('utf-8'))
+        return json.loads(requests.put(API_URL + '/browser/' + self.profile_id, headers=self.headers(), json=profile).content.decode('utf-8'))
 
     def waitDebuggingUrl(self, delay_s, try_count=3):
         url = 'https://' + self.profile_id + '.orbita.gologin.com/json/version'