@powercalc/power-router 1.0.39 → 1.0.42

package/dist/router/controllers/LoadAndParse.js

@@ -1,58 +1,58 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadAndParse = void 0;
-const path_1 = require("path");
-const fs_1 = require("fs");
-const LoadService_1 = require("../services/LoadService");
-const queryoptions_1 = require("../interfaces/queryoptions");
-class LoadAndParse {
-    constructor(config) {
-        this.country = '';
-        const countriesFile = (0, path_1.join)(__dirname, '../config/countries.json'); // Set the path to your config file
-        this.countries = JSON.parse((0, fs_1.readFileSync)(countriesFile, 'utf8')); // Read the config file from disk
-        this.loadService = new LoadService_1.LoadService(config);
-    }
-    async get(req, chartType) {
-        var _a;
-        const country = req.params.country;
-        if (this.country !== country) {
-            console.log(`=========== ${country} =============`);
-            this.country = country;
-        }
-        const queryOptions = {};
-        const year = parseInt(req.params.year);
-        const month = parseInt(req.params.month);
-        if (req.query.posneg === queryoptions_1.PosNeg.POS || req.query.posneg === queryoptions_1.PosNeg.NEG) {
-            queryOptions.posneg = req.query.posneg;
-        }
-        if (typeof (req.query.format) === 'string' && Object.values(queryoptions_1.Format).includes(req.query.format)) {
-            queryOptions.format = req.query.format;
-        }
-        let reload = false;
-        if (typeof (req.headers.reload) === 'string') {
-            reload = true;
-            queryOptions.reload = true;
-        }
-        const countryCode = (_a = this.countries.find(item => item.name === country)) === null || _a === void 0 ? void 0 : _a.code;
-        if (!countryCode) {
-            throw new Error('Unknown country ' + country);
-        }
-        if (chartType === 'installed') {
-            return await this.loadService.getInstalled(countryCode, reload);
-        }
-        if (chartType === 'power') {
-            return await this.loadService.getPower(countryCode, year, month, queryOptions);
-        }
-        if (chartType === 'hydrofill') {
-            return await this.loadService.getHydrofill(countryCode, reload);
-        }
-        if (chartType === 'fossil') {
-            return await this.loadService.getFossil(countryCode);
-        }
-        if (chartType === 'countrydata') {
-            return await this.loadService.getCountrydata(countryCode, reload);
-        }
-    }
-}
-exports.LoadAndParse = LoadAndParse;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoadAndParse = void 0;
+const path_1 = require("path");
+const fs_1 = require("fs");
+const LoadService_1 = require("../services/LoadService");
+const queryoptions_1 = require("../interfaces/queryoptions");
+class LoadAndParse {
+    constructor(config) {
+        this.country = '';
+        const countriesFile = (0, path_1.join)(__dirname, '../config/countries.json'); // Set the path to your config file
+        this.countries = JSON.parse((0, fs_1.readFileSync)(countriesFile, 'utf8')); // Read the config file from disk
+        this.loadService = new LoadService_1.LoadService(config);
+    }
+    async get(req, chartType) {
+        var _a;
+        const country = req.params.country;
+        if (this.country !== country) {
+            console.log(`=========== ${country} =============`);
+            this.country = country;
+        }
+        const queryOptions = {};
+        const year = parseInt(req.params.year);
+        const month = parseInt(req.params.month);
+        if (req.query.posneg === queryoptions_1.PosNeg.POS || req.query.posneg === queryoptions_1.PosNeg.NEG) {
+            queryOptions.posneg = req.query.posneg;
+        }
+        if (typeof (req.query.format) === 'string' && Object.values(queryoptions_1.Format).includes(req.query.format)) {
+            queryOptions.format = req.query.format;
+        }
+        let reload = false;
+        if (typeof (req.headers.reload) === 'string') {
+            reload = true;
+            queryOptions.reload = true;
+        }
+        const countryCode = (_a = this.countries.find(item => item.name === country)) === null || _a === void 0 ? void 0 : _a.code;
+        if (!countryCode) {
+            throw new Error('Unknown country ' + country);
+        }
+        if (chartType === 'installed') {
+            return await this.loadService.getInstalled(countryCode, reload);
+        }
+        if (chartType === 'power') {
+            return await this.loadService.getPower(countryCode, year, month, queryOptions);
+        }
+        if (chartType === 'hydrofill') {
+            return await this.loadService.getHydrofill(countryCode, reload);
+        }
+        if (chartType === 'fossil') {
+            return await this.loadService.getFossil(countryCode);
+        }
+        if (chartType === 'countrydata') {
+            return await this.loadService.getCountrydata(countryCode, reload);
+        }
+    }
+}
+exports.LoadAndParse = LoadAndParse;
 //# sourceMappingURL=LoadAndParse.js.map

