From 540d0549d7ec8ba525837a14881ec22524101869 Mon Sep 17 00:00:00 2001
From: Max Richter <jim-x@web.de>
Date: Thu, 19 Dec 2024 23:55:07 +0100
Subject: [PATCH] feat: some shit

---
 app/src/lib/node-store/NodeStore.svelte       |  8 +++----
 app/src/routes/+page.svelte                   |  3 +--
 packages/registry/src/node-registry-client.ts |  4 ++--
 store/Dockerfile                              | 13 ++++++++++
 store/deno.json                               |  3 ++-
 store/openapi.json                            |  2 +-
 store/src/db/db.ts                            |  2 +-
 store/src/routes/node/node.controller.ts      |  1 +
 store/src/routes/node/node.service.ts         |  4 +++-
 store/src/routes/node/schemas/node.schema.ts  |  8 ++++++-
 store/src/routes/router.ts                    | 10 --------
 store/src/routes/user/user.schema.ts          |  8 -------
 store/src/routes/user/user.validation.ts      |  8 +++++++
 store/src/{main.ts => server.ts}              | 24 ++++++++++++-------
 14 files changed, 58 insertions(+), 40 deletions(-)
 create mode 100644 store/Dockerfile
 delete mode 100644 store/src/routes/router.ts
 create mode 100644 store/src/routes/user/user.validation.ts
 rename store/src/{main.ts => server.ts} (69%)

