@golemio/energetics 1.4.3-dev.1393228263 → 1.4.3-dev.1411262009

package/dist/output-gateway/routers/v2/V2BuildingsRouter.d.ts

@@ -3,6 +3,7 @@ export declare class V2BuildingsRouter extends AbstractRouter {
     private controller;
     private cacheHeaderMiddleware;
     private maxAge;
+    private staleWhileRevalidate;
     constructor();
     protected initRoutes(): void;
 }

package/dist/output-gateway/routers/v2/V2BuildingsRouter.js

@@ -23,13 +23,14 @@ let V2BuildingsRouter = exports.V2BuildingsRouter = class V2BuildingsRouter exte
     constructor() {
         super(RouteVersion_1.RouteVersion.v2, Links_1.BUILDING_PATH);
         this.maxAge = 6 * 60 * 60; // 6 hours
+        this.staleWhileRevalidate = 60; // 1 minute
         this.controller = Di_1.OGEnergeticsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.BuildingsController);
         this.cacheHeaderMiddleware = Di_1.OGEnergeticsContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
         this.initRoutes();
     }
     initRoutes() {
-        this.router.get("/", (0, express_validator_1.query)("full").optional().isBoolean(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge), this.controller.getAll);
-        this.router.get("/:id", this.cacheHeaderMiddleware.getMiddleware(this.maxAge), (0, express_validator_1.param)("id").exists().isNumeric().not().isArray(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, this.controller.getOne);
+        this.router.get("/", (0, express_validator_1.query)("full").optional().isBoolean(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getAll);
+        this.router.get("/:id", (0, express_validator_1.param)("id").exists().isNumeric().not().isArray(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getOne);
     }
 };
 exports.V2BuildingsRouter = V2BuildingsRouter = __decorate([

package/dist/output-gateway/routers/v2/V2BuildingsRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"V2BuildingsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2BuildingsRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAAoD;AACpD,+DAA0D;AAE1D,qCAAmD;AACnD,yEAAoE;AACpE,sFAAmF;AAEnF,6EAA2E;AAC3E,+DAAuE;AACvE,mFAA2E;AAC3E,iEAAgE;AAGzD,IAAM,iBAAiB,+BAAvB,MAAM,iBAAkB,SAAQ,+BAAc;IAKjD;QACI,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,qBAAa,CAAC,CAAC;QAHlC,WAAM,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,UAAU;QAIpC,IAAI,CAAC,UAAU,GAAG,0BAAqB,CAAC,OAAO,CAAsB,2CAAoB,CAAC,mBAAmB,CAAC,CAAC;QAC/G,IAAI,CAAC,qBAAqB,GAAG,0BAAqB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACxH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,EACpC,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EACrD,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EACrD,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAChD,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;4BA9BY,iBAAiB;IAD7B,IAAA,qBAAU,GAAE;;GACA,iBAAiB,CA8B7B"}
+{"version":3,"file":"V2BuildingsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2BuildingsRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAAoD;AACpD,+DAA0D;AAE1D,qCAAmD;AACnD,yEAAoE;AACpE,sFAAmF;AAEnF,6EAA2E;AAC3E,+DAAuE;AACvE,mFAA2E;AAC3E,iEAAgE;AAGzD,IAAM,iBAAiB,+BAAvB,MAAM,iBAAkB,SAAQ,+BAAc;IAMjD;QACI,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,qBAAa,CAAC,CAAC;QAJlC,WAAM,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,UAAU;QAChC,yBAAoB,GAAG,EAAE,CAAC,CAAC,WAAW;QAI1C,IAAI,CAAC,UAAU,GAAG,0BAAqB,CAAC,OAAO,CAAsB,2CAAoB,CAAC,mBAAmB,CAAC,CAAC;QAC/G,IAAI,CAAC,qBAAqB,GAAG,0BAAqB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACxH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,EACpC,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAChD,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;4BA/BY,iBAAiB;IAD7B,IAAA,qBAAU,GAAE;;GACA,iBAAiB,CA+B7B"}

package/dist/output-gateway/routers/v2/V2DevicesRouter.d.ts

@@ -1,7 +1,10 @@
-import { AbstractRouter } from "@golemio/core/dist/helpers/routing/AbstractRouter";
 import { V2DevicesController } from "../../controllers/v2/V2DevicesController";
+import { AbstractRouter } from "@golemio/core/dist/helpers/routing/AbstractRouter";
 export declare class V2DevicesRouter extends AbstractRouter {
     private controller;
+    private cacheHeaderMiddleware;
+    private maxAge;
+    private staleWhileRevalidate;
     constructor(controller: V2DevicesController);
     protected initRoutes(): void;
 }

package/dist/output-gateway/routers/v2/V2DevicesRouter.js

@@ -13,24 +13,28 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V2DevicesRouter = void 0;
+const Links_1 = require("../../constants/Links");
+const RouteVersion_1 = require("../../constants/RouteVersion");
+const V2DevicesController_1 = require("../../controllers/v2/V2DevicesController");
+const Di_1 = require("../../ioc/Di");
+const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
 const AbstractRouter_1 = require("@golemio/core/dist/helpers/routing/AbstractRouter");
-const output_gateway_1 = require("@golemio/core/dist/output-gateway");
+const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
 const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
 const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
-const V2DevicesController_1 = require("../../controllers/v2/V2DevicesController");
-const RouteVersion_1 = require("../../constants/RouteVersion");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
-const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
-const Links_1 = require("../../constants/Links");
 let V2DevicesRouter = exports.V2DevicesRouter = class V2DevicesRouter extends AbstractRouter_1.AbstractRouter {
     constructor(controller) {
         super(RouteVersion_1.RouteVersion.v2, Links_1.DEVICES_PATH);
         this.controller = controller;
+        this.maxAge = 30 * 60; // 30 minutes
+        this.staleWhileRevalidate = 60; // 1 minute
+        this.cacheHeaderMiddleware = Di_1.OGEnergeticsContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
         this.initRoutes();
     }
     initRoutes() {
-        this.router.get("/", (0, express_validator_1.query)("accessLimit").exists(), Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), (0, output_gateway_1.useCacheMiddleware)(), this.controller.getAll);
-        this.router.get("/:id", (0, express_validator_1.param)("id").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, (0, output_gateway_1.useCacheMiddleware)(), this.controller.getOne);
+        this.router.get("/", (0, express_validator_1.query)("accessLimit").exists(), Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getAll);
+        this.router.get("/:id", (0, express_validator_1.param)("id").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getOne);
     }
 };
 exports.V2DevicesRouter = V2DevicesRouter = __decorate([

package/dist/output-gateway/routers/v2/V2DevicesRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"V2DevicesRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2DevicesRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sFAAmF;AACnF,sEAAuE;AACvE,6EAAkH;AAClH,mFAA2E;AAC3E,kFAA6E;AAC7E,+DAA0D;AAC1D,iEAAwE;AACxE,yEAAoE;AACpE,iDAAmD;AAG5C,IAAM,eAAe,6BAArB,MAAM,eAAgB,SAAQ,+BAAc;IAC/C,YAAsE,UAA+B;QACjG,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,oBAAY,CAAC,CAAC;QAD6B,eAAU,GAAV,UAAU,CAAqB;QAGjG,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAA,mCAAkB,GAAE,EACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAA,mCAAkB,GAAE,EACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;0BA3BY,eAAe;IAD3B,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,mBAAmB,CAAC,CAAA;qCAAqB,yCAAmB;GAD5F,eAAe,CA2B3B"}
+{"version":3,"file":"V2DevicesRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2DevicesRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAmD;AACnD,+DAA0D;AAC1D,kFAA6E;AAC7E,qCAAmD;AACnD,yEAAoE;AACpE,sFAAmF;AAEnF,+DAAuE;AACvE,6EAAkH;AAClH,mFAA2E;AAC3E,iEAAwE;AAEjE,IAAM,eAAe,6BAArB,MAAM,eAAgB,SAAQ,+BAAc;IAK/C,YAA8D,UAAuC;QACjG,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,oBAAY,CAAC,CAAC;QAD6B,eAAU,GAAV,UAAU,CAAqB;QAH7F,WAAM,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa;QAC/B,yBAAoB,GAAG,EAAE,CAAC,CAAC,WAAW;QAK1C,IAAI,CAAC,qBAAqB,GAAG,0BAAqB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACxH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;0BAhCY,eAAe;IAD3B,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,mBAAmB,CAAC,CAAA;qCAAqB,yCAAmB;GAL5F,eAAe,CAgC3B"}

package/dist/output-gateway/routers/v2/V2MeasurementsRouter.d.ts

@@ -1,7 +1,10 @@
-import { AbstractRouter } from "@golemio/core/dist/helpers/routing/AbstractRouter";
 import { V2MeasurementsController } from "../../controllers/v2/V2MeasurementsController";
+import { AbstractRouter } from "@golemio/core/dist/helpers/routing/AbstractRouter";
 export declare class V2MeasurementsRouter extends AbstractRouter {
     private controller;
+    private cacheHeaderMiddleware;
+    private maxAge;
+    private staleWhileRevalidate;
     constructor(controller: V2MeasurementsController);
     protected initRoutes(): void;
 }

package/dist/output-gateway/routers/v2/V2MeasurementsRouter.js

@@ -13,20 +13,24 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V2MeasurementsRouter = void 0;
+const Links_1 = require("../../constants/Links");
+const RouteVersion_1 = require("../../constants/RouteVersion");
+const V2MeasurementsController_1 = require("../../controllers/v2/V2MeasurementsController");
+const Di_1 = require("../../ioc/Di");
+const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
+const MeasurementConstants_1 = require("../../../schema-definitions/models/constants/MeasurementConstants");
 const AbstractRouter_1 = require("@golemio/core/dist/helpers/routing/AbstractRouter");
-const output_gateway_1 = require("@golemio/core/dist/output-gateway");
+const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
 const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
 const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
-const V2MeasurementsController_1 = require("../../controllers/v2/V2MeasurementsController");
-const RouteVersion_1 = require("../../constants/RouteVersion");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
-const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
-const Links_1 = require("../../constants/Links");
-const MeasurementConstants_1 = require("../../../schema-definitions/models/constants/MeasurementConstants");
 let V2MeasurementsRouter = exports.V2MeasurementsRouter = class V2MeasurementsRouter extends AbstractRouter_1.AbstractRouter {
     constructor(controller) {
         super(RouteVersion_1.RouteVersion.v2, Links_1.MEASUREMENTS_PATH);
         this.controller = controller;
+        this.maxAge = 30 * 60; // 30 minutes
+        this.staleWhileRevalidate = 60; // 1 minute
+        this.cacheHeaderMiddleware = Di_1.OGEnergeticsContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
         this.initRoutes();
     }
     initRoutes() {
@@ -51,7 +55,7 @@ let V2MeasurementsRouter = exports.V2MeasurementsRouter = class V2MeasurementsRo
             (0, express_validator_1.query)("dateFrom").optional().isISO8601().not().isArray(),
             (0, express_validator_1.query)("dateTo").optional().isISO8601().not().isArray(),
             (0, express_validator_1.query)("accessLimit").exists(),
-        ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), (0, output_gateway_1.useCacheMiddleware)(), this.controller.getMeasurements);
+        ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getMeasurements);
         this.router.get("/monthly-reading", [
             (0, express_validator_1.query)("addr1").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(),
             (0, express_validator_1.query)("addr2").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(),
@@ -59,7 +63,7 @@ let V2MeasurementsRouter = exports.V2MeasurementsRouter = class V2MeasurementsRo
             (0, express_validator_1.query)("year").exists().isInt().not().isArray(),
             (0, express_validator_1.query)("month").exists().isInt({ min: 1, max: 12 }).not().isArray(),
             (0, express_validator_1.query)("accessLimit").exists(),
-        ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), (0, output_gateway_1.useCacheMiddleware)(), this.controller.getMonthlyReadings);
+        ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getMonthlyReadings);
     }
 };
 exports.V2MeasurementsRouter = V2MeasurementsRouter = __decorate([

package/dist/output-gateway/routers/v2/V2MeasurementsRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"V2MeasurementsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2MeasurementsRouter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"V2MeasurementsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2MeasurementsRouter.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/routers/v2/V2OrganizationsRouter.d.ts

@@ -1,7 +1,10 @@
-import { AbstractRouter } from "@golemio/core/dist/helpers/routing/AbstractRouter";
 import { V2OrganizationsController } from "../../controllers/v2/V2OrganizationsController";
+import { AbstractRouter } from "@golemio/core/dist/helpers/routing/AbstractRouter";
 export declare class V2OrganizationsRouter extends AbstractRouter {
     private controller;
+    private cacheHeaderMiddleware;
+    private maxAge;
+    private staleWhileRevalidate;
     constructor(controller: V2OrganizationsController);
     protected initRoutes(): void;
 }

package/dist/output-gateway/routers/v2/V2OrganizationsRouter.js

@@ -13,24 +13,28 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V2OrganizationsRouter = void 0;
+const Links_1 = require("../../constants/Links");
+const RouteVersion_1 = require("../../constants/RouteVersion");
+const V2OrganizationsController_1 = require("../../controllers/v2/V2OrganizationsController");
+const Di_1 = require("../../ioc/Di");
+const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
 const AbstractRouter_1 = require("@golemio/core/dist/helpers/routing/AbstractRouter");
-const output_gateway_1 = require("@golemio/core/dist/output-gateway");
+const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
 const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
 const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
-const V2OrganizationsController_1 = require("../../controllers/v2/V2OrganizationsController");
-const RouteVersion_1 = require("../../constants/RouteVersion");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
-const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
-const Links_1 = require("../../constants/Links");
 let V2OrganizationsRouter = exports.V2OrganizationsRouter = class V2OrganizationsRouter extends AbstractRouter_1.AbstractRouter {
     constructor(controller) {
         super(RouteVersion_1.RouteVersion.v2, Links_1.ORGANIZATION_PATH);
         this.controller = controller;
+        this.maxAge = 30 * 60; // 30 minutes
+        this.staleWhileRevalidate = 60; // 1 minute
+        this.cacheHeaderMiddleware = Di_1.OGEnergeticsContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
         this.initRoutes();
     }
     initRoutes() {
-        this.router.get("/", [(0, express_validator_1.query)("full").optional().isBoolean().not().isArray()], (0, express_validator_1.query)("accessLimit").exists(), Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), (0, output_gateway_1.useCacheMiddleware)(), this.controller.getAll);
-        this.router.get("/:id", (0, express_validator_1.param)("id").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, (0, output_gateway_1.useCacheMiddleware)(), this.controller.getOne);
+        this.router.get("/", [(0, express_validator_1.query)("full").optional().isBoolean().not().isArray()], (0, express_validator_1.query)("accessLimit").exists(), Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getAll);
+        this.router.get("/:id", (0, express_validator_1.param)("id").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getOne);
     }
 };
 exports.V2OrganizationsRouter = V2OrganizationsRouter = __decorate([

package/dist/output-gateway/routers/v2/V2OrganizationsRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"V2OrganizationsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2OrganizationsRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sFAAmF;AACnF,sEAAuE;AACvE,6EAAkH;AAClH,mFAA2E;AAC3E,8FAAyF;AACzF,+DAA0D;AAC1D,iEAAwE;AACxE,yEAAoE;AACpE,iDAAwD;AAGjD,IAAM,qBAAqB,mCAA3B,MAAM,qBAAsB,SAAQ,+BAAc;IACrD,YAA4E,UAAqC;QAC7G,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,yBAAiB,CAAC,CAAC;QAD8B,eAAU,GAAV,UAAU,CAA2B;QAG7G,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,CAAC,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,EACtD,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAA,mCAAkB,GAAE,EACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAA,mCAAkB,GAAE,EACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;gCA5BY,qBAAqB;IADjC,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,yBAAyB,CAAC,CAAA;qCAAqB,qDAAyB;GADxG,qBAAqB,CA4BjC"}
+{"version":3,"file":"V2OrganizationsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2OrganizationsRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAwD;AACxD,+DAA0D;AAC1D,8FAAyF;AACzF,qCAAmD;AACnD,yEAAoE;AACpE,sFAAmF;AAEnF,+DAAuE;AACvE,6EAAkH;AAClH,mFAA2E;AAC3E,iEAAwE;AAGjE,IAAM,qBAAqB,mCAA3B,MAAM,qBAAsB,SAAQ,+BAAc;IAKrD,YAAoE,UAA6C;QAC7G,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,yBAAiB,CAAC,CAAC;QAD8B,eAAU,GAAV,UAAU,CAA2B;QAHzG,WAAM,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa;QAC/B,yBAAoB,GAAG,EAAE,CAAC,CAAC,WAAW;QAK1C,IAAI,CAAC,qBAAqB,GAAG,0BAAqB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACxH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,CAAC,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,EACtD,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;gCAjCY,qBAAqB;IADjC,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,yBAAyB,CAAC,CAAA;qCAAqB,qDAAyB;GALxG,qBAAqB,CAiCjC"}

package/docs/openapi-output.yaml

@@ -34,6 +34,12 @@ paths:
             responses:
                 "200":
                     description: OK
+                    headers:
+                        Cache-Control:
+                            description: Cache control directive for caching proxies
+                            schema:
+                                type: string
+                                example: public, s-maxage=21600, stale-while-revalidate=60
                     content:
                         application/json:
                             schema:
@@ -56,6 +62,12 @@ paths:
             responses:
                 "200":
                     description: OK
+                    headers:
+                        Cache-Control:
+                            description: Cache control directive for caching proxies
+                            schema:
+                                type: string
+                                example: public, s-maxage=1800, stale-while-revalidate=60
                     content:
                         application/json:
                             schema:
@@ -69,6 +81,12 @@ paths:
             responses:
                 "200":
                     description: Success
+                    headers:
+                        Cache-Control:
+                            description: Cache control directive for caching proxies
+                            schema:
+                                type: string
+                                example: public, s-maxage=1800, stale-while-revalidate=60
                     content:
                         application/json:
                             schema:
@@ -97,6 +115,12 @@ paths:
             responses:
                 "200":
                     description: Success
+                    headers:
+                        Cache-Control:
+                            description: Cache control directive for caching proxies
+                            schema:
+                                type: string
+                                example: public, s-maxage=1800, stale-while-revalidate=60
                     content:
                         application/json:
                             schema:
@@ -125,6 +149,12 @@ paths:
             responses:
                 "200":
                     description: Success
+                    headers:
+                        Cache-Control:
+                            description: Cache control directive for caching proxies
+                            schema:
+                                type: string
+                                example: public, s-maxage=1800, stale-while-revalidate=60
                     content:
                         application/json:
                             schema:
@@ -157,6 +187,12 @@ paths:
             responses:
                 "200":
                     description: Success
+                    headers:
+                        Cache-Control:
+                            description: Cache control directive for caching proxies
+                            schema:
+                                type: string
+                                example: public, s-maxage=1800, stale-while-revalidate=60
                     content:
                         application/json:
                             schema:
@@ -176,86 +212,92 @@ paths:
                 - ⚡ Energetics (v2)
             summary: Measurements
             parameters:
-                -   name: variable
-                    in: query
-                    required: false
-                    schema:
-                        $ref: '#/components/schemas/EnergeticsVariables'
-                    description: >-
-                        core - Kumulovaný objem [m3]<br />
-                        core2 - Kumulovaný přepočítaný objem [Nm3]<br />
-                        EFwActi - Odběr činné energie [kWh]<br />
-                        EFwActiVT - Odběr činné energie, vysoký tarif [kVArh]<br />
-                        ERvReact - Dodávka jalové energie [kVArh]<br />
-                        EFwReact - Odběr jalové energie [kVArh]<br />
-                        raw - Číselník impulzů [imp]<br />
-                        RSSI - Síla signálu [dBm]<br />
-                        T - Teplota [°C]<br />
-                        CO2 - Koncentrace CO2 [ppm]<br />
-                        RH - Relativní vlhkost [%]<br />
-                        EFwActiNT - Odběr činné energie, nízký tarif [kVArh]<br />
-                        VOC - Míra koncentrace těkavých látek [%]<br />
-                        VT - Vysoký tarif [kWh]<br />
-                        NT - Nízký tarif [kWh]<br />
-                -   name: type
-                    in: query
-                    required: false
-                    schema:
-                        $ref: '#/components/schemas/EnergeticsTypes'
-                    description: >-
-                        monthly_reading - hodnoty sčítané po měsících z 15 minutových spotřeb poskytovaných firmou PRE<br />
-                        provider_value - data získaná od poskytovatelů energií<br />
-                        dotcontrols_value - data získaná ze systémů VisApp firmy DotControls<br />
-                -   name: addr1
-                    in: query
-                    required: false
-                    schema:
-                        type: string
-                        example: "2.9"
-                -   name: addr2
-                    in: query
-                    required: false
-                    schema:
-                        type: string
-                        example: "PF1"
-                -   name: dateFrom
-                    in: query
-                    schema:
-                        type: string
-                        format: date-time
-                        example: 2023-05-01T00:00:00.000Z
-                -   name: dateTo
-                    in: query
-                    schema:
-                        type: string
-                        format: date-time
-                        example: 2023-05-02T00:00:00.000Z
-                -   name: limit
-                    in: query
-                    description: Limits number of retrieved items.
-                    schema:
-                        type: integer
-                        example: 10000
-                -   name: offset
-                    in: query
-                    description: Number of the first items that are skipped.
-                    schema:
-                        type: integer
-                        example: 0
+                - name: variable
+                  in: query
+                  required: false
+                  schema:
+                      $ref: "#/components/schemas/EnergeticsVariables"
+                  description: >-
+                      core - Kumulovaný objem [m3]<br />
+                      core2 - Kumulovaný přepočítaný objem [Nm3]<br />
+                      EFwActi - Odběr činné energie [kWh]<br />
+                      EFwActiVT - Odběr činné energie, vysoký tarif [kVArh]<br />
+                      ERvReact - Dodávka jalové energie [kVArh]<br />
+                      EFwReact - Odběr jalové energie [kVArh]<br />
+                      raw - Číselník impulzů [imp]<br />
+                      RSSI - Síla signálu [dBm]<br />
+                      T - Teplota [°C]<br />
+                      CO2 - Koncentrace CO2 [ppm]<br />
+                      RH - Relativní vlhkost [%]<br />
+                      EFwActiNT - Odběr činné energie, nízký tarif [kVArh]<br />
+                      VOC - Míra koncentrace těkavých látek [%]<br />
+                      VT - Vysoký tarif [kWh]<br />
+                      NT - Nízký tarif [kWh]<br />
+                - name: type
+                  in: query
+                  required: false
+                  schema:
+                      $ref: "#/components/schemas/EnergeticsTypes"
+                  description: >-
+                      monthly_reading - hodnoty sčítané po měsících z 15 minutových spotřeb poskytovaných firmou PRE<br />
+                      provider_value - data získaná od poskytovatelů energií<br />
+                      dotcontrols_value - data získaná ze systémů VisApp firmy DotControls<br />
+                - name: addr1
+                  in: query
+                  required: false
+                  schema:
+                      type: string
+                      example: "2.9"
+                - name: addr2
+                  in: query
+                  required: false
+                  schema:
+                      type: string
+                      example: "PF1"
+                - name: dateFrom
+                  in: query
+                  schema:
+                      type: string
+                      format: date-time
+                      example: 2023-05-01T00:00:00.000Z
+                - name: dateTo
+                  in: query
+                  schema:
+                      type: string
+                      format: date-time
+                      example: 2023-05-02T00:00:00.000Z
+                - name: limit
+                  in: query
+                  description: Limits number of retrieved items.
+                  schema:
+                      type: integer
+                      example: 10000
+                - name: offset
+                  in: query
+                  description: Number of the first items that are skipped.
+                  schema:
+                      type: integer
+                      example: 0
             responses:
-                '200':
+                "200":
                     description: Success
+                    headers:
+                        Cache-Control:
+                            description: Cache control directive for caching proxies
+                            schema:
+                                type: string
+                                example: public, s-maxage=1800, stale-while-revalidate=60
                     content:
                         application/json:
                             schema:
                                 type: array
                                 items:
-                                    $ref: '#/components/schemas/EnergeticsMeasurement'
-                '400':
+                                    $ref: "#/components/schemas/EnergeticsMeasurement"
+                "400":
                     $ref: "#/components/responses/BadRequestError"
-                '401':
+                "401":
                     $ref: "#/components/responses/UnauthorizedError"
-                '500':
+                "500":
                     $ref: "#/components/responses/ServerError"
 
     /v2/energetics/measurements/monthly-reading:
@@ -264,71 +306,77 @@ paths:
                 - ⚡ Energetics (v2)
             summary: Monthly sums of measurements from devices
             parameters:
-                -   name: addr1
-                    in: query
-                    description: First part of device address
-                    required: true
-                    schema:
-                        type: string
-                        example: "2.9"
-                -   name: addr2
-                    in: query
-                    description: Second part of device address
-                    required: true
-                    schema:
-                        type: string
-                        example: "PF1"
-                -   name: variable
-                    in: query
-                    required: true
-                    schema:
-                        $ref: '#/components/schemas/EnergeticsVariables'
-                    description: >-
-                        core - Kumulovaný objem [m3]<br />
-                        core2 - Kumulovaný přepočítaný objem [Nm3]<br />
-                        EFwActi - Odběr činné energie [kWh]<br />
-                        EFwActiVT - Odběr činné energie, vysoký tarif [kVArh]<br />
-                        ERvReact - Dodávka jalové energie [kVArh]<br />
-                        EFwReact - Odběr jalové energie [kVArh]<br />
-                        raw - Číselník impulzů [imp]<br />
-                        RSSI - Síla signálu [dBm]<br />
-                        T - Teplota [°C]<br />
-                        CO2 - Koncentrace CO2 [ppm]<br />
-                        RH - Relativní vlhkost [%]<br />
-                        EFwActiNT - Odběr činné energie, nízký tarif [kVArh]<br />
-                        VOC - Míra koncentrace těkavých látek [%]<br />
-                        VT - Vysoký tarif [kWh]<br />
-                        NT - Nízký tarif [kWh]<br />
-                -   name: year
-                    in: query
-                    description: Year of measurement
-                    required: true
-                    schema:
-                        type: integer
-                        format: int32
-                        example: 2023
-                -   name: month
-                    in: query
-                    description: Month of measurement
-                    required: true
-                    schema:
-                        type: integer
-                        format: int32
-                        example: 5
+                - name: addr1
+                  in: query
+                  description: First part of device address
+                  required: true
+                  schema:
+                      type: string
+                      example: "2.9"
+                - name: addr2
+                  in: query
+                  description: Second part of device address
+                  required: true
+                  schema:
+                      type: string
+                      example: "PF1"
+                - name: variable
+                  in: query
+                  required: true
+                  schema:
+                      $ref: "#/components/schemas/EnergeticsVariables"
+                  description: >-
+                      core - Kumulovaný objem [m3]<br />
+                      core2 - Kumulovaný přepočítaný objem [Nm3]<br />
+                      EFwActi - Odběr činné energie [kWh]<br />
+                      EFwActiVT - Odběr činné energie, vysoký tarif [kVArh]<br />
+                      ERvReact - Dodávka jalové energie [kVArh]<br />
+                      EFwReact - Odběr jalové energie [kVArh]<br />
+                      raw - Číselník impulzů [imp]<br />
+                      RSSI - Síla signálu [dBm]<br />
+                      T - Teplota [°C]<br />
+                      CO2 - Koncentrace CO2 [ppm]<br />
+                      RH - Relativní vlhkost [%]<br />
+                      EFwActiNT - Odběr činné energie, nízký tarif [kVArh]<br />
+                      VOC - Míra koncentrace těkavých látek [%]<br />
+                      VT - Vysoký tarif [kWh]<br />
+                      NT - Nízký tarif [kWh]<br />
+                - name: year
+                  in: query
+                  description: Year of measurement
+                  required: true
+                  schema:
+                      type: integer
+                      format: int32
+                      example: 2023
+                - name: month
+                  in: query
+                  description: Month of measurement
+                  required: true
+                  schema:
+                      type: integer
+                      format: int32
+                      example: 5
             responses:
-                '200':
+                "200":
                     description: Success
+                    headers:
+                        Cache-Control:
+                            description: Cache control directive for caching proxies
+                            schema:
+                                type: string
+                                example: public, s-maxage=1800, stale-while-revalidate=60
                     content:
                         application/json:
                             schema:
                                 type: array
                                 items:
-                                    $ref: '#/components/schemas/EnergeticsMeasurement'
-                '400':
+                                    $ref: "#/components/schemas/EnergeticsMeasurement"
+                "400":
                     $ref: "#/components/responses/BadRequestError"
-                '401':
+                "401":
                     $ref: "#/components/responses/UnauthorizedError"
-                '500':
+                "500":
                     $ref: "#/components/responses/ServerError"
 
 components:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/energetics",
-    "version": "1.4.3-dev.1393228263",
+    "version": "1.4.3-dev.1411262009",
     "description": "Golemio Energetics Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",