@mablhq/mabl-cli 1.44.5 → 1.45.8

package/http/requestInterceptor.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestInterceptor = exports.headerStringToProtocol = exports.headerStringToHeaders = void 0;
+exports.RequestInterceptor = exports.headerStringToProtocol = exports.headerStringToHeaders = exports.MAX_SERIALIZED_BODY_SIZE_BYTES = void 0;
 const axios_1 = __importDefault(require("axios"));
 const loggingProvider_1 = require("../providers/logging/loggingProvider");
 const uuid_1 = require("uuid");
 const httpUtil_1 = require("./httpUtil");
-const MAX_SERIALIZED_BODY_SIZE_BYTES = 1024 * 1024;
+const pureUtil_1 = require("../util/pureUtil");
+exports.MAX_SERIALIZED_BODY_SIZE_BYTES = 1024 * 1024;
 const HEADER_EXTRACT_REGEXP = /^(?<rawKey>[^:]+)(:)(?<value>.*)$/;
 function headerStringToHeaders(rawHeader) {
     const headers = {};
@@ -52,20 +53,31 @@ function handleRawResponseBody(body) {
     body = body !== null && body !== void 0 ? body : '';
     switch (typeof body) {
         case 'number':
+            return { body: body.toString(), responseSize: 8 };
         case 'boolean':
-            return body.toString();
+            return { body: body.toString(), responseSize: 4 };
         case 'string':
-            return body.substring(0, MAX_SERIALIZED_BODY_SIZE_BYTES);
+            return {
+                body: body.substring(0, exports.MAX_SERIALIZED_BODY_SIZE_BYTES),
+                responseSize: body.length,
+            };
         case 'object':
             const serializedBody = JSON.stringify(body);
-            if (serializedBody.length <= MAX_SERIALIZED_BODY_SIZE_BYTES) {
-                return body;
+            if (serializedBody.length <= exports.MAX_SERIALIZED_BODY_SIZE_BYTES) {
+                return { body, responseSize: serializedBody.length };
             }
-            return serializedBody.substring(0, MAX_SERIALIZED_BODY_SIZE_BYTES);
+            return {
+                body: serializedBody.substring(0, exports.MAX_SERIALIZED_BODY_SIZE_BYTES),
+                responseSize: serializedBody.length,
+            };
         default:
             throw new Error(`Unhandled request intercept body type: [${typeof body}]`);
     }
 }
+function getContentLength(headers) {
+    const contentLengthAsString = (0, pureUtil_1.getCaseInsensitiveProperty)(headers, 'content-length');
+    return contentLengthAsString ? Number(contentLengthAsString) : undefined;
+}
 class RequestInterceptor {
     constructor() {
         this.interceptedRequests = [];
@@ -132,11 +144,14 @@ class RequestInterceptor {
                     ? headerStringToProtocol(request._header)
                     : '<Unknown protocol>';
             }
+            const { body, responseSize } = handleRawResponseBody(response.data);
+            const contentLength = getContentLength(response.headers);
             chainEntry.response = {
                 headers: headerRecordToHeaderMultiMap(response.headers),
                 status: response.status,
                 response_received_time: responseReceivedTime,
-                body: handleRawResponseBody(response.data),
+                response_size: contentLength !== null && contentLength !== void 0 ? contentLength : responseSize,
+                body,
             };
         }
         catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "1.44.5",
+  "version": "1.45.8",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",

package/util/pureUtil.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCaseInsensitiveProperty = exports.extractKeyCountsFromArgs = exports.getCliName = exports.getCliVersion = exports.stringify = exports.isWholeNumber = exports.isString = exports.isNullish = exports.isDefined = void 0;
+exports.getCaseInsensitiveProperty = exports.extractKeyCountsFromArgs = exports.getCliName = exports.getCliVersion = exports.stringifyIfPresent = exports.stringify = exports.isWholeNumber = exports.isString = exports.isNullish = exports.isDefined = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const possibleCliPackagePaths = Object.freeze([
@@ -75,6 +75,13 @@ function stringify(value) {
     return value.toString();
 }
 exports.stringify = stringify;
+function stringifyIfPresent(value) {
+    if (isNullish(value)) {
+        return;
+    }
+    return stringify(value);
+}
+exports.stringifyIfPresent = stringifyIfPresent;
 function getCliVersion() {
     return getCliPackage().version;
 }