Merge remote-tracking branch 'origin/main' into yonadaaa/encapsulate-…

…functionality

.changeset/breezy-garlics-decide.md

@@ -0,0 +1,5 @@
+---
+"@latticexyz/world-modules": patch
+---
+
+Removed `IUniqueEntitySystem` in favor of calling `getUniqueEntity` via `world.call` instead of the world function selector. This had a small gas improvement.

.changeset/lazy-foxes-applaud.md

@@ -0,0 +1,9 @@
+---
+"@latticexyz/world": patch
+---
+
+Systems are expected to be always called via the central World contract.
+Depending on whether it is a root or non-root system, the call is performed via `delegatecall` or `call`.
+Since Systems are expected to be stateless and only interact with the World state, it is not necessary to prevent direct calls to the systems.
+However, since the `CoreSystem` is known to always be registered as a root system in the World, it is always expected to be delegatecalled,
+so we made this expectation explicit by reverting if it is not delegatecalled.

packages/store-indexer/bin/postgres-decoded-indexer.ts

@@ -10,6 +10,9 @@ import postgres from "postgres";
 import { createStorageAdapter } from "@latticexyz/store-sync/postgres-decoded";
 import { createStoreSync } from "@latticexyz/store-sync";
 import { indexerEnvSchema, parseEnv } from "./parseEnv";
+import { sentry } from "../src/koa-middleware/sentry";
+import { healthcheck } from "../src/koa-middleware/healthcheck";
+import { helloWorld } from "../src/koa-middleware/helloWorld";
 
 const env = parseEnv(
   z.intersection(
@@ -18,6 +21,7 @@ const env = parseEnv(
       DATABASE_URL: z.string(),
       HEALTHCHECK_HOST: z.string().optional(),
       HEALTHCHECK_PORT: z.coerce.number().optional(),
+      SENTRY_DSN: z.string().optional(),
     })
   )
 );
