caccl-send-request 2.2.5 → 2.2.7

package/lib/ErrorCode.d.ts

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

package/lib/ErrorCode.js

@@ -5,7 +5,7 @@ var ErrorCode;
 (function (ErrorCode) {
     ErrorCode["NotConnected"] = "CSR1";
     ErrorCode["SelfSigned"] = "CSR2";
-    ErrorCode["NotJSON"] = "CSR3";
+    ErrorCode["ResponseParseError"] = "CSR3";
 })(ErrorCode || (ErrorCode = {}));
 ;
 exports.default = ErrorCode;

package/lib/ErrorCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorCode.js","sourceRoot":"","sources":["../src/ErrorCode.ts"],"names":[],"mappings":";AAAA,2BAA2B;;AAE3B,IAAK,SAIJ;AAJD,WAAK,SAAS;IACZ,kCAAqB,CAAA;IACrB,gCAAmB,CAAA;IACnB,6BAAgB,CAAA;AAClB,CAAC,EAJI,SAAS,KAAT,SAAS,QAIb;AAAA,CAAC;AAEF,kBAAe,SAAS,CAAC"}
+{"version":3,"file":"ErrorCode.js","sourceRoot":"","sources":["../src/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/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/ResponseType.js

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

package/lib/ResponseType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResponseType.js","sourceRoot":"","sources":["../src/ResponseType.ts"],"names":[],"mappings":";;AAAA;;;GAGG;AACH,IAAK,YAGJ;AAHD,WAAK,YAAY;IACf,6BAAa,CAAA;IACb,6BAAa,CAAA;AACf,CAAC,EAHI,YAAY,KAAZ,YAAY,QAGhB;AAED,kBAAe,YAAY,CAAC"}

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+import ResponseType from './ResponseType';
 /**
  * Sends and retries an http request
  * @author Gabriel Abrams
@@ -11,6 +12,7 @@
  *   fails
  * @param [opts.sendCrossDomainCredentials=true if in development mode] if true,
  *   send cross-domain credentials even if not in dev mode
+ * @param [opts.responseType=ResponseType.JSON] expected response type
  * @returns { body, status, headers } on success
  */
 declare const sendRequest: (opts: {
@@ -25,6 +27,7 @@ declare const sendRequest: (opts: {
     };
     numRetries?: number;
     sendCrossDomainCredentials?: boolean;
+    responseType?: ResponseType;
 }) => Promise<{
     body: any;
     status: number;

package/lib/index.js

@@ -56,8 +56,7 @@ var qs_1 = __importDefault(require("qs"));
 var caccl_error_1 = __importDefault(require("caccl-error"));
 // Import shared types
 var ErrorCode_1 = __importDefault(require("./ErrorCode"));
-// Check if we're currently in developer mode
-var thisIsDev = (process.env.NODE_ENV === 'development');
+var ResponseType_1 = __importDefault(require("./ResponseType"));
 /**
  * Sends and retries an http request
  * @author Gabriel Abrams
@@ -71,17 +70,19 @@ var thisIsDev = (process.env.NODE_ENV === 'development');
  *   fails
  * @param [opts.sendCrossDomainCredentials=true if in development mode] if true,
  *   send cross-domain credentials even if not in dev mode
+ * @param [opts.responseType=ResponseType.JSON] expected response type
  * @returns { body, status, headers } on success
  */
 var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
-    var sendCrossDomainCredentials, numRetries, method, params, stringifiedParams, query, url, headers, data, encodedData, response, responseHeaders_1, responseBody, jsonErr_1, err_1;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    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) {
             case 0:
+                thisIsDev = (opts.host === 'localhost:8080');
                 sendCrossDomainCredentials = !!(opts.sendCrossDomainCredentials
                     || thisIsDev
-                    || ((_a = opts.headers) === null || _a === void 0 ? void 0 : _a.credentials) === 'include');
+                    || ((_b = opts.headers) === null || _b === void 0 ? void 0 : _b.credentials) === 'include');
                 numRetries = (opts.numRetries ? opts.numRetries : 0);
                 method = (opts.method || 'GET');
                 if (opts.params) {
@@ -128,9 +129,9 @@ var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
                         encodedData = JSON.stringify(data);
                     }
                 }
-                _b.label = 1;
+                _c.label = 1;
             case 1:
-                _b.trys.push([1, 7, , 8]);
+                _c.trys.push([1, 11, , 12]);
                 return [4 /*yield*/, fetch(url, {
                         method: method,
                         mode: 'cors',
@@ -145,39 +146,46 @@ var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
                         referrerPolicy: (sendCrossDomainCredentials ? 'origin' : undefined),
                     })];
             case 2:
-                response = _b.sent();
+                response = _c.sent();
                 responseHeaders_1 = {};
                 response.headers.forEach(function (value, key) {
                     responseHeaders_1[key] = value;
                 });
-                _b.label = 3;
+                responseBody = void 0;
+                _c.label = 3;
             case 3:
-                _b.trys.push([3, 5, , 6]);
-                return [4 /*yield*/, response.json()];
-            case 4:
-                responseBody = _b.sent();
-                return [2 /*return*/, {
-                        body: responseBody,
-                        status: response.status,
-                        headers: responseHeaders_1,
-                    }];
+                _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:
-                jsonErr_1 = _b.sent();
-                // Not JSON
+                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();
                 throw new caccl_error_1.default({
-                    message: "Response was not valid JSON: ".concat(jsonErr_1 === null || jsonErr_1 === void 0 ? void 0 : jsonErr_1.message),
-                    code: ErrorCode_1.default.NotJSON,
+                    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 6: return [3 /*break*/, 8];
-            case 7:
-                err_1 = _b.sent();
+            case 10: return [3 /*break*/, 12];
+            case 11:
+                err_2 = _c.sent();
                 // Request failed! Check if we have more attempts
                 if (numRetries > 0) {
                     // Update opts with one less retry
                     return [2 /*return*/, sendRequest(__assign(__assign({}, opts), { numRetries: opts.numRetries - 1 }))];
                 }
                 // Self-signed certificate error:
-                if (err_1.message.includes('self signed certificate')) {
+                if (err_2.message.includes('self signed certificate')) {
                     throw new caccl_error_1.default({
                         message: 'We refused to send a request because the receiver has self-signed certificates.',
                         code: ErrorCode_1.default.SelfSigned,
@@ -185,10 +193,10 @@ var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
                 }
                 // No tries left
                 throw new caccl_error_1.default({
-                    message: "We encountered an error when trying to send a network request. If this issue persists, contact an admin. Error: ".concat(err_1 === null || err_1 === void 0 ? void 0 : err_1.message),
+                    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 8: return [2 /*return*/];
+            case 12: 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caccl-send-request",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "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.5",
+    "caccl-error": "^2.2.6",
     "qs": "^6.9.6"
   }
 }

package/src/ErrorCode.ts

@@ -3,7 +3,7 @@
 enum ErrorCode {
   NotConnected = 'CSR1',
   SelfSigned = 'CSR2',
-  NotJSON = 'CSR3',
+  ResponseParseError = 'CSR3',
 };
 
 export default ErrorCode;

package/src/ResponseType.ts

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

package/src/index.ts

@@ -6,9 +6,7 @@ import CACCLError from 'caccl-error';
 
 // Import shared types
 import ErrorCode from './ErrorCode';
-
-// Check if we're currently in developer mode
-const thisIsDev = (process.env.NODE_ENV === 'development');
+import ResponseType from './ResponseType';
 
 /**
  * Sends and retries an http request
@@ -23,6 +21,7 @@ const thisIsDev = (process.env.NODE_ENV === 'development');
  *   fails
  * @param [opts.sendCrossDomainCredentials=true if in development mode] if true,
  *   send cross-domain credentials even if not in dev mode
+ * @param [opts.responseType=ResponseType.JSON] expected response type
  * @returns { body, status, headers } on success
  */
 const sendRequest = async (
@@ -34,12 +33,16 @@ const sendRequest = async (
     headers?: { [k in string]: any },
     numRetries?: number,
     sendCrossDomainCredentials?: boolean,
+    responseType?: ResponseType,
   },
 ): Promise<{
   body: any,
   status: number,
   headers: { [k in string]: any },
 }> => {
+  // Check if we're currently in developer mode
+  const thisIsDev = (opts.host === 'localhost:8080');
+
   // Check if we should be including credentials
   const sendCrossDomainCredentials = !!(
     opts.sendCrossDomainCredentials
@@ -138,19 +141,22 @@ const sendRequest = async (
       responseHeaders[key] = value;
     });
 
-    // Process json response
+    // Process response based on responseType
+    let responseBody: any;
     try {
-      const responseBody = await response.json();
-      return {
-        body: responseBody,
-        status: response.status,
-        headers: responseHeaders,
-      };
-    } catch (jsonErr) {
-      // Not JSON
+      switch (opts.responseType) {
+        case ResponseType.Text:
+          responseBody = await response.text();
+          break;
+        case ResponseType.JSON:
+        default:
+          responseBody = await response.json();
+          break;
+      }
+    } catch (err) {
       throw new CACCLError({
-        message: `Response was not valid JSON: ${(jsonErr as any)?.message}`,
-        code: ErrorCode.NotJSON,
+        message: `Failed to parse response as ${opts.responseType}: ${(err as any)?.message}`,
+        code: ErrorCode.ResponseParseError,
       });
     }
   } catch (err) {