@jskit-ai/users-web 0.1.106 → 0.1.107

package/package.descriptor.mjs

@@ -3,7 +3,7 @@ import { HOME_COG_OUTLET } from "./src/shared/toolsOutletContracts.js";
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-web",
-  version: "0.1.106",
+  version: "0.1.107",
   kind: "runtime",
   description: "Users web module: account/profile UI plus shared users web widgets.",
   dependsOn: [
@@ -278,12 +278,12 @@ export default Object.freeze({
     dependencies: {
       runtime: {
         "@mdi/js": "^7.4.47",
-        "@jskit-ai/http-runtime": "0.1.90",
-        "@jskit-ai/realtime": "0.1.90",
-        "@jskit-ai/kernel": "0.1.91",
-        "@jskit-ai/shell-web": "0.1.90",
-        "@jskit-ai/uploads-image-web": "0.1.69",
-        "@jskit-ai/users-core": "0.1.101"
+        "@jskit-ai/http-runtime": "0.1.91",
+        "@jskit-ai/realtime": "0.1.91",
+        "@jskit-ai/kernel": "0.1.92",
+        "@jskit-ai/shell-web": "0.1.91",
+        "@jskit-ai/uploads-image-web": "0.1.70",
+        "@jskit-ai/users-core": "0.1.102"
       },
       dev: {}
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-web",
-  "version": "0.1.106",
+  "version": "0.1.107",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -44,12 +44,12 @@
   },
   "dependencies": {
     "@mdi/js": "^7.4.47",
-    "@jskit-ai/http-runtime": "0.1.90",
-    "@jskit-ai/kernel": "0.1.91",
-    "@jskit-ai/realtime": "0.1.90",
-    "@jskit-ai/shell-web": "0.1.90",
-    "@jskit-ai/uploads-image-web": "0.1.69",
-    "@jskit-ai/users-core": "0.1.101"
+    "@jskit-ai/http-runtime": "0.1.91",
+    "@jskit-ai/kernel": "0.1.92",
+    "@jskit-ai/realtime": "0.1.91",
+    "@jskit-ai/shell-web": "0.1.91",
+    "@jskit-ai/uploads-image-web": "0.1.70",
+    "@jskit-ai/users-core": "0.1.102"
   },
   "peerDependencies": {
     "@tanstack/vue-query": "^5.90.5",

package/src/client/composables/records/useAddEdit.js

@@ -29,6 +29,7 @@ function useAddEdit({
   readMethod = "GET",
   readEnabled = true,
   writeMethod = "PATCH",
+  client = null,
   transport = null,
   requestRecovery = null,
   requestRecoveryLabel = "Resource",
@@ -119,6 +120,7 @@ function useAddEdit({
     queryKey: requestQueryRuntime.queryKey,
     path: operationScope.apiPath,
     enabled: queryCanRun,
+    client,
     readMethod,
     writeMethod,
     readQuery: requestQueryRuntime.requestQuery,

package/src/client/composables/records/useList.js

@@ -43,6 +43,7 @@ function useList({
   initialPageParam = null,
   getNextPageParam,
   selectItems,
+  client = null,
   transport = null,
   requestOptions,
   queryOptions,
@@ -224,6 +225,7 @@ function useList({
     queryKey: listQueryKey,
     path: listPath,
     enabled: operationScope.queryCanRun(canView),
+    client,
     transport,
     initialPageParam,
     getNextPageParam,

package/src/client/composables/records/useView.js

@@ -20,6 +20,7 @@ function useView({
   viewPermissions = [],
   readMethod = "GET",
   readEnabled = true,
+  client = null,
   transport = null,
   requestRecovery = null,
   requestRecoveryLabel = "Resource",
@@ -103,6 +104,7 @@ function useView({
     queryKey: requestQueryRuntime.queryKey,
     path: operationScope.apiPath,
     enabled: operationScope.queryCanRun(canView),
+    client,
     readMethod,
     readQuery: requestQueryRuntime.requestQuery,
     transport,

package/src/client/composables/runtime/useEndpointResource.js

@@ -1,6 +1,6 @@
 import { computed, unref } from "vue";
 import { useMutation, useQuery } from "@tanstack/vue-query";
-import { usersWebHttpClient } from "../../lib/httpClient.js";
+import { getUsersWebHttpClient } from "../../lib/httpClient.js";
 import { asPlainObject } from "../support/scopeHelpers.js";
 import { resolveEnabledRef, resolveTextRef } from "../support/refValueHelpers.js";
 import { toQueryErrorMessage } from "../support/errorMessageHelpers.js";
@@ -67,7 +67,7 @@ function useEndpointResource({
   queryKey,
   path = "",
   enabled = true,
-  client = usersWebHttpClient,
+  client = null,
   readMethod = "GET",
   writeMethod = "PATCH",
   readQuery = null,
@@ -81,7 +81,8 @@ function useEndpointResource({
   fallbackLoadError = "Unable to load resource.",
   fallbackSaveError = "Unable to save resource."
 } = {}) {
-  if (!client || typeof client.request !== "function") {
+  const activeClient = client || getUsersWebHttpClient();
+  if (!activeClient || typeof activeClient.request !== "function") {
     throw new TypeError("useEndpointResource requires a client with request().");
   }
 
@@ -96,7 +97,7 @@ function useEndpointResource({
         throw new Error("Resource path is required.");
       }
 
-      return client.request(requestPath, {
+      return activeClient.request(requestPath, {
         ...buildEndpointReadRequestOptions({
           method: readMethod,
           query: readQuery,
@@ -137,7 +138,7 @@ function useEndpointResource({
       const method = String(options.method || writeMethod || "PATCH").toUpperCase();
       const hasBody = Object.hasOwn(options, "body");
       const body = hasBody ? options.body : options.payload;
-      return client.request(
+      return activeClient.request(
         requestPath,
         buildEndpointWriteRequestOptions({
           method,

package/src/client/composables/runtime/useListCore.js

@@ -1,5 +1,5 @@
 import { computed, unref } from "vue";
-import { usersWebHttpClient } from "../../lib/httpClient.js";
+import { getUsersWebHttpClient } from "../../lib/httpClient.js";
 import { asPlainObject } from "../support/scopeHelpers.js";
 import { resolveEnabledRef, resolveTextRef } from "../support/refValueHelpers.js";
 import { usePagedCollection } from "../usePagedCollection.js";
@@ -56,7 +56,7 @@ function useListCore({
   queryKey,
   path = "",
   enabled = true,
-  client = usersWebHttpClient,
+  client = null,
   transport = null,
   initialPageParam = null,
   getNextPageParam,
@@ -67,7 +67,8 @@ function useListCore({
   requestRecoveryLabel = "List",
   fallbackLoadError = "Unable to load list."
 } = {}) {
-  if (!client || typeof client.request !== "function") {
+  const activeClient = client || getUsersWebHttpClient();
+  if (!activeClient || typeof activeClient.request !== "function") {
     throw new TypeError("useListCore requires a client with request().");
   }
 
@@ -84,7 +85,7 @@ function useListCore({
         throw new Error("List path is required.");
       }
 
-      return client.request(
+      return activeClient.request(
         requestPath,
         buildListRequestOptions({
           requestOptions,

package/src/client/composables/useCommand.js

@@ -17,6 +17,7 @@ function useCommand({
   apiSuffix = "",
   runPermissions = [],
   writeMethod = "POST",
+  client = null,
   transport = null,
   placementSource = "users-web.command",
   fallbackRunError = "Unable to complete action.",
@@ -52,6 +53,7 @@ function useCommand({
   const resource = useEndpointResource({
     path: operationScope.apiPath,
     enabled: false,
+    client,
     writeMethod,
     transport,
     fallbackSaveError: fallbackRunError

package/src/client/lib/httpClient.js

@@ -1,10 +1,47 @@
 import { createTransientRetryHttpClient } from "@jskit-ai/http-runtime/client";
 
-const usersWebHttpClient = createTransientRetryHttpClient({
-  credentials: "include",
-  csrf: {
-    sessionPath: "/api/session"
-  }
-});
-
-export { usersWebHttpClient };
+function normalizeOptions(value = null) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+
+function createUsersWebHttpClient(options = {}) {
+  const source = normalizeOptions(options);
+  const sourceCsrf = normalizeOptions(source.csrf);
+
+  return createTransientRetryHttpClient({
+    ...source,
+    credentials: source.credentials ?? "include",
+    csrf: {
+      sessionPath: "/api/session",
+      ...sourceCsrf
+    }
+  });
+}
+
+let usersWebHttpClient = createUsersWebHttpClient();
+
+function configureUsersWebHttpClient(optionsOrClient = {}) {
+  const source = normalizeOptions(optionsOrClient);
+  usersWebHttpClient =
+    typeof source.request === "function"
+      ? source
+      : createUsersWebHttpClient(source);
+  return usersWebHttpClient;
+}
+
+function getUsersWebHttpClient() {
+  return usersWebHttpClient;
+}
+
+function resetUsersWebHttpClientForTests() {
+  usersWebHttpClient = createUsersWebHttpClient();
+  return usersWebHttpClient;
+}
+
+export {
+  configureUsersWebHttpClient,
+  createUsersWebHttpClient,
+  getUsersWebHttpClient,
+  resetUsersWebHttpClientForTests,
+  usersWebHttpClient
+};

package/test/requestTransportOptions.test.js

@@ -9,6 +9,11 @@ import {
   buildEndpointWriteRequestOptions,
   useEndpointResource
 } from "../src/client/composables/runtime/useEndpointResource.js";
+import { useCommand } from "../src/client/composables/useCommand.js";
+import {
+  configureUsersWebHttpClient,
+  resetUsersWebHttpClientForTests
+} from "../src/client/lib/httpClient.js";
 import { buildListRequestOptions } from "../src/client/composables/runtime/useListCore.js";
 import {
   resolveOperationRealtimeOptions
@@ -287,3 +292,114 @@ test("endpoint resource reads attach request recovery metadata to query options"
     requestRecoveryMethod: "GET"
   });
 });
+
+test("endpoint resources use the configured users-web HTTP client by default", async () => {
+  const queryClient = new QueryClient();
+  const calls = [];
+  let resource = null;
+  configureUsersWebHttpClient({
+    csrf: {
+      enabled: false
+    },
+    resolveRequestUrl(url) {
+      return url.replace(/^\/api\//u, "/api/app/beepollen/");
+    },
+    fetchImpl: async (url, options) => {
+      calls.push([url, options]);
+      return {
+        ok: true,
+        status: 200,
+        headers: {
+          get(name) {
+            return String(name || "").toLowerCase() === "content-type"
+              ? "application/json; charset=utf-8"
+              : "";
+          }
+        },
+        async json() {
+          return {
+            ok: true
+          };
+        }
+      };
+    }
+  });
+
+  try {
+    const app = createSSRApp({
+      setup() {
+        resource = useEndpointResource({
+          queryKey: ["vibe64-sessions"],
+          path: "/api/vibe64/sessions"
+        });
+        return () => h("div");
+      }
+    });
+    app.use(VueQueryPlugin, {
+      queryClient
+    });
+    await renderToString(app);
+
+    await resource.reload();
+
+    assert.equal(calls.at(-1)?.[0], "/api/app/beepollen/vibe64/sessions");
+  } finally {
+    resetUsersWebHttpClientForTests();
+  }
+});
+
+test("commands use the configured users-web HTTP client by default", async () => {
+  const queryClient = new QueryClient();
+  const calls = [];
+  let command = null;
+  configureUsersWebHttpClient({
+    csrf: {
+      enabled: false
+    },
+    resolveRequestUrl(url) {
+      return url.replace(/^\/api\//u, "/api/app/beepollen/");
+    },
+    fetchImpl: async (url, options) => {
+      calls.push([url, options]);
+      return {
+        ok: true,
+        status: 200,
+        headers: {
+          get(name) {
+            return String(name || "").toLowerCase() === "content-type"
+              ? "application/json; charset=utf-8"
+              : "";
+          }
+        },
+        async json() {
+          return {
+            ok: true
+          };
+        }
+      };
+    }
+  });
+
+  try {
+    const app = createSSRApp({
+      setup() {
+        command = useCommand({
+          access: "always",
+          apiSuffix: "/vibe64/sessions"
+        });
+        return () => h("div");
+      }
+    });
+    app.use(VueQueryPlugin, {
+      queryClient
+    });
+    await renderToString(app);
+
+    await command.run();
+
+    assert.equal(calls.at(-1)?.[0], "/api/app/beepollen/vibe64/sessions");
+    assert.equal(calls.at(-1)?.[1]?.method, "POST");
+  } finally {
+    resetUsersWebHttpClientForTests();
+  }
+});