Spell UI, variables saving and mail server fixes (finally working in prod !!!)

server/api/admin/jobs/[id].post.ts

@@ -4,7 +4,11 @@ declare module 'nitropack'
 {
     interface TaskPayload
     {
-        type: string
+        type: string;
+    }
+    interface TaskResult<RT = unknown>
+    {
+        error?: Error | string;
     }
 }
 
@@ -17,7 +21,7 @@ export default defineEventHandler(async (e) => {
         return;
     }
     const id = getRouterParam(e, 'id');
-    const payload: Record<string, any> = await readBody(e);
+    const body: Record<string, any> = await readBody(e);
 
     if(!id)
     {
@@ -25,8 +29,11 @@ export default defineEventHandler(async (e) => {
         return;
     }
 
-    payload.type = id;
-    payload.data = JSON.parse(payload.data);
+    body.data = JSON.parse(body.data);
+    const payload = {
+        type: id,
+        data: body,
+    }
     
     const result = await runTask(id, {
         payload: payload
@@ -36,7 +43,7 @@ export default defineEventHandler(async (e) => {
     {
         setResponseStatus(e, 500);
 
-        if(result.error && (result.error as Error).message)
+        if(result.error && result.error.message)
             throw result.error;
         else if(result.error)
             throw new Error(result.error);

server/api/character/[id]/values.get.ts

@@ -1,35 +0,0 @@
-import { and, eq, sql } from 'drizzle-orm';
-import useDatabase from '~/composables/useDatabase';
-import { characterTable } from '~/db/schema';
-import type { CharacterVariables } from '~/types/character';
-
-export default defineEventHandler(async (e) => {
-    const id = getRouterParam(e, "id");
-
-    if(!id)
-    {
-        setResponseStatus(e, 400);
-        return;
-    }
-
-    const session = await getUserSession(e);
-    if(!session.user)
-    {
-        setResponseStatus(e, 401);
-        return;
-    }
-
-    const db = useDatabase();
-    const character = db.select({
-        health: characterTable.health,
-        mana: characterTable.mana,
-    }).from(characterTable).where(and(eq(characterTable.id, parseInt(id, 10)), eq(characterTable.owner, session.user.id))).get();
-
-    if(character !== undefined)
-    {
-        return character as CharacterVariables;
-    }
-    
-    setResponseStatus(e, 404);
-    return;
-});

server/api/character/[id]/variables.post.ts

@@ -1,7 +1,8 @@
 import { eq } from 'drizzle-orm';
 import useDatabase from '~/composables/useDatabase';
 import { characterTable } from '~/db/schema';
-import type { CharacterValues } from '~/types/character';
+import { CharacterVariablesValidation } from '~/shared/character.util';
+import type { CharacterVariables } from '~/types/character';
 
 export default defineEventHandler(async (e) => {
     const id = getRouterParam(e, "id");
@@ -11,11 +12,12 @@ export default defineEventHandler(async (e) => {
         return;
     }
 
-    const body = await readBody(e) as CharacterValues;
-    if(!body)
+    const body = await readValidatedBody(e, CharacterVariablesValidation.safeParse);
+    if(!body.success)
     {
+        console.error(body.error);
         setResponseStatus(e, 400);
-        return;
+        throw body.error;
     }
 
     const db = useDatabase();
@@ -35,8 +37,7 @@ export default defineEventHandler(async (e) => {
     }
 
     db.update(characterTable).set({
-        health: body.health,
-        mana: body.mana,
+        variables: body.data
     }).where(eq(characterTable.id, parseInt(id, 10))).run();
 
     setResponseStatus(e, 200);