inertia-sails 1.0.1 → 1.2.0

package/index.js

@@ -126,6 +126,23 @@ module.exports = function defineInertiaHook(sails) {
       })
     },
 
+    /**
+     * Hook routes - sets up AsyncLocalStorage context early so other hooks
+     * can use sails.inertia.share() with proper request-scoped context.
+     */
+    routes: {
+      before: {
+        'GET /*': {
+          skipAssets: true,
+          fn: (req, res, next) => requestContext.run(req, res, next)
+        },
+        'POST /*': (req, res, next) => requestContext.run(req, res, next),
+        'PUT /*': (req, res, next) => requestContext.run(req, res, next),
+        'PATCH /*': (req, res, next) => requestContext.run(req, res, next),
+        'DELETE /*': (req, res, next) => requestContext.run(req, res, next)
+      }
+    },
+
     /**
      * Share a property for the current request.
      * Uses AsyncLocalStorage to ensure data doesn't leak between concurrent requests.
@@ -172,9 +189,11 @@ module.exports = function defineInertiaHook(sails) {
     },
 
     /**
-     * Flush shared properties
+     * Flush shared properties for the current request.
+     * Since context is set up early in routes.before, this always works
+     * in hooks and middleware.
      * @param {string|null} key - The key of the property to flush, or null to flush all
-     * @param {boolean} [global=false] - Whether to flush global props
+     * @param {boolean} [global=false] - Whether to also flush global props (rarely needed)
      */
     flushShared(key, global = false) {
       const context = requestContext.getContext()

package/lib/middleware/inertia-middleware.js

@@ -2,39 +2,29 @@ const resolveValidationErrors = require('../helpers/resolve-validation-errors')
 const requestContext = require('../helpers/request-context')
 
 /**
- * Inertia middleware that handles validation errors and request context.
+ * Inertia middleware that handles validation errors.
  *
- * Uses AsyncLocalStorage to make the request available throughout the
- * request lifecycle without explicitly passing it.
+ * Note: AsyncLocalStorage context is set up earlier in routes.before
+ * (see index.js) so that other hooks can use sails.inertia.share()
+ * with proper request context.
  *
- * This enables request-scoped features:
- * - sails.inertia.share() - Per-request shared props (prevents data leaking between users)
- * - sails.inertia.flash() - Per-request flash messages
- * - sails.inertia.encryptHistory() - Per-request history encryption
- * - sails.inertia.clearHistory() - Per-request history clearing
+ * This middleware handles:
+ * - Validation errors from redirects (shared as 'errors' prop)
  *
  * @param {Object} hook - The inertia-sails hook instance
  * @returns {Function} Express/Sails middleware function
  */
 function inertia(hook) {
   return function inertiaMiddleware(req, res, next) {
-    // Skip Inertia middleware for WebSocket requests
-    if (req.isSocket) {
-      return next()
-    }
+    // Skip for WebSocket requests (they don't have req.flash)
+    if (req.isSocket) return next()
 
-    // Wrap the rest of the request in AsyncLocalStorage context
-    // This makes req/res and request-scoped data available anywhere
-    requestContext.run(req, res, () => {
-      // Handle validation errors - share them for this request only
-      const validationErrors = resolveValidationErrors(req)
-      req.flash('errors', validationErrors)
-
-      // Share errors for this request (request-scoped, not global)
-      requestContext.setSharedProp('errors', req.flash('errors')[0] || {})
-
-      return next()
-    })
+    // Handle validation errors - share them for this request only
+    // Context is already set up by routes.before in index.js
+    const validationErrors = resolveValidationErrors(req)
+    req.flash('errors', validationErrors)
+    requestContext.setSharedProp('errors', req.flash('errors')[0] || {})
+    return next()
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inertia-sails",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "The Sails adapter for Inertia.",
   "main": "index.js",
   "sails": {