Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions 28 apps/webapp/app/v3/services/deployment.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { type AuthenticatedEnvironment } from "~/services/apiAuth.server";
import { BaseService } from "./baseService.server";
import { errAsync, fromPromise, okAsync, type ResultAsync } from "neverthrow";
import { type WorkerDeployment, type Project } from "@trigger.dev/database";
import { logger, type GitMeta, type DeploymentEvent } from "@trigger.dev/core/v3";
import { BuildServerMetadata, logger, type GitMeta, type DeploymentEvent } from "@trigger.dev/core/v3";
import { TimeoutDeploymentService } from "./timeoutDeployment.server";
import { env } from "~/env.server";
import { createRemoteImageBuild } from "../remoteImageBuilder.server";
Expand Down Expand Up @@ -40,7 +40,7 @@ export class DeploymentService extends BaseService {
friendlyId: string,
updates: Partial<Pick<WorkerDeployment, "contentHash" | "runtime"> & { git: GitMeta }>
) {
const validateDeployment = (deployment: Pick<WorkerDeployment, "id" | "status">) => {
const validateDeployment = (deployment: Pick<WorkerDeployment, "id" | "status"> & { buildServerMetadata?: BuildServerMetadata }) => {
if (deployment.status !== "PENDING" && deployment.status !== "INSTALLING") {
logger.warn(
"Attempted progressing deployment that is not in PENDING or INSTALLING status",
Expand Down Expand Up @@ -75,14 +75,17 @@ export class DeploymentService extends BaseService {
return okAsync({ id: deployment.id, status: "INSTALLING" as const });
});

const createRemoteBuild = (deployment: Pick<WorkerDeployment, "id">) =>
fromPromise(createRemoteImageBuild(authenticatedEnv.project), (error) => ({
type: "failed_to_create_remote_build" as const,
cause: error,
}));
const progressToBuilding = (
deployment: Pick<WorkerDeployment, "id"> & { buildServerMetadata?: BuildServerMetadata }
) => {
const createRemoteBuildIfNeeded = deployment.buildServerMetadata?.isNativeBuild
? okAsync(undefined)
: fromPromise(createRemoteImageBuild(authenticatedEnv.project), (error) => ({
type: "failed_to_create_remote_build" as const,
cause: error,
}));

const progressToBuilding = (deployment: Pick<WorkerDeployment, "id">) =>
createRemoteBuild(deployment)
return createRemoteBuildIfNeeded
.andThen((externalBuildData) =>
fromPromise(
this._prisma.workerDeployment.updateMany({
Expand All @@ -106,6 +109,7 @@ export class DeploymentService extends BaseService {
}
return okAsync({ id: deployment.id, status: "BUILDING" as const });
});
};

const extendTimeout = (deployment: Pick<WorkerDeployment, "id" | "status">) =>
fromPromise(
Expand Down Expand Up @@ -432,6 +436,7 @@ export class DeploymentService extends BaseService {
select: {
status: true,
id: true,
buildServerMetadata: true,
imageReference: true,
shortCode: true,
environment: {
Expand All @@ -454,6 +459,9 @@ export class DeploymentService extends BaseService {
return errAsync({ type: "deployment_not_found" as const });
}
return okAsync(deployment);
});
}).map((deployment) => ({
...deployment,
buildServerMetadata: BuildServerMetadata.safeParse(deployment.buildServerMetadata).data,
}));
}
}
Morty Proxy This is a proxified and sanitized view of the page, visit original site.