Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Structure server environment ID failures (#3286)
Julius Marminge708bc7091dcd
diff --git a/apps/server/src/environment/ServerEnvironment.test.ts b/apps/server/src/environment/ServerEnvironment.test.tsindex 665447589..6b3290246 100644--- a/apps/server/src/environment/ServerEnvironment.test.ts+++ b/apps/server/src/environment/ServerEnvironment.test.ts@@ -1,16 +1,18 @@-// @effect-diagnostics nodeBuiltinImport:off-import * as NodePath from "node:path";import * as NodeServices from "@effect/platform-node/NodeServices";import { expect, it } from "@effect/vitest";import * as Effect from "effect/Effect";-import * as Exit from "effect/Exit";import * as FileSystem from "effect/FileSystem";import * as Layer from "effect/Layer";import * as PlatformError from "effect/PlatformError";+import * as Schema from "effect/Schema";import * as ServerConfig from "../config.ts";import * as ServerEnvironment from "./ServerEnvironment.ts";+const isServerEnvironmentIdPersistenceError = Schema.is(+ ServerEnvironment.ServerEnvironmentIdPersistenceError,+);+const makeServerEnvironmentLayer = (baseDir: string) =>ServerEnvironment.layer.pipe(Layer.provide(ServerConfig.layerTest(process.cwd(), baseDir)));@@ -68,62 +70,63 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {}),);- it.effect("fails instead of overwriting a persisted id when reading the file errors", () =>+ it.effect("structures persisted environment id filesystem failures", () =>Effect.gen(function* () {const fileSystem = yield* FileSystem.FileSystem;const baseDir = yield* fileSystem.makeTempDirectoryScoped({- prefix: "t3-server-environment-read-error-test-",+ prefix: "t3-server-environment-error-test-",});const serverConfig = yield* makeServerConfig(baseDir);const environmentIdPath = serverConfig.environmentIdPath;- yield* fileSystem.makeDirectory(NodePath.dirname(environmentIdPath), { recursive: true });- yield* fileSystem.writeFileString(environmentIdPath, "persisted-environment-id\n");- const writeAttempts: string[] = [];- const failingFileSystemLayer = FileSystem.layerNoop({- exists: (path) => Effect.succeed(path === environmentIdPath),- readFileString: (path) =>- path === environmentIdPath- ? Effect.fail(- PlatformError.systemError({- _tag: "PermissionDenied",- module: "FileSystem",- method: "readFileString",- description: "permission denied",- pathOrDescriptor: path,- }),- )- : Effect.fail(- PlatformError.systemError({- _tag: "NotFound",- module: "FileSystem",- method: "readFileString",- description: "not found",- pathOrDescriptor: path,- }),- ),- writeFileString: (path) => {- writeAttempts.push(path);- return Effect.void;- },- });+ const methodByOperation = {+ check: "exists",+ read: "readFileString",+ write: "writeFileString",+ } as const;- const exit = yield* Effect.gen(function* () {- const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;- return yield* serverEnvironment.getDescriptor;- }).pipe(- Effect.provide(- ServerEnvironment.layer.pipe(- Layer.provide(Layer.merge(ServerConfig.layer(serverConfig), failingFileSystemLayer)),+ for (const operation of ["check", "read", "write"] as const) {+ const writeAttempts: string[] = [];+ const cause = PlatformError.systemError({+ _tag: "PermissionDenied",+ module: "FileSystem",+ method: methodByOperation[operation],+ description: "permission denied",+ pathOrDescriptor: environmentIdPath,+ });+ const failingFileSystemLayer = FileSystem.layerNoop({+ exists: () =>+ operation === "check" ? Effect.fail(cause) : Effect.succeed(operation === "read"),+ readFileString: () => Effect.fail(cause),+ writeFileString: (path) => {+ writeAttempts.push(path);+ return Effect.fail(cause);+ },+ });++ const error = yield* Effect.gen(function* () {+ const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;+ return yield* serverEnvironment.getDescriptor;+ }).pipe(+ Effect.provide(+ ServerEnvironment.layer.pipe(+ Layer.provide(Layer.merge(ServerConfig.layer(serverConfig), failingFileSystemLayer)),+ ),),- ),- Effect.exit,- );+ Effect.flip,+ );- expect(Exit.isFailure(exit)).toBe(true);- expect(writeAttempts).toEqual([]);- expect(yield* fileSystem.readFileString(environmentIdPath)).toBe(- "persisted-environment-id\n",- );+ expect(isServerEnvironmentIdPersistenceError(error)).toBe(true);+ if (!isServerEnvironmentIdPersistenceError(error)) {+ throw error;+ }+ expect(error.operation).toBe(operation);+ expect(error.environmentIdPath).toBe(environmentIdPath);+ expect(error.cause).toBe(cause);+ expect(error.message).toBe(+ `Server environment ID ${operation} failed at '${environmentIdPath}'.`,+ );+ expect(writeAttempts).toEqual(operation === "write" ? [environmentIdPath] : []);+ }}),);});diff --git a/apps/server/src/environment/ServerEnvironment.ts b/apps/server/src/environment/ServerEnvironment.tsindex 433a9d3f0..b5fbd8e10 100644--- a/apps/server/src/environment/ServerEnvironment.ts+++ b/apps/server/src/environment/ServerEnvironment.ts@@ -6,12 +6,26 @@ import * as Effect from "effect/Effect";import * as FileSystem from "effect/FileSystem";import * as Layer from "effect/Layer";import * as Path from "effect/Path";+import * as Schema from "effect/Schema";import packageJson from "../../package.json" with { type: "json" };import * as ServerConfig from "../config.ts";import * as ProcessRunner from "../processRunner.ts";import { resolveServerEnvironmentLabel } from "./ServerEnvironmentLabel.ts";+export class ServerEnvironmentIdPersistenceError extends Schema.TaggedErrorClass<ServerEnvironmentIdPersistenceError>()(+ "ServerEnvironmentIdPersistenceError",+ {+ operation: Schema.Literals(["check", "read", "write"]),+ environmentIdPath: Schema.String,+ cause: Schema.Defect(),+ },+) {+ override get message(): string {+ return `Server environment ID ${this.operation} failed at '${this.environmentIdPath}'.`;+ }+}+export class ServerEnvironment extends Context.Service<ServerEnvironment,{@@ -55,22 +69,46 @@ export const make = Effect.gen(function* () {const hostArchitecture = yield* HostProcessArchitecture;const readPersistedEnvironmentId = Effect.gen(function* () {- const exists = yield* fileSystem- .exists(serverConfig.environmentIdPath)- .pipe(Effect.orElseSucceed(() => false));+ const exists = yield* fileSystem.exists(serverConfig.environmentIdPath).pipe(+ Effect.mapError(+ (cause) =>+ new ServerEnvironmentIdPersistenceError({+ operation: "check",+ environmentIdPath: serverConfig.environmentIdPath,+ cause,+ }),+ ),+ );if (!exists) {return null;}- const raw = yield* fileSystem- .readFileString(serverConfig.environmentIdPath)- .pipe(Effect.map((value) => value.trim()));+ const raw = yield* fileSystem.readFileString(serverConfig.environmentIdPath).pipe(+ Effect.map((value) => value.trim()),+ Effect.mapError(+ (cause) =>+ new ServerEnvironmentIdPersistenceError({+ operation: "read",+ environmentIdPath: serverConfig.environmentIdPath,+ cause,+ }),+ ),+ );return raw.length > 0 ? raw : null;});const persistEnvironmentId = (value: string) =>- fileSystem.writeFileString(serverConfig.environmentIdPath, `${value}\n`);+ fileSystem.writeFileString(serverConfig.environmentIdPath, `${value}\n`).pipe(+ Effect.mapError(+ (cause) =>+ new ServerEnvironmentIdPersistenceError({+ operation: "write",+ environmentIdPath: serverConfig.environmentIdPath,+ cause,+ }),+ ),+ );const environmentIdRaw = yield* Effect.gen(function* () {const persisted = yield* readPersistedEnvironmentId;