@api-client/core 0.6.1 → 0.6.4

package/build/src/runtime/http-engine/PayloadSupport.js

@@ -6,9 +6,8 @@ import { PayloadSerializer } from '../../lib/transformers/PayloadSerializer.js';
  */
 export class PayloadSupport {
     /**
-     * NormalizeLineEndingsToCRLF
-     * https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/
-     * platform/text/LineEnding.cpp&rcl=1458041387&l=101
+     * Normalizes line endings to CRLF
+     * https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/wtf/text/line_ending.cc;l=68
      *
      * @param string A string to be normalized.
      * @return normalized string
@@ -40,26 +39,34 @@ export class PayloadSupport {
     /**
      * Transforms the request payload into a `Buffer`
      *
-     * @param payload A payload message
      * @param headers A headers object where to append headers when needed
+     * @param payload A payload message
      * @returns A promise resolved to a `Buffer`.
      */
-    static async payloadToBuffer(payload, headers) {
+    static payloadToBuffer(headers, payload) {
         if (!payload) {
-            return;
+            return undefined;
         }
         if (typeof payload === 'string') {
             payload = PayloadSupport.normalizeString(payload);
             return Buffer.from(payload, 'utf8');
         }
         if (payload.type === 'string') {
-            return PayloadSupport.payloadToBuffer(payload.data, headers);
+            return PayloadSupport.payloadToBuffer(headers, payload.data);
+        }
+        if (payload.type === 'file') {
+            const meta = payload.meta;
+            if (!headers.has('content-type') && meta.mime) {
+                headers.set('content-type', meta.mime);
+            }
+            return PayloadSerializer.deserializeFileBuffer(payload);
         }
-        if (['blob', 'file'].includes(payload.type)) {
-            if (!headers.has('content-type') && payload.mime) {
-                headers.set('content-type', payload.mime);
+        if (payload.type === 'blob') {
+            const meta = payload.meta;
+            if (!headers.has('content-type') && meta.mime) {
+                headers.set('content-type', meta.mime);
             }
-            return PayloadSerializer.deserializeBlobBuffer(payload.data);
+            return PayloadSerializer.deserializeBlobBuffer(payload);
         }
         if (payload.type === 'buffer') {
             return PayloadSerializer.deserializeBuffer(payload.data);
@@ -68,7 +75,7 @@ export class PayloadSupport {
             return PayloadSerializer.deserializeArrayBufferBuffer(payload.data);
         }
         if (payload.type === 'formdata') {
-            const result = await formDataConverter(payload.data);
+            const result = formDataConverter(payload.data);
             headers.set('Content-Type', result.type);
             return result.buffer;
         }

package/build/src/runtime/http-engine/PayloadSupport.js.map

@@ -1 +1 @@
-{"version":3,"file":"PayloadSupport.js","sourceRoot":"","sources":["../../../../src/runtime/http-engine/PayloadSupport.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAW,iBAAiB,EAAkB,MAAM,6CAA6C,CAAC;AAEzG;;;GAGG;AACH,MAAM,OAAO,cAAc;IACzB;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CAAC,MAAc;QACnC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACxB,IAAI,CAAC,KAAK,IAAI,EAAE;gBACd,+CAA+C;gBAC/C,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;oBACnB,qBAAqB;oBACrB,MAAM,IAAI,IAAI,CAAC;oBACf,MAAM,IAAI,IAAI,CAAC;iBAChB;aACF;iBAAM,IAAI,CAAC,KAAK,IAAI,EAAE;gBACrB,MAAM,IAAI,IAAI,CAAC;gBACf,MAAM,IAAI,IAAI,CAAC;aAChB;iBAAM;gBACL,gCAAgC;gBAChC,MAAM,IAAI,CAAC,CAAC;aACb;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,OAAgB,EAAE,OAAgB;QAC7D,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,GAAG,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAClD,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC7B,OAAO,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,IAAc,EAAE,OAAO,CAAC,CAAC;SACxE;QAED,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC3C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,IAAI,EAAE;gBAChD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;aAC3C;YACD,OAAO,iBAAiB,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAc,CAAC,CAAC;SACxE;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC7B,OAAO,iBAAiB,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAgB,CAAC,CAAC;SACtE;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa,EAAE;YAClC,OAAO,iBAAiB,CAAC,4BAA4B,CAAC,OAAO,CAAC,IAAgB,CAAC,CAAC;SACjF;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE;YAC/B,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAwB,CAAC,CAAC;YACzE,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC,MAAM,CAAC;SACtB;QAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;CACF"}
+{"version":3,"file":"PayloadSupport.js","sourceRoot":"","sources":["../../../../src/runtime/http-engine/PayloadSupport.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-client/core",
   "description": "The API Client's core client library. Works in NodeJS and in a ES enabled browser.",
-  "version": "0.6.1",
+  "version": "0.6.4",
   "license": "Apache-2.0",
   "main": "build/index.js",
   "module": "build/index.js",
@@ -55,7 +55,6 @@
     "lint-staged": "^12.3.4",
     "mocha": "^9.1.3",
     "oauth2-mock-server": "^4.3.1",
-    "shrink-ray-current": "^4.1.3",
     "sinon": "^13.0.1",
     "source-map-support": "^0.5.21",
     "ssl-root-cas": "^1.3.1",
@@ -70,8 +69,8 @@
     "tsc:watch": "tsc --watch",
     "test:browser": "wtr --playwright --browsers chromium firefox webkit --coverage",
     "test:browser:watch": "wtr --watch --playwright --browsers chromium",
-    "test:mocha": "npm run build-ts && mocha",
-    "test": "npm run test:mocha && npm run test:browser"
+    "test:node": "npm run build-ts && mocha",
+    "test": "npm run test:node && npm run test:browser"
   },
   "husky": {
     "hooks": {
@@ -90,7 +89,6 @@
     "@pawel-up/jexl": "^3.0.0",
     "@xmldom/xmldom": "^0.8.2",
     "console-table-printer": "^2.11.0",
-    "form-data": "^4.0.0",
     "ws": "^8.5.0",
     "xpath": "^0.0.32"
   },

package/src/lib/transformers/PayloadSerializer.ts

@@ -1,35 +1,58 @@
-import { blobToDataUrl } from './Utils.js';
-
 export type PayloadTypes = 'string' | 'file' | 'blob' | 'buffer' | 'arraybuffer' | 'formdata' | 'x-www-form-urlencoded';
 export type DeserializedPayload = string | Blob | File | FormData | Buffer | ArrayBuffer | undefined;
 export const SupportedPayloadTypes: PayloadTypes[] = ['string', 'file', 'blob', 'buffer', 'arraybuffer', 'formdata', 'x-www-form-urlencoded'];
 
 export interface IMultipartBody {
   /**
-   * When true a this entry represent a file part
+   * Whether the parameter is enabled. Default to true.
    */
-  isFile: boolean;
+  enabled?: boolean;
   /**
    * The name of the filed
    */
   name: string;
   /**
-   * Converted value
+   * Converted value.
+   * When the part value was a string this is a string.
+   * When the previous value was a Blob or a Buffer, this will be a serialized payload.
+   */
+  value: string | ISafePayload;
+  /**
+   * Aside from the `value` which is used to process the Payload, the purpose of this field to to keep
+   * the entered by the user string value for the "blob" item. This is primarily handled by the UI
+   * and ignored by the HTTP Engine.
+   */
+  blobText?: string;
+  /**
+   * When `true` this entry represent a file part
+   * @deprecated This is only used for the compatibility with ARC. This information is encoded in the `value`.
    */
-  value: string;
+  isFile?: boolean;
   /**
    * A content type entered by the user to the text part of the text part input.
    * This can only be set when `isFile` is false.
+   * @deprecated This is only used for the compatibility with ARC. This information is encoded in the `value`.
    */
   type?: string;
   /**
    * The original file name used with the part
+   * @deprecated This is only used for the compatibility with ARC. This information is encoded in the `value`.
    */
   fileName?: string;
+}
+
+export interface IBlobMeta {
   /**
-   * Whether the parameter is enabled. Default to true.
+   * The blob's mime type.
    */
-  enabled?: boolean;
+  mime: string;
+}
+
+export interface IFileMeta extends IBlobMeta {
+  /**
+   * The file name.
+   */
+  name: string;
 }
 
 /**
@@ -43,13 +66,17 @@ export interface ISafePayload {
    * The type od the originating payload object.
    */
   type: PayloadTypes;
+  /**
+   * The payload contents. The data type depends on the `type`.
+   */
   data: string | number[] | IMultipartBody[];
   /**
    * Optionally the original mime type of the payload.
    * This is used with files.
    */
-  mime?: string;
+  meta?: IBlobMeta | IFileMeta;
 }
+
 /**
  * The request payload. When not a string then it has to go through a 
  * transformation from a store safe object to the original data object.
@@ -84,6 +111,17 @@ export class PayloadSerializer {
     return false;
   }
 
+  /**
+   * Tests whether the given input should be processed by the `serialize()`.
+   */
+  static needsSerialization(input: unknown): boolean {
+    const typedSerialized = input as ISafePayload;
+    if (typedSerialized.type && SupportedPayloadTypes.includes(typedSerialized.type)) {
+      return false;
+    }
+    return true;
+  }
+
   /**
    * Transforms the payload into a data store safe object.
    */
@@ -100,6 +138,10 @@ export class PayloadSerializer {
     // if (typeof payload === 'string') {
     //   return payload;
     // }
+
+    if (hasBlob && payload instanceof File) {
+      return PayloadSerializer.stringifyFile(payload);
+    }
     if (hasBlob && payload instanceof Blob) {
       return PayloadSerializer.stringifyBlob(payload);
     }
@@ -111,7 +153,7 @@ export class PayloadSerializer {
     }
     if (hasFormData && payload instanceof FormData) {
       try {
-        const result = await PayloadSerializer.stringifyFormData((payload as unknown) as Iterable<(string | File)[]>);
+        const result = await PayloadSerializer.stringifyFormData(payload);
         return result;
       } catch (e: unknown) {
         console.warn(`Unable to transform FormData: ${(e as Error).message}`);
@@ -121,18 +163,38 @@ export class PayloadSerializer {
   }
 
   /**
-   * Converts blob data to base64 string.
+   * Stringifies a file object.
+   */
+  static async stringifyFile(file: File): Promise<ISafePayload> {
+    const buffer = await file.arrayBuffer();
+    const view = new Uint8Array(buffer);
+    const meta: IFileMeta = {
+      mime: file.type,
+      name: file.name,
+    };
+    const result: ISafePayload = {
+      type: 'file',
+      data: [...view],
+      meta,
+    };
+    return result;
+  }
+
+  /**
+   * Stringifies a blob object.
    *
-   * @param blob File or blob object to be translated to string
-   * @return Promise resolved to a base64 string data from the file.
+   * @param blob Blob object to be translated to string
    */
   static async stringifyBlob(blob: Blob): Promise<ISafePayload> {
-    const typedFile = blob as File;
-    const data = await blobToDataUrl(blob);
+    const buffer = await blob.arrayBuffer();
+    const view = new Uint8Array(buffer);
+    const meta: IBlobMeta = {
+      mime: blob.type,
+    };
     const result: ISafePayload = {
       type: 'blob',
-      data,
-      mime: typedFile.type,
+      data: [...view],
+      meta,
     };
     return result;
   }
@@ -160,14 +222,11 @@ export class PayloadSerializer {
    * @returns The buffer metadata or undefined if the passed argument is not an ArrayBuffer.
    */
   static stringifyArrayBuffer(payload: ArrayBuffer): ISafePayload | undefined {
-    if (payload.byteLength) {
-      const view = new Uint8Array(payload);
-      return {
-        type: 'arraybuffer',
-        data: Array.from(view),
-      };
-    }
-    return undefined;
+    const view = new Uint8Array(payload);
+    return {
+      type: 'arraybuffer',
+      data: Array.from(view),
+    };
   }
 
   /**
@@ -176,9 +235,11 @@ export class PayloadSerializer {
    * @param payload A `FormData` object
    * @return A promise resolved to a datastore safe entries.
    */
-  static async stringifyFormData(payload: Iterable<(string | File)[]>): Promise<ISafePayload> {
+  static async stringifyFormData(payload: FormData): Promise<ISafePayload> {
+    // TS apparently doesn't know that FormData is iterable.
+    const iterable = (payload as unknown) as Iterable<(string | File)[]>;
     const promises: Promise<IMultipartBody>[] = [];
-    for (const part of payload) {
+    for (const part of iterable) {
       promises.push(PayloadSerializer.serializeFormDataEntry(part[0] as string, part[1]));
     }
     const items = await Promise.all(promises);
@@ -195,33 +256,27 @@ export class PayloadSerializer {
    * @param file The part value
    * @returns Transformed FormData part to a datastore safe entry.
    */
-  static async serializeFormDataEntry(name: string, file: string | File): Promise<IMultipartBody> {
+  static async serializeFormDataEntry(name: string, file: string | File | Blob): Promise<IMultipartBody> {
     if (typeof file === 'string') {
-      // when adding an item to the FormData object without 3rd parameter of the append function
-      // then  the value is a string.
       return {
-        isFile: false,
         name,
         value: file,
         enabled: true,
       };
     }
-
-    const value = await blobToDataUrl(file);
+    let value: ISafePayload;
+    // API Client adds the "blob" when adding a text value with a mime type.
+    // This is recognized by the UI to restore the entry as the text and not a file.
+    if (file instanceof File && file.name !== 'blob') {
+      value = await PayloadSerializer.stringifyFile(file);
+    } else {
+      value = await PayloadSerializer.stringifyBlob(file);
+    }
     const part: IMultipartBody = {
-      isFile: false,
       name,
       value,
       enabled: true,
     };
-    if (file.name === 'blob') {
-      // API Client adds the "blob" filename when the content type is set on the editor.
-      // otherwise it wouldn't be possible to set the content type value.
-      part.type = file.type;
-    } else {
-      part.isFile = true;
-      part.fileName = file.name;
-    }
     return part;
   }
 
@@ -240,8 +295,8 @@ export class PayloadSerializer {
       // We mostly gonna return a Buffer here.
       switch (payload.type) {
         case 'string': return payload.data as string;
-        case 'file':
-        case 'blob': return PayloadSerializer.deserializeBlobBuffer(payload.data as string);
+        case 'file': return PayloadSerializer.deserializeFileBuffer(payload);
+        case 'blob': return PayloadSerializer.deserializeBlobBuffer(payload);
         case 'buffer': return PayloadSerializer.deserializeBuffer(payload.data as number[]);
         case 'arraybuffer': return PayloadSerializer.deserializeArrayBufferBuffer(payload.data as number[]);
         case 'formdata': return undefined;
@@ -250,9 +305,9 @@ export class PayloadSerializer {
     }
     switch (payload.type) {
       case 'string': return payload.data as string;
-      case 'file':
-      case 'blob': return PayloadSerializer.deserializeBlob(payload.data as string);
-      case 'buffer': return PayloadSerializer.deserializeBuffer(payload.data as number[]);
+      case 'file': return PayloadSerializer.deserializeFile(payload);
+      case 'blob': return PayloadSerializer.deserializeBlob(payload);
+      case 'buffer': return PayloadSerializer.deserializeArrayBuffer(payload.data as number[]);
       case 'arraybuffer': return PayloadSerializer.deserializeArrayBuffer(payload.data as number[]);
       case 'formdata': return PayloadSerializer.deserializeFormData(payload.data as IMultipartBody[]);
       default: return undefined;
@@ -260,12 +315,47 @@ export class PayloadSerializer {
   }
 
   /**
-   * Converts data-url string to blob
+   * Deserializes previously serialized file object.
+   * 
+   * @param payload The serialized payload with a file.
+   */
+  static deserializeFile(payload: ISafePayload): File {
+    const data = payload.data as number[];
+    const meta = payload.meta as IFileMeta;
+    const { mime, name } = meta;
+    const { buffer } = new Uint8Array(data);
+    return new File([buffer], name, {
+      type: mime,
+    });
+  }
+
+  /**
+   * Deserializes previously serialized blob object.
+   * 
+   * In previous versions of ARC the data was a string as data URL. In API client this is a buffer.
    *
+   * @param payload The serialized payload.
+   * @return Restored blob value
+   */
+  static deserializeBlob(payload: ISafePayload): Blob | undefined {
+    if (typeof payload.data === 'string') {
+      return this.deserializeBlobLegacy(payload.data);
+    }
+    const data = payload.data as number[];
+    const meta = payload.meta as IBlobMeta;
+    const { mime } = meta;
+    const { buffer } = new Uint8Array(data);
+    return new Blob([buffer], { type: mime });
+  }
+
+  /**
+   * The old implementation of the blob deserializer.
+   * 
+   * @deprecated
    * @param dataUrl Data url from blob value.
    * @return Restored blob value
    */
-  static deserializeBlob(dataUrl: string): Blob | undefined {
+  static deserializeBlobLegacy(dataUrl: string): Blob | undefined {
     const arr = dataUrl.split(',');
     const matchedMime = arr[0].match(/:(.*?);/);
     if (!matchedMime) {
@@ -282,12 +372,40 @@ export class PayloadSerializer {
   }
 
   /**
-   * Converts data-url string to blob
+   * Converts previously serialized File to a Buffer.
+   *
+   * @param payload The serialized payload.
+   * @return Restored File value as Buffer
+   */
+  static deserializeFileBuffer(payload: ISafePayload): Buffer {
+    const data = payload.data as number[];
+    const ab = this.deserializeArrayBuffer(data);
+    return Buffer.from(ab);
+  }
+
+  /**
+   * Converts data-url string to buffer
    *
+   * @param payload The serialized payload.
+   * @return Restored blob value
+   */
+  static deserializeBlobBuffer(payload: ISafePayload): Buffer {
+    if (typeof payload.data === 'string') {
+      return this.deserializeBlobBufferLegacy(payload.data);
+    }
+    const data = payload.data as number[];
+    const ab = this.deserializeArrayBuffer(data);
+    return Buffer.from(ab);
+  }
+
+  /**
+   * Converts data-url string to buffer
+   *
+   * @deprecated
    * @param dataUrl Data url from blob value.
    * @return Restored blob value
    */
-  static deserializeBlobBuffer(dataUrl: string): Buffer {
+  static deserializeBlobBufferLegacy(dataUrl: string): Buffer {
     const arr = dataUrl.split(',');
     const value = arr[1];
     return Buffer.from(value, 'base64url');
@@ -334,26 +452,54 @@ export class PayloadSerializer {
     if (!Array.isArray(parts) || !parts.length) {
       return fd;
     }
-    parts.forEach((part) => {
-      const { isFile, name, value, type, fileName, enabled } = part;
-      if (enabled === false) {
-        return;
+    parts.forEach(part => this.deserializeFormDataPart(fd, part));
+    return fd;
+  }
+
+  private static deserializeFormDataPart(form: FormData, part: IMultipartBody): void {
+    if (part.enabled === false) {
+      return;
+    }
+    // the compatibility with old ARC.
+    if (typeof part.isFile === 'boolean') {
+      this.deserializeFormDataLegacy(form, part);
+      return;
+    }
+    const { name, value } = part;
+    if (typeof value === 'string') {
+      form.append(name, value);
+      return;
+    }
+    if (value.type === 'string') {
+      form.append(name, value.data as string);
+      return;
+    }
+    if (value.type === 'file') {
+      const file = this.deserializeFile(value);
+      form.append(name, file);
+      return;
+    }
+    const blob = this.deserializeBlob(value) as Blob;
+    form.append(name, blob);
+  }
+
+  /**
+   * @deprecated This is only for compatibility with ARC.
+   */
+  private static deserializeFormDataLegacy(form: FormData, part: IMultipartBody): void {
+    let blob;
+    if (part.isFile) {
+      blob = PayloadSerializer.deserializeBlobLegacy(part.value as string);
+      if (blob) {
+        form.append(part.name, blob, part.fileName);
       }
-      let blob;
-      if (isFile) {
-        blob = PayloadSerializer.deserializeBlob(value);
-        if (blob) {
-          fd.append(name, blob, fileName);
-        }
-      } else if (type) {
-        blob = PayloadSerializer.deserializeBlob(value);
-        if (blob) {
-          fd.append(name, blob, 'blob');
-        }
-      } else {
-        fd.append(name, value);
+    } else if (part.type) {
+      blob = PayloadSerializer.deserializeBlobLegacy(part.value as string);
+      if (blob) {
+        form.append(part.name, blob, 'blob');
       }
-    });
-    return fd;
+    } else {
+      form.append(part.name, part.value as string);
+    }
   }
 }

package/src/mocking/lib/Request.ts

@@ -83,7 +83,7 @@ export class Request {
       result.response = await this.response.response(init.response);
     }
     if (init.redirects) {
-      result.redirects = await this.response.redirects();
+      result.redirects = await this.response.redirects(undefined, init.response);
     }
     if (!init.noSize) {
       result.size = this.response.size();

package/src/mocking/lib/Response.ts

@@ -87,7 +87,7 @@ export class Response {
     return result;
   }
 
-  async redirect(init?: IResponseInit): Promise<IResponseRedirect> {
+  async redirect(init: IResponseInit = {}): Promise<IResponseRedirect> {
     const start = this.time.timestamp();
     const end = this.time.timestamp({ min: start + 1 })
     const info: IResponseRedirect = {
@@ -97,6 +97,9 @@ export class Response {
       url: this.internet.uri(),
       response: await this.httpResponse({ ...init, statusGroup: 3}),
     };
+    if (init.timings) {
+      info.timings = this.har.timing(init);
+    }
     return info;
   }
 

package/src/models/RequestUiMeta.ts

@@ -1,5 +1,5 @@
 import { IProperty, Property } from './Property.js';
-import { IMultipartBody } from '../lib/transformers/PayloadSerializer.js';
+import { IMultipartBody, ISafePayload } from '../lib/transformers/PayloadSerializer.js';
 import { RequestUiMeta as LegacyRequestUiMeta } from './legacy/request/ArcRequest.js';
 
 export const Kind = 'Core#RequestUiMeta';
@@ -70,7 +70,7 @@ export interface IBodyMetaModel {
   /**
    * Generated view model.
    */
-  viewModel: (IProperty | IMultipartBody | IRawBody)[];
+  viewModel: (IProperty | ISafePayload | IMultipartBody | IRawBody)[];
 }
 
 /**

package/src/runtime/http-engine/CoreEngine.ts

@@ -134,12 +134,9 @@ export class CoreEngine extends HttpEngine {
     if (auth) {
       headers.set('proxy-authorization', auth);
     }
-    let buffer: Buffer | undefined;
-    if (payload) {
-      buffer = await PayloadSupport.payloadToBuffer(payload, headers);
-      if (buffer) {
-        addContentLength(this.request.method || 'GET', buffer, headers);
-      }
+    const buffer = PayloadSupport.payloadToBuffer(headers, payload);
+    if (buffer) {
+      addContentLength(this.request.method || 'GET', buffer, headers);
     }
 
     this._handleAuthorization(headers);