@powerhousedao/reactor-api 1.29.17-dev.3 → 1.29.17-dev.5

package/dist/src/config.d.ts

@@ -0,0 +1,4 @@
+export declare const config: {
+    basePath: string;
+};
+//# sourceMappingURL=config.d.ts.map

package/dist/src/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM;;CAElB,CAAC"}

package/dist/src/config.js

@@ -0,0 +1,3 @@
+export const config = {
+    basePath: process.env.BASE_PATH || "/",
+};

package/dist/src/graphql/base/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/graphql/base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5C,qBAAa,QAAS,YAAW,SAAS;IACxC,IAAI,SAAa;IACjB,IAAI,SAAM;IACV,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAI5B;IACF,QAAQ,EAAE,YAAY,CAIpB;IACF,OAAO,EAAE,oBAAoB,CAAC;IAC9B,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,EAAE,CAAC;gBACT,IAAI,EAAE,YAAY;IAKxB,OAAO;CAGd"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/graphql/base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5C,qBAAa,QAAS,YAAW,SAAS;IACxC,IAAI,SAAa;IACjB,IAAI,SAAM;IACV,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAI5B;IACF,QAAQ,EAAE,YAAY,CAIpB;IACF,OAAO,EAAE,oBAAoB,CAAC;IAC9B,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,EAAE,CAAC;gBACT,IAAI,EAAE,YAAY;IAMxB,OAAO;CAGd"}

package/dist/src/graphql/base/index.js

