@unito/integration-sdk 1.0.22 → 1.0.24

package/dist/src/index.cjs

@@ -117,6 +117,7 @@ class Logger {
             ...this.metadata,
             ...metadata,
             message,
+            status: logLevel,
         });
         if (process.env.NODE_ENV === 'development') {
             console[logLevel](JSON.stringify(processedMessage, null, 2));
@@ -997,14 +998,10 @@ class Integration {
         app.use(express.json());
         // Must be one of the first handlers (to catch all the errors).
         app.use(middleware$2);
+        // Instantiate internal middlewares.
         app.use(middleware);
         app.use(middleware$a);
         app.use(middleware$9);
-        app.use(middleware$8);
-        app.use(middleware$6);
-        app.use(middleware$5);
-        app.use(middleware$4);
-        app.use(middleware$7);
         // Making sure we log all incoming requests (except to '/health'), prior any processing.
         app.use((req, res, next) => {
             if (req.originalUrl !== '/health') {
@@ -1012,6 +1009,13 @@ class Integration {
             }
             next();
         });
+        // Instantiate application middlewares. These can throw, so they have an implicit dependency on the internal
+        // middlewares such as the logger, the correlationId, and the error handling.
+        app.use(middleware$8);
+        app.use(middleware$6);
+        app.use(middleware$5);
+        app.use(middleware$4);
+        app.use(middleware$7);
         // Load handlers as needed.
         if (this.handlers.length) {
             for (const handler of this.handlers) {

package/dist/src/integration.js

@@ -114,14 +114,10 @@ export default class Integration {
         app.use(express.json());
         // Must be one of the first handlers (to catch all the errors).
         app.use(finishMiddleware);
+        // Instantiate internal middlewares.
         app.use(requestStartTimeMiddleware);
         app.use(correlationIdMiddleware);
         app.use(loggerMiddleware);
-        app.use(credentialsMiddleware);
-        app.use(secretsMiddleware);
-        app.use(filtersMiddleware);
-        app.use(selectsMiddleware);
-        app.use(signalMiddleware);
         // Making sure we log all incoming requests (except to '/health'), prior any processing.
         app.use((req, res, next) => {
             if (req.originalUrl !== '/health') {
@@ -129,6 +125,13 @@ export default class Integration {
             }
             next();
         });
+        // Instantiate application middlewares. These can throw, so they have an implicit dependency on the internal
+        // middlewares such as the logger, the correlationId, and the error handling.
+        app.use(credentialsMiddleware);
+        app.use(secretsMiddleware);
+        app.use(filtersMiddleware);
+        app.use(selectsMiddleware);
+        app.use(signalMiddleware);
         // Load handlers as needed.
         if (this.handlers.length) {
             for (const handler of this.handlers) {

package/dist/src/resources/logger.js

@@ -89,6 +89,7 @@ export default class Logger {
             ...this.metadata,
             ...metadata,
             message,
+            status: logLevel,
         });
         if (process.env.NODE_ENV === 'development') {
             console[logLevel](JSON.stringify(processedMessage, null, 2));

package/dist/test/resources/logger.test.js

@@ -33,35 +33,35 @@ describe('Logger', () => {
         logger.log('test');
         assert.strictEqual(logSpy.mock.calls.length, 1);
         assert.deepEqual(logSpy.mock.calls[0]?.arguments, [
-            JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+            JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'log' }),
         ]);
         const errorSpy = testContext.mock.method(global.console, 'error', () => { });
         assert.strictEqual(errorSpy.mock.calls.length, 0);
         logger.error('test');
         assert.strictEqual(errorSpy.mock.calls.length, 1);
         assert.deepEqual(errorSpy.mock.calls[0]?.arguments, [
-            JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+            JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'error' }),
         ]);
         const warnSpy = testContext.mock.method(global.console, 'warn', () => { });
         assert.strictEqual(warnSpy.mock.calls.length, 0);
         logger.warn('test');
         assert.strictEqual(warnSpy.mock.calls.length, 1);
         assert.deepEqual(warnSpy.mock.calls[0]?.arguments, [
-            JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+            JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'warn' }),
         ]);
         const infoSpy = testContext.mock.method(global.console, 'info', () => { });
         assert.strictEqual(infoSpy.mock.calls.length, 0);
         logger.info('test');
         assert.strictEqual(infoSpy.mock.calls.length, 1);
         assert.deepEqual(infoSpy.mock.calls[0]?.arguments, [
-            JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+            JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'info' }),
         ]);
         const debugSpy = testContext.mock.method(global.console, 'debug', () => { });
         assert.strictEqual(debugSpy.mock.calls.length, 0);
         logger.debug('test');
         assert.strictEqual(debugSpy.mock.calls.length, 1);
         assert.deepEqual(debugSpy.mock.calls[0]?.arguments, [
-            JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+            JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'debug' }),
         ]);
     });
     it('merges message payload with metadata', testContext => {
@@ -77,6 +77,7 @@ describe('Logger', () => {
                 http: { method: 'GET' },
                 error: { code: '200', message: 'Page Not Found' },
                 message: 'test',
+                status: 'log',
             }),
         ]);
     });
