-
-
Notifications
You must be signed in to change notification settings - Fork 710
Fix deploy timeout issues #1661
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| "trigger.dev": patch | ||
| "@trigger.dev/core": patch | ||
| --- | ||
|
|
||
| Fixed deploy timeout issues and improve the output of logs when deploying |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
apps/webapp/app/routes/api.v3.deployments.$deploymentId.finalize.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| import { ActionFunctionArgs, json } from "@remix-run/server-runtime"; | ||
| import { FinalizeDeploymentRequestBody } from "@trigger.dev/core/v3"; | ||
| import { z } from "zod"; | ||
| import { authenticateApiRequest } from "~/services/apiAuth.server"; | ||
| import { logger } from "~/services/logger.server"; | ||
| import { ServiceValidationError } from "~/v3/services/baseService.server"; | ||
| import { FinalizeDeploymentV2Service } from "~/v3/services/finalizeDeploymentV2.server"; | ||
|
|
||
| const ParamsSchema = z.object({ | ||
| deploymentId: z.string(), | ||
| }); | ||
|
|
||
| export async function action({ request, params }: ActionFunctionArgs) { | ||
| // Ensure this is a POST request | ||
| if (request.method.toUpperCase() !== "POST") { | ||
| return { status: 405, body: "Method Not Allowed" }; | ||
| } | ||
|
|
||
| const parsedParams = ParamsSchema.safeParse(params); | ||
|
|
||
| if (!parsedParams.success) { | ||
| return json({ error: "Invalid params" }, { status: 400 }); | ||
| } | ||
|
|
||
| // Next authenticate the request | ||
| const authenticationResult = await authenticateApiRequest(request); | ||
|
|
||
| if (!authenticationResult) { | ||
| logger.info("Invalid or missing api key", { url: request.url }); | ||
| return json({ error: "Invalid or Missing API key" }, { status: 401 }); | ||
| } | ||
|
|
||
| const authenticatedEnv = authenticationResult.environment; | ||
|
|
||
| const { deploymentId } = parsedParams.data; | ||
|
|
||
| const rawBody = await request.json(); | ||
| const body = FinalizeDeploymentRequestBody.safeParse(rawBody); | ||
|
|
||
| if (!body.success) { | ||
| return json({ error: "Invalid body", issues: body.error.issues }, { status: 400 }); | ||
| } | ||
|
|
||
| try { | ||
| // Create a text stream chain | ||
| const stream = new TransformStream(); | ||
| const encoder = new TextEncoderStream(); | ||
| const writer = stream.writable.getWriter(); | ||
|
|
||
| const service = new FinalizeDeploymentV2Service(); | ||
|
|
||
| // Chain the streams: stream -> encoder -> response | ||
| const response = new Response(stream.readable.pipeThrough(encoder), { | ||
| headers: { | ||
| "Content-Type": "text/event-stream", | ||
| "Cache-Control": "no-cache", | ||
| Connection: "keep-alive", | ||
| }, | ||
| }); | ||
|
|
||
| const pingInterval = setInterval(() => { | ||
| writer.write("event: ping\ndata: {}\n\n"); | ||
| }, 10000); // 10 seconds | ||
|
|
||
| service | ||
| .call(authenticatedEnv, deploymentId, body.data, writer) | ||
| .then(async () => { | ||
| clearInterval(pingInterval); | ||
|
|
||
| await writer.write(`event: complete\ndata: ${JSON.stringify({ id: deploymentId })}\n\n`); | ||
| await writer.close(); | ||
| }) | ||
| .catch(async (error) => { | ||
| let errorMessage; | ||
|
|
||
| if (error instanceof ServiceValidationError) { | ||
| errorMessage = { error: error.message }; | ||
| } else if (error instanceof Error) { | ||
| logger.error("Error finalizing deployment", { error: error.message }); | ||
| errorMessage = { error: `Internal server error: ${error.message}` }; | ||
| } else { | ||
| logger.error("Error finalizing deployment", { error: String(error) }); | ||
| errorMessage = { error: "Internal server error" }; | ||
| } | ||
|
|
||
| clearInterval(pingInterval); | ||
|
|
||
| await writer.write(`event: error\ndata: ${JSON.stringify(errorMessage)}\n\n`); | ||
| await writer.close(); | ||
| }); | ||
|
|
||
| return response; | ||
| } catch (error) { | ||
| if (error instanceof ServiceValidationError) { | ||
| return json({ error: error.message }, { status: 400 }); | ||
| } else if (error instanceof Error) { | ||
| logger.error("Error finalizing deployment", { error: error.message }); | ||
| return json({ error: `Internal server error: ${error.message}` }, { status: 500 }); | ||
| } else { | ||
| logger.error("Error finalizing deployment", { error: String(error) }); | ||
| return json({ error: "Internal server error" }, { status: 500 }); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Consider error handling for stream writes.
The code writes to the stream without handling potential write errors. Stream writes can fail, especially in case of network issues or if the client disconnects.
Apply this diff to add error handling:
if (writer) { for (const line of lines) { - await writer.write(`event: log\ndata: ${JSON.stringify({ message: line })}\n\n`); + try { + await writer.write(`event: log\ndata: ${JSON.stringify({ message: line })}\n\n`); + } catch (error) { + logger.error("Failed to write to stream", { error }); + break; + } } }📝 Committable suggestion