package/dist/router/controllers/Router.d.ts

@@ -1,7 +1,7 @@
-import { Router, Request, Response } from 'express';
-import { Config } from '../interfaces/config';
-export declare class PowerRouter {
-    static init(config: Config): Router;
-    static load(config: Config, req: Request, res: Response, type: string): Promise<void>;
-    static calcCacheTime(req: Request): number;
-}
+import { Router, Request, Response } from 'express';
+import { Config } from '../interfaces/config';
+export declare class PowerRouter {
+    static init(config: Config): Router;
+    static load(config: Config, req: Request, res: Response, type: string): Promise<void>;
+    static calcCacheTime(req: Request): number;
+}

package/dist/router/controllers/Router.js

@@ -1,106 +1,106 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PowerRouter = void 0;
-const express_1 = require("express");
-const crypto_1 = require("crypto");
-const promises_1 = require("fs/promises");
-const zlib_1 = require("zlib");
-const node_buffer_1 = require("node:buffer");
-const fs_1 = require("fs");
-const LoadAndParse_1 = require("./LoadAndParse");
-const path_1 = require("path");
-class PowerRouter {
-    static init(config) {
-        console.log('init', config);
-        const router = (0, express_1.Router)();
-        router.get(`/:country/:year/:month`, async (req, res) => {
-            await this.load(config, req, res, 'power');
-        });
-        router.get(`/:country/fossil`, async (req, res) => {
-            await this.load(config, req, res, 'fossil');
-        });
-        router.get(`/:country/installed`, async (req, res) => {
-            await this.load(config, req, res, 'installed');
-        });
-        router.get(`/:country/hydrofill`, async (req, res) => {
-            await this.load(config, req, res, 'hydrofill');
-        });
-        router.get(`/:country/countrydata`, async (req, res) => {
-            await this.load(config, req, res, 'countrydata');
-        });
-        router.get('/types', async (req, res) => {
-            const filePath = (0, path_1.join)(__dirname, '..', 'config', 'types.json');
-            res.set({ 'Cache-Control': 'max-age=86400' });
-            res.sendFile(filePath);
-        });
-        router.get('/countries', async (req, res) => {
-            const filePath = (0, path_1.join)(__dirname, '..', 'config', 'countrydata.json');
-            res.set({ 'Cache-Control': 'max-age=86400' });
-            res.sendFile(filePath);
-        });
-        return router;
-    }
-    static async load(config, req, res, type) {
-        const entsoeLoader = new LoadAndParse_1.LoadAndParse(config);
-        const cacheTime = this.calcCacheTime(req);
-        const successHeaders = {
-            'Cache-Control': `public, max-age=${cacheTime}`,
-            'Content-Encoding': 'gzip',
-            'Content-Type': 'application/json'
-        };
-        try {
-            let cacheData;
-            const cacheKey = req.url;
-            const cacheFilePath = `${config.cacheDir}/${(0, crypto_1.createHash)('md5').update(cacheKey).digest('hex')}.json.gz`;
-            if (!(req.headers['reload'] === 'full')) {
-                // check if there is a cache file for this request
-                try {
-                    const stats = await (0, promises_1.stat)(cacheFilePath);
-                    const modtime = stats.mtime.getTime();
-                    // Check if the If-Modified-Since header matches the last modified date
-                    const ifModifiedSince = req.headers['if-modified-since'];
-                    if (ifModifiedSince && (modtime - new Date(ifModifiedSince).getTime()) < 5000) {
-                        res.status(304).end();
-                        return;
-                    }
-                    res.setHeader('Last-Modified', (new Date(modtime)).toUTCString());
-                    res.set(successHeaders);
-                    console.log('cached');
-                    (0, fs_1.createReadStream)(cacheFilePath)
-                        .pipe(res);
-                    return;
-                }
-                catch (err) {
-                    // no cache file found, continue with request
-                }
-            }
-            // if no cache hit, load data and store in cache
-            if (!cacheData) {
-                // LOAD THE DATA  FROM SOURCE
-                const body = await entsoeLoader.get(req, type);
-                const buf = node_buffer_1.Buffer.from(JSON.stringify(body), 'utf-8');
-                const cacheDataBuffer = (0, zlib_1.gzipSync)(buf);
-                await (0, promises_1.writeFile)(cacheFilePath, cacheDataBuffer, 'utf-8');
-                res.setHeader('Last-Modified', (new Date()).toUTCString());
-                res.set(successHeaders);
-                res.send(cacheDataBuffer);
-            }
-        }
-        catch (e) {
-            console.log(e);
-        }
-    }
-    static calcCacheTime(req) {
-        const reqMonth = `${req.params.year} ${req.params.month}`;
-        const now = new Date();
-        const nowMonth = `${now.getFullYear()} ${now.getMonth() + 1}`;
-        if (reqMonth === nowMonth) {
-            return 5 * 60;
-        }
-        else {
-            return 3600 * 7;
-        }
-    }
-}
-exports.PowerRouter = PowerRouter;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PowerRouter = void 0;
+const express_1 = require("express");
+const crypto_1 = require("crypto");
+const promises_1 = require("fs/promises");
+const zlib_1 = require("zlib");
+const node_buffer_1 = require("node:buffer");
+const fs_1 = require("fs");
+const LoadAndParse_1 = require("./LoadAndParse");
+const path_1 = require("path");
+class PowerRouter {
+    static init(config) {
+        console.log('init', config);
+        const router = (0, express_1.Router)();
+        router.get(`/:country/:year/:month`, async (req, res) => {
+            await this.load(config, req, res, 'power');
+        });
+        router.get(`/:country/fossil`, async (req, res) => {
+            await this.load(config, req, res, 'fossil');
+        });
+        router.get(`/:country/installed`, async (req, res) => {
+            await this.load(config, req, res, 'installed');
+        });
+        router.get(`/:country/hydrofill`, async (req, res) => {
+            await this.load(config, req, res, 'hydrofill');
+        });
+        router.get(`/:country/countrydata`, async (req, res) => {
+            await this.load(config, req, res, 'countrydata');
+        });
+        router.get('/types', async (req, res) => {
+            const filePath = (0, path_1.join)(__dirname, '..', 'config', 'types.json');
+            res.set({ 'Cache-Control': 'max-age=86400' });
+            res.sendFile(filePath);
+        });
+        router.get('/countries', async (req, res) => {
+            const filePath = (0, path_1.join)(__dirname, '..', 'config', 'countrydata.json');
+            res.set({ 'Cache-Control': 'max-age=86400' });
+            res.sendFile(filePath);
+        });
+        return router;
+    }
+    static async load(config, req, res, type) {
+        const entsoeLoader = new LoadAndParse_1.LoadAndParse(config);
+        const cacheTime = this.calcCacheTime(req);
+        const successHeaders = {
+            'Cache-Control': `public, max-age=${cacheTime}`,
+            'Content-Encoding': 'gzip',
+            'Content-Type': 'application/json'
+        };
+        try {
+            let cacheData;
+            const cacheKey = req.url;
+            const cacheFilePath = `${config.cacheDir}/${(0, crypto_1.createHash)('md5').update(cacheKey).digest('hex')}.json.gz`;
+            if (!(req.headers['reload'] === 'full')) {
+                // check if there is a cache file for this request
+                try {
+                    const stats = await (0, promises_1.stat)(cacheFilePath);
+                    const modtime = stats.mtime.getTime();
+                    // Check if the If-Modified-Since header matches the last modified date
+                    const ifModifiedSince = req.headers['if-modified-since'];
+                    if (ifModifiedSince && (modtime - new Date(ifModifiedSince).getTime()) < 5000) {
+                        res.status(304).end();
+                        return;
+                    }
+                    res.setHeader('Last-Modified', (new Date(modtime)).toUTCString());
+                    res.set(successHeaders);
+                    console.log('cached');
+                    (0, fs_1.createReadStream)(cacheFilePath)
+                        .pipe(res);
+                    return;
+                }
+                catch (err) {
+                    // no cache file found, continue with request
+                }
+            }
+            // if no cache hit, load data and store in cache
+            if (!cacheData) {
+                // LOAD THE DATA  FROM SOURCE
+                const body = await entsoeLoader.get(req, type);
+                const buf = node_buffer_1.Buffer.from(JSON.stringify(body), 'utf-8');
+                const cacheDataBuffer = (0, zlib_1.gzipSync)(buf);
+                await (0, promises_1.writeFile)(cacheFilePath, cacheDataBuffer, 'utf-8');
+                res.setHeader('Last-Modified', (new Date()).toUTCString());
+                res.set(successHeaders);
+                res.send(cacheDataBuffer);
+            }
+        }
+        catch (e) {
+            console.log(e);
+        }
+    }
+    static calcCacheTime(req) {
+        const reqMonth = `${req.params.year} ${req.params.month}`;
+        const now = new Date();
+        const nowMonth = `${now.getFullYear()} ${now.getMonth() + 1}`;
+        if (reqMonth === nowMonth) {
+            return 5 * 60;
+        }
+        else {
+            return 3600 * 7;
+        }
+    }
+}
+exports.PowerRouter = PowerRouter;
 //# sourceMappingURL=Router.js.map

