scaffold separation core/itty sample

package.json

@@ -25,6 +25,6 @@
     "graphql-yoga": "^5.0.0",
     "itty-durable": "^2.1.0",
     "jest": "^29.7.0",
-    "node-fetch": "^3.3.2"
+    "node-fetch": "2.7.0"
   }
 }

packages/core/package.json

@@ -2,7 +2,7 @@
   "name": "@authdog/hydra-core",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "build/index.js",
   "scripts": {
     "dev": "tsc -w -p tsconfig.json",
     "build": "tsc -p tsconfig.json",

packages/core/src/handlers/graphql.ts

@@ -0,0 +1,28 @@
+import { createYoga } from "graphql-yoga";
+import { schema } from "../schema";
+
+export const GraphQLHandler = async (req: Request, env: any, ctx: any) => {
+  const yoga = createYoga({
+    schema,
+    context: async (event) => {
+      const { request } = event;
+      const authorization =
+        (request.headers.get("Authorization") ||
+          request.headers.get("authorization")) ??
+        null;
+
+      const forwardedFor = request.headers.get("x-forwarded-for");
+      //  "x-forwarded-for": "\"[2a02:1210:5274:9f00:b94e:d462:5886:5cc2]\", 140.248.74.113, 140.248.74.113",
+      // extract ip address in [] in forwardedFor
+      const remoteIp = forwardedFor?.match(/\[(.*?)\]/)?.[1] ?? null;
+
+      return {
+        authorization,
+        remoteIp,
+        userAgent: request.headers.get("user-agent") ?? null,
+      };
+    },
+    landingPage: false,
+  });
+  return yoga(req, env, ctx);
+};

packages/core/src/index.ts

@@ -1,29 +1 @@
-import { createYoga } from "graphql-yoga";
-import { schema } from "./schema";
-
-export const GraphQLHandler = async (req: Request, env: any, ctx: any) => {
-  const yoga = createYoga({
-    schema,
-    context: async (event) => {
-      const { request } = event;
-      const authorization =
-        (request.headers.get("Authorization") ||
-          request.headers.get("authorization")) ??
-        null;
-
-      const forwardedFor = request.headers.get("x-forwarded-for");
-      //  "x-forwarded-for": "\"[2a02:1210:5274:9f00:b94e:d462:5886:5cc2]\", 140.248.74.113, 140.248.74.113",
-      // extract ip address in [] in forwardedFor
-      const remoteIp = forwardedFor?.match(/\[(.*?)\]/)?.[1] ?? null;
-
-      return {
-        // request: modifiedRequest, // Pass the modified request to the context
-        authorization,
-        remoteIp,
-        userAgent: request.headers.get("user-agent") ?? null,
-      };
-    },
-    landingPage: false,
-  });
-  return yoga(req, env, ctx);
-};
+export {GraphQLHandler} from "./handlers/graphql";

services/itty-hydra/handlers/hydraHandler.ts

@@ -0,0 +1,11 @@
+interface Context {
+
+}
+
+export const Hydra = async (request: Request, env: any, ctx: Context 
+
+    ) => {
+        return new Response("Hydra handler", {
+            status: 200,
+        });
+}

services/itty-hydra/main.ts

@@ -3,6 +3,7 @@ import { createCors } from "itty-cors";
 import { withDurables } from "itty-durable";
 import { NotFound } from "./handlers/notFound";
 import { Health } from "./handlers/health";
+import {GraphQLHandler} from "@authdog/hydra-core";
 
 const { preflight, corsify } = createCors();
 
@@ -12,11 +13,20 @@ router
   .options("*", preflight)
   .get("/", Health)
   .get("/health", Health)
+  .get("/graphql", GraphQLHandler)
   .get("*", NotFound);
 
 const handleRequest = (req, env, ctx) => {
+  const {HYDRA_ACME} = env;
+
+  const enrichedContext = {
+    ...ctx,
+    kv: HYDRA_ACME,
+    rateLimiter: null,
+  };
+
   return router
-    .handle(req, env, ctx)
+    .handle(req, env, enrichedContext)
     .catch(
       (err) => () =>
         new Response(err.stack, {

services/itty-hydra/package.json

@@ -12,9 +12,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@authdog/hydra-core": "workspace:*",
     "itty-cors": "^0.3.6",
     "itty-router": "^4.0.23",
-    "keylab": "^0.1.30"
+    "keylab": "^0.1.30",
+    "node-fetch": "2.7"
   },
   "devDependencies": {
     "@esbuild-plugins/node-globals-polyfill": "0.2.3",

services/itty-hydra/wrangler.base.toml

@@ -4,6 +4,10 @@ workers_dev = true
 compatibility_date = "2023-10-10"
 compatibility_flags = ["nodejs_compat"]
 
+kv_namespaces = [
+    { binding = "HYDRA_ACME", id = "c63f48a0f29843e8ab8251ef533e1c9c" }    
+]
+
 [build]
 command = "npm run build"
 
@@ -17,6 +21,3 @@ ip = "0.0.0.0"
 local_protocol="http"
 upstream_protocol="https"
 
-kv_namespaces = [
-    { binding = "HYDRA_ACME", id = "c63f48a0f29843e8ab8251ef533e1c9c" }    
-]