@8ms/helpers 1.25.0 → 1.27.0

package/brightData/serpApi/buildGoogleSerpUrl.d.ts

@@ -22,5 +22,5 @@ type BuildGoogleSerpUrl = {
  * For geolocation use value from:
  * https://developers.google.com/google-ads/api/data/geotargets
  */
-declare const buildGoogleSerpUrl: (props: BuildGoogleSerpUrl) => URL;
+declare const buildGoogleSerpUrl: (props: BuildGoogleSerpUrl) => string;
 export default buildGoogleSerpUrl;

package/brightData/serpApi/buildGoogleSerpUrl.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * https://developers.google.com/google-ads/api/data/geotargets
  */
 const buildGoogleSerpUrl = (props) => {
-    let url = new URL(`https://www${props.googleDomain}/`);
+    let url = new URL(`https://www.${props.googleDomain}/`);
     url.searchParams.append("q", props.query);
     // Two-letter country code used to define the country of search
     if (props?.country) {
@@ -75,6 +75,6 @@ const buildGoogleSerpUrl = (props) => {
     }
     // Always return the JSON response with HTML field
     url.searchParams.append("brn_json", "html");
-    return url;
+    return url.toString();
 };
 exports.default = buildGoogleSerpUrl;

package/brightData/serpApi/buildGoogleTrendsUrl.d.ts

@@ -13,5 +13,5 @@ type BuildGoogleTrendsUrl = {
  * For category use value from:
  * https://trends.google.com/trends/api/explore/pickers/category?lang=en-US&tz=240
  */
-declare const buildGoogleTrendsUrl: (props: BuildGoogleTrendsUrl) => URL;
+declare const buildGoogleTrendsUrl: (props: BuildGoogleTrendsUrl) => string;
 export default buildGoogleTrendsUrl;

package/brightData/serpApi/buildGoogleTrendsUrl.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * https://trends.google.com/trends/api/explore/pickers/category?lang=en-US&tz=240
  */
 const buildGoogleTrendsUrl = (props) => {
-    let url = new URL(`https://trends.google.com/`);
+    let url = new URL(`http://trends.google.com/trends/explore`);
     url.searchParams.append("q", props.query);
     // Location of interest, two-letter country code
     if (props?.country) {
@@ -39,6 +39,6 @@ const buildGoogleTrendsUrl = (props) => {
             url.searchParams.append("gprop", "youtube");
             break;
     }
-    return url;
+    return url.toString();
 };
 exports.default = buildGoogleTrendsUrl;

package/brightData/serpApi/getRealtime.d.ts

@@ -1,7 +1,10 @@
 type GetRealtime = {
-    customerId: string;
-    host: string;
-    zonePassword: string;
+    auth: {
+        host: string;
+        port: string;
+        username: string;
+        password: string;
+    };
     url: string;
 };
 /**

package/brightData/serpApi/getRealtime.js

@@ -9,19 +9,21 @@ const get_1 = __importDefault(require("../../axios/get"));
  */
 const getRealtime = async (props) => {
     let response = {};
-    const { HttpsProxyAgent } = require("https-proxy-agent");
     // Prevent auth requests getting blocked
     process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
-    // Construct the proxy URL
-    const proxyUrl = `http://${props.customerId}:${props.zonePassword}@${props.host}`;
-    // Replace <proxy_url> with your actual proxy URL
-    const httpsAgent = new HttpsProxyAgent(proxyUrl);
     // Use fetch with the agent option to make an HTTP request through the proxy
     // Replace <target_url> with the URL you want to request
     const apiResponse = await (0, get_1.default)({
         config: {
-            proxy: false,
-            httpsAgent,
+            proxy: {
+                protocol: "http",
+                host: props.auth.host,
+                port: props.auth.port,
+                auth: {
+                    username: props.auth.username,
+                    password: props.auth.password,
+                }
+            },
         },
         url: props.url,
     });

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name":            "@8ms/helpers",
 	"license":         "UNLICENSED",
-	"version":         "1.25.0",
+	"version":         "1.27.0",
 	"repository":      {
 		"type": "git",
 		"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
@@ -39,7 +39,6 @@
 		"@types/lodash":                 "4.17.7",
 		"@types/node":                   "20.14.12",
 		"babel-jest":                    "29.7.0",
-		"https-proxy-agent":             "7.0.5",
 		"jest":                          "29.7.0",
 		"node-fetch":                    "3.3.2",
 		"stream-chain":                  "2.2.5",