@shaivpidadi/trends-js 0.0.0-beta.4 → 0.0.0-beta.5

package/lib/helpers/googleTrendsAPI.js

@@ -41,7 +41,7 @@ class GoogleTrendsApi {
             const defaultOptions = constants_1.GOOGLE_TRENDS_MAPPER["dailyTrends" /* GoogleTrendsEndpoints.dailyTrends */];
             const options = Object.assign(Object.assign({}, defaultOptions), { body: new URLSearchParams({
                     'f.req': `[[["i0OFE","[null,null,\\"${geo}\\",0,\\"${lang}\\",24,1]",null,"generic"]]]`,
-                }).toString() });
+                }).toString(), contentType: 'form' });
             try {
                 const response = yield (0, request_1.request)(options.url, options);
                 const text = yield response.text();
@@ -68,7 +68,7 @@ class GoogleTrendsApi {
             const defaultOptions = constants_1.GOOGLE_TRENDS_MAPPER["dailyTrends" /* GoogleTrendsEndpoints.dailyTrends */];
             const options = Object.assign(Object.assign({}, defaultOptions), { body: new URLSearchParams({
                     'f.req': `[[["i0OFE","[null,null,\\"${geo}\\",0,\\"en\\",${trendingHours},1]",null,"generic"]]]`,
-                }).toString() });
+                }).toString(), contentType: 'form' });
             try {
                 const response = yield (0, request_1.request)(options.url, options);
                 const text = yield response.text();

package/lib/helpers/request.d.ts

@@ -1,5 +1,9 @@
 export declare const request: (url: string, options: {
     method?: string;
     qs?: Record<string, any>;
-    body?: string;
-}) => Promise<Response>;
+    body?: string | Record<string, any>;
+    headers?: Record<string, string>;
+    contentType?: 'json' | 'form';
+}) => Promise<{
+    text: () => Promise<string>;
+}>;

package/lib/helpers/request.js

@@ -16,46 +16,53 @@ exports.request = void 0;
 const https_1 = __importDefault(require("https"));
 const querystring_1 = __importDefault(require("querystring"));
 let cookieVal;
-function rereq(options) {
+function rereq(options, body) {
     return new Promise((resolve, reject) => {
         const req = https_1.default.request(options, (res) => {
             let chunk = '';
-            res.on('data', (data) => {
-                chunk += data;
-            });
-            res.on('end', () => {
-                resolve(chunk.toString());
-            });
-        });
-        req.on('error', (e) => {
-            reject(e);
+            res.on('data', (data) => { chunk += data; });
+            res.on('end', () => resolve(chunk));
         });
+        req.on('error', reject);
+        if (body)
+            req.write(body);
         req.end();
     });
 }
 const request = (url, options) => __awaiter(void 0, void 0, void 0, function* () {
     const parsedUrl = new URL(url);
+    const method = options.method || 'POST';
+    // Prepare body
+    let bodyString = '';
+    const contentType = options.contentType || 'json';
+    if (typeof options.body === 'string') {
+        bodyString = options.body;
+    }
+    else if (contentType === 'form') {
+        bodyString = querystring_1.default.stringify(options.body || {});
+    }
+    else if (options.body) {
+        bodyString = JSON.stringify(options.body);
+    }
     const requestOptions = {
-        host: parsedUrl.host,
-        method: options.method || 'POST',
+        hostname: parsedUrl.hostname,
+        port: parsedUrl.port || 443,
         path: `${parsedUrl.pathname}${options.qs ? '?' + querystring_1.default.stringify(options.qs) : ''}`,
-        headers: {}
+        method,
+        headers: Object.assign(Object.assign(Object.assign(Object.assign({}, (options.headers || {})), (contentType === 'form'
+            ? { 'Content-Type': 'application/x-www-form-urlencoded' }
+            : { 'Content-Type': 'application/json' })), (bodyString ? { 'Content-Length': Buffer.byteLength(bodyString).toString() } : {})), (cookieVal ? { cookie: cookieVal } : {}))
     };
-    if (cookieVal) {
-        requestOptions.headers = { 'cookie': cookieVal };
-    }
     const response = yield new Promise((resolve, reject) => {
         const req = https_1.default.request(requestOptions, (res) => {
             let chunk = '';
-            res.on('data', (data) => {
-                chunk += data;
-            });
+            res.on('data', (data) => { chunk += data; });
             res.on('end', () => __awaiter(void 0, void 0, void 0, function* () {
                 if (res.statusCode === 429 && res.headers['set-cookie']) {
                     cookieVal = res.headers['set-cookie'][0].split(';')[0];
-                    requestOptions.headers = { 'cookie': cookieVal };
+                    requestOptions.headers['cookie'] = cookieVal;
                     try {
-                        const retryResponse = yield rereq(requestOptions);
+                        const retryResponse = yield rereq(requestOptions, bodyString);
                         resolve(retryResponse);
                     }
                     catch (err) {
@@ -63,16 +70,13 @@ const request = (url, options) => __awaiter(void 0, void 0, void 0, function* ()
                     }
                 }
                 else {
-                    resolve(chunk.toString());
+                    resolve(chunk);
                 }
             }));
         });
-        if (options.body) {
-            req.write(options.body);
-        }
-        req.on('error', (e) => {
-            reject(e);
-        });
+        req.on('error', reject);
+        if (bodyString)
+            req.write(bodyString);
         req.end();
     });
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaivpidadi/trends-js",
-  "version": "0.0.0-beta.4",
+  "version": "0.0.0-beta.5",
   "description": "Google Trends API for Node.js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",