From 0013bdd75fefa983c1897fc07c7e98962c36eef4 Mon Sep 17 00:00:00 2001
From: Bastiaan <bas@strootje.com>
Date: Sun, 11 Jan 2026 11:33:48 +0100
Subject: [PATCH] fix: different env service..

---
 pkgs/@scope/database/mod.server.ts         |  4 ++--
 src/data.functions/env.service.ts          | 12 ++++++++++++
 src/data.functions/feedback.service.ts     |  8 +++++---
 src/data.functions/mailing-list.service.ts | 10 ++++++----
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 src/data.functions/env.service.ts

diff --git a/pkgs/@scope/database/mod.server.ts b/pkgs/@scope/database/mod.server.ts
index 7420fe6..edf6894 100644
--- a/pkgs/@scope/database/mod.server.ts
+++ b/pkgs/@scope/database/mod.server.ts
@@ -4,14 +4,14 @@ import { ensureDirSync } from "@jsr/std__fs";
 import { dirname } from "@jsr/std__path";
 import { makeDatabase } from "@jsr/strootje__better-kysely";
 import type { Dialect } from "kysely";
+import { env } from "../../../src/data.functions/env.service.ts";
 import { server_m001_initial } from "./migrations/server-001-initial.ts";
 import { server_m002_add_subscriber_id } from "./migrations/server-002-add-subscriber-id.ts";
 import type { ServerDatabase } from "./models/server.models.ts";
 
 let dialect: DenoSqlite3Dialect;
 const getDialect = () => {
-  console.log("testing", import.meta.env);
-  const dbPath = `${import.meta.env.VITE_DATABASE_PATH ?? "."}/later.server.db`;
+  const dbPath = `${env().databasePath()}/later.server.db`;
   console.log(`[@scope/database/server] ::: loading '${dbPath}'`);
   ensureDirSync(dirname(dbPath));
 
diff --git a/src/data.functions/env.service.ts b/src/data.functions/env.service.ts
new file mode 100644
index 0000000..7dd2686
--- /dev/null
+++ b/src/data.functions/env.service.ts
@@ -0,0 +1,12 @@
+import { createServerOnlyFn } from "@tanstack/solid-start";
+
+export const env = createServerOnlyFn(() => ({
+  fider: {
+    token: () => Deno.env.get("FIDER_API_TOKEN"),
+  },
+  listmonk: {
+    login: () => Deno.env.get("LISTMONK_API_LOGIN") ?? "later",
+    token: () => Deno.env.get("LISTMONK_API_TOKEN"),
+  },
+  databasePath: () => Deno.env.get("DATABASE_PATH") ?? ".",
+}));
diff --git a/src/data.functions/feedback.service.ts b/src/data.functions/feedback.service.ts
index 7ebc8aa..9d7cb05 100644
--- a/src/data.functions/feedback.service.ts
+++ b/src/data.functions/feedback.service.ts
@@ -1,17 +1,19 @@
 import { createFiderClient } from "@strootje/fider-api";
 import { createMiddleware, createServerFn, createServerOnlyFn } from "@tanstack/solid-start";
 import * as v from "valibot";
+import { env } from "./env.service.ts";
 import { getUserMiddleware } from "./user.service.ts";
 
 const appTag = "app-later";
 const fider = createServerOnlyFn(() => {
-  if (!import.meta.env.VITE_FIDER_API_TOKEN) {
-    throw `[src/data.functions/feedback.service] ::: missing VITE_FIDER_API_TOKEN`;
+  const FIDER_API_TOKEN = env().fider.token();
+  if (!FIDER_API_TOKEN) {
+    throw `[src/data.functions/feedback.service] ::: missing FIDER_API_TOKEN`;
   }
 
   return createFiderClient({
     baseUri: "https://feedback.strooware.nl",
-    token: import.meta.env.VITE_FIDER_API_TOKEN,
+    token: FIDER_API_TOKEN,
   });
 });
 
diff --git a/src/data.functions/mailing-list.service.ts b/src/data.functions/mailing-list.service.ts
index 6b463d6..ca5834c 100644
--- a/src/data.functions/mailing-list.service.ts
+++ b/src/data.functions/mailing-list.service.ts
@@ -1,17 +1,19 @@
 import { createListmonkClient } from "@strootje/listmonk-api";
 import { createMiddleware, createServerFn, createServerOnlyFn } from "@tanstack/solid-start";
 import * as v from "valibot";
+import { env } from "./env.service.ts";
 import { getUserMiddleware, updateUser } from "./user.service.ts";
 
 const listmonk = createServerOnlyFn(() => {
-  if (!import.meta.env.VITE_LISTMONK_API_TOKEN) {
-    throw `[src/data.functions/mailing-list.service] ::: missing VITE_LISTMONK_API_TOKEN`;
+  const LISTMONK_API_TOKEN = env().listmonk.token();
+  if (!LISTMONK_API_TOKEN) {
+    throw `[src/data.functions/mailing-list.service] ::: missing LISTMONK_API_TOKEN`;
   }
 
   return createListmonkClient({
     baseUri: "https://lists.strooware.nl",
-    login: import.meta.env.VITE_LISTMONK_API_LOGIN ?? "later",
-    token: import.meta.env.VITE_LISTMONK_API_TOKEN,
+    login: env().listmonk.login(),
+    token: LISTMONK_API_TOKEN,
   });
 });
 
-- 
2.51.2