package/dist/router/index.d.ts

@@ -1,2 +1,2 @@
-export { PowerRouter } from './controllers/Router';
-export { Config } from './interfaces/config';
+export { PowerRouter } from './controllers/Router';
+export { Config } from './interfaces/config';

package/dist/router/index.js

@@ -1,6 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PowerRouter = void 0;
-var Router_1 = require("./controllers/Router");
-Object.defineProperty(exports, "PowerRouter", { enumerable: true, get: function () { return Router_1.PowerRouter; } });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PowerRouter = void 0;
+var Router_1 = require("./controllers/Router");
+Object.defineProperty(exports, "PowerRouter", { enumerable: true, get: function () { return Router_1.PowerRouter; } });
 //# sourceMappingURL=index.js.map

package/dist/router/interfaces/config.d.ts

@@ -1,5 +1,5 @@
-export interface Config {
-    securityToken: string;
-    cacheDir: string;
-    entsoeDomain: string;
-}
+export interface Config {
+    securityToken: string;
+    cacheDir: string;
+    entsoeDomain: string;
+}

package/dist/router/interfaces/config.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=config.js.map

package/dist/router/interfaces/entsoe.d.ts

@@ -1,50 +1,50 @@
-export interface Entsoe {
-    GL_MarketDocument?: EntsoeDocument;
-    Publication_MarketDocument?: EntsoeDocument;
-    Acknowledgement_MarketDocument?: ErrorDocument;
-}
-export interface EntsoeDocument {
-    TimeSeries: TimeSeries[];
-    'period.timeInterval'?: TimeInterval[];
-    'time_Period.timeInterval'?: TimeInterval[];
-    type?: string[];
-}
-export interface TimeSeries {
-    Period: EntsoePeriod[];
-    MktPSRType?: MktPSRType[];
-    'outBiddingZone_Domain.mRID': string;
-}
-export interface EntsoePeriod {
-    Point: EntsoePoint[];
-    resolution: string;
-    timeInterval: TimeInterval[];
-}
-interface TimeInterval {
-    start: string[];
-    end: string[];
-}
-export interface MktPSRType {
-    psrType?: string[];
-    PowerSystemResources?: PowerSystemResource[];
-}
-export interface EntsoePoint {
-    position: string[];
-    quantity?: string[];
-    'price.amount'?: string[];
-}
-export interface PowerSystemResource {
-    mRID: mRID[];
-    name: string[];
-}
-export interface mRID {
-    _: string;
-}
-export interface ErrorDocument {
-    mRID: string;
-    Reason: Reason[];
-}
-interface Reason {
-    code: string[];
-    text: string[];
-}
-export {};
+export interface Entsoe {
+    GL_MarketDocument?: EntsoeDocument;
+    Publication_MarketDocument?: EntsoeDocument;
+    Acknowledgement_MarketDocument?: ErrorDocument;
+}
+export interface EntsoeDocument {
+    TimeSeries: TimeSeries[];
+    'period.timeInterval'?: TimeInterval[];
+    'time_Period.timeInterval'?: TimeInterval[];
+    type?: string[];
+}
+export interface TimeSeries {
+    Period: EntsoePeriod[];
+    MktPSRType?: MktPSRType[];
+    'outBiddingZone_Domain.mRID': string;
+}
+export interface EntsoePeriod {
+    Point: EntsoePoint[];
+    resolution: string;
+    timeInterval: TimeInterval[];
+}
+interface TimeInterval {
+    start: string[];
+    end: string[];
+}
+export interface MktPSRType {
+    psrType?: string[];
+    PowerSystemResources?: PowerSystemResource[];
+}
+export interface EntsoePoint {
+    position: string[];
+    quantity?: string[];
+    'price.amount'?: string[];
+}
+export interface PowerSystemResource {
+    mRID: mRID[];
+    name: string[];
+}
+export interface mRID {
+    _: string;
+}
+export interface ErrorDocument {
+    mRID: string;
+    Reason: Reason[];
+}
+interface Reason {
+    code: string[];
+    text: string[];
+}
+export {};

