Skip to content

Commit 6712571

Browse files
committed
fix stuck deploy command after finalize error
1 parent f4261a2 commit 6712571

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

packages/cli-v3/src/apiClient.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,9 @@ export class CliApiClient {
289289
}
290290

291291
let resolvePromise: (value: ApiResult<FailDeploymentResponseBody>) => void;
292-
let rejectPromise: (reason: any) => void;
293292

294-
const promise = new Promise<ApiResult<FailDeploymentResponseBody>>((resolve, reject) => {
293+
const promise = new Promise<ApiResult<FailDeploymentResponseBody>>((resolve) => {
295294
resolvePromise = resolve;
296-
rejectPromise = reject;
297295
});
298296

299297
const source = zodfetchSSE({
@@ -311,9 +309,15 @@ export class CliApiClient {
311309
});
312310

313311
source.onConnectionError((error) => {
314-
rejectPromise({
312+
let message = error.message ?? "Unknown error";
313+
314+
if (error.status !== undefined) {
315+
message = `HTTP ${error.status} ${message}`;
316+
}
317+
318+
resolvePromise({
315319
success: false,
316-
error,
320+
error: message,
317321
});
318322
});
319323

@@ -325,7 +329,7 @@ export class CliApiClient {
325329
});
326330

327331
source.onMessage("error", ({ error }) => {
328-
rejectPromise({
332+
resolvePromise({
329333
success: false,
330334
error,
331335
});

packages/core/src/v3/apiClient/core.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
OffsetLimitPageParams,
1818
OffsetLimitPageResponse,
1919
} from "./pagination.js";
20-
import { EventSource } from "eventsource";
20+
import { EventSource, type ErrorEvent } from "eventsource";
2121

2222
export const defaultRetryOptions = {
2323
maxAttempts: 3,
@@ -665,7 +665,7 @@ export class ZodFetchSSEResult<TMessageCatalog extends ZodFetchSSEMessageCatalog
665665
});
666666
}
667667

668-
public onConnectionError(handler: (error: Event) => void) {
668+
public onConnectionError(handler: (error: ErrorEvent) => void) {
669669
this._eventSource.onerror = handler;
670670
}
671671

0 commit comments

Comments
 (0)