From 9624465ee253ff381903556eb1408d66eb0d4f21 Mon Sep 17 00:00:00 2001 From: Saadi Myftija Date: Tue, 11 Nov 2025 09:44:54 +0100 Subject: [PATCH] fix: error handling issue with s2 streams (#2664) * Fix logger import *old man yells at auto-import* * Fix s2 error handling for non-existing streams --- apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts | 2 +- .../route.tsx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts b/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts index e4db2bd17..08dd0f7f8 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:"; 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 9c5e9ec9f..6c7ae2b2b 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);