diff --git a/web/components/service/details/source-section.tsx b/web/components/service/details/source-section.tsx
index cf0c2d6..bf8058d 100644
--- a/web/components/service/details/source-section.tsx
+++ b/web/components/service/details/source-section.tsx
@@ -1,11 +1,11 @@
"use client";
+import { Box, GitBranch, Github, Loader2 } from "lucide-react";
import { memo, useState } from "react";
import { toast } from "sonner";
-import { Box, GitBranch, Github, Loader2 } from "lucide-react";
import {
- updateServiceGithubRepo,
updateServiceConfig,
+ updateServiceGithubRepo,
validateDockerImage,
} from "@/actions/projects";
import { Button } from "@/components/ui/button";
@@ -19,6 +19,7 @@ import {
} from "@/components/ui/item";
import { Label } from "@/components/ui/label";
import type { ServiceWithDetails as Service } from "@/db/types";
+import { imageNeedsProductionPinning } from "@/lib/docker-image";
function parseImageInfo(image: string): {
registry: string;
@@ -270,7 +271,7 @@ export const SourceSection = memo(function SourceSection({
{
setImage(e.target.value);
@@ -280,6 +281,12 @@ export const SourceSection = memo(function SourceSection({
{imageError && (
{imageError}
)}
+ {imageNeedsProductionPinning(image.trim()) && (
+
+ Use a version tag or digest for production. Unqualified images
+ default to latest.
+
+ )}
Supported: Docker Hub, GitHub Container Registry (ghcr.io), or
any public registry
diff --git a/web/db/schema.ts b/web/db/schema.ts
index e8e83bb..757b6ed 100644
--- a/web/db/schema.ts
+++ b/web/db/schema.ts
@@ -456,6 +456,12 @@ export const deployments = pgTable(
healthStatus: text("health_status", {
enum: ["none", "starting", "healthy", "unhealthy"],
}),
+ unhealthyReportCount: integer("unhealthy_report_count")
+ .notNull()
+ .default(0),
+ autohealRestartCount: integer("autoheal_restart_count")
+ .notNull()
+ .default(0),
rolloutId: text("rollout_id"),
previousDeploymentId: text("previous_deployment_id"),
failedStage: text("failed_stage"),
diff --git a/web/lib/agent-status.ts b/web/lib/agent-status.ts
index 1e451f7..e1586ed 100644
--- a/web/lib/agent-status.ts
+++ b/web/lib/agent-status.ts
@@ -12,7 +12,12 @@ import {
services,
} from "@/db/schema";
import { inngest } from "@/lib/inngest/client";
+import { inngestEvents } from "@/lib/inngest/events";
import { ingestRolloutLog } from "@/lib/victoria-logs";
+import { enqueueWork } from "@/lib/work-queue";
+
+const AUTOHEAL_UNHEALTHY_REPORTS = 3;
+const AUTOHEAL_MAX_RESTARTS = 3;
type ContainerStatus = {
deploymentId: string;
@@ -194,14 +199,13 @@ export async function applyStatusReport(
if (!hasHealthCheck) {
if (deployment.rolloutId) {
- await inngest.send({
- name: "deployment/healthy",
- data: {
+ await inngest.send(
+ inngestEvents.deploymentHealthy.create({
deploymentId: deployment.id,
rolloutId: deployment.rolloutId,
serviceId: deployment.serviceId,
- },
- });
+ }),
+ );
}
if (service?.migrationStatus === "deploying_target") {
@@ -225,6 +229,9 @@ export async function applyStatusReport(
}
const updateFields: Record = { healthStatus };
+ let autohealRestartPayload: Record | null = null;
+ let autohealFailed = false;
+
if (deployment.containerId !== container.containerId) {
updateFields.containerId = container.containerId;
}
@@ -266,27 +273,25 @@ export async function applyStatusReport(
.where(eq(deployments.id, deployment.id));
if (deployment.rolloutId) {
- await inngest.send({
- name: "deployment/healthy",
- data: {
+ await inngest.send(
+ inngestEvents.deploymentHealthy.create({
deploymentId: deployment.id,
rolloutId: deployment.rolloutId,
serviceId: deployment.serviceId,
- },
- });
+ }),
+ );
}
if (service?.migrationStatus === "deploying_target") {
console.log(
`[migration] deployment ${deployment.id} healthy (no health check), sending event`,
);
- await inngest.send({
- name: "migration/deployment-healthy",
- data: {
+ await inngest.send(
+ inngestEvents.migrationDeploymentHealthy.create({
deploymentId: deployment.id,
serviceId: deployment.serviceId,
- },
- });
+ }),
+ );
}
continue;
}
@@ -303,11 +308,69 @@ export async function applyStatusReport(
);
}
+ const canAutoheal =
+ container.status === "running" &&
+ (deployment.status === "running" || deployment.status === "healthy");
+ const healthRecovered =
+ healthStatus === "healthy" || healthStatus === "none";
+
+ if (canAutoheal && healthStatus === "unhealthy") {
+ const unhealthyReportCount = (deployment.unhealthyReportCount ?? 0) + 1;
+ updateFields.unhealthyReportCount = unhealthyReportCount;
+
+ if (unhealthyReportCount >= AUTOHEAL_UNHEALTHY_REPORTS) {
+ const restartCount = deployment.autohealRestartCount ?? 0;
+
+ if (restartCount >= AUTOHEAL_MAX_RESTARTS) {
+ console.log(
+ `[autoheal] deployment ${deployment.id} exceeded restart limit`,
+ );
+ updateFields.status = "failed";
+ updateFields.failedStage = "autoheal";
+ autohealFailed = true;
+ } else {
+ console.log(
+ `[autoheal] restarting unhealthy deployment ${deployment.id} (${restartCount + 1}/${AUTOHEAL_MAX_RESTARTS})`,
+ );
+ updateFields.unhealthyReportCount = 0;
+ updateFields.autohealRestartCount = restartCount + 1;
+ autohealRestartPayload = {
+ deploymentId: deployment.id,
+ containerId: container.containerId,
+ reason: "autoheal_unhealthy",
+ };
+ }
+ }
+ } else if (healthRecovered) {
+ updateFields.unhealthyReportCount = 0;
+ }
+
await db
.update(deployments)
.set(updateFields)
.where(eq(deployments.id, deployment.id));
+ if (autohealRestartPayload) {
+ await enqueueWork(serverId, "restart", autohealRestartPayload);
+ }
+
+ if (autohealFailed && deployment.rolloutId) {
+ await ingestRolloutLog(
+ deployment.rolloutId,
+ deployment.serviceId,
+ "autoheal",
+ `Deployment ${deployment.id} exceeded autoheal restart limit`,
+ );
+ await inngest.send(
+ inngestEvents.deploymentFailed.create({
+ deploymentId: deployment.id,
+ rolloutId: deployment.rolloutId,
+ serviceId: deployment.serviceId,
+ reason: "autoheal_restart_limit",
+ }),
+ );
+ }
+
if (
deployment.status === "starting" &&
container.status === "running" &&
@@ -329,14 +392,13 @@ export async function applyStatusReport(
"health_check",
`Deployment ${deployment.id} is healthy`,
);
- await inngest.send({
- name: "deployment/healthy",
- data: {
+ await inngest.send(
+ inngestEvents.deploymentHealthy.create({
deploymentId: deployment.id,
rolloutId: deployment.rolloutId,
serviceId: deployment.serviceId,
- },
- });
+ }),
+ );
}
const deployedService = await db
@@ -349,13 +411,12 @@ export async function applyStatusReport(
console.log(
`[migration] deployment ${deployment.id} healthy, sending event`,
);
- await inngest.send({
- name: "migration/deployment-healthy",
- data: {
+ await inngest.send(
+ inngestEvents.migrationDeploymentHealthy.create({
deploymentId: deployment.id,
serviceId: deployment.serviceId,
- },
- });
+ }),
+ );
}
}
@@ -374,15 +435,14 @@ export async function applyStatusReport(
"health_check",
`Deployment ${deployment.id} failed health check`,
);
- await inngest.send({
- name: "deployment/failed",
- data: {
+ await inngest.send(
+ inngestEvents.deploymentFailed.create({
deploymentId: deployment.id,
rolloutId: deployment.rolloutId,
serviceId: deployment.serviceId,
reason: "health_check_failed",
- },
- });
+ }),
+ );
}
}
}
@@ -405,13 +465,12 @@ export async function applyStatusReport(
"dns_sync",
`DNS synced on server ${serverId}`,
);
- await inngest.send({
- name: "server/dns-synced",
- data: {
+ await inngest.send(
+ inngestEvents.serverDnsSynced.create({
serverId,
rolloutId: rollout.id,
- },
- });
+ }),
+ );
}
}
}
diff --git a/web/lib/compose-parser.ts b/web/lib/compose-parser.ts
index cc82793..5adc734 100644
--- a/web/lib/compose-parser.ts
+++ b/web/lib/compose-parser.ts
@@ -1,5 +1,9 @@
import { parse as parseYaml } from "yaml";
import { z } from "zod";
+import {
+ imageIsUnqualified,
+ imageUsesMutableReference,
+} from "@/lib/docker-image";
import { formatZodErrors } from "@/lib/utils";
const composeHealthcheckSchema = z.object({
@@ -318,6 +322,10 @@ function parseHealthcheck(
};
}
+function volumeMentionsDockerSocket(volume: string): boolean {
+ return volume.split(":").some((part) => part === "/var/run/docker.sock");
+}
+
function quoteIfNeeded(arg: string): string {
if (arg.includes(" ") || arg.includes('"') || arg.includes("'")) {
return `"${arg.replace(/"/g, '\\"')}"`;
@@ -435,6 +443,24 @@ export function parseComposeYaml(yamlContent: string): ComposeParseResult {
});
}
+ if (imageIsUnqualified(serviceConfig.image)) {
+ warnings.push({
+ service: serviceName,
+ field: "image",
+ message:
+ "Image uses Docker Hub shorthand. Prefer a fully qualified registry path for production.",
+ });
+ }
+
+ if (imageUsesMutableReference(serviceConfig.image)) {
+ warnings.push({
+ service: serviceName,
+ field: "image",
+ message:
+ "Image uses a mutable tag or implicit latest. Pin a version tag or digest for production deploys.",
+ });
+ }
+
if (serviceConfig.depends_on) {
warnings.push({
service: serviceName,
@@ -478,7 +504,7 @@ export function parseComposeYaml(yamlContent: string): ComposeParseResult {
service: serviceName,
field: "restart",
message:
- "Restart policy ignored. Platform manages restarts automatically.",
+ "Restart policy ignored. The platform manages lifecycle, health, and restart behavior automatically.",
});
}
@@ -488,20 +514,28 @@ export function parseComposeYaml(yamlContent: string): ComposeParseResult {
if (result.error) {
errors.push({ service: serviceName, message: result.error });
} else if (result.port) {
+ const port = result.port;
if (
!parsedPorts.some(
- (p) =>
- p.port === result.port!.port &&
- p.protocol === result.port!.protocol,
+ (p) => p.port === port.port && p.protocol === port.protocol,
)
) {
- parsedPorts.push(result.port);
+ parsedPorts.push(port);
}
}
}
const parsedVolumes: ParsedVolume[] = [];
for (const volumeDef of serviceConfig.volumes || []) {
+ if (volumeMentionsDockerSocket(volumeDef)) {
+ warnings.push({
+ service: serviceName,
+ field: "volumes",
+ message:
+ "Docker socket mount ignored. Mounting /var/run/docker.sock grants host-level Docker control.",
+ });
+ }
+
const result = parseVolume(volumeDef, serviceName, definedVolumes);
if (result.error) {
errors.push({ service: serviceName, message: result.error });
@@ -512,8 +546,9 @@ export function parseComposeYaml(yamlContent: string): ComposeParseResult {
message: result.warning,
});
} else if (result.volume) {
- if (!parsedVolumes.some((v) => v.name === result.volume!.name)) {
- parsedVolumes.push(result.volume);
+ const volume = result.volume;
+ if (!parsedVolumes.some((v) => v.name === volume.name)) {
+ parsedVolumes.push(volume);
}
}
}
diff --git a/web/lib/docker-image.ts b/web/lib/docker-image.ts
new file mode 100644
index 0000000..2bf3dfb
--- /dev/null
+++ b/web/lib/docker-image.ts
@@ -0,0 +1,18 @@
+export function imageUsesMutableReference(image: string): boolean {
+ if (image.includes("@")) return false;
+
+ const lastSlash = image.lastIndexOf("/");
+ const lastColon = image.lastIndexOf(":");
+ if (lastColon <= lastSlash) return true;
+
+ return image.slice(lastColon + 1) === "latest";
+}
+
+export function imageIsUnqualified(image: string): boolean {
+ const imageWithoutDigest = image.split("@")[0];
+ return !imageWithoutDigest.includes("/");
+}
+
+export function imageNeedsProductionPinning(image: string): boolean {
+ return image !== "" && imageUsesMutableReference(image);
+}
diff --git a/web/lib/inngest/client.ts b/web/lib/inngest/client.ts
index c72ff47..595bb3a 100644
--- a/web/lib/inngest/client.ts
+++ b/web/lib/inngest/client.ts
@@ -1,7 +1,9 @@
-import { EventSchemas, Inngest } from "inngest";
-import type { Events } from "./events";
+import { Inngest } from "inngest";
export const inngest = new Inngest({
id: "techulus-cloud",
- schemas: new EventSchemas().fromRecord(),
+ baseUrl: process.env.INNGEST_BASE_URL,
+ eventKey: process.env.INNGEST_EVENT_KEY,
+ signingKey: process.env.INNGEST_SIGNING_KEY,
+ checkpointing: false,
});
diff --git a/web/lib/inngest/events/index.ts b/web/lib/inngest/events/index.ts
index c15c495..01a3019 100644
--- a/web/lib/inngest/events/index.ts
+++ b/web/lib/inngest/events/index.ts
@@ -1,3 +1,5 @@
+import { eventType, staticSchema } from "inngest";
+
export type { RolloutEvents } from "./rollout";
export type { MigrationEvents } from "./migration";
export type { BackupEvents } from "./backup";
@@ -15,3 +17,41 @@ export type Events = RolloutEvents &
BackupEvents &
RestoreEvents &
BuildEvents;
+
+type EventName = keyof Events & string;
+type EventData = Events[TName]["data"];
+
+const defineEvent = (name: TName) =>
+ eventType(name, { schema: staticSchema>() });
+
+export const inngestEvents = {
+ rolloutCreated: defineEvent("rollout/created"),
+ rolloutCancelled: defineEvent("rollout/cancelled"),
+ deploymentHealthy: defineEvent("deployment/healthy"),
+ deploymentFailed: defineEvent("deployment/failed"),
+ serverDnsSynced: defineEvent("server/dns-synced"),
+
+ migrationStarted: defineEvent("migration/started"),
+ migrationCancelled: defineEvent("migration/cancelled"),
+ migrationBackupCompleted: defineEvent("migration/backup-completed"),
+ migrationBackupFailed: defineEvent("migration/backup-failed"),
+ migrationRestoreCompleted: defineEvent("migration/restore-completed"),
+ migrationRestoreFailed: defineEvent("migration/restore-failed"),
+ migrationDeploymentHealthy: defineEvent("migration/deployment-healthy"),
+
+ backupStarted: defineEvent("backup/started"),
+ backupCompleted: defineEvent("backup/completed"),
+ backupFailed: defineEvent("backup/failed"),
+
+ restoreTrigger: defineEvent("restore/trigger"),
+ restoreStarted: defineEvent("restore/started"),
+ restoreCompleted: defineEvent("restore/completed"),
+ restoreFailed: defineEvent("restore/failed"),
+
+ buildTrigger: defineEvent("build/trigger"),
+ buildStarted: defineEvent("build/started"),
+ buildCancelled: defineEvent("build/cancelled"),
+ buildCompleted: defineEvent("build/completed"),
+ manifestCompleted: defineEvent("manifest/completed"),
+ manifestFailed: defineEvent("manifest/failed"),
+};
diff --git a/web/lib/inngest/functions/backup-workflow.ts b/web/lib/inngest/functions/backup-workflow.ts
index 330a819..e8f3e33 100644
--- a/web/lib/inngest/functions/backup-workflow.ts
+++ b/web/lib/inngest/functions/backup-workflow.ts
@@ -2,32 +2,35 @@ import { eq } from "drizzle-orm";
import { db } from "@/db";
import { volumeBackups } from "@/db/schema";
import { inngest } from "../client";
+import { inngestEvents } from "../events";
export const backupWorkflow = inngest.createFunction(
{
id: "backup-workflow",
+ triggers: [inngestEvents.backupStarted],
},
- { event: "backup/started" },
- async ({ event, step }) => {
+ async ({ event, step, group }) => {
const { backupId } = event.data;
- const completedPromise = step
- .waitForEvent("wait-backup-completed", {
- event: "backup/completed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}"`,
- })
- .then((result) => ({ status: "completed" as const, result }));
+ const outcome = await group.parallel(() => {
+ const completedPromise = step
+ .waitForEvent("wait-backup-completed", {
+ event: inngestEvents.backupCompleted,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}"`,
+ })
+ .then((result) => ({ status: "completed" as const, result }));
- const failedPromise = step
- .waitForEvent("wait-backup-failed", {
- event: "backup/failed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}"`,
- })
- .then((result) => ({ status: "failed" as const, result }));
+ const failedPromise = step
+ .waitForEvent("wait-backup-failed", {
+ event: inngestEvents.backupFailed,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}"`,
+ })
+ .then((result) => ({ status: "failed" as const, result }));
- const outcome = await Promise.race([completedPromise, failedPromise]);
+ return Promise.race([completedPromise, failedPromise]);
+ });
if (!outcome.result) {
await step.run("handle-backup-timeout", async () => {
@@ -58,8 +61,8 @@ export const backupWorkflow = inngest.createFunction(
export const onBackupFailed = inngest.createFunction(
{
id: "on-backup-failed",
+ triggers: [inngestEvents.backupFailed],
},
- { event: "backup/failed" },
async ({ event }) => {
const { backupId, error } = event.data;
return { status: "failed", backupId, error };
diff --git a/web/lib/inngest/functions/build-trigger-workflow.ts b/web/lib/inngest/functions/build-trigger-workflow.ts
index 43fe37f..0e9fb2c 100644
--- a/web/lib/inngest/functions/build-trigger-workflow.ts
+++ b/web/lib/inngest/functions/build-trigger-workflow.ts
@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
import { db } from "@/db";
import { builds } from "@/db/schema";
import { inngest } from "../client";
+import { inngestEvents } from "../events";
import {
selectBuildServerForPlatform,
getTargetPlatformsForService,
@@ -11,9 +12,9 @@ import { enqueueWork } from "@/lib/work-queue";
export const buildTriggerWorkflow = inngest.createFunction(
{
id: "build-trigger-workflow",
+ triggers: [inngestEvents.buildTrigger],
concurrency: [{ limit: 1, key: "event.data.serviceId" }],
},
- { event: "build/trigger" },
async ({ event, step }) => {
const {
serviceId,
@@ -62,14 +63,13 @@ export const buildTriggerWorkflow = inngest.createFunction(
);
await step.run("send-build-started", async () => {
- await inngest.send({
- name: "build/started",
- data: {
+ await inngest.send(
+ inngestEvents.buildStarted.create({
buildId: buildIds[0],
serviceId,
buildGroupId,
- },
- });
+ }),
+ );
});
return { status: "triggered", buildIds, buildGroupId };
diff --git a/web/lib/inngest/functions/build-workflow.ts b/web/lib/inngest/functions/build-workflow.ts
index 50d0001..0c056b4 100644
--- a/web/lib/inngest/functions/build-workflow.ts
+++ b/web/lib/inngest/functions/build-workflow.ts
@@ -2,21 +2,24 @@ import { eq, and } from "drizzle-orm";
import { db } from "@/db";
import { builds, services, projects, serviceReplicas } from "@/db/schema";
import { inngest } from "../client";
+import { inngestEvents } from "../events";
import { deployService } from "@/actions/projects";
export const buildWorkflow = inngest.createFunction(
{
id: "build-workflow",
+ triggers: [inngestEvents.buildStarted],
concurrency: [{ limit: 1, key: "event.data.serviceId" }],
- cancelOn: [{ event: "build/cancelled", match: "data.buildGroupId" }],
+ cancelOn: [
+ { event: inngestEvents.buildCancelled, match: "data.buildGroupId" },
+ ],
},
- { event: "build/started" },
async ({ event, step }) => {
const { buildId, serviceId, buildGroupId } = event.data;
if (!buildGroupId) {
const result = await step.waitForEvent("wait-single-build", {
- event: "build/completed",
+ event: inngestEvents.buildCompleted,
timeout: "60m",
if: `async.data.buildId == "${buildId}"`,
});
@@ -40,7 +43,7 @@ export const buildWorkflow = inngest.createFunction(
}
const manifestResult = await step.waitForEvent("wait-manifest", {
- event: "manifest/completed",
+ event: inngestEvents.manifestCompleted,
timeout: "10m",
if: `async.data.serviceId == "${serviceId}"`,
});
@@ -85,7 +88,7 @@ export const buildWorkflow = inngest.createFunction(
const buildResults = await Promise.all(
groupBuilds.map((build) =>
step.waitForEvent(`wait-build-${build.id}`, {
- event: "build/completed",
+ event: inngestEvents.buildCompleted,
timeout: "60m",
if: `async.data.buildId == "${build.id}"`,
}),
@@ -118,7 +121,7 @@ export const buildWorkflow = inngest.createFunction(
}
const manifestResult = await step.waitForEvent("wait-group-manifest", {
- event: "manifest/completed",
+ event: inngestEvents.manifestCompleted,
timeout: "10m",
if: `async.data.buildGroupId == "${buildGroupId}"`,
});
diff --git a/web/lib/inngest/functions/crons.ts b/web/lib/inngest/functions/crons.ts
index d3352bb..570835d 100644
--- a/web/lib/inngest/functions/crons.ts
+++ b/web/lib/inngest/functions/crons.ts
@@ -8,11 +8,15 @@ import {
checkAndRunScheduledDeployments,
cleanupStaleItems,
} from "@/lib/scheduler";
+import { cron } from "inngest";
import { inngest } from "../client";
export const staleServerCheck = inngest.createFunction(
- { id: "cron-stale-server-check", singleton: { mode: "skip" } },
- { cron: "*/5 * * * *" },
+ {
+ id: "cron-stale-server-check",
+ triggers: [cron("*/5 * * * *")],
+ singleton: { mode: "skip" },
+ },
async ({ step }) => {
await step.run("check-stale-servers", async () => {
console.log("[cron] running stale server check");
@@ -22,8 +26,11 @@ export const staleServerCheck = inngest.createFunction(
);
export const scheduledDeploymentsCheck = inngest.createFunction(
- { id: "cron-scheduled-deployments", singleton: { mode: "skip" } },
- { cron: "*/15 * * * *" },
+ {
+ id: "cron-scheduled-deployments",
+ triggers: [cron("*/15 * * * *")],
+ singleton: { mode: "skip" },
+ },
async ({ step }) => {
await step.run("check-scheduled-deployments", async () => {
console.log("[cron] checking scheduled deployments");
@@ -33,8 +40,11 @@ export const scheduledDeploymentsCheck = inngest.createFunction(
);
export const certificateRenewal = inngest.createFunction(
- { id: "cron-certificate-renewal", singleton: { mode: "skip" } },
- { cron: "0 2 * * *" },
+ {
+ id: "cron-certificate-renewal",
+ triggers: [cron("0 2 * * *")],
+ singleton: { mode: "skip" },
+ },
async ({ step }) => {
await step.run("renew-certificates", async () => {
console.log("[cron] checking for expiring certificates");
@@ -44,8 +54,11 @@ export const certificateRenewal = inngest.createFunction(
);
export const challengeCleanup = inngest.createFunction(
- { id: "cron-challenge-cleanup", singleton: { mode: "skip" } },
- { cron: "0 * * * *" },
+ {
+ id: "cron-challenge-cleanup",
+ triggers: [cron("0 * * * *")],
+ singleton: { mode: "skip" },
+ },
async ({ step }) => {
await step.run("cleanup-challenges", async () => {
await cleanupExpiredChallenges();
@@ -54,8 +67,11 @@ export const challengeCleanup = inngest.createFunction(
);
export const scheduledBackupsCheck = inngest.createFunction(
- { id: "cron-scheduled-backups", singleton: { mode: "skip" } },
- { cron: "*/15 * * * *" },
+ {
+ id: "cron-scheduled-backups",
+ triggers: [cron("*/15 * * * *")],
+ singleton: { mode: "skip" },
+ },
async ({ step }) => {
await step.run("check-scheduled-backups", async () => {
console.log("[cron] checking scheduled backups");
@@ -65,8 +81,11 @@ export const scheduledBackupsCheck = inngest.createFunction(
);
export const oldBackupsCleanup = inngest.createFunction(
- { id: "cron-old-backups-cleanup", singleton: { mode: "skip" } },
- { cron: "0 3 * * *" },
+ {
+ id: "cron-old-backups-cleanup",
+ triggers: [cron("0 3 * * *")],
+ singleton: { mode: "skip" },
+ },
async ({ step }) => {
await step.run("cleanup-old-backups", async () => {
console.log("[cron] cleaning up old backups");
@@ -76,8 +95,11 @@ export const oldBackupsCleanup = inngest.createFunction(
);
export const staleItemsCleanup = inngest.createFunction(
- { id: "cron-stale-items-cleanup", singleton: { mode: "skip" } },
- { cron: "*/15 * * * *" },
+ {
+ id: "cron-stale-items-cleanup",
+ triggers: [cron("*/15 * * * *")],
+ singleton: { mode: "skip" },
+ },
async ({ step }) => {
await step.run("cleanup-stale-items", async () => {
console.log("[cron] cleaning up stale items");
diff --git a/web/lib/inngest/functions/migration-workflow.ts b/web/lib/inngest/functions/migration-workflow.ts
index 8b4efbe..41d39d6 100644
--- a/web/lib/inngest/functions/migration-workflow.ts
+++ b/web/lib/inngest/functions/migration-workflow.ts
@@ -12,15 +12,18 @@ import { getBackupStorageConfig } from "@/db/queries";
import { detectDatabaseType } from "@/lib/database-utils";
import { enqueueWork } from "@/lib/work-queue";
import { inngest } from "../client";
+import { inngestEvents } from "../events";
import { deployService } from "@/actions/projects";
export const migrationWorkflow = inngest.createFunction(
{
id: "migration-workflow",
- cancelOn: [{ event: "migration/cancelled", match: "data.serviceId" }],
+ triggers: [inngestEvents.migrationStarted],
+ cancelOn: [
+ { event: inngestEvents.migrationCancelled, match: "data.serviceId" },
+ ],
},
- { event: "migration/started" },
- async ({ event, step }) => {
+ async ({ event, step, group }) => {
const {
serviceId,
targetServerId,
@@ -123,25 +126,27 @@ export const migrationWorkflow = inngest.createFunction(
});
const backupResults = await Promise.all(
- backupIds.map((backupId) => {
- const completedPromise = step
- .waitForEvent(`wait-backup-${backupId}`, {
- event: "migration/backup-completed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
- })
- .then((result) => ({ status: "completed" as const, result }));
+ backupIds.map((backupId) =>
+ group.parallel(() => {
+ const completedPromise = step
+ .waitForEvent(`wait-backup-${backupId}`, {
+ event: inngestEvents.migrationBackupCompleted,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
+ })
+ .then((result) => ({ status: "completed" as const, result }));
- const failedPromise = step
- .waitForEvent(`wait-backup-failed-${backupId}`, {
- event: "migration/backup-failed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
- })
- .then((result) => ({ status: "failed" as const, result }));
+ const failedPromise = step
+ .waitForEvent(`wait-backup-failed-${backupId}`, {
+ event: inngestEvents.migrationBackupFailed,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
+ })
+ .then((result) => ({ status: "failed" as const, result }));
- return Promise.race([completedPromise, failedPromise]);
- }),
+ return Promise.race([completedPromise, failedPromise]);
+ }),
+ ),
);
const backupTimedOut = backupResults.some((r) => r.result === null);
@@ -234,25 +239,27 @@ export const migrationWorkflow = inngest.createFunction(
});
const restoreResults = await Promise.all(
- backupIds.map((backupId) => {
- const completedPromise = step
- .waitForEvent(`wait-restore-${backupId}`, {
- event: "migration/restore-completed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
- })
- .then((result) => ({ status: "completed" as const, result }));
-
- const failedPromise = step
- .waitForEvent(`wait-restore-failed-${backupId}`, {
- event: "migration/restore-failed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
- })
- .then((result) => ({ status: "failed" as const, result }));
-
- return Promise.race([completedPromise, failedPromise]);
- }),
+ backupIds.map((backupId) =>
+ group.parallel(() => {
+ const completedPromise = step
+ .waitForEvent(`wait-restore-${backupId}`, {
+ event: inngestEvents.migrationRestoreCompleted,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
+ })
+ .then((result) => ({ status: "completed" as const, result }));
+
+ const failedPromise = step
+ .waitForEvent(`wait-restore-failed-${backupId}`, {
+ event: inngestEvents.migrationRestoreFailed,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
+ })
+ .then((result) => ({ status: "failed" as const, result }));
+
+ return Promise.race([completedPromise, failedPromise]);
+ }),
+ ),
);
const restoreTimedOut = restoreResults.some((r) => r.result === null);
@@ -314,7 +321,7 @@ export const migrationWorkflow = inngest.createFunction(
const deploymentHealthy = await step.waitForEvent(
"wait-deployment-healthy",
{
- event: "deployment/healthy",
+ event: inngestEvents.deploymentHealthy,
timeout: "10m",
if: `async.data.serviceId == "${serviceId}"`,
},
@@ -402,25 +409,27 @@ export const migrationWorkflow = inngest.createFunction(
});
const restoreResults = await Promise.all(
- backupIds.map((backupId) => {
- const completedPromise = step
- .waitForEvent(`wait-restore-${backupId}`, {
- event: "migration/restore-completed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
- })
- .then((result) => ({ status: "completed" as const, result }));
-
- const failedPromise = step
- .waitForEvent(`wait-restore-failed-${backupId}`, {
- event: "migration/restore-failed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
- })
- .then((result) => ({ status: "failed" as const, result }));
-
- return Promise.race([completedPromise, failedPromise]);
- }),
+ backupIds.map((backupId) =>
+ group.parallel(() => {
+ const completedPromise = step
+ .waitForEvent(`wait-restore-${backupId}`, {
+ event: inngestEvents.migrationRestoreCompleted,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
+ })
+ .then((result) => ({ status: "completed" as const, result }));
+
+ const failedPromise = step
+ .waitForEvent(`wait-restore-failed-${backupId}`, {
+ event: inngestEvents.migrationRestoreFailed,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}" && async.data.serviceId == "${serviceId}"`,
+ })
+ .then((result) => ({ status: "failed" as const, result }));
+
+ return Promise.race([completedPromise, failedPromise]);
+ }),
+ ),
);
const restoreTimedOut = restoreResults.some((r) => r.result === null);
diff --git a/web/lib/inngest/functions/on-deployment-failed.ts b/web/lib/inngest/functions/on-deployment-failed.ts
index f7c18bd..fbe2cf1 100644
--- a/web/lib/inngest/functions/on-deployment-failed.ts
+++ b/web/lib/inngest/functions/on-deployment-failed.ts
@@ -2,12 +2,12 @@ import { eq } from "drizzle-orm";
import { db } from "@/db";
import { rollouts } from "@/db/schema";
import { inngest } from "../client";
+import { inngestEvents } from "../events";
import { handleRolloutFailure } from "./rollout-utils";
import { ingestRolloutLog } from "@/lib/victoria-logs";
export const onDeploymentFailed = inngest.createFunction(
- { id: "on-deployment-failed" },
- { event: "deployment/failed" },
+ { id: "on-deployment-failed", triggers: [inngestEvents.deploymentFailed] },
async ({ event, step }) => {
const { rolloutId, serviceId, reason } = event.data;
@@ -28,10 +28,10 @@ export const onDeploymentFailed = inngest.createFunction(
`Rollout failed: ${reason}`,
);
- await step.sendEvent("cancel-rollout", {
- name: "rollout/cancelled",
- data: { rolloutId },
- });
+ await step.sendEvent(
+ "cancel-rollout",
+ inngestEvents.rolloutCancelled.create({ rolloutId }),
+ );
await step.run("handle-failure", async () => {
await handleRolloutFailure(rolloutId, serviceId, reason, true);
diff --git a/web/lib/inngest/functions/restore-trigger-workflow.ts b/web/lib/inngest/functions/restore-trigger-workflow.ts
index 9e7b8f3..ec1d617 100644
--- a/web/lib/inngest/functions/restore-trigger-workflow.ts
+++ b/web/lib/inngest/functions/restore-trigger-workflow.ts
@@ -4,6 +4,7 @@ import { volumeBackups, services, deployments } from "@/db/schema";
import { getBackupStorageConfig } from "@/db/queries";
import { enqueueWork } from "@/lib/work-queue";
import { inngest } from "../client";
+import { inngestEvents } from "../events";
function detectBackupTypeFromPath(storagePath: string): "volume" | "database" {
if (storagePath.endsWith(".tar.gz")) return "volume";
@@ -17,8 +18,8 @@ function detectBackupTypeFromPath(storagePath: string): "volume" | "database" {
export const restoreTriggerWorkflow = inngest.createFunction(
{
id: "restore-trigger-workflow",
+ triggers: [inngestEvents.restoreTrigger],
},
- { event: "restore/trigger" },
async ({ event, step }) => {
const { serviceId, backupId, targetServerId } = event.data;
@@ -101,14 +102,13 @@ export const restoreTriggerWorkflow = inngest.createFunction(
});
await step.run("send-restore-started", async () => {
- await inngest.send({
- name: "restore/started",
- data: {
+ await inngest.send(
+ inngestEvents.restoreStarted.create({
backupId,
serviceId,
serverId,
- },
- });
+ }),
+ );
});
return { status: "triggered", backupId };
diff --git a/web/lib/inngest/functions/restore-workflow.ts b/web/lib/inngest/functions/restore-workflow.ts
index ac2ff4d..9712835 100644
--- a/web/lib/inngest/functions/restore-workflow.ts
+++ b/web/lib/inngest/functions/restore-workflow.ts
@@ -1,30 +1,33 @@
import { inngest } from "../client";
+import { inngestEvents } from "../events";
export const restoreWorkflow = inngest.createFunction(
{
id: "restore-workflow",
+ triggers: [inngestEvents.restoreStarted],
},
- { event: "restore/started" },
- async ({ event, step }) => {
+ async ({ event, step, group }) => {
const { backupId } = event.data;
- const completedPromise = step
- .waitForEvent("wait-restore-completed", {
- event: "restore/completed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}"`,
- })
- .then((result) => ({ status: "completed" as const, result }));
-
- const failedPromise = step
- .waitForEvent("wait-restore-failed", {
- event: "restore/failed",
- timeout: "30m",
- if: `async.data.backupId == "${backupId}"`,
- })
- .then((result) => ({ status: "failed" as const, result }));
-
- const outcome = await Promise.race([completedPromise, failedPromise]);
+ const outcome = await group.parallel(() => {
+ const completedPromise = step
+ .waitForEvent("wait-restore-completed", {
+ event: inngestEvents.restoreCompleted,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}"`,
+ })
+ .then((result) => ({ status: "completed" as const, result }));
+
+ const failedPromise = step
+ .waitForEvent("wait-restore-failed", {
+ event: inngestEvents.restoreFailed,
+ timeout: "30m",
+ if: `async.data.backupId == "${backupId}"`,
+ })
+ .then((result) => ({ status: "failed" as const, result }));
+
+ return Promise.race([completedPromise, failedPromise]);
+ });
if (!outcome.result) {
return { status: "failed", reason: "timeout", backupId };
@@ -45,8 +48,8 @@ export const restoreWorkflow = inngest.createFunction(
export const onRestoreFailed = inngest.createFunction(
{
id: "on-restore-failed",
+ triggers: [inngestEvents.restoreFailed],
},
- { event: "restore/failed" },
async ({ event, step }) => {
const { backupId, error } = event.data;
return { status: "failed", backupId, error };
diff --git a/web/lib/inngest/functions/rollout-workflow.ts b/web/lib/inngest/functions/rollout-workflow.ts
index 7a31a93..95f9a1b 100644
--- a/web/lib/inngest/functions/rollout-workflow.ts
+++ b/web/lib/inngest/functions/rollout-workflow.ts
@@ -4,6 +4,7 @@ import { getService } from "@/db/queries";
import { deployments, rollouts } from "@/db/schema";
import { ingestRolloutLog } from "@/lib/victoria-logs";
import { inngest } from "../client";
+import { inngestEvents } from "../events";
import {
calculateServicePlacements,
checkForRollingUpdate,
@@ -20,10 +21,12 @@ import { handleRolloutFailure } from "./rollout-utils";
export const rolloutWorkflow = inngest.createFunction(
{
id: "rollout-workflow",
+ triggers: [inngestEvents.rolloutCreated],
concurrency: [{ limit: 1, key: "event.data.serviceId" }],
- cancelOn: [{ event: "rollout/cancelled", match: "data.rolloutId" }],
+ cancelOn: [
+ { event: inngestEvents.rolloutCancelled, match: "data.rolloutId" },
+ ],
},
- { event: "rollout/created" },
async ({ event, step }) => {
const { rolloutId, serviceId } = event.data;
@@ -235,7 +238,7 @@ export const rolloutWorkflow = inngest.createFunction(
const healthResults = await Promise.all(
pendingHealthDeploymentIds.map((deploymentId) =>
step.waitForEvent(`wait-healthy-${deploymentId}`, {
- event: "deployment/healthy",
+ event: inngestEvents.deploymentHealthy,
timeout: "10m",
if: `async.data.deploymentId == "${deploymentId}"`,
}),
@@ -309,7 +312,7 @@ export const rolloutWorkflow = inngest.createFunction(
const dnsResults = await Promise.all(
serverIds.map((serverId) =>
step.waitForEvent(`wait-dns-${serverId}`, {
- event: "server/dns-synced",
+ event: inngestEvents.serverDnsSynced,
timeout: "5m",
if: `async.data.serverId == "${serverId}" && async.data.rolloutId == "${rolloutId}"`,
}),
diff --git a/web/package.json b/web/package.json
index a0c83bc..d5d7a8b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"scripts": {
- "dev": "portless cloud next dev",
+ "dev": "portless cloud --app-port 3000 next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
@@ -26,7 +26,7 @@
"cron-parser": "^5.4.0",
"cronstrue": "^3.9.0",
"drizzle-orm": "^0.45.1",
- "inngest": "^3.54.2",
+ "inngest": "^4.3.0",
"ip-address": "^10.1.0",
"jose": "^6.1.3",
"lucide-react": "^0.562.0",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index 5fb9963..dd7b6bc 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -52,8 +52,8 @@ importers:
specifier: ^0.45.1
version: 0.45.1(@opentelemetry/api@1.9.1)(@types/pg@8.16.0)(kysely@0.28.11)(pg@8.18.0)
inngest:
- specifier: ^3.54.2
- version: 3.54.2(@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.1))(express@5.2.1)(hono@4.11.8)(next@16.2.1(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)(zod@4.3.6)
+ specifier: ^4.3.0
+ version: 4.3.0(@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.1))(express@5.2.1)(hono@4.11.8)(next@16.2.1(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4)(typescript@5.9.3)(zod@4.3.6)
ip-address:
specifier: ^10.1.0
version: 10.1.0
@@ -2982,10 +2982,6 @@ packages:
ajv@8.17.1:
resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
- ansi-regex@4.1.1:
- resolution: {integrity: sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==}
- engines: {node: '>=6'}
-
ansi-regex@5.0.1:
resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
engines: {node: '>=8'}
@@ -4126,8 +4122,8 @@ packages:
inherits@2.0.4:
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
- inngest@3.54.2:
- resolution: {integrity: sha512-SAAc52c7n34E9dBEapy99g0vO5MPJP2yttoZpCu3LcYy1d8tz6CrkdoEQ4FBBgzMNnQxNpeAH5lvNeFCGNXbtA==}
+ inngest@4.3.0:
+ resolution: {integrity: sha512-UYx2fFbtcEDq092yL088iEeB0j57+6fjvTbrkH3JX+c87j2YsSNVxUddr20EHzd5psXQX5CC5+39hA16OcxdzQ==}
engines: {node: '>=20'}
peerDependencies:
'@sveltejs/kit': '>=1.27.3'
@@ -4139,6 +4135,7 @@ packages:
hono: '>=4.2.7'
koa: '>=2.14.2'
next: '>=12.0.0'
+ react: '>=18.0.0'
typescript: '>=5.8.0'
zod: ^3.25.0 || ^4.0.0
peerDependenciesMeta:
@@ -4160,6 +4157,8 @@ packages:
optional: true
next:
optional: true
+ react:
+ optional: true
typescript:
optional: true
@@ -5339,10 +5338,6 @@ packages:
resolution: {integrity: sha512-zaJYxz2FtcMb4f+g60KsRNFOpVMUyuJgA51Zi5Z1DOTC3S59+OQiVOzE9GZt0x72uBGWKsQIuBKeF9iusmKFsg==}
engines: {node: '>=14.16'}
- strip-ansi@5.2.0:
- resolution: {integrity: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==}
- engines: {node: '>=6'}
-
strip-ansi@6.0.1:
resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
engines: {node: '>=8'}
@@ -8922,8 +8917,6 @@ snapshots:
json-schema-traverse: 1.0.0
require-from-string: 2.0.2
- ansi-regex@4.1.1: {}
-
ansi-regex@5.0.1: {}
ansi-regex@6.2.2: {}
@@ -10201,7 +10194,7 @@ snapshots:
inherits@2.0.4: {}
- inngest@3.54.2(@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.1))(express@5.2.1)(hono@4.11.8)(next@16.2.1(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)(zod@4.3.6):
+ inngest@4.3.0(@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.1))(express@5.2.1)(hono@4.11.8)(next@16.2.1(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4)(typescript@5.9.3)(zod@4.3.6):
dependencies:
'@bufbuild/protobuf': 2.12.0
'@inngest/ai': 0.1.7
@@ -10218,14 +10211,12 @@ snapshots:
'@types/debug': 4.1.13
'@types/ms': 2.1.0
canonicalize: 1.0.8
- chalk: 4.1.2
cross-fetch: 4.1.0
debug: 4.4.3
hash.js: 1.1.7
json-stringify-safe: 5.0.1
ms: 2.1.3
serialize-error-cjs: 0.1.4
- strip-ansi: 5.2.0
temporal-polyfill: 0.2.5
ulid: 2.4.0
zod: 4.3.6
@@ -10233,6 +10224,7 @@ snapshots:
express: 5.2.1
hono: 4.11.8
next: 16.2.1(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+ react: 19.2.4
typescript: 5.9.3
transitivePeerDependencies:
- '@opentelemetry/core'
@@ -11461,10 +11453,6 @@ snapshots:
is-obj: 3.0.0
is-regexp: 3.1.0
- strip-ansi@5.2.0:
- dependencies:
- ansi-regex: 4.1.1
-
strip-ansi@6.0.1:
dependencies:
ansi-regex: 5.0.1