caccl-send-request 2.2.8 → 2.2.10

package/lib/index.d.ts

@@ -1,7 +1,8 @@
-import ResponseType from './ResponseType';
+import ResponseType from './types/ResponseType';
 /**
  * Sends and retries an http request
  * @author Gabriel Abrams
+ * @author Yuen Ler Chow
  * @param opts object containing all arguments
  * @param opts.path path to send request to
  * @param [opts.host] host to send request to

package/lib/index.js

@@ -55,11 +55,12 @@ var qs_1 = __importDefault(require("qs"));
 // Import other CACCL libs
 var caccl_error_1 = __importDefault(require("caccl-error"));
 // Import shared types
-var ErrorCode_1 = __importDefault(require("./ErrorCode"));
-var ResponseType_1 = __importDefault(require("./ResponseType"));
+var ErrorCode_1 = __importDefault(require("./types/ErrorCode"));
+var ResponseType_1 = __importDefault(require("./types/ResponseType"));
 /**
  * Sends and retries an http request
  * @author Gabriel Abrams
+ * @author Yuen Ler Chow
  * @param opts object containing all arguments
  * @param opts.path path to send request to
  * @param [opts.host] host to send request to
@@ -74,15 +75,15 @@ var ResponseType_1 = __importDefault(require("./ResponseType"));
  * @returns { body, status, headers } on success
  */
 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:
                 thisIsDev = (opts.host === 'localhost:8080');
                 sendCrossDomainCredentials = !!(opts.sendCrossDomainCredentials
                     || 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);
                 method = (opts.method || 'GET');
                 if (opts.params) {
@@ -129,9 +130,9 @@ var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
                         encodedData = JSON.stringify(data);
                     }
                 }
-                _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, {
                         method: method,
                         mode: 'cors',
@@ -146,39 +147,43 @@ var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
                         referrerPolicy: (sendCrossDomainCredentials ? 'origin' : undefined),
                     })];
             case 2:
-                response = _c.sent();
+                response = _b.sent();
                 responseHeaders_1 = {};
                 response.headers.forEach(function (value, key) {
                     responseHeaders_1[key] = value;
                 });
-                responseBody = void 0;
-                _c.label = 3;
+                _b.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();
+                _b.trys.push([3, 8, , 9]);
+                responseBody = void 0;
+                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({
                     message: "Failed to parse response as ".concat(opts.responseType, ": ").concat(err_1 === null || err_1 === void 0 ? void 0 : err_1.message),
                     code: ErrorCode_1.default.ResponseParseError,
                 });
-            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
                 if (numRetries > 0) {
                     // Update opts with one less retry
@@ -196,7 +201,7 @@ var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
                     message: "We encountered an error when trying to send a network request. If this issue persists, contact an admin. Error: ".concat(err_2 === null || err_2 === void 0 ? void 0 : err_2.message),
                     code: ErrorCode_1.default.NotConnected,
                 });
-            case 12: return [2 /*return*/];
+            case 11: return [2 /*return*/];
         }
     });
 }); };

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/types/ErrorCode.d.ts

@@ -0,0 +1,6 @@
+declare enum ErrorCode {
+    NotConnected = "CSR1",
+    SelfSigned = "CSR2",
+    ResponseParseError = "CSR3"
+}
+export default ErrorCode;

package/lib/types/ErrorCode.js

@@ -0,0 +1,12 @@
+"use strict";
+// Highest error code: CSR3
+Object.defineProperty(exports, "__esModule", { value: true });
+var ErrorCode;
+(function (ErrorCode) {
+    ErrorCode["NotConnected"] = "CSR1";
+    ErrorCode["SelfSigned"] = "CSR2";
+    ErrorCode["ResponseParseError"] = "CSR3";
+})(ErrorCode || (ErrorCode = {}));
+;
+exports.default = ErrorCode;
+//# sourceMappingURL=ErrorCode.js.map

package/lib/types/ErrorCode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ErrorCode.js","sourceRoot":"","sources":["../../src/types/ErrorCode.ts"],"names":[],"mappings":";AAAA,2BAA2B;;AAE3B,IAAK,SAIJ;AAJD,WAAK,SAAS;IACZ,kCAAqB,CAAA;IACrB,gCAAmB,CAAA;IACnB,wCAA2B,CAAA;AAC7B,CAAC,EAJI,SAAS,KAAT,SAAS,QAIb;AAAA,CAAC;AAEF,kBAAe,SAAS,CAAC"}

package/lib/types/ResponseType.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Response types
+ * @author Yuen Ler Chow
+ */
+declare enum ResponseType {
+    Text = "Text",
+    JSON = "JSON"
+}
+export default ResponseType;

package/lib/types/ResponseType.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Response types
+ * @author Yuen Ler Chow
+ */
+var ResponseType;
+(function (ResponseType) {
+    // Response is plain text
+    ResponseType["Text"] = "Text";
+    // Response is encoded JSON (object or array)
+    ResponseType["JSON"] = "JSON";
+})(ResponseType || (ResponseType = {}));
+exports.default = ResponseType;
+//# sourceMappingURL=ResponseType.js.map

package/lib/types/ResponseType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResponseType.js","sourceRoot":"","sources":["../../src/types/ResponseType.ts"],"names":[],"mappings":";;AAAA;;;GAGG;AACH,IAAK,YAKJ;AALD,WAAK,YAAY;IACf,yBAAyB;IACzB,6BAAa,CAAA;IACb,6CAA6C;IAC7C,6BAAa,CAAA;AACf,CAAC,EALI,YAAY,KAAZ,YAAY,QAKhB;AAED,kBAAe,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caccl-send-request",
-  "version": "2.2.8",
+  "version": "2.2.10",
   "description": "The default request sender used throughout the CACCL project.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -36,7 +36,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "caccl-error": "^2.2.8",
+    "caccl-error": "^2.2.10",
     "qs": "^6.9.6"
   }
 }

package/src/index.ts

@@ -5,12 +5,13 @@ import qs from 'qs';
 import CACCLError from 'caccl-error';
 
 // Import shared types
-import ErrorCode from './ErrorCode';
-import ResponseType from './ResponseType';
+import ErrorCode from './types/ErrorCode';
+import ResponseType from './types/ResponseType';
 
 /**
  * Sends and retries an http request
  * @author Gabriel Abrams
+ * @author Yuen Ler Chow
  * @param opts object containing all arguments
  * @param opts.path path to send request to
  * @param [opts.host] host to send request to
@@ -142,17 +143,26 @@ const sendRequest = async (
     });
 
     // 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) {
       throw new CACCLError({
         message: `Failed to parse response as ${opts.responseType}: ${(err as any)?.message}`,

package/src/{ResponseType.ts → types/ResponseType.ts}

@@ -3,7 +3,9 @@
  * @author Yuen Ler Chow
  */
 enum ResponseType {
+  // Response is plain text
   Text = 'Text',
+  // Response is encoded JSON (object or array)
   JSON = 'JSON',
 }