use JSON as persistence format for local schema

.changeset/shiny-bulldogs-leave.md

@@ -0,0 +1,5 @@
+---
+"@authdog/hydra-core": patch
+---
+
+use json as schemaRaw persistence format

.gitignore

@@ -34,3 +34,5 @@ yarn-error.log*
 
 # vercel
 .vercel
+
+.hydra

packages/cli/src/__assets__/constants.ts

@@ -1,2 +1,2 @@
-export const hydraSchemaRawPath = ".hydra/schemaRaw.js";
+export const hydraSchemaRawPath = ".hydra/schemaRaw.json";
 export const hydraConfigPathDefault = "./hydra.config.ts";

packages/cli/src/utils/introspectSchemas.ts

@@ -68,16 +68,25 @@ export const buildSchemaIntrospection = async (
   stopSpinner(interval);
 
   // const outputPath = "src/handlers/federation/schemaRawGenerated.ts";
-  const exportStatements = schemaWithIntrospection.map(
-    (s) =>
-      `export const ${s.name} = {
-        name: "${s.name}",
-        url: "${s.url}",
-        introspected: ${JSON.stringify(s.introspected, null, 2)}
-      };`,
-  );
-
-  const fileContent = `${exportStatements.join("\n")}\n`;
+  // const exportStatements = schemaWithIntrospection.map(
+  //   (s) =>
+  //     `export const ${s.name} = {
+  //       name: "${s.name}",
+  //       url: "${s.url}",
+  //       introspected: ${JSON.stringify(s.introspected, null, 2)}
+  //     };`,
+  // );
+
+  const exportObjects = schemaWithIntrospection.map(s => ({
+    name: s.name,
+    url: s.url,
+    introspected: s.introspected
+  }));
+
+  // const fileContent = `${exportStatements.join("\n")}\n`;
+
+  const fileContent = JSON.stringify(exportObjects, null, 2);
+
 
   const fs = require("fs");
 

packages/core/src/schema.ts

@@ -1,22 +1,27 @@
 import { makeExecutableSchema } from "@graphql-tools/schema";
 import { default as fetch } from "node-fetch";
-let schemaRaw;
+import * as fs from "fs";
+
+let schemas = [];
+
 
 try {
-  schemaRaw = require(".hydra/schemaRaw");
+  // schemaRaw = require(".hydra/schemaRaw");
+  const filePath = "./.hydra/schemaRaw.json";
+  const fileContent = fs.readFileSync(filePath, { encoding: "utf8" });
+  schemas = JSON.parse(fileContent);
 } catch (error) {
   // Handle error when import fails
   console.error("Error loading schemaRaw:", error);
-  schemaRaw = {}; // Set schemaRaw as an empty object when import fails
 }
 
 // If the schemaRaw is empty, handle it here
-if (!schemaRaw || Object.keys(schemaRaw).length === 0) {
+if (!schemas || schemas.length === 0) {
   console.warn("SchemaRaw is empty or invalid.");
   // Perform necessary actions or log messages for an empty schemaRaw
 }
 
-const schemas = Object.values(schemaRaw);
+
 
 import {
   addTypenameKeywordToSchema,

services/itty-hydra/hydra.config.ts

@@ -1,4 +1,14 @@
-export const HydraConfig = {
+export const HydraConfigAcme = {
+  schemas: [
+    {
+      id: "mgt",
+      uri: "https://mgt.auth.dog/graphql",
+    },
+    {
+      id: "authz",
+      uri: "https://authz.auth.dog/graphql",
+    },
+  ],
   rateLimiting: {
     default: {
       budget: 100,

services/itty-hydra/main.ts

@@ -4,7 +4,7 @@ import { createCors } from "itty-cors";
 import { NotFound } from "./handlers/notFound";
 import { Health } from "./handlers/health";
 import { GraphQLHandler, HydraHandler } from "@authdog/hydra-core";
-import { HydraConfig } from "./hydra.config";
+import { HydraConfigAcme } from "./hydra.config";
 
 const { preflight, corsify } = createCors();
 
@@ -25,10 +25,12 @@ const handleRequest = (req, env, ctx) => {
   const enrichedContext = {
     ...ctx,
     kv: HYDRA_ACME,
-    hydraConfig: HydraConfig,
+    hydraConfig: HydraConfigAcme,
     // rateLimiter: null,
   };
 
+
+
   return router
     .handle(req, env, enrichedContext)
     .catch(

services/itty-hydra/package.json

@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "build": "node build.mjs",
-    "dev": "npx wrangler dev  -c wrangler.base.toml --live-reload --port 3544",
+    "dev": "npx wrangler dev  -c wrangler.base.toml --live-reload --port 3546",
     "deploy": "npx wrangler -c wrangler.base.toml deploy --minify"
   },
   "keywords": [],