gologin-commonjs 1.1.7 → 1.1.9

package/dist/src/gologin.js

@@ -40,9 +40,10 @@ var _browser = require("./utils/browser.js");
 var _common = require("./utils/common.js");
 var _constants = require("./utils/constants.js");
 var _utils2 = require("./utils/utils.js");
-var _timezone = require("./utils/timezone.js");
 var _gologinApi = require("./gologin-api.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// import { tzlookup } from "./utils/timezone.js";
+
 const {
   access,
   unlink,
@@ -618,55 +619,19 @@ class GoLogin {
       }
       const proxyUrl = `${proxy.mode}://${proxy.username}:${proxy.password}@${proxy.host}:${proxy.port}`;
       debug(`getTimeZone start ${TIMEZONE_URL}`, proxyUrl);
-      const response = await _requestretry.default.get(TIMEZONE_URL, {
+      data = await _requestretry.default.get(TIMEZONE_URL, {
         proxy: proxyUrl,
-        timeout: 20 * 1000,
-        maxAttempts: 5
+        timeout: 3 * 1000,
+        maxAttempts: 3
       });
-      const result = JSON.parse(response.body);
-      let timezone = null;
-      try {
-        timezone = (0, _timezone.tzlookup)(result.latitude, result.longitude);
-      } catch {
-        timezone = "Asia/Jakarta";
-      }
-      data = {
-        body: {
-          country: result.country_code,
-          stateProv: result.city,
-          city: result.city,
-          timezone: timezone,
-          ll: [result.latitude, result.longitude],
-          languages: "en",
-          accuracy: 100
-        }
-      };
     } else {
-      const response = await _requestretry.default.get(TIMEZONE_URL, {
-        timeout: 20 * 1000,
-        maxAttempts: 5
+      data = await _requestretry.default.get(TIMEZONE_URL, {
+        timeout: 3 * 1000,
+        maxAttempts: 3
       });
-      const result = JSON.parse(response.body);
-      let timezone = null;
-      try {
-        timezone = (0, _timezone.tzlookup)(result.latitude, result.longitude);
-      } catch {
-        timezone = "Asia/Jakarta";
-      }
-      data = {
-        body: {
-          country: result.country_code,
-          stateProv: result.city,
-          city: result.city,
-          timezone: timezone,
-          ll: [result.latitude, result.longitude],
-          languages: "en",
-          accuracy: 100
-        }
-      };
     }
     debug("getTimeZone finish", data.body);
-    this._tz = data.body;
+    this._tz = JSON.parse(data.body);
     return this._tz.timezone;
   }
   async getTimezoneWithSocks(params) {

package/gologin/src/gologin.js

@@ -38,15 +38,15 @@ import { checkAutoLang } from "./utils/browser.js";
 import { API_URL, getOsAdvanced } from "./utils/common.js";
 import { STORAGE_GATEWAY_BASE_URL } from "./utils/constants.js";
 import { get, isPortReachable } from "./utils/utils.js";
-import { tzlookup } from "./utils/timezone.js";
+// import { tzlookup } from "./utils/timezone.js";
 export { exitAll, GologinApi } from "./gologin-api.js";
 
 const { access, unlink, writeFile, readFile } = _promises;
 
 const SEPARATOR = sep;
 const OS_PLATFORM = process.platform;
-const TIMEZONE_URL = "https://geolocation-db.com/json/";
-// const TIMEZONE_URL = 'https://geo.myip.link';
+// const TIMEZONE_URL = "https://geolocation-db.com/json/";
+const TIMEZONE_URL = "https://geo.myip.link";
 const PROXY_NONE = "none";
 
 const debug = debugDefault("gologin");
@@ -838,56 +838,20 @@ export class GoLogin {
 
       const proxyUrl = `${proxy.mode}://${proxy.username}:${proxy.password}@${proxy.host}:${proxy.port}`;
       debug(`getTimeZone start ${TIMEZONE_URL}`, proxyUrl);
-      const response = await requests.get(TIMEZONE_URL, {
+      data = await requests.get(TIMEZONE_URL, {
         proxy: proxyUrl,
-        timeout: 20 * 1000,
-        maxAttempts: 5,
+        timeout: 3 * 1000,
+        maxAttempts: 3,
       });
-      const result = JSON.parse(response.body);
-      let timezone = null;
-      try {
-        timezone = tzlookup(result.latitude, result.longitude);
-      } catch {
-        timezone = "Asia/Jakarta";
-      }
-      data = {
-        body: {
-          country: result.country_code,
-          stateProv: result.city,
-          city: result.city,
-          timezone: timezone,
-          ll: [result.latitude, result.longitude],
-          languages: "en",
-          accuracy: 100,
-        },
-      };
     } else {
-      const response = await requests.get(TIMEZONE_URL, {
-        timeout: 20 * 1000,
-        maxAttempts: 5,
+      data = await requests.get(TIMEZONE_URL, {
+        timeout: 3 * 1000,
+        maxAttempts: 3,
       });
-      const result = JSON.parse(response.body);
-      let timezone = null;
-      try {
-        timezone = tzlookup(result.latitude, result.longitude);
-      } catch {
-        timezone = "Asia/Jakarta";
-      }
-      data = {
-        body: {
-          country: result.country_code,
-          stateProv: result.city,
-          city: result.city,
-          timezone: timezone,
-          ll: [result.latitude, result.longitude],
-          languages: "en",
-          accuracy: 100,
-        },
-      };
     }
 
     debug("getTimeZone finish", data.body);
-    this._tz = data.body;
+    this._tz = JSON.parse(data.body);
 
     return this._tz.timezone;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gologin-commonjs",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "A Transpiled GoLogin API ESM to CommonJS",
   "types": "./types/src/gologin.d.ts",
   "main": "./dist/src/gologin.js",