Query-Doctor
diff --git a/‎nodejs/sqlcommenter-nodejs/packages/sqlcommenter-knex/hooks.js‎
Lines changed: 28 additions & 0 deletions b/‎nodejs/sqlcommenter-nodejs/packages/sqlcommenter-knex/hooks.js‎
Lines changed: 28 additions & 0 deletions
diff --git a/‎nodejs/sqlcommenter-nodejs/packages/sqlcommenter-knex/index.js‎
Lines changed: 7 additions & 15 deletions b/‎nodejs/sqlcommenter-nodejs/packages/sqlcommenter-knex/index.js‎
Lines changed: 7 additions & 15 deletions
@@ -0,0 +1,28 @@
+const hooks = require('async_hooks')
+const store = new Map();
+
+const hook = hooks.createHook({
+    init: (asyncId, _, triggerAsyncId) => {
+        if (store.has(triggerAsyncId)) {
+            store.set(asyncId, store.get(triggerAsyncId))
+        }
+    },
+    destroy: (asyncId) => {
+        if (store.has(asyncId)) {
+            store.delete(asyncId)
+        }
+    }
+});
+
+hook.enable();
+
+const createContext = (data) => {
+    store.set(hooks.executionAsyncId(), data);
+    return data;
+};
+
+const getContext = () => {
+    return store.get(hooks.executionAsyncId());
+};
+
+module.exports = { createContext, getContext };
@@ -14,6 +14,7 @@
 
 const {hasComment} = require('./util');
 const provider = require('./provider');
+const hook = require('./hooks');
 
 const defaultFields = {
     'route': true,
@@ -63,16 +64,11 @@ exports.wrapMainKnex = (Knex, include={}, options={}) => {
             db_driver: `knex:${knexVersion}`
         };
 
-        // TODO: Perhaps remove uuid as it is highly ephemeral?
-        // comments.uuid = obj.__knexQueryUid;
-
         if (Knex.__middleware__) {
-            const req = Knex.__req__;
-
-            comments['route'] = req.path;
-
-            // TODO: Clear out __req__ for the next usage.
-            // Knex.__req__ = null;
+            const context = hook.getContext();
+            if (context && context.req) {
+                comments.route = context.req.route.path;
+            }
         }
 
         // Add trace context to comments, depending on the current provider.
@@ -150,13 +146,9 @@ exports.wrapMainKnexAsMiddleware = (Knex, include=null, options) => {
     exports.wrapMainKnex(Knex, include, options);
 
     return (req, res, next) => {
-
+        data = { req: req };
+        hook.createContext(data);
         Knex.__middleware__ = true;
-        Knex.__req__ = req;
-
-        // TODO: Perhaps grab the view/controller name.
-        //       Usually req.route.path is useful enough to correlate
-        //       where/what source code originates.
         next();
     }
 }