typed-bridge 2.0.13 → 2.0.15

package/dist/bridge/index.js

@@ -27,7 +27,7 @@ const createBridge = (bridge, port, path = '/bridge') => {
     app.use(express_1.default.json());
     app.use(express_1.default.urlencoded({ extended: true }));
     // Typed bridge middleware
-    let requestId = 1;
+    let requestId = 0;
     app.use((req, res, next) => {
         const _req = req;
         const xForwardedFor = req.headers['x-forwarded-for'];
@@ -36,16 +36,16 @@ const createBridge = (bridge, port, path = '/bridge') => {
             : (xForwardedFor || '').split(', ')[0] || req.socket.remoteAddress || '';
         if (ip === '::1')
             ip = '127.0.0.1';
+        // Set typed bridge header
+        res.setHeader('X-Powered-By', 'typed-bridge');
+        requestId++;
         // Bind data
         _req.bind = {
-            id: 0,
+            id: requestId,
             ts: Date.now(),
             args: {},
             ip
         };
-        // Set typed bridge header
-        res.setHeader('X-Powered-By', 'typed-bridge');
-        requestId++;
         // Log request
         if (__1.tbConfig.logs.request) {
             console.log(chalk_1.default.blueBright(`REQ | ${new Date().toISOString()} | ${requestId} :: ${req.method} | ${req.path} | ${ip}`));
@@ -93,9 +93,11 @@ const createBridge = (bridge, port, path = '/bridge') => {
 };
 exports.createBridge = createBridge;
 const bridgeHandler = (bridge) => async (req, res) => {
+    let args = {};
+    let context = {};
     try {
         const path = req.path.split('/').pop() || '';
-        const args = req.body;
+        args = req.body;
         if (!path)
             throw new Error('Bridge not found!');
         const serverFunction = bridge[path];
@@ -105,7 +107,7 @@ const bridgeHandler = (bridge) => async (req, res) => {
                 console.error(error);
             return res.status(404).json({ error });
         }
-        let context = {};
+        context = {};
         for (const middleware of middlewares) {
             if ((0, helpers_1.matchesPattern)(path, middleware.pattern)) {
                 const result = await middleware.handler(req, res);
@@ -118,13 +120,18 @@ const bridgeHandler = (bridge) => async (req, res) => {
         res.json((await serverFunction(args, context)) || {});
     }
     catch (error) {
+        const id = req.bind?.id;
+        if (__1.tbConfig.logs.argsOnError)
+            console.error(`ARGS | ${id} ::`, JSON.stringify(args, null, 2));
+        if (__1.tbConfig.logs.contextOnError)
+            console.error(`CONTEXT | ${id} ::`, JSON.stringify(context, null, 2));
         if (Array.isArray(error.errors)) {
             const keyPath = error.errors[0].path.join('/');
             const errorMessage = (keyPath ? keyPath + ': ' : '') + error.errors[0].message;
             return res.status(400).send(errorMessage);
         }
         if (__1.tbConfig.logs.error)
-            console.error(error);
+            console.error(`ERROR | ${id} ::`, error);
         return res.status(500).json({ error: error.message });
     }
 };

package/dist/config/index.d.ts

@@ -3,6 +3,8 @@ interface config {
         request: boolean;
         response: boolean;
         error: boolean;
+        argsOnError: boolean;
+        contextOnError: boolean;
     };
     responseDelay: number;
 }

package/dist/config/index.js

@@ -5,7 +5,9 @@ exports.config = {
     logs: {
         request: true,
         response: true,
-        error: true
+        error: true,
+        argsOnError: true,
+        contextOnError: true
     },
     responseDelay: 0
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "typed-bridge",
     "description": "Strictly typed server functions for typescript apps",
-    "version": "2.0.13",
+    "version": "2.0.15",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "author": "neilveil",