Parse V4 response types on Containers API requests

Author: jseba

packages/wrangler/src/cloudchamber/client/core/request.ts

@@ -9,6 +9,21 @@ import type { ApiRequestOptions } from "./ApiRequestOptions";
 import type { ApiResult } from "./ApiResult";
 import type { OnCancel } from "./CancelablePromise";
 
+interface FetchError {
+	code: number;
+	documentation_url?: string;
+	message: string;
+	error_chain?: FetchError[];
+}
+
+interface FetchResult<ResponseType = unknown> {
+	success: boolean;
+	result: ResponseType;
+	errors: FetchError[];
+	messages?: string[];
+	result_info?: unknown;
+}
+
 const isDefined = <T>(
 	value: T | null | undefined
 ): value is Exclude<T, null | undefined> => {
@@ -197,6 +212,13 @@ const getRequestBody = (options: ApiRequestOptions): any => {
 	return undefined;
 };
 
+const isResponseSchemaV4 = (
+	config: OpenAPIConfig,
+	_options: ApiRequestOptions
+): boolean => {
+	return config.BASE.endsWith("/containers");
+};
+
 export const sendRequest = async (
 	config: OpenAPIConfig,
 	options: ApiRequestOptions,
@@ -319,16 +341,28 @@ export const request = <T>(
 					options.responseHeader
 				);
 
-				const result: ApiResult = {
-					url,
-					ok: response.ok,
-					status: response.status,
-					statusText: response.statusText,
-					body: responseHeader ?? responseBody,
+				const parseResponseSchemaV4 = (body: any): ApiResult => {
+					const fetchResult = body as FetchResult<T>;
+					return {
+						url,
+						ok: response.ok && fetchResult.success,
+						status: response.status,
+						statusText: response.statusText,
+						body: responseHeader ?? fetchResult.result,
+					};
 				};
 
-				catchErrorCodes(options, result);
+				const result: ApiResult = isResponseSchemaV4(config, options)
+					? parseResponseSchemaV4(responseBody)
+					: {
+							url,
+							ok: response.ok,
+							status: response.status,
+							statusText: response.statusText,
+							body: responseHeader ?? responseBody,
+						};
 
+				catchErrorCodes(options, result);
 				resolve(result.body);
 			}
 		} catch (error) {