@jskit-ai/http-runtime 0.1.156 → 0.1.158

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/http-runtime",
-  "version": "0.1.156",
+  "version": "0.1.158",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -18,7 +18,7 @@
     "./shared/validators/operationValidation": "./src/shared/validators/operationValidation.js"
   },
   "dependencies": {
-    "@jskit-ai/kernel": "0.1.158",
+    "@jskit-ai/kernel": "0.1.160",
     "json-rest-schema": "^1.0.17"
   },
   "jskit": {
@@ -32,15 +32,14 @@
     },
     "runtime": {
       "server": {
-        "providerEntrypoint": "src/server/providers/HttpValidatorsServiceProvider.js",
         "providers": [
           {
-            "entrypoint": "src/server/providers/HttpValidatorsServiceProvider.js",
-            "export": "HttpValidatorsServiceProvider"
+            "entrypoint": "src/server/providers/HttpValidatorsProvider.js",
+            "export": "HttpValidatorsProvider"
           },
           {
-            "entrypoint": "src/server/providers/HttpClientRuntimeServiceProvider.js",
-            "export": "HttpClientRuntimeServiceProvider"
+            "entrypoint": "src/server/providers/HttpClientProvider.js",
+            "export": "HttpClientProvider"
           }
         ]
       },
@@ -66,35 +65,14 @@
           },
           {
             "subpath": "./server",
-            "summary": "Exports service providers only (HttpValidatorsServiceProvider, HttpClientRuntimeServiceProvider)."
+            "summary": "Provides named HTTP validation and server-side HTTP client capabilities."
           },
           {
             "subpath": "./shared",
             "summary": "Exports HTTP validator/schema utilities, with structured validator subpaths under ./shared/validators/*."
           }
-        ],
-        "containerTokens": {
-          "server": [
-            "runtime.http-client"
-          ],
-          "client": [
-            "runtime.http-client.client"
-          ]
-        }
+        ]
       }
-    },
-    "mutations": {
-      "dependencies": {
-        "runtime": {
-          "@jskit-ai/kernel": "0.1.158"
-        },
-        "dev": {}
-      },
-      "packageJson": {
-        "scripts": {}
-      },
-      "procfile": {},
-      "files": []
     }
   }
 }

package/src/client/providers/HttpClientRuntimeClientProvider.js

@@ -1,21 +1,20 @@
+import { defineProvider } from "@jskit-ai/kernel/shared/capabilities";
 import * as httpClientRuntime from "../../shared/clientRuntime/index.js";
 
 const HTTP_CLIENT_RUNTIME_CLIENT_API = Object.freeze({
   ...httpClientRuntime
 });
 