package/dist/router/interfaces/entsoe.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=entsoe.js.map

package/dist/router/interfaces/queryoptions.d.ts

@@ -1,15 +1,15 @@
-export interface QueryOptions {
-    reload?: boolean;
-    format?: Format;
-    posneg?: PosNeg;
-}
-export declare enum Format {
-    EDIFACT = "edifact",
-    EDIJSON = "edijson",
-    SOURCES = "sources",
-    KEYVALUE = "keyvalue"
-}
-export declare enum PosNeg {
-    POS = "pos",
-    NEG = "neg"
-}
+export interface QueryOptions {
+    reload?: boolean;
+    format?: Format;
+    posneg?: PosNeg;
+}
+export declare enum Format {
+    EDIFACT = "edifact",
+    EDIJSON = "edijson",
+    SOURCES = "sources",
+    KEYVALUE = "keyvalue"
+}
+export declare enum PosNeg {
+    POS = "pos",
+    NEG = "neg"
+}

package/dist/router/interfaces/queryoptions.js

@@ -1,16 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PosNeg = exports.Format = void 0;
-var Format;
-(function (Format) {
-    Format["EDIFACT"] = "edifact";
-    Format["EDIJSON"] = "edijson";
-    Format["SOURCES"] = "sources";
-    Format["KEYVALUE"] = "keyvalue";
-})(Format = exports.Format || (exports.Format = {}));
-var PosNeg;
-(function (PosNeg) {
-    PosNeg["POS"] = "pos";
-    PosNeg["NEG"] = "neg";
-})(PosNeg = exports.PosNeg || (exports.PosNeg = {}));
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PosNeg = exports.Format = void 0;
+var Format;
+(function (Format) {
+    Format["EDIFACT"] = "edifact";
+    Format["EDIJSON"] = "edijson";
+    Format["SOURCES"] = "sources";
+    Format["KEYVALUE"] = "keyvalue";
+})(Format = exports.Format || (exports.Format = {}));
+var PosNeg;
+(function (PosNeg) {
+    PosNeg["POS"] = "pos";
+    PosNeg["NEG"] = "neg";
+})(PosNeg = exports.PosNeg || (exports.PosNeg = {}));
 //# sourceMappingURL=queryoptions.js.map

