api/adminsRoute.ts

@@ -1,26 +1,22 @@
-import { Model } from "indexed_kv";
 import { info } from "std/log/mod.ts";
-import { Elysia, t } from "elysia";
+import { Elysia, Static, t } from "elysia";
 import { Admin, adminSchema, adminStore } from "../app/adminStore.ts";
-import { getUser, withAdmin, withUser } from "./withUser.ts";
+import { getUser, withSessionAdmin, withSessionUser } from "./getUser.ts";
+import { TkvEntry } from "../utils/Tkv.ts";
 
-export type AdminData = Admin & { id: string };
+const adminDataSchema = t.Intersect([adminSchema, t.Object({ tgUserId: t.Number() })]);
 
-const adminDataSchema = t.Object({
+export type AdminData = Static<typeof adminDataSchema>;
-  id: t.String(),
-  tgUserId: t.Number(),
-  promotedBy: t.Nullable(t.String()),
-});
 
-function getAdminData(adminEntry: Model<Admin>): AdminData {
+function getAdminData(adminEntry: TkvEntry<["admins", number], Admin>): AdminData {
-  return { id: adminEntry.id, ...adminEntry.value };
+  return { tgUserId: adminEntry.key[1], ...adminEntry.value };
 }
 
 export const adminsRoute = new Elysia()
   .get(
     "",
     async () => {
-      const adminEntries = await adminStore.getAll();
+      const adminEntries = await Array.fromAsync(adminStore.list({ prefix: ["admins"] }));
       const admins = adminEntries.map(getAdminData);
       return admins;
     },
@@ -30,15 +26,18 @@ export const adminsRoute = new Elysia()
   )
   .post(
     "",
-    async ({ query, body }) => {
+    async ({ query, body, set }) => {
-      return withAdmin(query, async (user, adminEntry) => {
+      return withSessionAdmin({ query, set }, async (sessionUser, sessionAdminEntry) => {
         const newAdminUser = await getUser(body.tgUserId);
-        const newAdminEntry = await adminStore.create({
+        const newAdminKey = ["admins", body.tgUserId] as const;
-          tgUserId: body.tgUserId,
+        const newAdminValue = { promotedBy: sessionAdminEntry.key[1] };
-          promotedBy: adminEntry.id,
+        const newAdminResult = await adminStore.atomicSet(newAdminKey, null, newAdminValue);
-        });
+        if (!newAdminResult.ok) {
-        info(`User ${user.first_name} promoted user ${newAdminUser.first_name} to admin`);
+          set.status = 409;
-        return getAdminData(newAdminEntry);
+          return "User is already an admin";
+        }
+        info(`User ${sessionUser.first_name} promoted user ${newAdminUser.first_name} to admin`);
+        return getAdminData({ ...newAdminResult, key: newAdminKey, value: newAdminValue });
       });
     },
     {
@@ -46,62 +45,84 @@ export const adminsRoute = new Elysia()
       body: t.Object({
         tgUserId: t.Number(),
       }),
-      response: adminDataSchema,
+      response: {
+        200: adminDataSchema,
+        401: t.Literal("Must be logged in"),
+        403: t.Literal("Must be an admin"),
+        409: t.Literal("User is already an admin"),
+      },
     },
   )
   .post(
     "/promote_self",
     // if there are no admins, allow any user to promote themselves
-    async ({ query }) => {
+    async ({ query, set }) => {
-      return withUser(query, async (user) => {
+      return withSessionUser({ query, set }, async (sessionUser) => {
-        const adminEntries = await adminStore.getAll();
+        const adminEntries = await Array.fromAsync(adminStore.list({ prefix: ["admins"] }));
-        if (adminEntries.length === 0) {
+        if (adminEntries.length !== 0) {
-          const newAdminEntry = await adminStore.create({
+          set.status = 409;
-            tgUserId: user.id,
+          return "You are not allowed to promote yourself";
-            promotedBy: null,
-          });
-          info(`User ${user.first_name} promoted themselves to admin`);
-          return getAdminData(newAdminEntry);
         }
-        throw new Error("You are not allowed to promote yourself");
+        const newAdminKey = ["admins", sessionUser.id] as const;
+        const newAdminValue = { promotedBy: null };
+        const newAdminResult = await adminStore.set(newAdminKey, newAdminValue);
+        info(`User ${sessionUser.first_name} promoted themselves to admin`);
+        return getAdminData({ ...newAdminResult, key: newAdminKey, value: newAdminValue });
       });
     },
     {
       query: t.Object({ sessionId: t.String() }),
-      response: adminDataSchema,
+      response: {
+        200: adminDataSchema,
+        401: t.Literal("Must be logged in"),
+        403: t.Literal("Must be an admin"),
+        409: t.Literal("You are not allowed to promote yourself"),
+      },
     },
   )
   .get(
     "/:adminId",
-    async ({ params }) => {
+    async ({ params, set }) => {
-      const adminEntry = await adminStore.getById(params.adminId!);
+      const adminEntry = await adminStore.get(["admins", Number(params.adminId)]);
-      if (!adminEntry) {
+      if (!adminEntry.versionstamp) {
-        throw new Error("Admin not found");
+        set.status = 404;
+        return "Admin not found";
       }
       return getAdminData(adminEntry);
     },
     {
       params: t.Object({ adminId: t.String() }),
-      response: adminDataSchema,
+      response: {
+        200: adminDataSchema,
+        404: t.Literal("Admin not found"),
+      },
     },
   )
   .delete(
     "/:adminId",
-    async ({ params, query }) => {
+    async ({ params, query, set }) => {
-      return withAdmin(query, async (chat) => {
+      return withSessionAdmin({ query, set }, async (sessionUser) => {
-        const deletedAdminEntry = await adminStore.getById(params.adminId!);
+        const deletedAdminEntry = await adminStore.get(["admins", Number(params.adminId)]);
-        if (!deletedAdminEntry) {
+        if (!deletedAdminEntry.versionstamp) {
-          throw new Error("Admin not found");
+          set.status = 404;
+          return "Admin not found";
         }
-        const deletedAdminUser = await getUser(deletedAdminEntry.value.tgUserId);
+        const deletedAdminUser = await getUser(deletedAdminEntry.key[1]);
-        await deletedAdminEntry.delete();
+        await adminStore.delete(["admins", Number(params.adminId)]);
-        info(`User ${chat.first_name} demoted user ${deletedAdminUser.first_name} from admin`);
+        info(
+          `User ${sessionUser.first_name} demoted user ${deletedAdminUser.first_name} from admin`,
+        );
         return null;
       });
     },
     {
       params: t.Object({ adminId: t.String() }),
       query: t.Object({ sessionId: t.String() }),
-      response: t.Null(),
+      response: {
+        200: t.Null(),
+        401: t.Literal("Must be logged in"),
+        403: t.Literal("Must be an admin"),
+        404: t.Literal("Admin not found"),
+      },
     },
   );

api/getUser.ts

@@ -0,0 +1,45 @@
+import { Chat } from "grammy_types";
+import { Admin, adminStore } from "../app/adminStore.ts";
+import { bot } from "../bot/mod.ts";
+import { sessions } from "./sessionsRoute.ts";
+import { TkvEntry } from "../utils/Tkv.ts";
+
+export async function withSessionUser<O>(
+  { query, set }: { query: { sessionId: string }; set: { status?: string | number } },
+  cb: (sessionUser: Chat.PrivateGetChat) => Promise<O>,
+) {
+  const session = sessions.get(query.sessionId);
+  if (!session?.userId) {
+    set.status = 401;
+    return "Must be logged in";
+  }
+  const user = await getUser(session.userId);
+  return cb(user);
+}
+
+export async function withSessionAdmin<O>(
+  { query, set }: { query: { sessionId: string }; set: { status?: string | number } },
+  cb: (
+    sessionUser: Chat.PrivateGetChat,
+    sessionAdminEntry: TkvEntry<["admins", number], Admin>,
+  ) => Promise<O>,
+) {
+  const session = sessions.get(query.sessionId);
+  if (!session?.userId) {
+    set.status = 401;
+    return "Must be logged in";
+  }
+  const sessionUser = await getUser(session.userId);
+  const sessionAdminEntry = await adminStore.get(["admins", sessionUser.id]);
+  if (!sessionAdminEntry.versionstamp) {
+    set.status = 403;
+    return "Must be an admin";
+  }
+  return cb(sessionUser, sessionAdminEntry);
+}
+
+export async function getUser(userId: number): Promise<Chat.PrivateGetChat> {
+  const chat = await bot.api.getChat(userId);
+  if (chat.type !== "private") throw new Error("Chat is not private");
+  return chat;
+}

api/paramsRoute.ts

@@ -1,46 +1,39 @@
 import { Elysia, t } from "elysia";
-import { deepMerge } from "std/collections/deep_merge.ts";
 import { info } from "std/log/mod.ts";
-import { getConfig, setConfig } from "../app/config.ts";
+import { defaultParamsSchema, getConfig, setConfig } from "../app/config.ts";
-import { omitUndef } from "../utils/omitUndef.ts";
+import { withSessionAdmin } from "./getUser.ts";
-import { withAdmin } from "./withUser.ts";
-
-const paramsSchema = t.Partial(t.Object({
-  batch_size: t.Number(),
-  n_iter: t.Number(),
-  width: t.Number(),
-  height: t.Number(),
-  steps: t.Number(),
-  cfg_scale: t.Number(),
-  sampler_name: t.String(),
-  negative_prompt: t.String(),
-}));
 
 export const paramsRoute = new Elysia()
   .get(
     "",
     async () => {
       const config = await getConfig();
-      return omitUndef(config.defaultParams);
+      return config.defaultParams;
     },
     {
-      response: paramsSchema,
+      response: {
+        200: defaultParamsSchema,
+      },
     },
   )
   .patch(
     "",
-    async ({ query, body }) => {
+    async ({ query, body, set }) => {
-      return withAdmin(query, async (user) => {
+      return withSessionAdmin({ query, set }, async (user) => {
         const config = await getConfig();
         info(`User ${user.first_name} updated default params: ${JSON.stringify(body)}`);
-        const defaultParams = deepMerge(config.defaultParams ?? {}, body);
+        const defaultParams = { ...config.defaultParams, ...body };
         await setConfig({ defaultParams });
-        return omitUndef(config.defaultParams);
+        return config.defaultParams;
       });
     },
     {
       query: t.Object({ sessionId: t.String() }),
-      body: paramsSchema,
+      body: defaultParamsSchema,
-      response: paramsSchema,
+      response: {
+        200: defaultParamsSchema,
+        401: t.Literal("Must be logged in"),
+        403: t.Literal("Must be an admin"),
+      },
     },
   );

api/sessionsRoute.ts

@@ -1,4 +1,4 @@
-import { Elysia, t } from "elysia";
+import { Elysia, NotFoundError, t } from "elysia";
 import { ulid } from "ulid";
 
 export const sessions = new Map<string, Session>();
@@ -29,7 +29,7 @@ export const sessionsRoute = new Elysia()
       const id = params.sessionId!;
       const session = sessions.get(id);
       if (!session) {
-        throw new Error("Session not found");
+        throw new NotFoundError("Session not found");
       }
       return { id, userId: session.userId ?? null };
     },

api/statsRoute.ts

@@ -1,11 +1,11 @@
 import { Elysia, t } from "elysia";
 import { subMinutes } from "date-fns";
-import { getDailyStats } from "../app/dailyStatsStore.ts";
+import { dailyStatsSchema, getDailyStats } from "../app/dailyStatsStore.ts";
 import { generationStore } from "../app/generationStore.ts";
 import { globalStats } from "../app/globalStats.ts";
-import { getUserDailyStats } from "../app/userDailyStatsStore.ts";
+import { getUserDailyStats, userDailyStatsSchema } from "../app/userDailyStatsStore.ts";
-import { getUserStats } from "../app/userStatsStore.ts";
+import { getUserStats, userStatsSchema } from "../app/userStatsStore.ts";
-import { withAdmin } from "./withUser.ts";
+import { withSessionAdmin } from "./getUser.ts";
 
 const STATS_INTERVAL_MIN = 3;
 
@@ -48,32 +48,25 @@ export const statsRoute = new Elysia()
       };
     },
     {
-      response: t.Object({
+      response: {
-        imageCount: t.Number(),
+        200: t.Object({
-        stepCount: t.Number(),
+          imageCount: t.Number(),
-        pixelCount: t.Number(),
+          stepCount: t.Number(),
-        pixelStepCount: t.Number(),
+          pixelCount: t.Number(),
-        userCount: t.Number(),
+          pixelStepCount: t.Number(),
-        imagesPerMinute: t.Number(),
+          userCount: t.Number(),
-        stepsPerMinute: t.Number(),
+          imagesPerMinute: t.Number(),
-        pixelsPerMinute: t.Number(),
+          stepsPerMinute: t.Number(),
-        pixelStepsPerMinute: t.Number(),
+          pixelsPerMinute: t.Number(),
-      }),
+          pixelStepsPerMinute: t.Number(),
+        }),
+      },
     },
   )
   .get(
     "/daily/:year/:month/:day",
     async ({ params }) => {
-      const year = Number(params.year);
+      return getDailyStats(params.year, params.month, params.day);
-      const month = Number(params.month);
-      const day = Number(params.day);
-      const stats = await getDailyStats(year, month, day);
-      return {
-        imageCount: stats.imageCount,
-        pixelCount: stats.pixelCount,
-        userCount: stats.userIds.length,
-        timestamp: stats.timestamp,
-      };
     },
     {
       params: t.Object({
@@ -81,40 +74,31 @@ export const statsRoute = new Elysia()
         month: t.Number(),
         day: t.Number(),
       }),
-      response: t.Object({
+      response: {
-        imageCount: t.Number(),
+        200: dailyStatsSchema,
-        pixelCount: t.Number(),
+      },
-        userCount: t.Number(),
-        timestamp: t.Number(),
-      }),
     },
   )
   .get(
     "/users/:userId",
     async ({ params }) => {
       const userId = params.userId;
-      const stats = await getUserStats(userId);
+      // deno-lint-ignore no-unused-vars
-      return {
+      const { tagCountMap, ...stats } = await getUserStats(userId);
-        imageCount: stats.imageCount,
+      return stats;
-        pixelCount: stats.pixelCount,
-        timestamp: stats.timestamp,
-      };
     },
     {
       params: t.Object({ userId: t.Number() }),
-      response: t.Object({
+      response: {
-        imageCount: t.Number(),
+        200: t.Omit(userStatsSchema, ["tagCountMap"]),
-        pixelCount: t.Number(),
+      },
-        timestamp: t.Number(),
-      }),
     },
   )
   .get(
     "/users/:userId/tagcount",
-    async ({ params, query }) => {
+    async ({ params, query, set }) => {
-      return withAdmin(query, async () => {
+      return withSessionAdmin({ query, set }, async () => {
-        const userId = Number(params.userId);
+        const stats = await getUserStats(params.userId);
-        const stats = await getUserStats(userId);
         return {
           tagCountMap: stats.tagCountMap,
           timestamp: stats.timestamp,
@@ -124,22 +108,17 @@ export const statsRoute = new Elysia()
     {
       params: t.Object({ userId: t.Number() }),
       query: t.Object({ sessionId: t.String() }),
-      response: t.Object({
+      response: {
-        tagCountMap: t.Record(t.String(), t.Number()),
+        200: t.Pick(userStatsSchema, ["tagCountMap", "timestamp"]),
-        timestamp: t.Number(),
+        401: t.Literal("Must be logged in"),
-      }),
+        403: t.Literal("Must be an admin"),
+      },
     },
   )
   .get(
     "/users/:userId/daily/:year/:month/:day",
     async ({ params }) => {
-      const { userId, year, month, day } = params;
+      return getUserDailyStats(params.userId, params.year, params.month, params.day);
-      const stats = await getUserDailyStats(userId, year, month, day);
-      return {
-        imageCount: stats.imageCount,
-        pixelCount: stats.pixelCount,
-        timestamp: stats.timestamp,
-      };
     },
     {
       params: t.Object({
@@ -148,10 +127,8 @@ export const statsRoute = new Elysia()
         month: t.Number(),
         day: t.Number(),
       }),
-      response: t.Object({
+      response: {
-        imageCount: t.Number(),
+        200: userDailyStatsSchema,
-        pixelCount: t.Number(),
+      },
-        timestamp: t.Number(),
-      }),
     },
   );

api/usersRoute.ts

@@ -1,7 +1,7 @@
 import { Elysia, t } from "elysia";
-import { adminStore } from "../app/adminStore.ts";
+import { adminSchema, adminStore } from "../app/adminStore.ts";
 import { bot } from "../bot/mod.ts";
-import { getUser } from "./withUser.ts";
+import { getUser } from "./getUser.ts";
 
 export const usersRoute = new Elysia()
   .get(
@@ -31,15 +31,14 @@ export const usersRoute = new Elysia()
     "/:userId",
     async ({ params }) => {
       const user = await getUser(Number(params.userId));
-      const [adminEntry] = await adminStore.getBy("tgUserId", { value: user.id });
+      const adminEntry = await adminStore.get(["admins", user.id]);
-      const admin = adminEntry?.value;
       return {
         id: user.id,
         first_name: user.first_name,
         last_name: user.last_name ?? null,
         username: user.username ?? null,
         bio: user.bio ?? null,
-        admin: admin ?? null,
+        admin: adminEntry.value ?? null,
       };
     },
     {
@@ -50,10 +49,7 @@ export const usersRoute = new Elysia()
         last_name: t.Nullable(t.String()),
         username: t.Nullable(t.String()),
         bio: t.Nullable(t.String()),
-        admin: t.Nullable(t.Object({
+        admin: t.Nullable(adminSchema),
-          tgUserId: t.Number(),
-          promotedBy: t.Nullable(t.String()),
-        })),
       }),
     },
   );

api/withUser.ts

@@ -1,39 +0,0 @@
-import { Chat } from "grammy_types";
-import { Model } from "indexed_kv";
-import { Admin, adminStore } from "../app/adminStore.ts";
-import { bot } from "../bot/mod.ts";
-import { sessions } from "./sessionsRoute.ts";
-
-export async function withUser<O>(
-  query: { sessionId: string },
-  cb: (user: Chat.PrivateGetChat) => Promise<O>,
-) {
-  const session = sessions.get(query.sessionId);
-  if (!session?.userId) {
-    throw new Error("Must be logged in");
-  }
-  const user = await getUser(session.userId);
-  return cb(user);
-}
-
-export async function withAdmin<O>(
-  query: { sessionId: string },
-  cb: (user: Chat.PrivateGetChat, admin: Model<Admin>) => Promise<O>,
-) {
-  const session = sessions.get(query.sessionId);
-  if (!session?.userId) {
-    throw new Error("Must be logged in");
-  }
-  const user = await getUser(session.userId);
-  const [admin] = await adminStore.getBy("tgUserId", { value: session.userId });
-  if (!admin) {
-    throw new Error("Must be admin");
-  }
-  return cb(user, admin);
-}
-
-export async function getUser(userId: number): Promise<Chat.PrivateGetChat> {
-  const chat = await bot.api.getChat(userId);
-  if (chat.type !== "private") throw new Error("Chat is not private");
-  return chat;
-}

api/workersRoute.ts

@@ -2,66 +2,38 @@ import { subMinutes } from "date-fns";
 import { Model } from "indexed_kv";
 import createOpenApiFetch from "openapi_fetch";
 import { info } from "std/log/mod.ts";
-import { Elysia, t } from "elysia";
+import { Elysia, NotFoundError, Static, t } from "elysia";
 import { activeGenerationWorkers } from "../app/generationQueue.ts";
 import { generationStore } from "../app/generationStore.ts";
 import * as SdApi from "../app/sdApi.ts";
 import {
   WorkerInstance,
-  workerInstanceSchema as _,
+  workerInstanceSchema,
   workerInstanceStore,
 } from "../app/workerInstanceStore.ts";
 import { getAuthHeader } from "../utils/getAuthHeader.ts";
 import { omitUndef } from "../utils/omitUndef.ts";
-import { withAdmin } from "./withUser.ts";
+import { withSessionAdmin } from "./getUser.ts";
 
-const workerInstanceSchema = t.Object({
+const workerResponseSchema = t.Intersect([
-  name: t.Nullable(t.String()),
+  t.Object({ id: t.String() }),
-  key: t.String(),
+  t.Omit(workerInstanceSchema, ["sdUrl", "sdAuth"]),
-  sdUrl: t.String(),
+  t.Object({
-  sdAuth: t.Nullable(t.Object({
+    isActive: t.Boolean(),
-    user: t.String(),
+    imagesPerMinute: t.Number(),
-    password: t.String(),
+    stepsPerMinute: t.Number(),
-  })),
+    pixelsPerMinute: t.Number(),
-  lastOnlineTime: t.Number(),
+    pixelStepsPerMinute: t.Number(),
-  lastError: t.Optional(t.Object({
+  }),
-    message: t.String(),
+]);
-    time: t.Number(),
-  })),
-});
 
-export type WorkerData = {
+export type WorkerResponse = Static<typeof workerResponseSchema>;
-  id: string;
-  name: string | null;
-  key: string;
-  lastError?: { message: string; time: number };
-  lastOnlineTime: number | null;
-  isActive: boolean;
-  imagesPerMinute: number;
-  stepsPerMinute: number;
-  pixelsPerMinute: number;
-  pixelStepsPerMinute: number;
-};
 
-const workerDataSchema = t.Object({
+const workerRequestSchema = t.Omit(workerInstanceSchema, ["lastOnlineTime", "lastError"]);
-  id: t.String(),
-  key: t.String(),
-  name: t.Nullable(t.String()),
-  lastError: t.Optional(t.Object({
-    message: t.String(),
-    time: t.Number(),
-  })),
-  lastOnlineTime: t.Nullable(t.Number()),
-  isActive: t.Boolean(),
-  imagesPerMinute: t.Number(),
-  stepsPerMinute: t.Number(),
-  pixelsPerMinute: t.Number(),
-  pixelStepsPerMinute: t.Number(),
-});
 
 const STATS_INTERVAL_MIN = 10;
 
-async function getWorkerData(workerInstance: Model<WorkerInstance>): Promise<WorkerData> {
+async function getWorkerResponse(workerInstance: Model<WorkerInstance>): Promise<WorkerResponse> {
   const after = subMinutes(new Date(), STATS_INTERVAL_MIN);
 
   const generations = await generationStore.getBy("workerInstanceKey", {
@@ -91,7 +63,7 @@ async function getWorkerData(workerInstance: Model<WorkerInstance>): Promise<Wor
     key: workerInstance.value.key,
     name: workerInstance.value.name,
     lastError: workerInstance.value.lastError,
-    lastOnlineTime: workerInstance.value.lastOnlineTime ?? null,
+    lastOnlineTime: workerInstance.value.lastOnlineTime,
     isActive: activeGenerationWorkers.get(workerInstance.id)?.isProcessing ?? false,
     imagesPerMinute,
     stepsPerMinute,
@@ -105,73 +77,85 @@ export const workersRoute = new Elysia()
     "",
     async () => {
       const workerInstances = await workerInstanceStore.getAll();
-      const workers = await Promise.all(workerInstances.map(getWorkerData));
+      const workers = await Promise.all(workerInstances.map(getWorkerResponse));
       return workers;
     },
     {
-      response: t.Array(workerDataSchema),
+      response: t.Array(workerResponseSchema),
     },
   )
   .post(
     "",
-    async ({ query, body }) => {
+    async ({ query, body, set }) => {
-      return withAdmin(query, async (user) => {
+      return withSessionAdmin({ query, set }, async (sessionUser) => {
         const workerInstance = await workerInstanceStore.create(body);
-        info(`User ${user.first_name} created worker ${workerInstance.value.name}`);
+        info(`User ${sessionUser.first_name} created worker ${workerInstance.value.name}`);
-        return await getWorkerData(workerInstance);
+        return await getWorkerResponse(workerInstance);
       });
     },
     {
       query: t.Object({ sessionId: t.String() }),
-      body: t.Omit(workerInstanceSchema, ["lastOnlineTime", "lastError"]),
+      body: workerRequestSchema,
+      response: {
+        200: workerResponseSchema,
+        401: t.Literal("Must be logged in"),
+        403: t.Literal("Must be an admin"),
+      },
     },
   )
   .get(
     "/:workerId",
     async ({ params }) => {
-      const workerInstance = await workerInstanceStore.getById(params.workerId!);
+      const workerInstance = await workerInstanceStore.getById(params.workerId);
       if (!workerInstance) {
-        throw new Error("Worker not found");
+        throw new NotFoundError("Worker not found");
       }
-      return await getWorkerData(workerInstance);
+      return await getWorkerResponse(workerInstance);
     },
     {
       params: t.Object({ workerId: t.String() }),
-      response: workerDataSchema,
+      response: {
+        200: workerResponseSchema,
+      },
     },
   )
   .patch(
     "/:workerId",
-    async ({ params, query, body }) => {
+    async ({ params, query, body, set }) => {
-      const workerInstance = await workerInstanceStore.getById(params.workerId!);
+      const workerInstance = await workerInstanceStore.getById(params.workerId);
       if (!workerInstance) {
-        throw new Error("Worker not found");
+        throw new NotFoundError("Worker not found");
       }
-      return withAdmin(query, async (user) => {
+      return withSessionAdmin({ query, set }, async (sessionUser) => {
         info(
-          `User ${user.first_name} updated worker ${workerInstance.value.name}: ${
+          `User ${sessionUser.first_name} updated worker ${workerInstance.value.name}: ${
             JSON.stringify(body)
           }`,
         );
-        await workerInstance.update(omitUndef(body));
+        await workerInstance.update(body);
-        return await getWorkerData(workerInstance);
+        return await getWorkerResponse(workerInstance);
       });
     },
     {
       params: t.Object({ workerId: t.String() }),
       query: t.Object({ sessionId: t.String() }),
-      body: t.Partial(workerInstanceSchema),
+      body: t.Partial(workerRequestSchema),
+      response: {
+        200: workerResponseSchema,
+        401: t.Literal("Must be logged in"),
+        403: t.Literal("Must be an admin"),
+      },
     },
   )
   .delete(
     "/:workerId",
-    async ({ params, query }) => {
+    async ({ params, query, set }) => {
-      const workerInstance = await workerInstanceStore.getById(params.workerId!);
+      const workerInstance = await workerInstanceStore.getById(params.workerId);
       if (!workerInstance) {
         throw new Error("Worker not found");
       }
-      return withAdmin(query, async (user) => {
+      return withSessionAdmin({ query, set }, async (sessionUser) => {
-        info(`User ${user.first_name} deleted worker ${workerInstance.value.name}`);
+        info(`User ${sessionUser.first_name} deleted worker ${workerInstance.value.name}`);
         await workerInstance.delete();
         return null;
       });
@@ -179,15 +163,19 @@ export const workersRoute = new Elysia()
     {
       params: t.Object({ workerId: t.String() }),
       query: t.Object({ sessionId: t.String() }),
-      response: t.Null(),
+      response: {
+        200: t.Null(),
+        401: t.Literal("Must be logged in"),
+        403: t.Literal("Must be an admin"),
+      },
     },
   )
   .get(
     "/:workerId/loras",
     async ({ params }) => {
-      const workerInstance = await workerInstanceStore.getById(params.workerId!);
+      const workerInstance = await workerInstanceStore.getById(params.workerId);
       if (!workerInstance) {
-        throw new Error("Worker not found");
+        throw new NotFoundError("Worker not found");
       }
       const sdClient = createOpenApiFetch<SdApi.paths>({
         baseUrl: workerInstance.value.sdUrl,
@@ -218,9 +206,9 @@ export const workersRoute = new Elysia()
   .get(
     "/:workerId/models",
     async ({ params }) => {
-      const workerInstance = await workerInstanceStore.getById(params.workerId!);
+      const workerInstance = await workerInstanceStore.getById(params.workerId);
       if (!workerInstance) {
-        throw new Error("Worker not found");
+        throw new NotFoundError("Worker not found");
       }
       const sdClient = createOpenApiFetch<SdApi.paths>({
         baseUrl: workerInstance.value.sdUrl,

app/adminStore.ts

@@ -1,24 +1,11 @@
-import { Store } from "indexed_kv";
+import { Static, t } from "elysia";
-import { JsonSchema, jsonType } from "t_rest/server";
 import { db } from "./db.ts";
+import { Tkv } from "../utils/Tkv.ts";
 
-export const adminSchema = {
+export const adminSchema = t.Object({
-  type: "object",
+  promotedBy: t.Nullable(t.Number()),
-  properties: {
-    tgUserId: { type: "number" },
-    promotedBy: { type: ["string", "null"] },
-  },
-  required: ["tgUserId", "promotedBy"],
-} as const satisfies JsonSchema;
-
-export type Admin = jsonType<typeof adminSchema>;
-
-type AdminIndices = {
-  tgUserId: number;
-};
-
-export const adminStore = new Store<Admin, AdminIndices>(db, "adminUsers", {
-  indices: {
-    tgUserId: { getValue: (adminUser) => adminUser.tgUserId },
-  },
 });
+
+export type Admin = Static<typeof adminSchema>;
+
+export const adminStore = new Tkv<["admins", number], Admin>(db);

app/config.ts

@@ -1,51 +1,45 @@
+import { Static, t } from "elysia";
+import { Tkv } from "../utils/Tkv.ts";
 import { db } from "./db.ts";
-import { JsonSchema, jsonType } from "t_rest/server";
 
-export const configSchema = {
+export const defaultParamsSchema = t.Partial(t.Object({
-  type: "object",
+  batch_size: t.Number(),
-  properties: {
+  n_iter: t.Number(),
-    pausedReason: { type: ["string", "null"] },
+  width: t.Number(),
-    maxUserJobs: { type: "number" },
+  height: t.Number(),
-    maxJobs: { type: "number" },
+  steps: t.Number(),
-    defaultParams: {
+  cfg_scale: t.Number(),
-      type: "object",
+  sampler_name: t.String(),
-      properties: {
+  negative_prompt: t.String(),
-        batch_size: { type: "number" },
+}));
-        n_iter: { type: "number" },
-        width: { type: "number" },
-        height: { type: "number" },
-        steps: { type: "number" },
-        cfg_scale: { type: "number" },
-        sampler_name: { type: "string" },
-        negative_prompt: { type: "string" },
-      },
-    },
-  },
-  required: ["adminUsernames", "maxUserJobs", "maxJobs", "defaultParams"],
-} as const satisfies JsonSchema;
 
-export type Config = jsonType<typeof configSchema>;
+export type DefaultParams = Static<typeof defaultParamsSchema>;
+
+export const configSchema = t.Object({
+  pausedReason: t.Nullable(t.String()),
+  maxUserJobs: t.Number(),
+  maxJobs: t.Number(),
+  defaultParams: defaultParamsSchema,
+});
+
+export type Config = Static<typeof configSchema>;
+
+export const configStore = new Tkv<["config"], Config>(db);
+
+const defaultConfig: Config = {
+  pausedReason: null,
+  maxUserJobs: Infinity,
+  maxJobs: Infinity,
+  defaultParams: {},
+};
 
 export async function getConfig(): Promise<Config> {
-  const configEntry = await db.get<Config>(["config"]);
+  const configEntry = await configStore.get(["config"]);
-  const config = configEntry?.value;
+  return { ...defaultConfig, ...configEntry.value };
-  return {
-    pausedReason: config?.pausedReason ?? null,
-    maxUserJobs: config?.maxUserJobs ?? Infinity,
-    maxJobs: config?.maxJobs ?? Infinity,
-    defaultParams: config?.defaultParams ?? {},
-  };
 }
 
-export async function setConfig(newConfig: Partial<Config>): Promise<void> {
+export async function setConfig<K extends keyof Config>(newConfig: Pick<Config, K>): Promise<void> {
-  const oldConfig = await getConfig();
+  const configEntry = await configStore.get(["config"]);
-  const config: Config = {
+  const config = { ...defaultConfig, ...configEntry.value, ...newConfig };
-    pausedReason: newConfig.pausedReason === undefined
+  await configStore.atomicSet(["config"], configEntry.versionstamp, config);
-      ? oldConfig.pausedReason
-      : newConfig.pausedReason,
-    maxUserJobs: newConfig.maxUserJobs ?? oldConfig.maxUserJobs,
-    maxJobs: newConfig.maxJobs ?? oldConfig.maxJobs,
-    defaultParams: newConfig.defaultParams ?? oldConfig.defaultParams,
-  };
-  await db.set(["config"], config);
 }

app/dailyStatsStore.ts

@@ -1,25 +1,21 @@
 import { hoursToMilliseconds, isSameDay, minutesToMilliseconds } from "date-fns";
 import { UTCDateMini } from "date-fns/utc";
+import { Static, t } from "elysia";
 import { info } from "std/log/mod.ts";
-import { JsonSchema, jsonType } from "t_rest/server";
 import { db } from "./db.ts";
 import { generationStore } from "./generationStore.ts";
-import { kvMemoize } from "./kvMemoize.ts";
+import { kvMemoize } from "../utils/kvMemoize.ts";
 
-export const dailyStatsSchema = {
+export const dailyStatsSchema = t.Object({
-  type: "object",
+  userIds: t.Array(t.Number()),
-  properties: {
+  imageCount: t.Number(),
-    userIds: { type: "array", items: { type: "number" } },
+  stepCount: t.Number(),
-    imageCount: { type: "number" },
+  pixelCount: t.Number(),
-    stepCount: { type: "number" },
+  pixelStepCount: t.Number(),
-    pixelCount: { type: "number" },
+  timestamp: t.Number(),
-    pixelStepCount: { type: "number" },
+});
-    timestamp: { type: "number" },
-  },
-  required: ["userIds", "imageCount", "stepCount", "pixelCount", "pixelStepCount", "timestamp"],
-} as const satisfies JsonSchema;
 
-export type DailyStats = jsonType<typeof dailyStatsSchema>;
+export type DailyStats = Static<typeof dailyStatsSchema>;
 
 export const getDailyStats = kvMemoize(
   db,

app/globalStats.ts

@@ -1,23 +1,16 @@
 import { addDays } from "date-fns";
-import { JsonSchema, jsonType } from "t_rest/server";
 import { decodeTime } from "ulid";
 import { getDailyStats } from "./dailyStatsStore.ts";
 import { generationStore } from "./generationStore.ts";
 
-export const globalStatsSchema = {
+export interface GlobalStats {
-  type: "object",
+  userIds: number[];
-  properties: {
+  imageCount: number;
-    userIds: { type: "array", items: { type: "number" } },
+  stepCount: number;
-    imageCount: { type: "number" },
+  pixelCount: number;
-    stepCount: { type: "number" },
+  pixelStepCount: number;
-    pixelCount: { type: "number" },
+  timestamp: number;
-    pixelStepCount: { type: "number" },
+}
-    timestamp: { type: "number" },
-  },
-  required: ["userIds", "imageCount", "stepCount", "pixelCount", "pixelStepCount", "timestamp"],
-} as const satisfies JsonSchema;
-
-export type GlobalStats = jsonType<typeof globalStatsSchema>;
 
 export const globalStats: GlobalStats = await getGlobalStats();
 

app/userDailyStatsStore.ts

@@ -1,21 +1,18 @@
-import { JsonSchema, jsonType } from "t_rest/server";
+import { Static, t } from "elysia";
-import { kvMemoize } from "./kvMemoize.ts";
+import { kvMemoize } from "../utils/kvMemoize.ts";
 import { db } from "./db.ts";
 import { generationStore } from "./generationStore.ts";
 import { hoursToMilliseconds, isSameDay, minutesToMilliseconds } from "date-fns";
 import { UTCDateMini } from "date-fns/utc";
 
-export const userDailyStatsSchema = {
+export const userDailyStatsSchema = t.Object({
-  type: "object",
+  imageCount: t.Number(),
-  properties: {
+  pixelCount: t.Number(),
-    imageCount: { type: "number" },
+  pixelStepCount: t.Number(),
-    pixelCount: { type: "number" },
+  timestamp: t.Number(),
-    timestamp: { type: "number" },
+});
-  },
-  required: ["imageCount", "pixelCount", "timestamp"],
-} as const satisfies JsonSchema;
 
-export type UserDailyStats = jsonType<typeof userDailyStatsSchema>;
+export type UserDailyStats = Static<typeof userDailyStatsSchema>;
 
 export const getUserDailyStats = kvMemoize(
   db,
@@ -23,6 +20,7 @@ export const getUserDailyStats = kvMemoize(
   async (userId: number, year: number, month: number, day: number): Promise<UserDailyStats> => {
     let imageCount = 0;
     let pixelCount = 0;
+    let pixelStepCount = 0;
 
     for await (
       const generation of generationStore.listBy("fromId", {
@@ -33,11 +31,15 @@ export const getUserDailyStats = kvMemoize(
     ) {
       imageCount++;
       pixelCount += (generation.value.info?.width ?? 0) * (generation.value.info?.height ?? 0);
+      pixelStepCount += (generation.value.info?.width ?? 0) *
+        (generation.value.info?.height ?? 0) *
+        (generation.value.info?.steps ?? 0);
     }
 
     return {
       imageCount,
       pixelCount,
+      pixelStepCount,
       timestamp: Date.now(),
     };
   },
@@ -51,6 +53,7 @@ export const getUserDailyStats = kvMemoize(
         : hoursToMilliseconds(24 * 7 + Math.random() * 24 * 7);
     },
     // should cache if the stats are non-zero
-    shouldCache: (result) => result.imageCount > 0 || result.pixelCount > 0,
+    shouldCache: (result) =>
+      result.imageCount > 0 || result.pixelCount > 0 || result.pixelStepCount > 0,
   },
 );

app/userStatsStore.ts

@@ -1,38 +1,23 @@
 import { minutesToMilliseconds } from "date-fns";
 import { Store } from "indexed_kv";
 import { info } from "std/log/mod.ts";
-import { JsonSchema, jsonType } from "t_rest/server";
+import { Static, t } from "elysia";
 import { db } from "./db.ts";
 import { generationStore } from "./generationStore.ts";
-import { kvMemoize } from "./kvMemoize.ts";
+import { kvMemoize } from "../utils/kvMemoize.ts";
 import { sortBy } from "std/collections/sort_by.ts";
 
-export const userStatsSchema = {
+export const userStatsSchema = t.Object({
-  type: "object",
+  userId: t.Number(),
-  properties: {
+  imageCount: t.Number(),
-    userId: { type: "number" },
+  stepCount: t.Number(),
-    imageCount: { type: "number" },
+  pixelCount: t.Number(),
-    stepCount: { type: "number" },
+  pixelStepCount: t.Number(),
-    pixelCount: { type: "number" },
+  tagCountMap: t.Record(t.String(), t.Number()),
-    pixelStepCount: { type: "number" },
+  timestamp: t.Number(),
-    tagCountMap: {
+});
-      type: "object",
-      additionalProperties: { type: "number" },
-    },
-    timestamp: { type: "number" },
-  },
-  required: [
-    "userId",
-    "imageCount",
-    "stepCount",
-    "pixelCount",
-    "pixelStepCount",
-    "tagCountMap",
-    "timestamp",
-  ],
-} as const satisfies JsonSchema;
 
-export type UserStats = jsonType<typeof userStatsSchema>;
+export type UserStats = Static<typeof userStatsSchema>;
 
 type UserStatsIndices = {
   userId: number;

app/workerInstanceStore.ts

@@ -1,37 +1,23 @@
 import { Store } from "indexed_kv";
-import { JsonSchema, jsonType } from "t_rest/server";
+import { Static, t } from "elysia";
 import { db } from "./db.ts";
 
-export const workerInstanceSchema = {
+export const workerInstanceSchema = t.Object({
-  type: "object",
+  key: t.String(),
-  properties: {
+  name: t.Nullable(t.String()),
-    // used for counting stats
+  sdUrl: t.String(),
-    key: { type: "string" },
+  sdAuth: t.Nullable(t.Object({
-    // used for display
+    user: t.String(),
-    name: { type: ["string", "null"] },
+    password: t.String(),
-    sdUrl: { type: "string" },
+  })),
-    sdAuth: {
+  lastOnlineTime: t.Optional(t.Number()),
-      type: ["object", "null"],
+  lastError: t.Optional(t.Object({
-      properties: {
+    message: t.String(),
-        user: { type: "string" },
+    time: t.Number(),
-        password: { type: "string" },
+  })),
-      },
+});
-      required: ["user", "password"],
-    },
-    lastOnlineTime: { type: "number" },
-    lastError: {
-      type: "object",
-      properties: {
-        message: { type: "string" },
-        time: { type: "number" },
-      },
-      required: ["message", "time"],
-    },
-  },
-  required: ["key", "name", "sdUrl", "sdAuth"],
-} as const satisfies JsonSchema;
 
-export type WorkerInstance = jsonType<typeof workerInstanceSchema>;
+export type WorkerInstance = Static<typeof workerInstanceSchema>;
 
 export const workerInstanceStore = new Store<WorkerInstance>(db, "workerInstances", {
   indices: {},

bot/broadcastCommand.ts

@@ -12,9 +12,9 @@ export async function broadcastCommand(ctx: CommandContext<ErisContext>) {
     return ctx.reply("I don't know who you are.");
   }
 
-  const [admin] = await adminStore.getBy("tgUserId", { value: ctx.from.id });
+  const adminEntry = await adminStore.get(["admins", ctx.from.id]);
 
-  if (!admin) {
+  if (!adminEntry.versionstamp) {
     return ctx.reply("Only a bot admin can use this command.");
   }
 

bot/txt2imgCommand.ts

@@ -39,9 +39,9 @@ async function txt2img(ctx: ErisContext, match: string, includeRepliedTo: boolea
     return;
   }
 
-  const [admin] = await adminStore.getBy("tgUserId", { value: ctx.from.id });
+  const adminEntry = await adminStore.get(["admins", ctx.from.id]);
 
-  if (admin) {
+  if (adminEntry.versionstamp) {
     priority = 1;
   } else {
     const jobs = await generationQueue.getAllJobs();

deno.json

@@ -12,8 +12,8 @@
     "date-fns": "https://cdn.skypack.dev/date-fns@2.30.0?dts",
     "date-fns/utc": "https://cdn.skypack.dev/@date-fns/utc@1.1.0?dts",
     "elysia": "https://esm.sh/elysia@0.7.21?dev",
-    "elysia/eden": "https://esm.sh/@elysiajs/eden@0.7.4?dev",
+    "elysia/eden": "https://esm.sh/@elysiajs/eden@0.7.4?external=elysia&dev",
-    "elysia/swagger": "https://esm.sh/@elysiajs/swagger@0.7.4?dev",
+    "elysia/swagger": "https://esm.sh/@elysiajs/swagger@0.7.4?external=elysia&dev",
     "exifreader": "https://esm.sh/exifreader@4.14.1",
     "file_type": "https://esm.sh/file-type@18.5.0",
     "grammy": "https://lib.deno.dev/x/grammy@1/mod.ts",
@@ -43,8 +43,6 @@
     "std/path/": "https://deno.land/std@0.204.0/path/",
     "swr": "https://esm.sh/swr@2.2.4?external=react&dev",
     "swr/mutation": "https://esm.sh/swr@2.2.4/mutation?external=react&dev",
-    "t_rest/client": "https://esm.sh/ty-rest@0.4.1/client",
-    "t_rest/server": "https://esm.sh/ty-rest@0.4.1/server",
     "twind/core": "https://esm.sh/@twind/core@1.1.3",
     "twind/preset-tailwind": "https://esm.sh/@twind/preset-tailwind@1.1.4",
     "ulid": "https://deno.land/x/ulid@v0.3.0/mod.ts"

deno.lock

@@ -299,7 +299,9 @@
     "https://deno.land/x/swc@0.2.1/lib/deno_swc.generated.js": "a112eb5a4871bcbd5b660d3fd9d7afdd5cf2bb9e135eb9b04aceaa24d16481a0",
     "https://deno.land/x/swc@0.2.1/mod.ts": "9e03f5daf4c2a25208e34e19ce3e997d2e23a5a11ee8c8ed58023b0e3626073f",
     "https://deno.land/x/ulid@v0.3.0/mod.ts": "f7ff065b66abd485051fc68af23becef6ccc7e81f7774d7fcfd894a4b2da1984",
+    "https://esm.sh/@elysiajs/eden@0.7.4?external=elysia&dev": "28d477942e36cdeb3e57791a3acc1f52dd16378b1e639693897b21e98d7295e3",
     "https://esm.sh/@elysiajs/swagger@0.7.4?dev": "78520881a756f6c3a69ccc1f306bc32e258c6e0e27f971f68231763fbafd303e",
+    "https://esm.sh/@elysiajs/swagger@0.7.4?external=elysia&dev": "9732dabca93af3dee2ed1781edb740f6e6bdbe88167cc6a03fa42bef3aadd315",
     "https://esm.sh/@grammyjs/types@2.0.0": "5e5d1ae9f014cb64f0af36fb91f9d35414d670049b77367818a70cd62092b2ac",
     "https://esm.sh/@grammyjs/types@2.12.1": "eebe448d3bf3d4fdaeacee50e31b9e3947ce965d2591f1036e5c0273cb7aec36",
     "https://esm.sh/@twind/core@1.1.3": "bf3e64c13de95b061a721831bf2aed322f6e7335848b06d805168c3212686c1d",
@@ -378,6 +380,10 @@
     "https://esm.sh/v133/ty-rest@0.4.1/denonext/server.js": "00be1165ac96313b077629556a1587d4662f4e23bb0e815b945cc95cd3582370",
     "https://esm.sh/v133/use-local-storage@3.0.0/X-ZS9yZWFjdA/denonext/use-local-storage.development.mjs": "1fdc00893fe7dac56e95e2817e05d413b674f5cb5a1c6afd8994e25c9e2a56c8",
     "https://esm.sh/v133/use-sync-external-store@1.2.0/X-ZS9yZWFjdA/denonext/shim.development.js": "5388baf48494f5abe76f8a4a30810c48e828b52f1298826aa9a3f3378e2b533f",
-    "https://esm.sh/v133/util-deprecate@1.0.2/denonext/util-deprecate.mjs": "f69f67cf655c38428b0934e0f7c865c055834a87cc3866b629d6b2beb21005e9"
+    "https://esm.sh/v133/util-deprecate@1.0.2/denonext/util-deprecate.mjs": "f69f67cf655c38428b0934e0f7c865c055834a87cc3866b629d6b2beb21005e9",
+    "https://esm.sh/v134/@elysiajs/eden@0.7.4/X-ZS9lbHlzaWE/denonext/eden.development.mjs": "c79c9f105d2b2062b882240272faa81cab1cbdde1113290d2d56c15ed9479986",
+    "https://esm.sh/v134/@elysiajs/swagger@0.7.4/X-ZS9lbHlzaWE/denonext/swagger.development.mjs": "4aa74e7b8108e9bacd7830c374ef24ee1b4100d65eef045bf6802ceaa3635554",
+    "https://esm.sh/v134/@sinclair/typebox@0.31.26/X-ZS9lbHlzaWE/denonext/typebox.development.mjs": "5f24db9ca594ccb61f2ae58df80a1f7690d21e117772e7b00babdb290c0747df",
+    "https://esm.sh/v134/lodash.clonedeep@4.5.0/X-ZS9lbHlzaWE/denonext/lodash.clonedeep.development.mjs": "f44c863cb41bcd2714103a36d97e8eb8268f56070b5cd56dcfae26c556e6622e"
   }
 }

ui/AdminsPage.tsx

@@ -32,15 +32,10 @@ export function AdminsPage(props: { sessionId: string | null }) {
         <button
           className="button-filled"
           onClick={() => {
-            mutate(
+            fetchApi("/admins/promote_self", {
-              (key) => Array.isArray(key) && key[0] === "admins",
+              method: "POST",
-              async () =>
+              query: { sessionId: sessionId ?? "" },
-                fetchApi("/admins/promote_self", {
+            }).then(handleResponse).then(() => mutate(() => true));
-                  method: "POST",
-                  query: { sessionId: sessionId ?? "" },
-                }).then(handleResponse),
-              { populateCache: false },
-            );
           }}
         >
           Promote me to admin
@@ -51,7 +46,7 @@ export function AdminsPage(props: { sessionId: string | null }) {
         ? (
           <ul className="flex flex-col gap-2">
             {getAdmins.data.map((admin) => (
-              <AdminListItem key={admin.id} admin={admin} sessionId={sessionId} />
+              <AdminListItem key={admin.tgUserId} admin={admin} sessionId={sessionId} />
             ))}
           </ul>
         )
@@ -100,18 +95,13 @@ function AddAdminDialog(props: {
         onSubmit={(e) => {
           e.preventDefault();
           const data = new FormData(e.target as HTMLFormElement);
-          mutate(
+          fetchApi("/admins", {
-            (key) => Array.isArray(key) && key[0] === "admins",
+            method: "POST",
-            async () =>
+            query: { sessionId: sessionId! },
-              fetchApi("/admins", {
+            body: {
-                method: "POST",
+              tgUserId: Number(data.get("tgUserId") as string),
-                query: { sessionId: sessionId! },
+            },
-                body: {
+          }).then(handleResponse).then(() => mutate(() => true));
-                  tgUserId: Number(data.get("tgUserId") as string),
-                },
-              }).then(handleResponse),
-            { populateCache: false },
-          );
           dialogRef.current?.close();
         }}
       >
@@ -151,7 +141,7 @@ function AdminListItem(props: { admin: AdminData; sessionId: string | null }) {
   const deleteDialogRef = useRef<HTMLDialogElement>(null);
 
   const getAdminUser = useSWR(
-    ["/users/:userId", { params: { userId: String( admin.tgUserId) } }] as const,
+    ["/users/:userId", { params: { userId: String(admin.tgUserId) } }] as const,
     (args) => fetchApi(...args).then(handleResponse),
   );
 
@@ -161,7 +151,7 @@ function AdminListItem(props: { admin: AdminData; sessionId: string | null }) {
   );
   const getUser = useSWR(
     getSession.data?.userId
-      ? ["/users/:userId", { params: { userId: String( getSession.data.userId) } }] as const
+      ? ["/users/:userId", { params: { userId: String(getSession.data.userId) } }] as const
       : null,
     (args) => fetchApi(...args).then(handleResponse),
   );
@@ -169,7 +159,7 @@ function AdminListItem(props: { admin: AdminData; sessionId: string | null }) {
   return (
     <li className="flex flex-col gap-2 rounded-md bg-zinc-100 dark:bg-zinc-800 p-2">
       <p className="font-bold">
-        {getAdminUser.data?.first_name ?? admin.id} {getAdminUser.data?.last_name}{" "}
+        {getAdminUser.data?.first_name ?? admin.tgUserId} {getAdminUser.data?.last_name}{" "}
         {getAdminUser.data?.username
           ? (
             <a href={`https://t.me/${getAdminUser.data.username}`} className="link">
@@ -197,7 +187,7 @@ function AdminListItem(props: { admin: AdminData; sessionId: string | null }) {
       )}
       <DeleteAdminDialog
         dialogRef={deleteDialogRef}
-        adminId={admin.id}
+        adminId={admin.tgUserId}
         sessionId={sessionId}
       />
     </li>
@@ -206,7 +196,7 @@ function AdminListItem(props: { admin: AdminData; sessionId: string | null }) {
 
 function DeleteAdminDialog(props: {
   dialogRef: React.RefObject<HTMLDialogElement>;
-  adminId: string;
+  adminId: number;
   sessionId: string | null;
 }) {
   const { dialogRef, adminId, sessionId } = props;
@@ -222,16 +212,12 @@ function DeleteAdminDialog(props: {
         className="flex flex-col gap-4 p-4"
         onSubmit={(e) => {
           e.preventDefault();
-          mutate(
+
-            (key) => Array.isArray(key) && key[0] === "admins",
+          fetchApi("/admins/:adminId", {
-            async () =>
+            method: "DELETE",
-              fetchApi("/admins/:adminId", {
+            query: { sessionId: sessionId! },
-                method: "DELETE",
+            params: { adminId: String(adminId) },
-                query: { sessionId: sessionId! },
+          }).then(handleResponse).then(() => mutate(() => true));
-                params: { adminId: adminId },
-              }).then(handleResponse),
-            { populateCache: false },
-          );
           dialogRef.current?.close();
         }}
       >

ui/App.tsx

@@ -16,10 +16,12 @@ export function App() {
   // initialize a new session when there is no session ID
   useEffect(() => {
     if (!sessionId) {
-      fetchApi("/sessions", { method: "POST" }).then(handleResponse).then((session) => {
+      fetchApi("/sessions", { method: "POST" }).then((resp) => resp).then(handleResponse).then(
-        console.log("Initialized session", session.id);
+        (session) => {
-        setSessionId(session.id);
+          console.log("Initialized session", session.id);
-      });
+          setSessionId(session.id);
+        },
+      );
     }
   }, [sessionId]);
 

ui/AppHeader.tsx

@@ -2,7 +2,7 @@ import React, { ReactNode } from "react";
 import { NavLink } from "react-router-dom";
 import useSWR from "swr";
 import { cx } from "twind/core";
-import { fetchApi, handleResponse } from "./apiClient.ts";
+import { API_URL, fetchApi, handleResponse } from "./apiClient.ts";
 
 function NavTab(props: { to: string; children: ReactNode }) {
   return (
@@ -50,8 +50,9 @@ export function AppHeader(props: {
         params: { userId: String(getSession.data.userId) },
       }] as const
       : null,
-    (args) =>
+    () =>
-      fetchApi(...args).then((response) => response.response)
+      // elysia fetch can't download file
+      fetch(`${API_URL}/users/${getSession.data?.userId}/photo`)
         .then((response) => {
           if (!response.ok) throw new Error(response.statusText);
           return response;
@@ -60,8 +61,6 @@ export function AppHeader(props: {
         .then((blob) => blob ? URL.createObjectURL(blob) : null),
   );
 
-  console.log(getUserPhoto);
-
   return (
     <header
       className={cx(

ui/WorkersPage.tsx

@@ -1,7 +1,7 @@
-import React, { RefObject, useRef, useState } from "react";
+import React, { RefObject, useRef } from "react";
 import { FormattedRelativeTime } from "react-intl";
 import useSWR, { useSWRConfig } from "swr";
-import { WorkerData } from "../api/workersRoute.ts";
+import { WorkerResponse } from "../api/workersRoute.ts";
 import { Counter } from "./Counter.tsx";
 import { fetchApi, handleResponse } from "./apiClient.ts";
 
@@ -88,21 +88,16 @@ function AddWorkerDialog(props: {
           const user = data.get("user") as string;
           const password = data.get("password") as string;
           console.log(key, name, user, password);
-          mutate(
+          fetchApi("/workers", {
-            (key) => Array.isArray(key) && key[0] === "workers",
+            method: "POST",
-            async () =>
+            query: { sessionId: sessionId! },
-              fetchApi("/workers", {
+            body: {
-                method: "POST",
+              key,
-                query: { sessionId: sessionId! },
+              name: name || null,
-                body: {
+              sdUrl,
-                  key,
+              sdAuth: user && password ? { user, password } : null,
-                  name: name || null,
+            },
-                  sdUrl,
+          }).then(handleResponse).then(() => mutate(() => true));
-                  sdAuth: user && password ? { user, password } : null,
-                },
-              }).then(handleResponse),
-            { populateCache: false },
-          );
           dialogRef.current?.close();
         }}
       >
@@ -188,7 +183,7 @@ function AddWorkerDialog(props: {
 }
 
 function WorkerListItem(props: {
-  worker: WorkerData;
+  worker: WorkerResponse;
   sessionId: string | null;
 }) {
   const { worker, sessionId } = props;
@@ -294,19 +289,14 @@ function EditWorkerDialog(props: {
           const user = data.get("user") as string;
           const password = data.get("password") as string;
           console.log(user, password);
-          mutate(
+          fetchApi("/workers/:workerId", {
-            (key) => Array.isArray(key) && key[0] === "workers",
+            method: "PATCH",
-            async () =>
+            params: { workerId: workerId },
-              fetchApi("/workers/:workerId", {
+            query: { sessionId: sessionId! },
-                method: "PATCH",
+            body: {
-                params: { workerId: workerId },
+              sdAuth: user && password ? { user, password } : null,
-                query: { sessionId: sessionId! },
+            },
-                body: {
+          }).then(handleResponse).then(() => mutate(() => true));
-                  sdAuth: user && password ? { user, password } : null,
-                },
-              }).then(handleResponse),
-            { populateCache: false },
-          );
           dialogRef.current?.close();
         }}
       >
@@ -367,16 +357,11 @@ function DeleteWorkerDialog(props: {
         className="flex flex-col gap-4 p-4"
         onSubmit={(e) => {
           e.preventDefault();
-          mutate(
+          fetchApi("/workers/:workerId", {
-            (key) => Array.isArray(key) && key[0] === "workers",
+            method: "DELETE",
-            async () =>
+            params: { workerId: workerId },
-              fetchApi("/workers/:workerId", {
+            query: { sessionId: sessionId! },
-                method: "DELETE",
+          }).then(handleResponse).then(() => mutate(() => true));
-                params: { workerId: workerId },
-                query: { sessionId: sessionId! },
-              }).then(handleResponse),
-            { populateCache: false },
-          );
           dialogRef.current?.close();
         }}
       >

ui/apiClient.ts

@@ -1,13 +1,19 @@
 import { edenFetch } from "elysia/eden";
 import { Api } from "../api/serveApi.ts";
 
-export const fetchApi = edenFetch<Api>(`${location.origin}/api`);
+export const API_URL = "/api";
 
-export function handleResponse<D, E>(
+export const fetchApi = edenFetch<Api>(API_URL);
-  response: { data: D; error: E },
+
-): NonNullable<D> {
+export function handleResponse<
-  if (response.data) {
+  T extends
-    return response.data;
+    | { data: unknown; error: null }
+    | { data: null; error: { status: number; value: unknown } },
+>(
+  response: T,
+): (T & { error: null })["data"] {
+  if (response.error) {
+    throw new Error(`${response.error?.status}: ${response.error?.value}`);
   }
-  throw new Error(String(response.error));
+  return response.data;
 }

utils/Tkv.ts

@@ -0,0 +1,76 @@
+export type TkvEntry<K extends Deno.KvKey, T> = {
+  key: readonly [...K];
+  value: T;
+  versionstamp: string;
+};
+
+export type TkvEntryMaybe<K extends Deno.KvKey, T> = TkvEntry<K, T> | {
+  key: readonly [...K];
+  value: null;
+  versionstamp: null;
+};
+
+export type TkvListSelector<K extends Deno.KvKey> =
+  | { prefix: KvKeyPrefix<K> }
+  | { prefix: KvKeyPrefix<K>; start: readonly [...K] }
+  | { prefix: KvKeyPrefix<K>; end: readonly [...K] }
+  | { start: readonly [...K]; end: readonly [...K] };
+
+export type KvKeyPrefix<Key extends Deno.KvKey> = Key extends readonly [infer Prefix, ...infer Rest]
+  ? readonly [Prefix] | readonly [Prefix, ...Rest]
+  : never;
+
+/**
+ * Typed wrapper for {@link Deno.Kv}
+ */
+export class Tkv<K extends Deno.KvKey, T> {
+  constructor(readonly db: Deno.Kv) {}
+
+  get(
+    key: readonly [...K],
+    options: Parameters<Deno.Kv["get"]>[1] = {},
+  ): Promise<TkvEntryMaybe<K, T>> {
+    return this.db.get<T>(key, options) as any;
+  }
+
+  set(
+    key: readonly [...K],
+    value: T,
+    options: Parameters<Deno.Kv["set"]>[2] = {},
+  ): ReturnType<Deno.Kv["set"]> {
+    return this.db.set(key, value, options);
+  }
+
+  atomicSet(
+    key: readonly [...K],
+    versionstamp: Parameters<Deno.AtomicOperation["check"]>[0]["versionstamp"],
+    value: T,
+    options: Parameters<Deno.AtomicOperation["set"]>[2] = {},
+  ): ReturnType<Deno.AtomicOperation["commit"]> {
+    return this.db.atomic()
+      .check({ key, versionstamp })
+      .set(key, value, options)
+      .commit();
+  }
+
+  delete(key: readonly [...K]): ReturnType<Deno.Kv["delete"]> {
+    return this.db.delete(key);
+  }
+
+  atomicDelete(
+    key: readonly [...K],
+    versionstamp: Parameters<Deno.AtomicOperation["check"]>[0]["versionstamp"],
+  ): ReturnType<Deno.AtomicOperation["commit"]> {
+    return this.db.atomic()
+      .check({ key, versionstamp })
+      .delete(key)
+      .commit();
+  }
+
+  list(
+    selector: TkvListSelector<K>,
+    options: Parameters<Deno.Kv["list"]>[1] = {},
+  ): AsyncIterableIterator<TkvEntry<K, T>> {
+    return this.db.list<T>(selector as Deno.KvListSelector, options) as any;
+  }
+}