@@ -19,6 +19,7 @@ export class Subgraph {
         this.reactor = args.reactor;
         this.graphqlManager = args.graphqlManager;
         this.operationalStore = args.operationalStore;
+        this.path = args.path ?? "";
     }
     async onSetup() {
         // noop

package/dist/src/graphql/graphql-manager.d.ts

@@ -15,7 +15,7 @@ export declare class GraphQLManager {
     private contextFields;
     constructor(path: string, app: express.Express, reactor: IDocumentDriveServer, operationalStore: Db, analyticsStore: IAnalyticsStore, subgraphs?: Map<string, Subgraph[]>);
     init(): Promise<void>;
-    registerSubgraph(subgraph: SubgraphClass, supergraph?: string, path?: string): Promise<void>;
+    registerSubgraph(subgraph: SubgraphClass, supergraph?: string): Promise<void>;
     updateRouter(): Promise<void>;
     getAdditionalContextFields: () => Record<string, any>;
     setAdditionalContextFields(fields: Record<string, any>): void;

package/dist/src/graphql/graphql-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-manager.d.ts","sourceRoot":"","sources":["../../../src/graphql/graphql-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,WAAW,CAAC;AAOpC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAMnC,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAG/D,qBAAa,cAAc;;IAKvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAT5B,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,aAAa,CAA2B;gBAG7B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,OAAO,EAAE,oBAAoB,EAC7B,gBAAgB,EAAE,EAAE,EACpB,cAAc,EAAE,eAAe,EAC/B,SAAS,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAa;IAW3D,IAAI;IAmBJ,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,SAAK,EAAE,IAAI,SAAK;IAsBpE,YAAY;IAQlB,0BAA0B,4BAExB;IAEF,0BAA0B,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAItD,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE;CA8HxD"}
+{"version":3,"file":"graphql-manager.d.ts","sourceRoot":"","sources":["../../../src/graphql/graphql-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,WAAW,CAAC;AAOpC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAOnC,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAG/D,qBAAa,cAAc;;IAKvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAT5B,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,aAAa,CAA2B;gBAG7B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,OAAO,EAAE,oBAAoB,EAC7B,gBAAgB,EAAE,EAAE,EACpB,cAAc,EAAE,eAAe,EAC/B,SAAS,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAa;IAK3D,IAAI;IA2BJ,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,SAAK;IA6BzD,YAAY;IASlB,0BAA0B,4BAExB;IAEF,0BAA0B,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAItD,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE;CAiJxD"}

package/dist/src/graphql/graphql-manager.js

@@ -7,6 +7,7 @@ import { ApolloServerPluginLandingPageLocalDefault } from "@apollo/server/plugin
 import bodyParser from "body-parser";
 import cors from "cors";
 import { Router } from "express";
+import path from "node:path";
 import { AnalyticsSubgraph } from "./analytics/index.js";
 import { AuthSubgraph } from "./auth/index.js";
 import { DriveSubgraph } from "./drive/index.js";
@@ -27,15 +28,16 @@ export class GraphQLManager {
         this.operationalStore = operationalStore;
         this.analyticsStore = analyticsStore;
         this.subgraphs = subgraphs;
-        // Setup Default subgraphs
-        this.registerSubgraph(AuthSubgraph, "graphql");
-        this.registerSubgraph(SystemSubgraph, "graphql");
-        this.registerSubgraph(AnalyticsSubgraph, "graphql");
-        // special case for drive
-        this.registerSubgraph(DriveSubgraph);
+        this.subgraphs.set("graphql", []);
     }
     async init() {
         console.log(`> Initializing Subgraph Manager...`);
+        // Setup Default subgraphs
+        await this.registerSubgraph(AuthSubgraph, "graphql");
+        await this.registerSubgraph(SystemSubgraph, "graphql");
+        await this.registerSubgraph(AnalyticsSubgraph, "graphql");
+        // special case for drive
+        await this.registerSubgraph(DriveSubgraph);
         const models = this.reactor.getDocumentModelModules();
         const driveModel = models.find((it) => it.documentModel.name === "DocumentDrive");
         if (!driveModel) {
@@ -44,15 +46,16 @@ export class GraphQLManager {
         this.reactor.on("documentModelModules", () => {
             this.updateRouter().catch((error) => console.error(error));
         });
-        this.app.use(this.path, (req, res, next) => this.reactorRouter(req, res, next));
+        this.app.use("/", (req, res, next) => this.reactorRouter(req, res, next));
+        this.updateRouter();
     }
-    async registerSubgraph(subgraph, supergraph = "", path = "") {
+    async registerSubgraph(subgraph, supergraph = "") {
         const subgraphInstance = new subgraph({
             operationalStore: this.operationalStore,
             analyticsStore: this.analyticsStore,
             reactor: this.reactor,
             graphqlManager: this,
-            path,
+            path: this.path,
         });
         await subgraphInstance.onSetup();
         if (!this.subgraphs.get(supergraph)) {
@@ -62,10 +65,15 @@ export class GraphQLManager {
             this.subgraphs.set(supergraph, []);
         }
         this.subgraphs.get(supergraph)?.push(subgraphInstance);
-        console.log(`> Registered ${supergraph ? "/" + supergraph : ""}${this.path.endsWith("/") ? this.path : this.path + "/"}${subgraphInstance.name} subgraph.`);
-        await this.updateRouter();
+        // also add to global graphql supergraph
+        if (supergraph !== "" && supergraph !== "graphql") {
+            this.subgraphs.get("graphql")?.push(subgraphInstance);
+        }
+        console.log(`> Registered ${this.path.endsWith("/") ? this.path : this.path + "/"}${supergraph ? supergraph + "/" : ""}${subgraphInstance.name} subgraph.`);
+        // this.updateRouter();
     }
     async updateRouter() {
+        console.log("> Updating router");
         const newRouter = Router();
         newRouter.use(cors());
         newRouter.use(bodyParser.json());
@@ -110,9 +118,12 @@ export class GraphQLManager {
             }
         });
     }
+    #getSubgraphPath(subgraph, supergraph) {
+        return path.join(subgraph.path, supergraph, subgraph.name);
+    }
     async #setupSubgraphs(router) {
         for (const [supergraph, subgraphs] of this.subgraphs.entries()) {
-            const supergraphEndpoints = {};
+            const supergraphEndpoints = [];
             for (const subgraph of subgraphs) {
                 const subgraphConfig = this.#getLocalSubgraphConfig(subgraph.name);
                 if (!subgraphConfig)
@@ -121,30 +132,39 @@ export class GraphQLManager {
                 const schema = createSchema(this.reactor, subgraphConfig.resolvers, subgraphConfig.typeDefs);
                 // create and start apollo server
                 const server = this.#createApolloServer(schema);
-                const path = `${subgraph.path ? "/" + subgraph.path : ""}${supergraph !== "" ? "/" + supergraph : ""}/${subgraphConfig.name}`;
+                const path = this.#getSubgraphPath(subgraph, supergraph);
                 await server.start();
                 await this.#waitForServer(server);
                 this.#setupApolloExpressMiddleware(server, router, path);
                 if (supergraph !== "") {
-                    supergraphEndpoints[path] = server;
+                    supergraphEndpoints.push(this.#getSubgraphPath(subgraph, supergraph));
                 }
             }
-            if (Object.keys(supergraphEndpoints).length > 0) {
+            if (supergraphEndpoints.length > 0) {
+                await this.#sleep(1000);
                 const supergraphServer = await this.#createApolloGateway(supergraphEndpoints);
                 if (supergraphServer) {
-                    const path = `/${supergraph}`;
-                    this.#setupApolloExpressMiddleware(supergraphServer, router, path);
+                    const superGraphPath = path.join(this.path, supergraph ?? "graphql");
+                    this.#setupApolloExpressMiddleware(supergraphServer, router, superGraphPath);
                 }
             }
         }
     }
+    #sleep(ms) {
+        return new Promise((resolve) => {
+            setTimeout(resolve, ms);
+        });
+    }
     async #createApolloGateway(endpoints) {
         try {
+            const herokuOrLocal = process.env.HEROKU_APP_DEFAULT_DOMAIN_NAME
+                ? `https://${process.env.HEROKU_APP_DEFAULT_DOMAIN_NAME}`
+                : `http://localhost:${process.env.PORT ?? 4001}`;
             const gateway = new ApolloGateway({
                 supergraphSdl: new IntrospectAndCompose({
-                    subgraphs: Object.keys(endpoints).map((path) => ({
-                        name: path.replaceAll("/", ""),
-                        url: `http://localhost:${process.env.PORT ?? 4001}${path}`,
+                    subgraphs: endpoints.map((endpoint) => ({
+                        name: endpoint.replaceAll("/", ""),
+                        url: `${herokuOrLocal}${endpoint}`,
                     })),
                 }),
             });

package/dist/src/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAOnD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAM3D,OAAgB,EAAE,KAAK,OAAO,EAAE,MAAM,SAAS,CAAC;AAMhD,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAGtC,KAAK,OAAO,GAAG;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,IAAI,GAAG,SAAS,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,CAAC,EACF;QACE,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;KAClB,GACD,OAAO,GACP,SAAS,CAAC;CACf,CAAC;AAsKF,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,GAAG,CAAC,CAuDd"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAOnD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAM3D,OAAgB,EAAE,KAAK,OAAO,EAAE,MAAM,SAAS,CAAC;AAMhD,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAGtC,KAAK,OAAO,GAAG;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,IAAI,GAAG,SAAS,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,CAAC,EACF;QACE,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;KAClB,GACD,OAAO,GACP,SAAS,CAAC;CACf,CAAC;AAsKF,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,GAAG,CAAC,CAwDd"}

package/dist/src/server.js

@@ -1,3 +1,4 @@
+import { config } from "#config.js";
 import { GraphQLManager } from "#graphql/graphql-manager.js";
 import { renderGraphqlPlayground } from "#graphql/playground.js";
 import { getUniqueDocumentModels, PackagesManager, } from "#package-manager.js";
@@ -13,11 +14,12 @@ const DEFAULT_PORT = 4000;
 /**
  * Sets up the Express app with necessary routes
  */
-function setupGraphQlExplorer(app) {
-    app.get("/explorer/:endpoint?", (req, res) => {
+function setupGraphQlExplorer(router) {
+    router.get("/explorer/:endpoint?", (req, res) => {
         res.setHeader("Content-Type", "text/html");
-        const basePath = process.env.BASE_PATH === "/" ? "" : process.env.BASE_PATH || "";
-        const endpoint = `${basePath}${req.params.endpoint !== undefined ? `/${req.params.endpoint}` : "/graphql"}`;
+        const endpoint = req.params.endpoint !== undefined
+            ? `/${req.params.endpoint}`
+            : "/graphql";
         const { query } = req.query;
         if (query && typeof query !== "string") {
             throw new Error("Invalid query");
@@ -54,15 +56,15 @@ async function initializePackageManager(options) {
  * Sets up the subgraph manager and registers subgraphs
  */
 async function setupGraphQLManager(app, reactor, db, analyticsStore, result) {
-    const graphqlManager = new GraphQLManager("/", app, reactor, db, analyticsStore);
-    await graphqlManager.init();
+    const graphqlManager = new GraphQLManager(config.basePath, app, reactor, db, analyticsStore);
     if (result.subgraphs) {
         for (const [supergraph, subgraphs] of result.subgraphs.entries()) {
             for (const subgraph of subgraphs) {
-                graphqlManager.registerSubgraph(subgraph, supergraph);
+                await graphqlManager.registerSubgraph(subgraph, supergraph);
             }
         }
     }
+    await graphqlManager.init();
     return graphqlManager;
 }
 /**
@@ -80,6 +82,7 @@ function setupEventListeners(pkgManager, reactor, graphqlManager, processorManag
                 graphqlManager.registerSubgraph(subgraph, supergraph);
             }
         }
+        graphqlManager.updateRouter();
     });
     pkgManager.onProcessorsChange(async (processors) => {
         for (const [packageName, fn] of processors) {
@@ -124,8 +127,9 @@ async function startServer(app, port, httpsOptions) {
 export async function startAPI(reactor, options) {
     const port = options.port ?? DEFAULT_PORT;
     const app = options.express ?? express();
-    // Set up Express app with routes
-    setupGraphQlExplorer(app);
+    const defaultRouter = express.Router();
+    setupGraphQlExplorer(defaultRouter);
+    app.use(config.basePath, defaultRouter);
     // Initialize database and analytics store
     const { db, analyticsStore } = initializeDatabaseAndAnalytics(options.dbPath);
     const module = { db, analyticsStore };