-class HttpClientRuntimeClientProvider {
-  static id = "runtime.http-client.client";
-
-  register(app) {
-    if (!app || typeof app.singleton !== "function") {
-      throw new Error("HttpClientRuntimeClientProvider requires application singleton().");
-    }
-
-    app.singleton("runtime.http-client.client", () => HTTP_CLIENT_RUNTIME_CLIENT_API);
+const HttpClientRuntimeClientProvider = defineProvider({
+  id: "runtime.http-client.client",
+  provides: {
+    httpClient: "runtime.http-client.client"
+  },
+  setup() {
+    return {
+      httpClient: HTTP_CLIENT_RUNTIME_CLIENT_API
+    };
   }
-
-  boot() {}
-}
+});
 
 export { HttpClientRuntimeClientProvider };

package/src/client/providers/HttpValidatorsClientProvider.js

@@ -1,14 +1,16 @@
-import { SingletonApiProvider } from "../../shared/providers/singletonApiProvider.js";
+import { defineProvider } from "@jskit-ai/kernel/shared/capabilities";
 import { HTTP_VALIDATORS_API } from "../../shared/validators/httpValidatorsApi.js";
 
-class HttpValidatorsClientProvider extends SingletonApiProvider {
-  static id = "validators.http.client";
-
-  static bindingToken = "validators.http.client";
-
-  static api = HTTP_VALIDATORS_API;
-
-  static providerName = "HttpValidatorsClientProvider";
-}
+const HttpValidatorsClientProvider = defineProvider({
+  id: "validators.http.client",
+  provides: {
+    validators: "validators.http.client"
+  },
+  setup() {
+    return {
+      validators: HTTP_VALIDATORS_API
+    };
+  }
+});
 
 export { HttpValidatorsClientProvider };

package/src/server/providers/HttpClientProvider.js

@@ -0,0 +1,16 @@
+import { defineProvider } from "@jskit-ai/kernel/shared/capabilities";
+import * as httpClient from "../../shared/clientRuntime/index.js";
+
+const HttpClientProvider = defineProvider({
+  id: "runtime.http-client",
+  provides: {
+    httpClient: "runtime.http-client"
+  },
+  setup() {
+    return {
+      httpClient: Object.freeze({ ...httpClient })
+    };
+  }
+});
+
+export { HttpClientProvider };

package/src/server/providers/HttpValidatorsProvider.js

@@ -0,0 +1,16 @@
+import { defineProvider } from "@jskit-ai/kernel/shared/capabilities";
+import { HTTP_VALIDATORS_API } from "../../shared/validators/httpValidatorsApi.js";
+
+const HttpValidatorsProvider = defineProvider({
+  id: "validators.http",
+  provides: {
+    validators: "validators.http"
+  },
+  setup() {
+    return {
+      validators: HTTP_VALIDATORS_API
+    };
+  }
+});
+
+export { HttpValidatorsProvider };

package/test/entrypoints.boundary.test.js

@@ -4,8 +4,8 @@ import test from "node:test";
 
 import * as clientApi from "../src/client/index.js";
 import * as sharedApi from "../src/shared/index.js";
-import { HttpValidatorsServiceProvider } from "../src/server/providers/HttpValidatorsServiceProvider.js";
-import { HttpClientRuntimeServiceProvider } from "../src/server/providers/HttpClientRuntimeServiceProvider.js";
+import { HttpValidatorsProvider } from "../src/server/providers/HttpValidatorsProvider.js";
+import { HttpClientProvider } from "../src/server/providers/HttpClientProvider.js";
 
 test("package exports include explicit shared entrypoint and no server barrel", async () => {
   const packageJson = JSON.parse(await readFile(new URL("../package.json", import.meta.url), "utf8"));
@@ -17,14 +17,14 @@ test("package exports include explicit shared entrypoint and no server barrel",
 test("client entrypoint exports client runtime helpers and client providers only", () => {
   assert.equal(typeof clientApi.createHttpClient, "function");
   assert.equal(typeof clientApi.createTransientRetryHttpClient, "function");
-  assert.equal(typeof clientApi.HttpValidatorsClientProvider, "function");
-  assert.equal(typeof clientApi.HttpClientRuntimeClientProvider, "function");
+  assert.equal(clientApi.HttpValidatorsClientProvider.id, "validators.http.client");
+  assert.equal(clientApi.HttpClientRuntimeClientProvider.id, "runtime.http-client.client");
   assert.equal(typeof clientApi.withStandardErrorResponses, "undefined");
 });
 
-test("server provider modules export server providers only", () => {
-  assert.equal(typeof HttpValidatorsServiceProvider, "function");
-  assert.equal(typeof HttpClientRuntimeServiceProvider, "function");
+test("server provider modules export declarative providers only", () => {
+  assert.equal(HttpValidatorsProvider.id, "validators.http");
+  assert.equal(HttpClientProvider.id, "runtime.http-client");
 });
 
 test("shared entrypoint exports shared validators only", () => {
@@ -41,5 +41,5 @@ test("shared entrypoint exports shared validators only", () => {
   assert.equal(typeof sharedApi.createJsonApiResourceRouteContract, "function");
   assert.equal(typeof sharedApi.withJsonApiErrorResponses, "function");
   assert.equal(typeof sharedApi.createHttpClient, "undefined");
-  assert.equal(typeof sharedApi.HttpValidatorsServiceProvider, "undefined");
+  assert.equal(typeof sharedApi.HttpValidatorsProvider, "undefined");
 });

package/test/providerRuntime.httpClient.test.js

@@ -1,35 +1,22 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { HttpClientRuntimeServiceProvider } from "../src/server/providers/HttpClientRuntimeServiceProvider.js";
-import { HttpClientRuntimeClientProvider } from "../src/client/providers/HttpClientRuntimeClientProvider.js";
+import { createCapabilityRuntime, defineProvider } from "@jskit-ai/kernel/shared/capabilities";
+import { HttpClientProvider } from "../src/server/providers/HttpClientProvider.js";
 
-function createSingletonApp() {
-  const singletons = new Map();
-  return {
-    singletons,
-    singleton(token, factory) {
-      singletons.set(token, factory(this));
+test("HttpClientProvider provides the server HTTP client API", async () => {
+  let httpClient;
+  const consumer = defineProvider({
+    id: "test.http-client.consumer",
+    requires: { value: "runtime.http-client" },
+    setup({ value }) {
+      httpClient = value;
+      return {};
     }
-  };
-}
-
-test("HttpClientRuntimeServiceProvider registers runtime http client api", () => {
-  const app = createSingletonApp();
-  const provider = new HttpClientRuntimeServiceProvider();
-  provider.register(app);
-
-  assert.equal(app.singletons.has("runtime.http-client"), true);
-  const api = app.singletons.get("runtime.http-client");
-  assert.equal(typeof api.createHttpClient, "function");
-});
-
-test("HttpClientRuntimeClientProvider registers client http client api", () => {
-  const app = createSingletonApp();
-  const provider = new HttpClientRuntimeClientProvider();
-  provider.register(app);
-
-  assert.equal(app.singletons.has("runtime.http-client.client"), true);
-  const api = app.singletons.get("runtime.http-client.client");
-  assert.equal(typeof api.createHttpClient, "function");
+  });
+  const runtime = createCapabilityRuntime({ providers: [HttpClientProvider, consumer] });
+  await runtime.start();
+  assert.equal(typeof httpClient.createHttpClient, "function");
+  assert.equal(typeof httpClient.shouldRetryForCsrfFailure, "function");
+  await runtime.shutdown();
 });

package/test/providerRuntime.validators.test.js

@@ -1,39 +1,22 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { HttpValidatorsServiceProvider } from "../src/server/providers/HttpValidatorsServiceProvider.js";
-import { HttpValidatorsClientProvider } from "../src/client/providers/HttpValidatorsClientProvider.js";
+import { createCapabilityRuntime, defineProvider } from "@jskit-ai/kernel/shared/capabilities";
+import { HttpValidatorsProvider } from "../src/server/providers/HttpValidatorsProvider.js";
 
-function createSingletonApp() {
-  const singletons = new Map();
-  return {
-    singletons,
-    singleton(token, factory) {
-      singletons.set(token, factory(this));
+test("HttpValidatorsProvider provides the shared validator API", async () => {
+  let validators;
+  const consumer = defineProvider({
+    id: "test.http-validators.consumer",
+    requires: { value: "validators.http" },
+    setup({ value }) {
+      validators = value;
+      return {};
     }
-  };
-}
-
-test("HttpValidatorsServiceProvider registers shared validators api", () => {
-  const app = createSingletonApp();
-  const provider = new HttpValidatorsServiceProvider();
-  provider.register(app);
-
-  assert.equal(app.singletons.has("validators.http"), true);
-  const api = app.singletons.get("validators.http");
-  assert.equal(typeof api.withStandardErrorResponses, "function");
-  assert.equal(typeof api.createResource, "function");
-  assert.equal(typeof api.createCommand, "function");
-});
-
-test("HttpValidatorsClientProvider registers client validators api", () => {
-  const app = createSingletonApp();
-  const provider = new HttpValidatorsClientProvider();
-  provider.register(app);
-
-  assert.equal(app.singletons.has("validators.http.client"), true);
-  const api = app.singletons.get("validators.http.client");
-  assert.equal(typeof api.withStandardErrorResponses, "function");
-  assert.equal(typeof api.createResource, "function");
-  assert.equal(typeof api.createCommand, "function");
+  });
+  const runtime = createCapabilityRuntime({ providers: [HttpValidatorsProvider, consumer] });
+  await runtime.start();
+  assert.equal(typeof validators.enumSchema, "function");
+  assert.equal(typeof validators.createResource, "function");
+  await runtime.shutdown();
 });

package/src/server/providers/HttpClientRuntimeServiceProvider.js

@@ -1,21 +0,0 @@
-import * as httpClientRuntime from "../../shared/clientRuntime/index.js";
-
-const HTTP_CLIENT_RUNTIME_API = Object.freeze({
-  ...httpClientRuntime
-});
-
-class HttpClientRuntimeServiceProvider {
-  static id = "runtime.http-client";
-
-  register(app) {
-    if (!app || typeof app.singleton !== "function") {
-      throw new Error("HttpClientRuntimeServiceProvider requires application singleton().");
-    }
-
-    app.singleton("runtime.http-client", () => HTTP_CLIENT_RUNTIME_API);
-  }
-
-  boot() {}
-}
-
-export { HttpClientRuntimeServiceProvider };

package/src/server/providers/HttpValidatorsServiceProvider.js

@@ -1,14 +0,0 @@
-import { SingletonApiProvider } from "../../shared/providers/singletonApiProvider.js";
-import { HTTP_VALIDATORS_API } from "../../shared/validators/httpValidatorsApi.js";
-
-class HttpValidatorsServiceProvider extends SingletonApiProvider {
-  static id = "validators.http";
-
-  static bindingToken = "validators.http";
-
-  static api = HTTP_VALIDATORS_API;
-
-  static providerName = "HttpValidatorsServiceProvider";
-}
-
-export { HttpValidatorsServiceProvider };

package/src/shared/providers/singletonApiProvider.js

@@ -1,27 +0,0 @@
-class SingletonApiProvider {
-  static bindingToken = "";
-
-  static api = null;
-
-  static providerName = "SingletonApiProvider";
-
-  register(app) {
-    if (!app || typeof app.singleton !== "function") {
-      throw new Error(`${this.constructor.providerName} requires application singleton().`);
-    }
-
-    const bindingToken = String(this.constructor.bindingToken || "").trim();
-    if (!bindingToken) {
-      throw new Error(`${this.constructor.providerName} requires static bindingToken.`);
-    }
-    if (!this.constructor.api || typeof this.constructor.api !== "object") {
-      throw new Error(`${this.constructor.providerName} requires static api object.`);
-    }
-
-    app.singleton(bindingToken, () => this.constructor.api);
-  }
-
-  boot() {}
-}
-
-export { SingletonApiProvider };