@@ -88,33 +92,21 @@ combineLatest([latestBlockNumber$, storedBlockLogs$])
 if (env.HEALTHCHECK_HOST != null || env.HEALTHCHECK_PORT != null) {
   const { default: Koa } = await import("koa");
   const { default: cors } = await import("@koa/cors");
-  const { default: Router } = await import("@koa/router");
 
   const server = new Koa();
-  server.use(cors());
-
-  const router = new Router();
-
-  router.get("/", (ctx) => {
-    ctx.body = "emit HelloWorld();";
-  });
 
-  // k8s healthchecks
-  router.get("/healthz", (ctx) => {
-    ctx.status = 200;
-  });
-  router.get("/readyz", (ctx) => {
-    if (isCaughtUp) {
-      ctx.status = 200;
-      ctx.body = "ready";
-    } else {
-      ctx.status = 424;
-      ctx.body = "backfilling";
-    }
-  });
+  if (env.SENTRY_DSN) {
+    server.use(sentry(env.SENTRY_DSN));
+  }
 
-  server.use(router.routes());
-  server.use(router.allowedMethods());
+  server.use(cors());
+  server.use(cors());
+  server.use(
+    healthcheck({
+      isReady: () => isCaughtUp,
+    })
+  );
+  server.use(helloWorld());
 
   server.listen({ host: env.HEALTHCHECK_HOST, port: env.HEALTHCHECK_PORT });
   console.log(

packages/store-indexer/bin/postgres-frontend.ts

@@ -3,21 +3,23 @@ import "dotenv/config";
 import { z } from "zod";
 import Koa from "koa";
 import cors from "@koa/cors";
-import Router from "@koa/router";
 import { createKoaMiddleware } from "trpc-koa-adapter";
 import { createAppRouter } from "@latticexyz/store-sync/trpc-indexer";
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 import { frontendEnvSchema, parseEnv } from "./parseEnv";
 import { createQueryAdapter } from "../src/postgres/deprecated/createQueryAdapter";
 import { apiRoutes } from "../src/postgres/apiRoutes";
-import { registerSentryMiddlewares } from "../src/sentry";
+import { sentry } from "../src/koa-middleware/sentry";
+import { healthcheck } from "../src/koa-middleware/healthcheck";
+import { helloWorld } from "../src/koa-middleware/helloWorld";
 
 const env = parseEnv(
   z.intersection(
     frontendEnvSchema,
     z.object({
       DATABASE_URL: z.string(),
+      SENTRY_DSN: z.string().optional(),
     })
   )
 );
@@ -26,30 +28,15 @@ const database = postgres(env.DATABASE_URL, { prepare: false });
 
 const server = new Koa();
 
-if (process.env.SENTRY_DSN) {
-  registerSentryMiddlewares(server);
+if (env.SENTRY_DSN) {
+  server.use(sentry(env.SENTRY_DSN));
 }
 
 server.use(cors());
+server.use(healthcheck());
+server.use(helloWorld());
 server.use(apiRoutes(database));
 
-const router = new Router();
-
-router.get("/", (ctx) => {
-  ctx.body = "emit HelloWorld();";
-});
-
-// k8s healthchecks
-router.get("/healthz", (ctx) => {
-  ctx.status = 200;
-});
-router.get("/readyz", (ctx) => {
-  ctx.status = 200;
-});
-
-server.use(router.routes());
-server.use(router.allowedMethods());
-
 server.use(
   createKoaMiddleware({
     prefix: "/trpc",

packages/store-indexer/bin/postgres-indexer.ts

@@ -93,33 +93,18 @@ combineLatest([latestBlockNumber$, storedBlockLogs$])
 if (env.HEALTHCHECK_HOST != null || env.HEALTHCHECK_PORT != null) {
   const { default: Koa } = await import("koa");
   const { default: cors } = await import("@koa/cors");
-  const { default: Router } = await import("@koa/router");
+  const { healthcheck } = await import("../src/koa-middleware/healthcheck");
+  const { helloWorld } = await import("../src/koa-middleware/helloWorld");
 
   const server = new Koa();
-  server.use(cors());
-
-  const router = new Router();
-
-  router.get("/", (ctx) => {
-    ctx.body = "emit HelloWorld();";
-  });
-
-  // k8s healthchecks
-  router.get("/healthz", (ctx) => {
-    ctx.status = 200;
-  });
-  router.get("/readyz", (ctx) => {
-    if (isCaughtUp) {
-      ctx.status = 200;
-      ctx.body = "ready";
-    } else {
-      ctx.status = 424;
-      ctx.body = "backfilling";
-    }
-  });
 
-  server.use(router.routes());
-  server.use(router.allowedMethods());
+  server.use(cors());
+  server.use(
+    healthcheck({
+      isReady: () => isCaughtUp,
+    })
+  );
+  server.use(helloWorld());
 
   server.listen({ host: env.HEALTHCHECK_HOST, port: env.HEALTHCHECK_PORT });
   console.log(

packages/store-indexer/bin/sqlite-indexer.ts

@@ -8,16 +8,17 @@ import Database from "better-sqlite3";
 import { createPublicClient, fallback, webSocket, http, Transport } from "viem";
 import Koa from "koa";
 import cors from "@koa/cors";
-import Router from "@koa/router";
 import { createKoaMiddleware } from "trpc-koa-adapter";
 import { createAppRouter } from "@latticexyz/store-sync/trpc-indexer";
 import { chainState, schemaVersion, syncToSqlite } from "@latticexyz/store-sync/sqlite";
 import { createQueryAdapter } from "../src/sqlite/createQueryAdapter";
 import { isDefined } from "@latticexyz/common/utils";
 import { combineLatest, filter, first } from "rxjs";
 import { frontendEnvSchema, indexerEnvSchema, parseEnv } from "./parseEnv";
+import { healthcheck } from "../src/koa-middleware/healthcheck";
+import { helloWorld } from "../src/koa-middleware/helloWorld";
 import { apiRoutes } from "../src/sqlite/apiRoutes";
-import { registerSentryMiddlewares } from "../src/sentry";
+import { sentry } from "../src/koa-middleware/sentry";
 
 const env = parseEnv(
   z.intersection(
@@ -93,35 +94,19 @@ combineLatest([latestBlockNumber$, storedBlockLogs$])
   });
 
 const server = new Koa();
-server.use(cors());
-server.use(apiRoutes(database));
 
 if (env.SENTRY_DSN) {
-  registerSentryMiddlewares(server);
+  server.use(sentry(env.SENTRY_DSN));
 }
 
-const router = new Router();
-
-router.get("/", (ctx) => {
-  ctx.body = "emit HelloWorld();";
-});
-
-// k8s healthchecks
-router.get("/healthz", (ctx) => {
-  ctx.status = 200;
-});
-router.get("/readyz", (ctx) => {
-  if (isCaughtUp) {
-    ctx.status = 200;
-    ctx.body = "ready";
-  } else {
-    ctx.status = 424;
-    ctx.body = "backfilling";
-  }
-});
-
-server.use(router.routes());
-server.use(router.allowedMethods());
+server.use(cors());
+server.use(
+  healthcheck({
+    isReady: () => isCaughtUp,
+  })
+);
+server.use(helloWorld());
+server.use(apiRoutes(database));
 
 server.use(
   createKoaMiddleware({

packages/store-indexer/package.json

@@ -68,7 +68,6 @@
   "devDependencies": {
     "@types/accepts": "^1.3.7",
     "@types/better-sqlite3": "^7.6.4",
-    "@types/cors": "^2.8.13",
     "@types/debug": "^4.1.7",
     "@types/koa": "^2.13.12",
     "@types/koa-compose": "^3.2.8",

packages/store-indexer/src/koa-middleware/healthcheck.ts

@@ -0,0 +1,37 @@
+import { Middleware } from "koa";
+
+type HealthcheckOptions = {
+  isHealthy?: () => boolean;
+  isReady?: () => boolean;
+};
+
+/**
+ * Middleware to add Kubernetes healthcheck endpoints
+ */
+export function healthcheck({ isHealthy, isReady }: HealthcheckOptions = {}): Middleware {
+  return async function healthcheckMiddleware(ctx, next): Promise<void> {
+    if (ctx.path === "/healthz") {
+      if (isHealthy == null || isHealthy()) {
+        ctx.status = 200;
+        ctx.body = "healthy";
+      } else {
+        ctx.status = 503;
+        ctx.body = "not healthy";
+      }
+      return;
+    }
+
+    if (ctx.path === "/readyz") {
+      if (isReady == null || isReady()) {
+        ctx.status = 200;
+        ctx.body = "ready";
+      } else {
+        ctx.status = 503;
+        ctx.body = "not ready";
+      }
+      return;
+    }
+
+    await next();
+  };
+}

packages/store-indexer/src/koa-middleware/helloWorld.ts

@@ -0,0 +1,12 @@
+import { Middleware } from "koa";
+
+export function helloWorld(): Middleware {
+  return async function helloWorldMiddleware(ctx, next): Promise<void> {
+    if (ctx.path === "/") {
+      ctx.status = 200;
+      ctx.body = "emit HelloWorld();";
+      return;
+    }
+    await next();
+  };
+}