@substrate/api-sidecar 19.1.0 → 19.2.1

package/build/src/{util/metrics.d.ts → metrics/Metrics.d.ts}

@@ -1,14 +1,9 @@
 import { Request, Response } from 'express';
+import client from 'prom-client';
 interface IAppConfiguration {
     port: number;
     host: string;
 }
-export declare const enum MetricType {
-    Counter = "counter",
-    Gauge = "gauge",
-    Histogram = "histogram",
-    Summary = "summary"
-}
 interface Query extends Request {
     route: {
         path: string;
@@ -25,11 +20,11 @@ export default class Metrics_App {
     /**
      * @param appConfig configuration for app.
      */
-    constructor({ host }: IAppConfiguration);
+    constructor({ host, port }: IAppConfiguration);
     listen(): void;
+    getRegisteredMetrics(): Record<string, client.Metric>;
     private createMetricByType;
     private getRoute;
-    private blocksControllerMetrics;
     preMiddleware(): (req: Query, res: Response, next: () => void) => void;
     private init;
 }

package/build/src/{util/metrics.js → metrics/Metrics.js}

@@ -6,81 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
 const prom_client_1 = __importDefault(require("prom-client"));
 const Log_1 = require("../logging/Log");
-const parseArgs_1 = require("../parseArgs");
-const metrics = [
-    {
-        name: 'request_errors_total',
-        help: 'Number of HTTP Errors',
-        type: "counter" /* MetricType.Counter */,
-    },
-    {
-        name: 'request_success_total',
-        help: 'Number of HTTP Success',
-        type: "counter" /* MetricType.Counter */,
-    },
-    {
-        name: 'requests_total',
-        help: 'Total number of HTTP Requests',
-        type: "counter" /* MetricType.Counter */,
-    },
-    {
-        name: 'request_duration_seconds',
-        help: 'Duration of HTTP requests in seconds',
-        labels: ['method', 'route', 'status_code'],
-        buckets: [0.1, 0.5, 1, 1.5, 2, 3, 4, 5],
-        type: "histogram" /* MetricType.Histogram */,
-    },
-    {
-        name: 'response_size_bytes_seconds',
-        help: 'Size of HTTP responses in bytes',
-        labels: ['method', 'route', 'status_code'],
-        buckets: [100, 500, 1000, 5000, 10000, 50000, 100000, 500000, 1000000, 5000000],
-        type: "histogram" /* MetricType.Histogram */,
-    },
-    {
-        name: 'response_size_latency_ratio_seconds',
-        help: 'Ratio of response size to latency',
-        labels: ['method', 'route', 'status_code'],
-        buckets: [64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144],
-        type: "histogram" /* MetricType.Histogram */,
-    },
-    {
-        name: 'extrinsics_in_request_count',
-        help: 'Number of extrinsics in a request',
-        type: "histogram" /* MetricType.Histogram */,
-        buckets: [5, 10, 20, 40, 80, 160, 320, 640, 1280, 2560, 5120, 10240, 20480],
-        labels: ['method', 'route', 'status_code'],
-    },
-    {
-        name: 'extrinsics_per_second_count',
-        help: 'Number of extrinsics per second',
-        type: "histogram" /* MetricType.Histogram */,
-        labels: ['method', 'route', 'status_code'],
-        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
-    },
-    {
-        name: 'extrinsics_per_block_count',
-        help: 'Average number of extrinsics per block',
-        type: "histogram" /* MetricType.Histogram */,
-        labels: ['method', 'route', 'status_code'],
-        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
-    },
-    {
-        name: 'seconds_per_block_count',
-        help: 'Average seconds per block',
-        type: "histogram" /* MetricType.Histogram */,
-        labels: ['method', 'route', 'status_code'],
-        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
-    },
-];
+const SidecarConfig_1 = require("../SidecarConfig");
+const _1 = require(".");
 class Metrics_App {
     /**
      * @param appConfig configuration for app.
      */
-    constructor({ host }) {
-        const args = (0, parseArgs_1.parseArgs)();
-        this.includeQueryParams = !!args.prometheus_queryparams;
-        this.port = Number(args.prometheus_port);
+    constructor({ host, port }) {
+        this.includeQueryParams = SidecarConfig_1.SidecarConfig.config.METRICS.INCLUDE_QUERYPARAMS;
+        this.port = port;
         this.app = (0, express_1.default)();
         this.host = host;
         this.registry = new prom_client_1.default.Registry();
@@ -93,6 +27,9 @@ class Metrics_App {
             logger.info(`Metrics Server started at http://${this.host}:${this.port}/metrics`);
         });
     }
+    getRegisteredMetrics() {
+        return this.metrics;
+    }
     createMetricByType(prefix = 'sas', metric) {
         const prefixedName = prefix + '_' + metric.name;
         if (prefixedName in this.metrics) {
@@ -164,72 +101,19 @@ class Metrics_App {
         }
         return route;
     }
-    blocksControllerMetrics(req, res, end) {
-        var _a, _b;
-        const body = res.locals.body;
-        if (((_a = req.params) === null || _a === void 0 ? void 0 : _a.number) && !Array.isArray(body)) {
-            const extrinscs = body.extrinsics ? body.extrinsics.length : 0;
-            const extrinsics_per_second = this.metrics['sas_extrinsics_per_second_count'];
-            const seconds = end();
-            extrinsics_per_second
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(extrinscs / seconds);
-            const extrinsics_per_block = this.metrics['sas_extrinsics_per_block_count'];
-            const blocks = 1;
-            extrinsics_per_block
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(extrinscs / blocks);
-            const seconds_per_block = this.metrics['sas_seconds_per_block_count'];
-            seconds_per_block
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(seconds / blocks);
-        }
-        if ((_b = req.query) === null || _b === void 0 ? void 0 : _b.range) {
-            let totExtrinsics = 0;
-            if (Array.isArray(body)) {
-                totExtrinsics = body.reduce((current, block) => {
-                    const extrinsics = block['extrinsics'];
-                    if (Array.isArray(extrinsics)) {
-                        return current + extrinsics.length;
-                    }
-                    return current;
-                }, 0);
-            }
-            else {
-                const extrinsics = body['extrinsics'];
-                if (Array.isArray(extrinsics)) {
-                    totExtrinsics = extrinsics.length;
-                }
-            }
-            const extrinsics_in_request = this.metrics['sas_extrinsics_in_request_count'];
-            extrinsics_in_request
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(totExtrinsics);
-            const extrinsics_per_second = this.metrics['sas_extrinsics_per_second_count'];
-            const seconds = end();
-            extrinsics_per_second
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(totExtrinsics / seconds);
-            const extrinsics_per_block = this.metrics['sas_extrinsics_per_block_count'];
-            const blocks = Array.isArray(body) ? body.length : 1;
-            extrinsics_per_block
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(totExtrinsics / blocks);
-            const seconds_per_block = this.metrics['sas_seconds_per_block_count'];
-            seconds_per_block
-                .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
-                .observe(seconds / blocks);
-        }
-    }
     preMiddleware() {
         return (req, res, next) => {
-            const tot_requests = this.metrics['sas_requests_total'];
+            const tot_requests = this.metrics['sas_http_requests'];
             // request count metrics
             if (req.originalUrl != '/favicon.ico') {
                 tot_requests.inc();
             }
             const request_duration_seconds = this.metrics['sas_request_duration_seconds'];
             const end = request_duration_seconds.startTimer();
+            res.locals.metrics = {
+                timer: end,
+                registry: this.metrics,
+            };
             const oldJson = res.json;
             res.json = (body) => {
                 res.locals.body = body;
@@ -237,11 +121,11 @@ class Metrics_App {
             };
             res.once('finish', () => {
                 if (res.statusCode >= 400 && req.originalUrl != '/favicon.ico') {
-                    const request_errors = this.metrics['sas_request_errors'];
+                    const request_errors = this.metrics['sas_http_request_error'];
                     request_errors.inc();
                 }
                 else if (res.statusCode < 400) {
-                    const request_success = this.metrics['sas_request_errors_total'];
+                    const request_success = this.metrics['sas_http_request_success'];
                     request_success.inc();
                 }
                 let resContentLength = '0';
@@ -251,19 +135,16 @@ class Metrics_App {
                 else if (res.hasHeader('Content-Length')) {
                     resContentLength = res.getHeader('Content-Length');
                 }
-                // route specific metrics
-                if (this.getRoute(req).includes('blocks')) {
-                    this.blocksControllerMetrics(req, res, end);
-                }
+                // Generic Metrics per route (latency, response size, response size to latency ratio)
                 // response size metrics
-                const response_size_bytes = this.metrics['sas_response_size_bytes_seconds'];
+                const response_size_bytes = this.metrics['sas_response_size_bytes'];
                 response_size_bytes
                     .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
                     .observe(parseFloat(resContentLength));
                 // latency metrics
                 const latency = end({ method: req.method, route: this.getRoute(req), status_code: res.statusCode });
                 // response size to latency ratio
-                const response_size_latency_ratio = this.metrics['sas_response_size_latency_ratio_seconds'];
+                const response_size_latency_ratio = this.metrics['sas_response_size_bytes_seconds'];
                 response_size_latency_ratio
                     .labels({ method: req.method, route: this.getRoute(req), status_code: res.statusCode })
                     .observe(parseFloat(resContentLength) / latency);
@@ -273,7 +154,7 @@ class Metrics_App {
     }
     init() {
         // Set up
-        metrics.forEach((metric) => this.createMetricByType('sas', metric));
+        _1.config.metric_list.forEach((metric) => this.createMetricByType('sas', metric));
         prom_client_1.default.collectDefaultMetrics({ register: this.registry, prefix: 'sas_' });
         // Set up the metrics endpoint
         this.app.get('/metrics', (_req, res) => {
@@ -291,4 +172,4 @@ class Metrics_App {
     }
 }
 exports.default = Metrics_App;
-//# sourceMappingURL=metrics.js.map
+//# sourceMappingURL=Metrics.js.map

package/build/src/metrics/Metrics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Metrics.js","sourceRoot":"","sources":["../../../src/metrics/Metrics.ts"],"names":[],"mappings":"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"}

package/build/src/metrics/config.d.ts

@@ -0,0 +1,2 @@
+import { IMetric } from '../types/metrics';
+export declare const metric_list: IMetric[];

package/build/src/metrics/config.js

@@ -0,0 +1,71 @@
+"use strict";
+// as new metrics are added in routes they need to be registered here to make them available across the apps
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.metric_list = void 0;
+exports.metric_list = [
+    {
+        name: 'http_request_error',
+        help: 'Number of HTTP Errors',
+        type: "counter" /* MetricType.Counter */,
+    },
+    {
+        name: 'http_request_success',
+        help: 'Number of HTTP Success',
+        type: "counter" /* MetricType.Counter */,
+    },
+    {
+        name: 'http_requests',
+        help: 'Total number of HTTP Requests',
+        type: "counter" /* MetricType.Counter */,
+    },
+    {
+        name: 'request_duration_seconds',
+        help: 'Duration of HTTP requests in seconds',
+        labels: ['method', 'route', 'status_code'],
+        buckets: [0.1, 0.5, 1, 1.5, 2, 3, 4, 5],
+        type: "histogram" /* MetricType.Histogram */,
+    },
+    {
+        name: 'response_size_bytes',
+        help: 'Size of HTTP responses in bytes',
+        labels: ['method', 'route', 'status_code'],
+        buckets: [100, 500, 1000, 5000, 10000, 50000, 100000, 500000, 1000000, 5000000],
+        type: "histogram" /* MetricType.Histogram */,
+    },
+    {
+        name: 'response_size_bytes_seconds',
+        help: 'Ratio of response size to latency',
+        labels: ['method', 'route', 'status_code'],
+        buckets: [64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144],
+        type: "histogram" /* MetricType.Histogram */,
+    },
+    {
+        name: 'extrinsics_in_request',
+        help: 'Number of extrinsics in a request',
+        type: "histogram" /* MetricType.Histogram */,
+        buckets: [5, 10, 20, 40, 80, 160, 320, 640, 1280, 2560, 5120, 10240, 20480],
+        labels: ['method', 'route', 'status_code'],
+    },
+    {
+        name: 'extrinsics_per_second',
+        help: 'Number of extrinsics per second',
+        type: "histogram" /* MetricType.Histogram */,
+        labels: ['method', 'route', 'status_code'],
+        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
+    },
+    {
+        name: 'extrinsics_per_block',
+        help: 'Average number of extrinsics per block',
+        type: "histogram" /* MetricType.Histogram */,
+        labels: ['method', 'route', 'status_code'],
+        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
+    },
+    {
+        name: 'seconds_per_block',
+        help: 'Average seconds per block',
+        type: "histogram" /* MetricType.Histogram */,
+        labels: ['method', 'route', 'status_code'],
+        buckets: [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024],
+    },
+];
+//# sourceMappingURL=config.js.map

package/build/src/metrics/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/metrics/config.ts"],"names":[],"mappings":"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"}

package/build/src/metrics/index.d.ts

@@ -0,0 +1,2 @@
+export * as config from './config';
+export { default as MetricsApp } from './Metrics';

package/build/src/metrics/index.js

@@ -0,0 +1,33 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetricsApp = exports.config = void 0;
+exports.config = __importStar(require("./config"));
+var Metrics_1 = require("./Metrics");
+Object.defineProperty(exports, "MetricsApp", { enumerable: true, get: function () { return __importDefault(Metrics_1).default; } });
+//# sourceMappingURL=index.js.map

package/build/src/metrics/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/metrics/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAmC;AACnC,qCAAkD;AAAzC,sHAAA,OAAO,OAAc"}

package/build/src/middleware/error/errorMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/errorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAIxE,2CAAwC;AAExC;;;;;;;GAOG;AACI,MAAM,eAAe,GAAwB,CAAC,GAAY,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;;IAC3F,IAAI,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE;QAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;KACjB;IAED,MAAM,IAAI,GAAG;QACZ,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,MAAA,GAAG,CAAC,OAAO,mCAAI,gBAAgB;QACxC,KAAK,EAAE,GAAG,CAAC,KAAK;KAChB,CAAC;IAEF,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEvB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC;AAdW,QAAA,eAAe,mBAc1B"}
+{"version":3,"file":"errorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/errorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAIxE,2CAAwC;AAExC;;;;;;;GAOG;AACI,MAAM,eAAe,GAAwB,CAAC,GAAY,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;;IAC3F,IAAI,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG;QACZ,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,MAAA,GAAG,CAAC,OAAO,mCAAI,gBAAgB;QACxC,KAAK,EAAE,GAAG,CAAC,KAAK;KAChB,CAAC;IAEF,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEvB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC;AAdW,QAAA,eAAe,mBAc1B"}

package/build/src/middleware/error/httpErrorMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpErrorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/httpErrorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAGxE,6CAAwC;AAExC,2CAAwC;AACxC;;;;;;;;;;GAUG;AACI,MAAM,mBAAmB,GAAwB,CAAC,GAAY,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;IAC/F,IAAI,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,YAAY,uBAAS,CAAC,EAAE;QACnD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;KACjB;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC;IAExB,MAAM,IAAI,GAAG;QACZ,IAAI;QACJ,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KAChB,CAAC;IAEF,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B"}
+{"version":3,"file":"httpErrorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/httpErrorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAGxE,6CAAwC;AAExC,2CAAwC;AACxC;;;;;;;;;;GAUG;AACI,MAAM,mBAAmB,GAAwB,CAAC,GAAY,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;IAC/F,IAAI,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,YAAY,uBAAS,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC;IAExB,MAAM,IAAI,GAAG;QACZ,IAAI;QACJ,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KAChB,CAAC;IAEF,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B"}

package/build/src/middleware/error/internalErrorMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"internalErrorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/internalErrorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAGxE,6CAAkD;AAElD,2CAAwC;AAExC;;;;;;;;GAQG;AACI,MAAM,uBAAuB,GAAwB,CAAC,SAAkB,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;IACzG,sEAAsE;IACtE,mEAAmE;IACnE,IAAI,GAAG,CAAC,WAAW,EAAE;QACpB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;KACvB;IAED,MAAM,OAAO,GAAG,IAAI,iCAAmB,CAAC,gBAAgB,CAAC,CAAC;IAE1D,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IAEzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC,CAAC;AAZW,QAAA,uBAAuB,2BAYlC"}
+{"version":3,"file":"internalErrorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/internalErrorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAGxE,6CAAkD;AAElD,2CAAwC;AAExC;;;;;;;;GAQG;AACI,MAAM,uBAAuB,GAAwB,CAAC,SAAkB,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;IACzG,sEAAsE;IACtE,mEAAmE;IACnE,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,iCAAmB,CAAC,gBAAgB,CAAC,CAAC;IAE1D,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IAEzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC,CAAC;AAZW,QAAA,uBAAuB,2BAYlC"}

package/build/src/middleware/error/legacyErrorMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"legacyErrorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/legacyErrorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;;;;AAGxE,8DAA+C;AAC/C,6CAAkD;AAElD,2CAAwC;AACxC,+CAAuE;AAEvE;;;;;;;GAOG;AACI,MAAM,qBAAqB,GAAwB,CAAC,GAAY,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;IACjG,IAAI,GAAG,CAAC,WAAW,IAAI,CAAC,IAAA,2BAAkB,EAAC,GAAG,CAAC,EAAE;QAChD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;KACjB;IAED,IAAI,IAAA,sBAAa,EAAC,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,GAAG;YACZ,IAAI,EAAE,GAAG,CAAC,UAAU;YACpB,OAAO,EAAE,IAAA,qBAAoB,EAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC;SACxD,CAAC;QAEF,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO;KACP;IAED,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,iCAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AAlBW,QAAA,qBAAqB,yBAkBhC"}
+{"version":3,"file":"legacyErrorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/legacyErrorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;;;;AAGxE,8DAA+C;AAC/C,6CAAkD;AAElD,2CAAwC;AACxC,+CAAuE;AAEvE;;;;;;;GAOG;AACI,MAAM,qBAAqB,GAAwB,CAAC,GAAY,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;IACjG,IAAI,GAAG,CAAC,WAAW,IAAI,CAAC,IAAA,2BAAkB,EAAC,GAAG,CAAC,EAAE,CAAC;QACjD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,IAAA,sBAAa,EAAC,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG;YACZ,IAAI,EAAE,GAAG,CAAC,UAAU;YACpB,OAAO,EAAE,IAAA,qBAAoB,EAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC;SACxD,CAAC;QAEF,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO;IACR,CAAC;IAED,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,iCAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AAlBW,QAAA,qBAAqB,yBAkBhC"}

package/build/src/middleware/error/testTools.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright 2017-2024 Parity Technologies (UK) Ltd.
 // This file is part of Substrate API Sidecar.
 //
 // Substrate API Sidecar is free software: you can redistribute it and/or modify
@@ -15,7 +15,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callsNextWithSentHeaders = exports.catchesErrWithResponse = exports.catchesErrWithStatus = exports.callsNextWithErr = void 0;
+exports.catchesErrWithResponse = exports.catchesErrWithStatus = exports.callsNextWithErr = void 0;
+exports.callsNextWithSentHeaders = callsNextWithSentHeaders;
 /**
  * Empty mock Express Request.
  */
@@ -28,7 +29,7 @@ const mockReq = {};
  * @param err error
  */
 const callsNextWithErr = (ware) => (name, err) => {
-    it(`calls next on error of type ${name}`, () => {
+    it(`calls next on error of type ${name}`, async () => {
         const next = jest.fn();
         const send = jest.fn();
         const status = jest.fn((_code) => {
@@ -36,10 +37,10 @@ const callsNextWithErr = (ware) => (name, err) => {
                 send,
             };
         });
-        ware(err, mockReq, { headersSent: false, status }, next);
-        expect(status).not.toBeCalled();
-        expect(send).not.toBeCalled();
-        expect(next).toBeCalledTimes(1);
+        await ware(err, mockReq, { headersSent: false, status }, next);
+        expect(status).not.toHaveBeenCalled();
+        expect(send).not.toHaveBeenCalled();
+        expect(next).toHaveBeenCalledTimes(1);
     });
 };
 exports.callsNextWithErr = callsNextWithErr;
@@ -53,7 +54,7 @@ exports.callsNextWithErr = callsNextWithErr;
  * @param code expected code to be sent as status
  */
 const catchesErrWithStatus = (ware) => (name, err, code) => {
-    it(`catches ${name} and sends status code ${code}`, () => {
+    it(`catches ${name} and sends status code ${code}`, async () => {
         const next = jest.fn();
         const send = jest.fn();
         const status = jest.fn((_code) => {
@@ -61,11 +62,11 @@ const catchesErrWithStatus = (ware) => (name, err, code) => {
                 send,
             };
         });
-        ware(err, mockReq, { headersSent: false, status }, next);
-        expect(send).toBeCalledTimes(1);
-        expect(status).toBeCalledWith(code);
-        expect(status).toBeCalledTimes(1);
-        expect(next).not.toBeCalled();
+        await ware(err, mockReq, { headersSent: false, status }, next);
+        expect(send).toHaveBeenCalledTimes(1);
+        expect(status).toHaveBeenCalledWith(code);
+        expect(status).toHaveBeenCalledTimes(1);
+        expect(next).not.toHaveBeenCalled();
     });
 };
 exports.catchesErrWithStatus = catchesErrWithStatus;
@@ -80,7 +81,7 @@ exports.catchesErrWithStatus = catchesErrWithStatus;
  * @param response expected response body
  */
 const catchesErrWithResponse = (ware) => (name, err, code, response) => {
-    it(`catches ${name} and sends status code ${code}`, () => {
+    it(`catches ${name} and sends status code ${code}`, async () => {
         const next = jest.fn();
         const send = jest.fn();
         const status = jest.fn((_code) => {
@@ -88,17 +89,17 @@ const catchesErrWithResponse = (ware) => (name, err, code, response) => {
                 send,
             };
         });
-        ware(err, mockReq, { headersSent: false, status }, next);
-        expect(send).toBeCalledTimes(1);
-        expect(send).toBeCalledWith(response);
-        expect(status).toBeCalledWith(code);
-        expect(status).toBeCalledTimes(1);
-        expect(next).not.toBeCalled();
+        await ware(err, mockReq, { headersSent: false, status }, next);
+        expect(send).toHaveBeenCalledTimes(1);
+        expect(send).toHaveBeenCalledWith(response);
+        expect(status).toHaveBeenCalledWith(code);
+        expect(status).toHaveBeenCalledTimes(1);
+        expect(next).not.toHaveBeenCalled();
     });
 };
 exports.catchesErrWithResponse = catchesErrWithResponse;
 function callsNextWithSentHeaders(ware, err) {
-    it('calls next if the headers have been sent', () => {
+    it('calls next if the headers have been sent', async () => {
         const next = jest.fn();
         const send = jest.fn();
         const status = jest.fn((_code) => {
@@ -106,11 +107,10 @@ function callsNextWithSentHeaders(ware, err) {
                 send,
             };
         });
-        ware(err, mockReq, { headersSent: true, status }, next);
+        await ware(err, mockReq, { headersSent: true, status }, next);
         expect(send).not.toBeCalled();
         expect(status).not.toBeCalled();
         expect(next).toBeCalledTimes(1);
     });
 }
-exports.callsNextWithSentHeaders = callsNextWithSentHeaders;
 //# sourceMappingURL=testTools.js.map

package/build/src/middleware/error/testTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"testTools.js","sourceRoot":"","sources":["../../../../src/middleware/error/testTools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testTools.js","sourceRoot":"","sources":["../../../../src/middleware/error/testTools.ts"],"names":[],"mappings":"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"}

package/build/src/middleware/error/txErrorMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"txErrorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/txErrorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAIxE,2CAAwC;AACxC,+CAAqD;AAErD;;;;;;;GAOG;AACI,MAAM,iBAAiB,GAAwB,CAAC,GAAY,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;IAC7F,IAAI,GAAG,CAAC,WAAW,IAAI,CAAC,IAAA,wBAAe,EAAC,GAAG,CAAC,EAAE;QAC7C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;KACjB;IAED,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC;IAEjE,MAAM,IAAI,GAAG;QACZ,IAAI;QACJ,KAAK;QACL,IAAI;QACJ,WAAW;QACX,KAAK;QACL,KAAK;QACL,EAAE;KACF,CAAC;IAEF,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC;QAChB,GAAG,IAAI;QACP,OAAO,EAAE,GAAG,KAAK,aAAa,KAAe,mBAAmB,WAAqB,EAAE;KACvF,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B"}
+{"version":3,"file":"txErrorMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/error/txErrorMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAIxE,2CAAwC;AACxC,+CAAqD;AAErD;;;;;;;GAOG;AACI,MAAM,iBAAiB,GAAwB,CAAC,GAAY,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;IAC7F,IAAI,GAAG,CAAC,WAAW,IAAI,CAAC,IAAA,wBAAe,EAAC,GAAG,CAAC,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC;IAEjE,MAAM,IAAI,GAAG;QACZ,IAAI;QACJ,KAAK;QACL,IAAI;QACJ,WAAW;QACX,KAAK;QACL,KAAK;QACL,EAAE;KACF,CAAC;IAEF,SAAG,CAAC,MAAM,CAAC,KAAK,CAAC;QAChB,GAAG,IAAI;QACP,OAAO,EAAE,GAAG,KAAK,aAAa,KAAe,mBAAmB,WAAqB,EAAE;KACvF,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B"}

package/build/src/middleware/logger/httpLogger.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpLogger.js","sourceRoot":"","sources":["../../../../src/middleware/logger/httpLogger.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;;;;;;;;;;;;;;;;;;;;;;;;AAGxE,gEAAkD;AAG3C,MAAM,gBAAgB,GAAG,CAAC,eAA+B,EAAa,EAAE,CAC9E,cAAc,CAAC,MAAM,CAAC;IACrB,cAAc;IACd,eAAe;IACf,GAAG,EAAE,0EAA0E;IAC/E,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACpB,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;QAC3B,IAAI,UAAU,GAAG,GAAG,EAAE;YACrB,6FAA6F;YAC7F,OAAO,MAAM,CAAC;SACd;QACD,IAAI,UAAU,GAAG,GAAG,EAAE;YACrB,OAAO,MAAM,CAAC;SACd;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;CACD,CAAC,CAAC;AAjBS,QAAA,gBAAgB,oBAiBzB"}
+{"version":3,"file":"httpLogger.js","sourceRoot":"","sources":["../../../../src/middleware/logger/httpLogger.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;;;;;;;;;;;;;;;;;;;;;;;;AAGxE,gEAAkD;AAG3C,MAAM,gBAAgB,GAAG,CAAC,eAA+B,EAAa,EAAE,CAC9E,cAAc,CAAC,MAAM,CAAC;IACrB,cAAc;IACd,eAAe;IACf,GAAG,EAAE,0EAA0E;IAC/E,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACpB,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;QAC3B,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;YACtB,6FAA6F;YAC7F,OAAO,MAAM,CAAC;QACf,CAAC;QACD,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;YACtB,OAAO,MAAM,CAAC;QACf,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;CACD,CAAC,CAAC;AAjBS,QAAA,gBAAgB,oBAiBzB"}

package/build/src/middleware/validate/util.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright 2017-2024 Parity Technologies (UK) Ltd.
 // This file is part of Substrate API Sidecar.
 //
 // Substrate API Sidecar is free software: you can redistribute it and/or modify
@@ -23,11 +23,11 @@ exports.errorsWith = exports.doesNotErrorWith = void 0;
  * @param req Express Request containing thing it errors on.
  */
 const doesNotErrorWith = (name, req, middleware) => {
-    it(`does not error with ${name}`, () => {
+    it(`does not error with ${name}`, async () => {
         const next = jest.fn();
-        middleware(req, null, next);
-        expect(next).toBeCalledTimes(1);
-        expect(next).toBeCalledWith();
+        await middleware(req, null, next);
+        expect(next).toHaveBeenCalledTimes(1);
+        expect(next).toHaveBeenCalledWith();
     });
 };
 exports.doesNotErrorWith = doesNotErrorWith;
@@ -40,11 +40,11 @@ exports.doesNotErrorWith = doesNotErrorWith;
  * @param err Expected error that it passes to next.
  */
 const errorsWith = (name, req, err, middleware) => {
-    it(`errors with ${name}`, () => {
+    it(`errors with ${name}`, async () => {
         const next = jest.fn();
-        middleware(req, null, next);
-        expect(next).toBeCalledTimes(1);
-        expect(next).toBeCalledWith(err);
+        await middleware(req, null, next);
+        expect(next).toHaveBeenCalledTimes(1);
+        expect(next).toHaveBeenCalledWith(err);
     });
 };
 exports.errorsWith = errorsWith;

package/build/src/middleware/validate/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/middleware/validate/util.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAKxE;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,GAAY,EAAE,UAA0B,EAAQ,EAAE;IAChG,EAAE,CAAC,uBAAuB,IAAI,EAAE,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACvB,UAAU,CAAC,GAAG,EAAE,IAA2B,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,gBAAgB,oBAO3B;AAEF;;;;;;;GAOG;AACI,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,GAAY,EAAE,GAAY,EAAE,UAA0B,EAAQ,EAAE;IACxG,EAAE,CAAC,eAAe,IAAI,EAAE,EAAE,GAAG,EAAE;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAEvB,UAAU,CAAC,GAAG,EAAE,IAA2B,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,UAAU,cAQrB"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/middleware/validate/util.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAKxE;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,GAAY,EAAE,UAA0B,EAAQ,EAAE;IAChG,EAAE,CAAC,uBAAuB,IAAI,EAAE,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACvB,MAAM,UAAU,CAAC,GAAG,EAAE,IAA2B,EAAE,IAAI,CAAC,CAAC;QACzD,MAAM,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,CAAC,oBAAoB,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,gBAAgB,oBAO3B;AAEF;;;;;;;GAOG;AACI,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,GAAY,EAAE,GAAY,EAAE,UAA0B,EAAQ,EAAE;IACxG,EAAE,CAAC,eAAe,IAAI,EAAE,EAAE,KAAK,IAAI,EAAE;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAEvB,MAAM,UAAU,CAAC,GAAG,EAAE,IAA2B,EAAE,IAAI,CAAC,CAAC;QACzD,MAAM,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,UAAU,cAQrB"}

package/build/src/middleware/validate/validateAddressMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateAddressMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/validate/validateAddressMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAExE,yCAAuC;AACvC,uDAA8F;AAC9F,qEAAkE;AAElE,6CAAyC;AAEzC;;GAEG;AACI,MAAM,yBAAyB,GAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAC5E,IAAI,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE;QAC/B,OAAO,IAAI,EAAE,CAAC;KACd;IAED,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE1D,IAAI,CAAC,OAAO,IAAI,KAAK,EAAE;QACtB,OAAO,IAAI,CAAC,IAAI,wBAAU,CAAC,KAAK,CAAC,CAAC,CAAC;KACnC;IAED,OAAO,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAZW,QAAA,yBAAyB,6BAYpC;AAEF;;;;;;;GAOG;AACH,SAAS,YAAY,CAAC,OAAe;IACpC,IAAI,SAAS,CAAC;IAEd,IAAI,IAAA,YAAK,EAAC,OAAO,CAAC,EAAE;QACnB,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;KAClE;SAAM;QACN,IAAI;YACH,SAAS,GAAG,IAAA,0BAAY,EAAC,OAAO,CAAC,CAAC;SAClC;QAAC,OAAO,KAAK,EAAE;YACf,OAAO,CAAC,KAAK,EAAG,KAAe,CAAC,OAAO,CAAC,CAAC;SACzC;KACD;IAED,IAAI,mBAAQ,CAAC,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;QAC9D,MAAM,CAAC,OAAO,CAAC,GAAG,IAAA,kCAAoB,EAAC,SAAS,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC;KAC3E;IAED,IAAI,IAAA,+BAAiB,EAAC,OAAO,CAAC,EAAE;QAC/B,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KACzB;IAED,OAAO,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"validateAddressMiddleware.js","sourceRoot":"","sources":["../../../../src/middleware/validate/validateAddressMiddleware.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAExE,yCAAuC;AACvC,uDAA8F;AAC9F,qEAAkE;AAElE,6CAAyC;AAEzC;;GAEG;AACI,MAAM,yBAAyB,GAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAC5E,IAAI,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,OAAO,IAAI,EAAE,CAAC;IACf,CAAC;IAED,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE1D,IAAI,CAAC,OAAO,IAAI,KAAK,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC,IAAI,wBAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAZW,QAAA,yBAAyB,6BAYpC;AAEF;;;;;;;GAOG;AACH,SAAS,YAAY,CAAC,OAAe;IACpC,IAAI,SAAS,CAAC;IAEd,IAAI,IAAA,YAAK,EAAC,OAAO,CAAC,EAAE,CAAC;QACpB,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC;SAAM,CAAC;QACP,IAAI,CAAC;YACJ,SAAS,GAAG,IAAA,0BAAY,EAAC,OAAO,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,EAAG,KAAe,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;IACF,CAAC;IAED,IAAI,mBAAQ,CAAC,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/D,MAAM,CAAC,OAAO,CAAC,GAAG,IAAA,kCAAoB,EAAC,SAAS,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,IAAA,+BAAiB,EAAC,OAAO,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAC;AAC1C,CAAC"}