@@ -92,6 +93,7 @@ describe('Logger', () => {
                 correlation_id: '123456789',
                 http: { status_code: 200 },
                 message: 'test',
+                status: 'log',
             }),
         ]);
     });
@@ -108,6 +110,7 @@ describe('Logger', () => {
                 http: { method: 'GET', status_code: 200 },
                 error_context: { error_code: 200, error_message: 'Page Not Found' },
                 message: 'test',
+                status: 'log',
             }),
         ]);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unito/integration-sdk",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "Integration SDK",
   "type": "module",
   "types": "dist/src/index.d.ts",

package/src/integration.ts

@@ -130,14 +130,10 @@ export default class Integration {
     // Must be one of the first handlers (to catch all the errors).
     app.use(finishMiddleware);
 
+    // Instantiate internal middlewares.
     app.use(requestStartTimeMiddleware);
     app.use(correlationIdMiddleware);
     app.use(loggerMiddleware);
-    app.use(credentialsMiddleware);
-    app.use(secretsMiddleware);
-    app.use(filtersMiddleware);
-    app.use(selectsMiddleware);
-    app.use(signalMiddleware);
 
     // Making sure we log all incoming requests (except to '/health'), prior any processing.
     app.use((req, res, next) => {
@@ -147,6 +143,14 @@ export default class Integration {
       next();
     });
 
+    // Instantiate application middlewares. These can throw, so they have an implicit dependency on the internal
+    // middlewares such as the logger, the correlationId, and the error handling.
+    app.use(credentialsMiddleware);
+    app.use(secretsMiddleware);
+    app.use(filtersMiddleware);
+    app.use(selectsMiddleware);
+    app.use(signalMiddleware);
+
     // Load handlers as needed.
     if (this.handlers.length) {
       for (const handler of this.handlers) {

package/src/resources/logger.ts

@@ -111,6 +111,7 @@ export default class Logger {
       ...this.metadata,
       ...metadata,
       message,
+      status: logLevel,
     });
 
     if (process.env.NODE_ENV === 'development') {

package/test/resources/logger.test.ts

@@ -42,7 +42,7 @@ describe('Logger', () => {
     logger.log('test');
     assert.strictEqual(logSpy.mock.calls.length, 1);
     assert.deepEqual(logSpy.mock.calls[0]?.arguments, [
-      JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+      JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'log' }),
     ]);
 
     const errorSpy = testContext.mock.method(global.console, 'error', () => {});
@@ -50,7 +50,7 @@ describe('Logger', () => {
     logger.error('test');
     assert.strictEqual(errorSpy.mock.calls.length, 1);
     assert.deepEqual(errorSpy.mock.calls[0]?.arguments, [
-      JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+      JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'error' }),
     ]);
 
     const warnSpy = testContext.mock.method(global.console, 'warn', () => {});
@@ -58,7 +58,7 @@ describe('Logger', () => {
     logger.warn('test');
     assert.strictEqual(warnSpy.mock.calls.length, 1);
     assert.deepEqual(warnSpy.mock.calls[0]?.arguments, [
-      JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+      JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'warn' }),
     ]);
 
     const infoSpy = testContext.mock.method(global.console, 'info', () => {});
@@ -66,7 +66,7 @@ describe('Logger', () => {
     logger.info('test');
     assert.strictEqual(infoSpy.mock.calls.length, 1);
     assert.deepEqual(infoSpy.mock.calls[0]?.arguments, [
-      JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+      JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'info' }),
     ]);
 
     const debugSpy = testContext.mock.method(global.console, 'debug', () => {});
@@ -74,7 +74,7 @@ describe('Logger', () => {
     logger.debug('test');
     assert.strictEqual(debugSpy.mock.calls.length, 1);
     assert.deepEqual(debugSpy.mock.calls[0]?.arguments, [
-      JSON.stringify({ correlation_id: '123456789', message: 'test' }),
+      JSON.stringify({ correlation_id: '123456789', message: 'test', status: 'debug' }),
     ]);
   });
 
@@ -92,6 +92,7 @@ describe('Logger', () => {
         http: { method: 'GET' },
         error: { code: '200', message: 'Page Not Found' },
         message: 'test',
+        status: 'log',
       }),
     ]);
   });
@@ -109,6 +110,7 @@ describe('Logger', () => {
         correlation_id: '123456789',
         http: { status_code: 200 },
         message: 'test',
+        status: 'log',
       }),
     ]);
   });
@@ -127,6 +129,7 @@ describe('Logger', () => {
         http: { method: 'GET', status_code: 200 },
         error_context: { error_code: 200, error_message: 'Page Not Found' },
         message: 'test',
+        status: 'log',
       }),
     ]);
   });