velocious 1.0.472 → 1.0.473

package/src/frontend-model-controller.js

@@ -638,11 +638,15 @@ export default class FrontendModelController extends Controller {
    */
   async withFrontendModelRequestContext(params, response, callback) {
     const configuration = this.getConfiguration()
-    const tenant = await configuration.resolveTenant({
-      params,
-      request: this.request(),
-      response
-    })
+    const tenant = configuration.getTenantResolver()
+      ? await configuration.ensureConnections({name: "Frontend model request tenant resolution"}, async () => {
+          return await configuration.resolveTenant({
+            params,
+            request: this.request(),
+            response
+          })
+        })
+      : undefined
 
     return await configuration.runWithTenant(tenant, async () => {
       return await configuration.ensureConnections({name: "Frontend model request"}, async () => {

package/src/frontend-models/websocket-channel.js

@@ -106,15 +106,6 @@ export default class FrontendModelWebsocketChannel extends VelociousWebsocketCha
    * @returns {Promise<void>} Resolves after delivery.
    */
   async deliverBroadcast(body, meta) {
-    const configuration = this.session.configuration
-
-    if (configuration) {
-      await configuration.ensureConnections({name: "Frontend model websocket broadcast"}, async () => {
-        await this._deliverBroadcast(body, meta)
-      })
-      return
-    }
-
     await this._deliverBroadcast(body, meta)
   }
 
@@ -367,6 +358,29 @@ export default class FrontendModelWebsocketChannel extends VelociousWebsocketCha
     return controller
   }
 
+  /**
+   * Resolves tenant for event.
+   * @param {string | number} id - Event record id.
+   * @returns {Promise<?>} - Resolved tenant.
+   */
+  async _resolveEventTenant(id) {
+    const configuration = this.session.configuration
+
+    return await configuration.ensureConnections({name: "Frontend model websocket event tenant resolution"}, async () => {
+      // Mirror the subscribe-time tenant resolution (`WebsocketSession._resolveTenant`):
+      // pass `subscription: {channel, params}` so resolvers that derive scope from the
+      // subscription behave the same for broadcasts as they did at `channel-subscribe`.
+      // The synthetic request forwards the subscriber's params (e.g. authenticationToken),
+      // matching this channel's ability resolution above.
+      return await configuration.resolveTenant({
+        params: {...this.params, id, model: this._modelName()},
+        request: /** @type {import("../http-server/client/request.js").default} */ (this._syntheticRequest()),
+        response: new Response({configuration}),
+        subscription: {channel: FRONTEND_MODELS_CHANNEL_NAME, params: this.params}
+      })
+    })
+  }
+
   /**
    * Resolves the subscriber's tenant for the broadcast record and runs `callback` inside that tenant
    * context. Broadcast delivery runs in whatever ambient tenant context the publisher left behind. For
@@ -388,17 +402,7 @@ export default class FrontendModelWebsocketChannel extends VelociousWebsocketCha
       return await callback()
     }
 
-    // Mirror the subscribe-time tenant resolution (`WebsocketSession._resolveTenant`):
-    // pass `subscription: {channel, params}` so resolvers that derive scope from the
-    // subscription behave the same for broadcasts as they did at `channel-subscribe`.
-    // The synthetic request forwards the subscriber's params (e.g. authenticationToken),
-    // matching this channel's ability resolution above.
-    const tenant = await configuration.resolveTenant({
-      params: {...this.params, id, model: this._modelName()},
-      request: /** @type {import("../http-server/client/request.js").default} */ (this._syntheticRequest()),
-      response: new Response({configuration}),
-      subscription: {channel: FRONTEND_MODELS_CHANNEL_NAME, params: this.params}
-    })
+    const tenant = await this._resolveEventTenant(id)
 
     // Always enter `runWithTenant`, even when no tenant resolved. Broadcast fan-out
     // runs in the publisher's ambient tenant context; falling back to `callback()`

package/src/routes/resolver.js

@@ -202,12 +202,14 @@ export default class VelociousRoutesResolver {
     await this._logActionStart({action, controllerClass, logMethod})
 
     try {
-      const tenant = skipTenantResolution
+      const tenant = skipTenantResolution || !this.configuration.getTenantResolver()
         ? undefined
-        : await this.configuration.resolveTenant({
-            params: {...this.queryParameters(), ...this.params},
-            request: this.request,
-            response: this.response
+        : await this.configuration.ensureConnections({name: `${controllerClass.name}.${action} tenant resolution`}, async () => {
+            return await this.configuration.resolveTenant({
+              params: {...this.queryParameters(), ...this.params},
+              request: this.request,
+              response: this.response
+            })
           })
 
       const runAction = async () => {