Merge branch 'main' into feature/github-oauth

Author: adb-sh

src/knative.ts

@@ -117,7 +117,6 @@ export class Knative {
         kind: "Service",
         metadata: {
           name: service.name,
-          namespace: namespace,
           labels: {
             "app.kubernetes.io/managed-by": "deploycat",
           },

src/lib/config.ts

@@ -1,8 +1,9 @@
 import { z } from "zod";
 import fs from "fs/promises";
 import merge from "deepmerge";
+import { isServer } from "solid-js/web";
 
-const configPath = `${process.cwd()}/config.json`;
+const configPath = process.cwd?.() && `${process.cwd()}/config.json`;
 
 const schemaConfig = z.object({
   database: z.object({
@@ -20,7 +21,7 @@ const schemaConfig = z.object({
   }),
 });
 
-const parseEnv = ({ prefix = "", envs = process.env } = {}) => {
+const parseEnv = ({ prefix = "", envs = process.env ?? {} } = {}) => {
   const parsed = {} as any;
   Object.entries(envs).forEach(([key, value]) => {
     const seq = (obj: any, arr: Array<string>, v: string | undefined) => {
@@ -36,10 +37,11 @@ const parseEnv = ({ prefix = "", envs = process.env } = {}) => {
     const keyArr = key.split("_").map((e) => e.toLocaleLowerCase());
     seq(parsed, keyArr, value);
   });
-  return prefix !== "" ? parsed?.[prefix] : parsed;
+  return prefix !== "" ? parsed?.[prefix] ?? {} : parsed;
 };
 
 const parseJSON = async () => {
+  if (!configPath) return {};
   try {
     return JSON.parse((await fs.readFile(configPath)).toString());
   } catch (e) {
@@ -54,4 +56,4 @@ const getConfig = async () => {
   return config;
 };
 
-export const config = schemaConfig.parse(await getConfig());
+export const config = isServer ? schemaConfig.parse(await getConfig()) : {};

src/lib/prometheus.ts

@@ -3,8 +3,6 @@ import { getUser } from "./server";
 import { knative } from "~/k8s";
 import { config } from "./config";
 
-const baseUrl = `${config.prometheus.url}/api/v1`;
-
 export const rangeQuery = async ({
   query,
   start,
@@ -16,6 +14,7 @@ export const rangeQuery = async ({
   end: Date;
   step: number;
 }) => {
+  const baseUrl = `${config.prometheus.url}/api/v1`;
   const url = new URL(`${baseUrl}/query_range`);
   url.search = new URLSearchParams({
     query,