From 2e34da7a5a3f1a7053f5e03851d71ce1fff04331 Mon Sep 17 00:00:00 2001 From: myftija Date: Tue, 11 Nov 2025 09:30:24 +0100 Subject: [PATCH 1/2] Fix logger import *old man yells at auto-import* --- apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts b/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts index e4db2bd17f..08dd0f7f86 100644 --- a/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts +++ b/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts @@ -1,7 +1,6 @@ import { DeploymentErrorData, ExternalBuildData, - logger, prepareDeploymentError, } from "@trigger.dev/core/v3"; import { type RuntimeEnvironment, type WorkerDeployment } from "@trigger.dev/database"; @@ -16,6 +15,7 @@ import { S2 } from "@s2-dev/streamstore"; import { env } from "~/env.server"; import { createRedisClient } from "~/redis.server"; import { tryCatch } from "@trigger.dev/core"; +import { logger } from "~/services/logger.server"; const S2_TOKEN_KEY_PREFIX = "s2-token:project:"; From 86bf08c13f57ebd041fcd143e0281641d892efde Mon Sep 17 00:00:00 2001 From: myftija Date: Tue, 11 Nov 2025 09:33:29 +0100 Subject: [PATCH 2/2] Fix s2 error handling for non-existing streams --- .../route.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx index 9c5e9ec9fe..6c7ae2b2b5 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx @@ -137,7 +137,10 @@ export default function Page() { } catch (error) { if (abortController.signal.aborted) return; - const isNotFoundError = error instanceof S2Error && error.code === "stream_not_found"; + const isNotFoundError = + error instanceof S2Error && + error.code && + ["permission_denied", "stream_not_found"].includes(error.code); if (isNotFoundError) return; console.error("Failed to stream logs:", error);