fix: Scope store service instances to requests

package.json

@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@aklinker1/logger": "^1.0.6",
-    "@aklinker1/zero-ioc": "^1.5.1",
+    "@aklinker1/zero-ioc": "^1.6.0",
     "@aklinker1/zero-serialize-error": "^1.0.2",
     "@aklinker1/zeta": "^2.2.0",
     "dataloader": "^2.2.3",

src/@types/gql-ctx.d.ts

@@ -1,5 +1,5 @@
 declare namespace Gql {
   export type WxtQueueCtx = {
-    deps: import("../dependencies").Dependencies;
+    deps: import("../dependencies").RequestDependencies;
   };
 }

src/apis/graphql-apis.ts

@@ -6,6 +6,7 @@ import { version } from "../../package.json";
 import PLAYGROUND_HTML_TEMPLATE from "../assets/playground.html" with { type: "text" };
 import { OpenApiTag } from "../enums";
 import { createGraphql } from "../graphql";
+import { contextPlugin } from "../plugins/context-plugin";
 
 const PLAYGROUND_HTML = (PLAYGROUND_HTML_TEMPLATE as any as string).replace("{{VERSION}}", version);
 
@@ -14,6 +15,7 @@ const graphql = createGraphql();
 export const graphqlApis = createApp({
   tags: [OpenApiTag.Graphql],
 })
+  .use(contextPlugin)
   .post(
     "/api",
     {
@@ -67,7 +69,7 @@ export const graphqlApis = createApp({
           },
         }),
     },
-    ({ request, body }) => graphql.evaluateQuery(request.method, body) as any,
+    ({ request, body, deps }) => graphql.evaluateQuery(deps, request.method, body) as any,
   )
   .get(
     "/playground",

src/dependencies.ts

@@ -1,10 +1,9 @@
-import { createIocContainer, transient } from "@aklinker1/zero-ioc";
+import { createIocContainer } from "@aklinker1/zero-ioc";
 
-import { ExtensionStoreName } from "./enums";
 import { createChromeWebStore } from "./services/chrome-web-store";
 import { createEdgeAddonStore } from "./services/edge-addon-store";
 import { createEdgeApi } from "./services/edge-api";
-import type { ExtensionStores } from "./services/extension-stores";
+import { ExtensionStoreProvider } from "./services/extension-store-provider";
 import { createFirefoxAddonStore } from "./services/firefox-addon-store";
 import { createFirefoxApi } from "./services/firefox-api";
 import { createInMemoryCache } from "./services/in-memory-cache";
@@ -21,23 +20,15 @@ export const container = createIocContainer()
         : createInMemoryCache,
   )
   .register("edgeApi", createEdgeApi)
-  .register("firefoxApi", createFirefoxApi)
-  .register("chromeWebStore", transient(createChromeWebStore))
-  .register("firefoxAddonStore", transient(createFirefoxAddonStore))
-  .register("edgeAddonStore", transient(createEdgeAddonStore))
-  .register(
-    "stores",
-    (deps) =>
-      ({
-        [ExtensionStoreName.ChromeWebStore]: deps.chromeWebStore,
-        [ExtensionStoreName.FirefoxAddonStore]: deps.firefoxAddonStore,
-        [ExtensionStoreName.EdgeAddonStore]: deps.edgeAddonStore,
-
-        // Deprecated, but staying around for a while.
-        [ExtensionStoreName.ChromeExtensions]: deps.chromeWebStore,
-        [ExtensionStoreName.FirefoxExtensions]: deps.firefoxAddonStore,
-        [ExtensionStoreName.EdgeExtensions]: deps.edgeAddonStore,
-      }) satisfies ExtensionStores,
-  );
+  .register("firefoxApi", createFirefoxApi);
 
 export type Dependencies = typeof container.registrations;
+
+export const requestScope = container
+  .scope<{}>()
+  .register("chromeWebStore", createChromeWebStore)
+  .register("firefoxAddonStore", createFirefoxAddonStore)
+  .register("edgeAddonStore", createEdgeAddonStore)
+  .register("stores", ExtensionStoreProvider);
+
+export type RequestDependencies = ReturnType<typeof requestScope>["registrations"];

src/graphql/index.ts

@@ -2,7 +2,7 @@ import { createLogger } from "@aklinker1/logger";
 import { buildSchema, graphql } from "graphql";
 
 import gqlSchema from "../assets/schema.gql" with { type: "text" };
-import { container } from "../dependencies";
+import { type RequestDependencies } from "../dependencies";
 import { rootResolver } from "./resolvers";
 
 const logger = createLogger("gql");
@@ -12,7 +12,7 @@ export function createGraphql() {
 
   let increment = 0;
 
-  const evaluateQuery = async (method: string, body: GraphQLParams) => {
+  const evaluateQuery = async (deps: RequestDependencies, method: string, body: GraphQLParams) => {
     const id = ++increment;
     const { operationName = "Unknown", query, variables } = body;
 
@@ -21,7 +21,7 @@ export function createGraphql() {
     logger.debug("Running query", { id, method, operationName });
 
     const ctx: Gql.WxtQueueCtx = {
-      deps: container.registrations,
+      deps,
     };
 
     const response = await graphql({

src/plugins/context-plugin.ts

@@ -1,5 +1,7 @@
 import { createApp } from "@aklinker1/zeta";
 
-import { container } from "../dependencies";
+import { requestScope } from "../dependencies";
 
-export const contextPlugin = createApp().decorate({ deps: container.registrations }).export();
+export const contextPlugin = createApp()
+  .onTransform(() => ({ deps: requestScope({}).registrations }))
+  .export();

src/services/extension-store-provider.ts

@@ -0,0 +1,33 @@
+import { ExtensionStoreName } from "../enums";
+import type { ExtensionStore } from "./extension-store";
+
+export class ExtensionStoreProvider {
+  constructor(
+    readonly deps: {
+      chromeWebStore: ExtensionStore<Gql.ChromeExtension>;
+      firefoxAddonStore: ExtensionStore<Gql.FirefoxAddon>;
+      edgeAddonStore: ExtensionStore<Gql.EdgeAddon>;
+    },
+  ) {}
+
+  get [ExtensionStoreName.ChromeWebStore]() {
+    return this.deps.chromeWebStore;
+  }
+  get [ExtensionStoreName.ChromeExtensions]() {
+    return this.deps.chromeWebStore;
+  }
+
+  get [ExtensionStoreName.FirefoxAddonStore]() {
+    return this.deps.firefoxAddonStore;
+  }
+  get [ExtensionStoreName.FirefoxExtensions]() {
+    return this.deps.firefoxAddonStore;
+  }
+
+  get [ExtensionStoreName.EdgeAddonStore]() {
+    return this.deps.edgeAddonStore;
+  }
+  get [ExtensionStoreName.EdgeExtensions]() {
+    return this.deps.edgeAddonStore;
+  }
+}