package/dist/router/interfaces/types.d.ts

@@ -1,12 +1,12 @@
-export interface Types {
-    [key: string]: Type;
-}
-export interface Type {
-    name: string;
-    psrType: string;
-    co2Footprint: number;
-    color: string;
-    abbr: string;
-    yAxis: string;
-    stack: string;
-}
+export interface Types {
+    [key: string]: Type;
+}
+export interface Type {
+    name: string;
+    psrType: string;
+    co2Footprint: number;
+    color: string;
+    abbr: string;
+    yAxis: string;
+    stack: string;
+}

package/dist/router/interfaces/types.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=types.js.map

package/dist/router/services/CommonTimestamps.d.ts

@@ -1,15 +1,15 @@
-import { AllInResulotions, DataPoint, DataPointResolutions } from "./ParseEdifact";
-export interface Result {
-    [key: string]: (number | null)[];
-}
-export declare class CommonTimestamps {
-    static transform(all: AllInResulotions, startMonth: string, endMonth: string): Result;
-    static makeCommonTimeBase(all: DataPointResolutions, newTimes: number[], best: string): (number | null)[] | undefined;
-    static shouldMerge(all: DataPointResolutions): boolean;
-    static interpolate(all: DataPointResolutions, newTimes: number[]): (number | null)[] | undefined;
-    private static findTime;
-    static makeNumbers(all: DataPoint[], newTimes: number[]): (number | null)[];
-    static makeTimeArray(startIsoString: string, endIsoString: string, resolution: string): number[];
-    static best(all: any): string;
-    static bestResolution(all: any): string;
-}
+import { AllInResulotions, DataPoint, DataPointResolutions } from "./ParseEdifact";
+export interface Result {
+    [key: string]: (number | null)[];
+}
+export declare class CommonTimestamps {
+    static transform(all: AllInResulotions, startMonth: string, endMonth: string): Result;
+    static makeCommonTimeBase(all: DataPointResolutions, newTimes: number[], best: string): (number | null)[] | undefined;
+    static shouldMerge(all: DataPointResolutions): boolean;
+    static interpolate(all: DataPointResolutions, newTimes: number[]): (number | null)[] | undefined;
+    private static findTime;
+    static makeNumbers(all: DataPoint[], newTimes: number[]): (number | null)[];
+    static makeTimeArray(startIsoString: string, endIsoString: string, resolution: string): number[];
+    static best(all: any): string;
+    static bestResolution(all: any): string;
+}