caccl-send-request - npm Package Compare versions

Comparing version 2.2.8 to 2.2.9

lib/index.js

@@ -77,6 +77,6 @@ "use strict";
 var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
-    var thisIsDev, sendCrossDomainCredentials, numRetries, method, params, stringifiedParams, query, url, headers, data, encodedData, response, responseHeaders_1, responseBody, _a, err_1, err_2;
-    var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var thisIsDev, sendCrossDomainCredentials, numRetries, method, params, stringifiedParams, query, url, headers, data, encodedData, response, responseHeaders_1, responseBody, err_1, err_2;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
@@ -86,3 +86,3 @@ thisIsDev = (opts.host === 'localhost:8080');
                     || thisIsDev
-                    || ((_b = opts.headers) === null || _b === void 0 ? void 0 : _b.credentials) === 'include');
+                    || ((_a = opts.headers) === null || _a === void 0 ? void 0 : _a.credentials) === 'include');
                 numRetries = (opts.numRetries ? opts.numRetries : 0);
@@ -134,5 +134,5 @@ method = (opts.method || 'GET');
                 }
-                _c.label = 1;
+                _b.label = 1;
             case 1:
-                _c.trys.push([1, 11, , 12]);
+                _b.trys.push([1, 10, , 11]);
                 return [4 /*yield*/, fetch(url, {
@@ -152,3 +152,3 @@ method: method,
             case 2:
-                response = _c.sent();
+                response = _b.sent();
                 responseHeaders_1 = {};
@@ -158,23 +158,27 @@ response.headers.forEach(function (value, key) {
                 });
+                _b.label = 3;
+            case 3:
+                _b.trys.push([3, 8, , 9]);
                 responseBody = void 0;
-                _c.label = 3;
-            case 3:
-                _c.trys.push([3, 9, , 10]);
-                _a = opts.responseType;
-                switch (_a) {
-                    case ResponseType_1.default.Text: return [3 /*break*/, 4];
-                    case ResponseType_1.default.JSON: return [3 /*break*/, 6];
-                }
-                return [3 /*break*/, 6];
-            case 4: return [4 /*yield*/, response.text()];
-            case 5:
-                responseBody = _c.sent();
-                return [3 /*break*/, 8];
-            case 6: return [4 /*yield*/, response.json()];
-            case 7:
-                responseBody = _c.sent();
-                return [3 /*break*/, 8];
-            case 8: return [3 /*break*/, 10];
-            case 9:
-                err_1 = _c.sent();
+                if (!(opts.responseType
+                    && opts.responseType === ResponseType_1.default.Text)) return [3 /*break*/, 5];
+                return [4 /*yield*/, response.text()];
+            case 4:
+                // Response type is text
+                responseBody = _b.sent();
+                return [3 /*break*/, 7];
+            case 5: return [4 /*yield*/, response.json()];
+            case 6:
+                // Response type is JSON
+                responseBody = _b.sent();
+                _b.label = 7;
+            case 7: 
+            // Return response
+            return [2 /*return*/, {
+                    body: responseBody,
+                    status: response.status,
+                    headers: responseHeaders_1,
+                }];
+            case 8:
+                err_1 = _b.sent();
                 throw new caccl_error_1.default({
@@ -184,5 +188,5 @@ message: "Failed to parse response as ".concat(opts.responseType, ": ").concat(err_1 === null || err_1 === void 0 ? void 0 : err_1.message),
                 });
-            case 10: return [3 /*break*/, 12];
-            case 11:
-                err_2 = _c.sent();
+            case 9: return [3 /*break*/, 11];
+            case 10:
+                err_2 = _b.sent();
                 // Request failed! Check if we have more attempts
@@ -205,3 +209,3 @@ if (numRetries > 0) {
                 });
-            case 12: return [2 /*return*/];
+            case 11: return [2 /*return*/];
         }
@@ -208,0 +212,0 @@ });

package.json

 {
   "name": "caccl-send-request",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "description": "The default request sender used throughout the CACCL project.",
@@ -39,5 +39,5 @@ "main": "./lib/index.js",
   "dependencies": {
-    "caccl-error": "^2.2.8",
+    "caccl-error": "^2.2.9",
     "qs": "^6.9.6"
   }
 }

src/index.ts

@@ -145,13 +145,22 @@ // Import libs
     // Process response based on responseType
-    let responseBody: any;
     try {
-      switch (opts.responseType) {
-        case ResponseType.Text:
-          responseBody = await response.text();
-          break;
-        case ResponseType.JSON:
-        default:
-          responseBody = await response.json();
-          break;
+      // Parse response
+      let responseBody: any;
+      if (
+        opts.responseType
+        && opts.responseType === ResponseType.Text
+      ) {
+        // Response type is text
+        responseBody = await response.text();
+      } else {
+        // Response type is JSON
+        responseBody = await response.json();
       }
+
+      // Return response
+      return {
+        body: responseBody,
+        status: response.status,
+        headers: responseHeaders,
+      };
     } catch (err) {
@@ -158,0 +167,0 @@ throw new CACCLError({

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

26335

increased by1.52%

Lines of code

554

increased by2.21%

Dependency changes

• Updatedcaccl-error@^2.2.9