diff --git a/app/src/lib/node-store/NodeStore.svelte b/app/src/lib/node-store/NodeStore.svelte
index 39fbf62..1cef014 100644
--- a/app/src/lib/node-store/NodeStore.svelte
+++ b/app/src/lib/node-store/NodeStore.svelte
@@ -23,7 +23,7 @@
 <div class="wrapper">
   {#if !activeUser}
     {#await registry.fetchUsers()}
-      <div>Loading...</div>
+      <div>Loading Users...</div>
     {:then users}
       {#each users as user}
         <button
@@ -37,7 +37,7 @@
     {/await}
   {:else if !activeCollection}
     {#await registry.fetchUser(activeUser)}
-      <div>Loading...</div>
+      <div>Loading User...</div>
     {:then user}
       {#each user.collections as collection}
         <button
@@ -53,11 +53,11 @@
     {/await}
   {:else if !activeNode}
     {#await registry.fetchCollection(`${activeUser}/${activeCollection}`)}
-      <div>Loading...</div>
+      <div>Loading Collection...</div>
     {:then collection}
       {#each collection.nodes as node}
         {#await registry.fetchNodeDefinition(node.id)}
-          <div>Loading... {node.id}</div>
+          <div>Loading Node... {node.id}</div>
         {:then node}
           {#if node}
             <DraggableNode {node} />
diff --git a/app/src/routes/+page.svelte b/app/src/routes/+page.svelte
index feb73ac..331cce1 100644
--- a/app/src/routes/+page.svelte
+++ b/app/src/routes/+page.svelte
@@ -32,8 +32,7 @@
   let performanceStore = createPerformanceStore();
 
   const registryCache = new IndexDBCache("node-registry");
-  const nodeRegistry = new RemoteNodeRegistry("");
-  nodeRegistry.cache = registryCache;
+  const nodeRegistry = new RemoteNodeRegistry("", registryCache);
   const workerRuntime = new WorkerRuntimeExecutor();
   const runtimeCache = new MemoryRuntimeCache();
   const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
diff --git a/packages/registry/src/node-registry-client.ts b/packages/registry/src/node-registry-client.ts
index b3768d5..2d4e30e 100644
--- a/packages/registry/src/node-registry-client.ts
+++ b/packages/registry/src/node-registry-client.ts
@@ -13,7 +13,7 @@ export class RemoteNodeRegistry implements NodeRegistry {
 
   fetch: typeof fetch = globalThis.fetch.bind(globalThis);
 
-  constructor(private url: string) { }
+  constructor(private url: string, private cache?: AsyncCache<ArrayBuffer>) { }
 
   async fetchUsers() {
     const response = await this.fetch(`${this.url}/nodes/users.json`);
@@ -24,7 +24,7 @@ export class RemoteNodeRegistry implements NodeRegistry {
   }
 
   async fetchUser(userId: `${string}`) {
-    const response = await this.fetch(`${this.url}/nodes/${userId}.json`);
+    const response = await this.fetch(`${this.url}/user/${userId}.json`);
     if (!response.ok) {
       throw new Error(`Failed to load user ${userId}`);
     }
diff --git a/store/Dockerfile b/store/Dockerfile
new file mode 100644
index 0000000..a6c7e43
--- /dev/null
+++ b/store/Dockerfile
@@ -0,0 +1,13 @@
+FROM denoland/deno:alpine
+
+ARG GIT_REVISION
+ENV DENO_DEPLOYMENT_ID=${GIT_REVISION}
+
+WORKDIR /app
+
+COPY . .
+RUN deno cache main.ts && deno task build
+
+EXPOSE 8000
+
+CMD ["task", "run"]
diff --git a/store/deno.json b/store/deno.json
index 2e40cf2..637a2cd 100644
--- a/store/deno.json
+++ b/store/deno.json
@@ -1,6 +1,7 @@
 {
   "tasks": {
-    "dev": "deno run -A --watch src/main.ts",
+    "dev": "deno run -A --watch src/server.ts",
+    "run": "deno run -A src/server.ts",
     "test": "deno run vitest",
     "drizzle": "podman-compose exec app deno --env -A --node-modules-dir npm:drizzle-kit",
     "upload": "deno run --allow-read --allow-net bin/upload.ts"
diff --git a/store/openapi.json b/store/openapi.json
index 3b8195e..082c588 100644
--- a/store/openapi.json
+++ b/store/openapi.json
@@ -1 +1 @@
-404 Not Found
\ No newline at end of file
+{"openapi":"3.0.0","info":{"version":"1.0.0","title":"Nodarium API"},"components":{"schemas":{"NodeInput":{"anyOf":[{"type":"object","properties":{"internal":{"type":"boolean"},"external":{"type":"boolean"},"setting":{"type":"string"},"label":{"type":"string"},"description":{"type":"string"},"accepts":{"type":"array","items":{"type":"string"}},"hidden":{"type":"boolean"},"type":{"type":"string","enum":["seed"]},"value":{"type":"number"}},"required":["type"]},{"type":"object","properties":{"internal":{"type":"boolean"},"external":{"type":"boolean"},"setting":{"type":"string"},"label":{"type":"string"},"description":{"type":"string"},"accepts":{"type":"array","items":{"type":"string"}},"hidden":{"type":"boolean"},"type":{"type":"string","enum":["boolean"]},"value":{"type":"boolean"}},"required":["type"]},{"type":"object","properties":{"internal":{"type":"boolean"},"external":{"type":"boolean"},"setting":{"type":"string"},"label":{"type":"string"},"description":{"type":"string"},"accepts":{"type":"array","items":{"type":"string"}},"hidden":{"type":"boolean"},"type":{"type":"string","enum":["float"]},"element":{"type":"string","enum":["slider"]},"value":{"type":"number"},"min":{"type":"number"},"max":{"type":"number"},"step":{"type":"number"}},"required":["type"]},{"type":"object","properties":{"internal":{"type":"boolean"},"external":{"type":"boolean"},"setting":{"type":"string"},"label":{"type":"string"},"description":{"type":"string"},"accepts":{"type":"array","items":{"type":"string"}},"hidden":{"type":"boolean"},"type":{"type":"string","enum":["integer"]},"element":{"type":"string","enum":["slider"]},"value":{"type":"number"},"min":{"type":"number"},"max":{"type":"number"}},"required":["type"]},{"type":"object","properties":{"internal":{"type":"boolean"},"external":{"type":"boolean"},"setting":{"type":"string"},"label":{"type":"string"},"description":{"type":"string"},"accepts":{"type":"array","items":{"type":"string"}},"hidden":{"type":"boolean"},"type":{"type":"string","enum":["select"]},"options":{"type":"array","items":{"type":"string"}},"value":{"type":"number"}},"required":["type"]},{"type":"object","properties":{"internal":{"type":"boolean"},"external":{"type":"boolean"},"setting":{"type":"string"},"label":{"type":"string"},"description":{"type":"string"},"accepts":{"type":"array","items":{"type":"string"}},"hidden":{"type":"boolean"},"type":{"type":"string","enum":["seed"]},"value":{"type":"number"}},"required":["type"]},{"type":"object","properties":{"internal":{"type":"boolean"},"external":{"type":"boolean"},"setting":{"type":"string"},"label":{"type":"string"},"description":{"type":"string"},"accepts":{"type":"array","items":{"type":"string"}},"hidden":{"type":"boolean"},"type":{"type":"string","enum":["vec3"]},"value":{"type":"array","items":{"type":"number"}}},"required":["type"]},{"type":"object","properties":{"internal":{"type":"boolean"},"external":{"type":"boolean"},"setting":{"type":"string"},"label":{"type":"string"},"description":{"type":"string"},"accepts":{"type":"array","items":{"type":"string"}},"hidden":{"type":"boolean"},"type":{"type":"string","enum":["geometry"]}},"required":["type"]},{"type":"object","properties":{"internal":{"type":"boolean"},"external":{"type":"boolean"},"setting":{"type":"string"},"label":{"type":"string"},"description":{"type":"string"},"accepts":{"type":"array","items":{"type":"string"}},"hidden":{"type":"boolean"},"type":{"type":"string","enum":["path"]}},"required":["type"]}]},"NodeDefinition":{"type":"object","properties":{"id":{"type":"string","pattern":"^([a-z0-9-]+)\\/([a-z0-9-]+)\\/([a-z0-9-]+)$"},"inputs":{"type":"object","additionalProperties":{"$ref":"#/components/schemas/NodeInput"}},"outputs":{"type":"array","items":{"type":"string"}},"meta":{"type":"object","properties":{"description":{"type":"string"},"title":{"type":"string"}}}},"required":["id"]},"User":{"type":"object","properties":{"id":{"type":"string","format":"uuid"},"name":{"type":"string","minLength":1}},"required":["id","name"]}},"parameters":{}},"paths":{"/nodes/{user}.json":{"get":{"parameters":[{"schema":{"type":"string","minLength":3,"maxLength":20},"required":true,"name":"user","in":"path"}],"responses":{"200":{"description":"Retrieve a single node definition","content":{"application/json":{"schema":{"type":"array","items":{"$ref":"#/components/schemas/NodeDefinition"}}}}}}}},"/nodes/{user}/{system}.json":{"get":{"parameters":[{"schema":{"type":"string","minLength":3,"maxLength":20},"required":true,"name":"user","in":"path"},{"schema":{"type":"string","minLength":3,"maxLength":20},"required":false,"name":"system","in":"path"}],"responses":{"200":{"description":"Retrieve a single node definition","content":{"application/json":{"schema":{"type":"array","items":{"$ref":"#/components/schemas/NodeDefinition"}}}}}}}},"/nodes/{user}/{system}/{nodeId}{.+\\.json}":{"get":{"parameters":[{"schema":{"type":"string","minLength":3,"maxLength":20},"required":true,"name":"user","in":"path"},{"schema":{"type":"string","minLength":3,"maxLength":20},"required":true,"name":"system","in":"path"},{"schema":{"type":"string","minLength":3,"maxLength":20},"required":true,"name":"nodeId","in":"path"}],"responses":{"200":{"description":"Retrieve a single node definition","content":{"application/json":{"schema":{"$ref":"#/components/schemas/NodeDefinition"}}}}}}},"/nodes/{user}/{system}/{nodeId}{.+\\.wasm}":{"get":{"parameters":[{"schema":{"type":"string","minLength":3,"maxLength":20},"required":true,"name":"user","in":"path"},{"schema":{"type":"string","minLength":3,"maxLength":20},"required":true,"name":"system","in":"path"},{"schema":{"type":"string","minLength":3,"maxLength":20},"required":true,"name":"nodeId","in":"path"}],"responses":{"200":{"description":"Retrieve a single node","content":{"application/wasm":{"schema":{"nullable":true}}}}}}},"/nodes":{"post":{"responses":{"200":{"description":"Create a single node","content":{"application/json":{"schema":{"$ref":"#/components/schemas/NodeDefinition"}}}}}}},"/users/users.json":{"get":{"responses":{"200":{"description":"Retrieve a single node definition","content":{"application/json":{"schema":{"type":"array","items":{"$ref":"#/components/schemas/User"}}}}}}}},"/users/{userId}.json":{"get":{"parameters":[{"schema":{"type":"string"},"required":false,"name":"userId","in":"path"}],"responses":{"200":{"description":"Retrieve a single node definition","content":{"application/json":{"schema":{"$ref":"#/components/schemas/User"}}}}}}}}}
\ No newline at end of file
diff --git a/store/src/db/db.ts b/store/src/db/db.ts
index cef4ebf..417bb87 100644
--- a/store/src/db/db.ts
+++ b/store/src/db/db.ts
@@ -8,8 +8,8 @@ const { Pool } = pg;
 // Instantiate Drizzle client with pg driver and schema.
 export const db = drizzle({
   client: new Pool({
+    max: 20,
     connectionString: Deno.env.get("DATABASE_URL"),
   }),
   schema,
 });
-
diff --git a/store/src/routes/node/node.controller.ts b/store/src/routes/node/node.controller.ts
index 8ac1dda..66368c7 100644
--- a/store/src/routes/node/node.controller.ts
+++ b/store/src/routes/node/node.controller.ts
@@ -129,6 +129,7 @@ const getNodeWasmRoute = createRoute({
 nodeRouter.openapi(getNodeWasmRoute, async (c) => {
   const { user, system, nodeId } = c.req.valid("param");
 
+  const a = performance.now();
   const wasmContent = await service.getNodeWasmById(
     user,
     system,
diff --git a/store/src/routes/node/node.service.ts b/store/src/routes/node/node.service.ts
index 2deed45..eefdb0c 100644
--- a/store/src/routes/node/node.service.ts
+++ b/store/src/routes/node/node.service.ts
@@ -110,6 +110,7 @@ export async function getNodeWasmById(
   systemId: string,
   nodeId: string,
 ) {
+  const a = performance.now();
   const node = await db.select({ content: nodeTable.content }).from(nodeTable)
     .where(
       and(
@@ -117,7 +118,8 @@ export async function getNodeWasmById(
         eq(nodeTable.systemId, systemId),
         eq(nodeTable.nodeId, nodeId),
       ),
-    ).limit(1);
+    ).limit(1).execute();
+  console.log("Time to load wasm", performance.now() - a);
 
   if (!node[0]) {
     throw new Error("Node not found");
diff --git a/store/src/routes/node/schemas/node.schema.ts b/store/src/routes/node/schemas/node.schema.ts
index bb67512..83b4b6e 100644
--- a/store/src/routes/node/schemas/node.schema.ts
+++ b/store/src/routes/node/schemas/node.schema.ts
@@ -1,5 +1,6 @@
 import {
   customType,
+  index,
   integer,
   json,
   pgTable,
@@ -27,7 +28,12 @@ export const nodeTable = pgTable("nodes", {
   definition: json().notNull(),
   hash: varchar({ length: 8 }).notNull(),
   previous: integer(),
-});
+}, (table) => [
+  index("user_id_idx").on(table.userId),
+  index("system_id_idx").on(table.systemId),
+  index("node_id_idx").on(table.nodeId),
+  index("hash_idx").on(table.hash),
+]);
 
 export const nodeRelations = relations(nodeTable, ({ one }) => ({
   userId: one(usersTable, {
diff --git a/store/src/routes/router.ts b/store/src/routes/router.ts
deleted file mode 100644
index 10442fb..0000000
--- a/store/src/routes/router.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { OpenAPIHono } from "@hono/zod-openapi";
-import { nodeRouter } from "./node/node.controller.ts";
-import { userRouter } from "./user/user.controller.ts";
-
-const router = new OpenAPIHono();
-
-router.route("nodes", nodeRouter);
-router.route("users", userRouter);
-
-export { router };
diff --git a/store/src/routes/user/user.schema.ts b/store/src/routes/user/user.schema.ts
index d6f5b35..7345341 100644
--- a/store/src/routes/user/user.schema.ts
+++ b/store/src/routes/user/user.schema.ts
@@ -1,14 +1,6 @@
 import { pgTable, text, uuid } from "drizzle-orm/pg-core";
-import { z } from "@hono/zod-openapi";
 
 export const usersTable = pgTable("users", {
   id: uuid().primaryKey().defaultRandom(),
   name: text().unique().notNull(),
 });
-
-export const UserSchema = z
-  .object({
-    id: z.string().uuid(),
-    name: z.string().min(1), // Non-null text with a unique constraint (enforced at the database level)
-  })
-  .openapi("User");
diff --git a/store/src/routes/user/user.validation.ts b/store/src/routes/user/user.validation.ts
new file mode 100644
index 0000000..822617d
--- /dev/null
+++ b/store/src/routes/user/user.validation.ts
@@ -0,0 +1,8 @@
+import { z } from "@hono/zod-openapi";
+
+export const UserSchema = z
+  .object({
+    id: z.string().uuid(),
+    name: z.string().min(1),
+  })
+  .openapi("User");
diff --git a/store/src/main.ts b/store/src/server.ts
similarity index 69%
rename from store/src/main.ts
rename to store/src/server.ts
index 194e5ab..5144bf0 100644
--- a/store/src/main.ts
+++ b/store/src/server.ts
@@ -1,20 +1,17 @@
-import { router } from "./routes/router.ts";
 import { createUser } from "./routes/user/user.service.ts";
 import { swaggerUI } from "@hono/swagger-ui";
 import { logger } from "hono/logger";
 import { cors } from "hono/cors";
+import { OpenAPIHono } from "@hono/zod-openapi";
+import { nodeRouter } from "./routes/node/node.controller.ts";
+import { userRouter } from "./routes/user/user.controller.ts";
 
-async function init() {
-  const openapi = await router.request("/openapi.json");
-  const json = await openapi.text();
-  Deno.writeTextFile("openapi.json", json);
-
-  await createUser("max");
-}
-await init();
+const router = new OpenAPIHono();
 
 router.use(logger());
 router.use(cors());
+router.route("nodes", nodeRouter);
+router.route("users", userRouter);
 
 router.doc("/openapi.json", {
   openapi: "3.0.0",
@@ -27,3 +24,12 @@ router.doc("/openapi.json", {
 router.get("/ui", swaggerUI({ url: "/openapi.json" }));
 
 Deno.serve(router.fetch);
+
+async function init() {
+  const openapi = await router.request("/openapi.json");
+  const json = await openapi.text();
+  Deno.writeTextFile("openapi.json", json);
+
+  await createUser("max");
+}
+await init();