@powercalc/power-router 1.0.63 → 1.0.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/controllers/LoadAndParse.d.ts +1 -0
- package/dist/controllers/LoadAndParse.js +12 -5
- package/dist/controllers/LoadAndParse.js.map +1 -1
- package/dist/controllers/Router.js +1 -0
- package/dist/controllers/Router.js.map +1 -1
- package/dist/interfaces/config.d.ts +1 -0
- package/dist/services/EnergyCharts.d.ts +17 -0
- package/dist/services/EnergyCharts.js +190 -0
- package/dist/services/EnergyCharts.js.map +1 -0
- package/dist/services/Eurostat.d.ts +3 -2
- package/dist/services/Eurostat.js +49 -13
- package/dist/services/Eurostat.js.map +1 -1
- package/dist/services/LoadService.d.ts +12 -11
- package/dist/services/LoadService.js +44 -18
- package/dist/services/LoadService.js.map +1 -1
- package/dist/services/Loader.d.ts +2 -2
- package/dist/services/Loader.js +10 -2
- package/dist/services/Loader.js.map +1 -1
- package/dist/services/NaturalGasPrice.d.ts +2 -1
- package/dist/services/NaturalGasPrice.js +5 -1
- package/dist/services/NaturalGasPrice.js.map +1 -1
- package/dist/services/ParseEdifact.js +0 -6
- package/dist/services/ParseEdifact.js.map +1 -1
- package/dist/services/batch/maxHydrofill.js +0 -2
- package/dist/services/batch/maxHydrofill.js.map +1 -1
- package/package.json +1 -1
- package/src/app.ts +9 -0
- package/src/genTypes.ts +0 -1
- package/src/router/controllers/LoadAndParse.ts +11 -6
- package/src/router/controllers/Router.ts +1 -1
- package/src/router/interfaces/config.ts +6 -5
- package/src/router/services/EnergyCharts.ts +195 -0
- package/src/router/services/Eurostat.ts +111 -68
- package/src/router/services/LoadService.ts +129 -80
- package/src/router/services/Loader.ts +11 -4
- package/src/router/services/NaturalGasPrice.ts +5 -1
- package/src/router/services/ParseEdifact.ts +0 -6
- package/src/router/services/batch/maxHydrofill.ts +0 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoadService.js","sourceRoot":"","sources":["../../src/router/services/LoadService.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"LoadService.js","sourceRoot":"","sources":["../../src/router/services/LoadService.ts"],"names":[],"mappings":";;;AAAA,2BAAiC;AACjC,+BAA2B;AAC3B,qCAAqD;AACrD,iDAAyD;AACzD,qDAAiD;AACjD,yDAAqD;AACrD,yCAAwC;AAExC,6DAAiE;AACjE,uDAAoD;AAEpD,iDAA6C;AAE7C,MAAa,WAAW;IAMtB,YAAoB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAL9C,YAAO,GAAG,EAAE,CAAA;QAMV,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,sBAAsB,CAAC,CAAA,CAAC,mCAAmC;QAC7F,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,SAAS,EAAE,MAAM,CAAC,CAAU,CAAA,CAAC,iCAAiC;QAEpG,IAAI,CAAC,MAAM,GAAG,IAAI,qBAAY,CAAC,YAAY,CAAC,CAAA;QAC5C,IAAI,CAAC,MAAM,GAAG,IAAI,4BAAa,CAAC,KAAK,CAAC,CAAA;QACtC,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,KAAK,CAAC,CAAA;IACjD,CAAC;IACD,KAAK,CAAC,oBAAoB,CACxB,WAAmB,EACnB,IAAY,EACZ,KAAa;QAEb,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;QACpE,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;QAC9D,MAAM,YAAY,GAAG,IAAI,2BAAY,EAAE,CAAA;QACvC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;QACxE,OAAO,KAAK,CAAA;IACd,CAAC;IACD,KAAK,CAAC,QAAQ,CACZ,WAAmB,EACnB,IAAY,EACZ,KAAa,EACb,YAA2B;QAE3B,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;QACpE,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;QAC9D,MAAM,MAAM,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,CAAC,CAAA;QACrD,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,MAAK,qBAAM,CAAC,OAAO,EAAE;YAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;SAC9D;QACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAC1C,MAAM,EACN,WAAW,EACX,IAAI,EACJ,KAAK,EACL,YAAY,CACb,CAAA;QACD,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,MAAK,qBAAM,CAAC,OAAO,EAAE;YAC3C,OAAO,aAAa,CAAA;SACrB;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;QACxD,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,MAAK,qBAAM,CAAC,QAAQ,EAAE;YAC5C,OAAO,MAAM,CAAA;SACd;QACD,MAAM,KAAK,GAAQ,mCAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;QAC3E,gCAAgC;QAChC;;;;UAIE;QACF,OAAO,KAAK,CAAA;IACd,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,WAAmB,EAAE,YAA0B;QAChE;;;;cAIM;QACN,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CACnD,WAAW,EACX,YAAY,CACb,CAAA;QACD,IAAI,YAAY,CAAC,MAAM,KAAK,qBAAM,CAAC,OAAO,EAAE;YAC1C,OAAO,aAAa,CAAA;SACrB;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,aAAyB,CAAC,CAAA;QACxE,OAAO,KAAK,CAAA;IACd,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,WAAmB,EAAE,YAA0B;;QAChE,MAAM,MAAM,GAAG,CAAC,WAAW,CAAC,CAAA;QAC5B,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;QAC5C,IAAI,GAAG,GAAgB,EAAE,CAAA;QACzB,KAAK,IAAI,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE;YAC5C,MAAM,KAAK,GAAG,CAAC,CAAA;YACf,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAC1C,MAAM,EACN,WAAW,EACX,IAAI,EACJ,KAAK,EACL,YAAY,CACb,CAAA;YACD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YAC1B,IAAI,YAAY,CAAC,MAAM,KAAK,qBAAM,CAAC,OAAO,EAAE;gBAC1C,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;aACjC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;YACxD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,EAAE;gBACrB,MAAM,OAAO,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAC,0CAAG,CAAC,CAAC,CAAA;gBACrD,IAAI,OAAO,EAAE;oBACX,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;iBAC1B;aACF;SACF;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC/C,OAAO,KAAK,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,CAAA;QAC7D,CAAC,CAAC,CAAA;QACF,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;YACvC,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;SAC9C,CAAA;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,YAA0B;QACzD,MAAM,QAAQ,GAAG,IAAI,sBAAW,EAAE,CAAA;QAClC,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IACnD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAe,EAAE,YAA0B;QACnE,MAAM,QAAQ,GAAG,IAAI,kCAAgB,EAAE,CAAA;QACvC,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IACnD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAe,EAAE,YAA0B;QAC9D,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,CAAA;QACnD,OAAO;YACL,MAAM,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;YACnD,KAAK,EAAE,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC;YAC5D,SAAS,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC;YACzD,SAAS,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC;SAC1D,CAAA;IACH,CAAC;CACF;AAnID,kCAmIC"}
|
|
@@ -27,9 +27,9 @@ export declare class EntsoeLoader {
|
|
|
27
27
|
private loaderConfig;
|
|
28
28
|
private config;
|
|
29
29
|
constructor(loaderConfig: LoaderConfig);
|
|
30
|
-
load(wanted: string[], countryCode: string, year: number, month: number, queryOptions?: QueryOptions): Promise<
|
|
30
|
+
load(wanted: string[], countryCode: string, year: number, month: number, queryOptions?: QueryOptions): Promise<any>;
|
|
31
31
|
makeUrls(wanted: string[], countryCode: string, year: number, month: number): KV;
|
|
32
|
-
loadInstalled(countryCode: string,
|
|
32
|
+
loadInstalled(countryCode: string, queryOptions?: QueryOptions): Promise<string[] | Entsoe[]>;
|
|
33
33
|
fetchAndMakeJson(urls: string[], reload?: boolean): Promise<Entsoe[]>;
|
|
34
34
|
filterEmpty(all: Data): void;
|
|
35
35
|
fetchAndCache(url: string, reload?: boolean): Promise<Entsoe>;
|
package/dist/services/Loader.js
CHANGED
|
@@ -5,6 +5,7 @@ const xml2js_1 = require("xml2js");
|
|
|
5
5
|
const promises_1 = require("node:fs/promises");
|
|
6
6
|
const node_path_1 = require("node:path");
|
|
7
7
|
const date_fns_1 = require("date-fns");
|
|
8
|
+
const queryoptions_1 = require("../interfaces/queryoptions");
|
|
8
9
|
class EntsoeLoader {
|
|
9
10
|
constructor(loaderConfig) {
|
|
10
11
|
this.loaderConfig = loaderConfig;
|
|
@@ -12,6 +13,9 @@ class EntsoeLoader {
|
|
|
12
13
|
}
|
|
13
14
|
async load(wanted, countryCode, year, month, queryOptions) {
|
|
14
15
|
const urls = this.makeUrls(wanted, countryCode, year, month);
|
|
16
|
+
if ((queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.format) === queryoptions_1.Format.SOURCES) {
|
|
17
|
+
return urls;
|
|
18
|
+
}
|
|
15
19
|
const allJsons = await this.fetchAndMakeJson(Object.values(urls), queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.reload);
|
|
16
20
|
const result = {};
|
|
17
21
|
Object.keys(urls).forEach((key, i) => {
|
|
@@ -54,7 +58,8 @@ class EntsoeLoader {
|
|
|
54
58
|
const filteredUrls = this.filterURLs(urls, wanted);
|
|
55
59
|
return filteredUrls;
|
|
56
60
|
}
|
|
57
|
-
async loadInstalled(countryCode,
|
|
61
|
+
async loadInstalled(countryCode, queryOptions) {
|
|
62
|
+
console.log('8858', queryOptions);
|
|
58
63
|
const currentYear = (new Date()).getFullYear();
|
|
59
64
|
const urls = [];
|
|
60
65
|
for (let year = 2015; year <= currentYear; year++) {
|
|
@@ -63,7 +68,10 @@ class EntsoeLoader {
|
|
|
63
68
|
const installed = `${this.config.entsoeDomain}/api?documentType=A68&processType=A33&in_Domain=${countryCode}&periodStart=${periodStart}&periodEnd=${periodEnd}`;
|
|
64
69
|
urls.push(installed);
|
|
65
70
|
}
|
|
66
|
-
|
|
71
|
+
if ((queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.format) === queryoptions_1.Format.SOURCES) {
|
|
72
|
+
return urls;
|
|
73
|
+
}
|
|
74
|
+
const allJsons = await this.fetchAndMakeJson(Object.values(urls), queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.reload);
|
|
67
75
|
return allJsons;
|
|
68
76
|
}
|
|
69
77
|
async fetchAndMakeJson(urls, reload) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../src/router/services/Loader.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAC5C,+CAAuD;AAEvD,yCAAiC;AACjC,uCAA2C;
|
|
1
|
+
{"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../src/router/services/Loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Country } from "./Loader";
|
|
2
|
+
import { QueryOptions } from "../interfaces/queryoptions";
|
|
2
3
|
export declare class NaturalGasPrices {
|
|
3
4
|
countries: Country[];
|
|
4
5
|
constructor();
|
|
5
|
-
load(countryCode: string): Promise<{
|
|
6
|
+
load(countryCode: string, queryOptions: QueryOptions): Promise<string[] | {
|
|
6
7
|
time: number[];
|
|
7
8
|
naturalGasPrice: number[];
|
|
8
9
|
}>;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.NaturalGasPrices = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
+
const queryoptions_1 = require("../interfaces/queryoptions");
|
|
6
7
|
class NaturalGasPrices {
|
|
7
8
|
constructor() {
|
|
8
9
|
this.countries = [];
|
|
@@ -10,10 +11,13 @@ class NaturalGasPrices {
|
|
|
10
11
|
const countriesString = (0, fs_1.readFileSync)(countryPath, 'utf-8');
|
|
11
12
|
this.countries = JSON.parse(countriesString);
|
|
12
13
|
}
|
|
13
|
-
async load(countryCode) {
|
|
14
|
+
async load(countryCode, queryOptions) {
|
|
14
15
|
var _a;
|
|
15
16
|
const countryShort = (_a = this.countries.find((item) => item.code === countryCode)) === null || _a === void 0 ? void 0 : _a.short;
|
|
16
17
|
const url = `https://ec.europa.eu/eurostat/api/dissemination/sdmx/2.1/data/nrg_pc_203/S.4100.GJ10000-99999.KWH.X_TAX.EUR.${countryShort}/?format=JSON&lang=en&startPeriod=2014&endPeriod=2023`;
|
|
18
|
+
if (queryOptions.format === queryoptions_1.Format.SOURCES) {
|
|
19
|
+
return [url];
|
|
20
|
+
}
|
|
17
21
|
const response = await fetch(url);
|
|
18
22
|
const json = await response.json();
|
|
19
23
|
const r = this.convert(json);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NaturalGasPrice.js","sourceRoot":"","sources":["../../src/router/services/NaturalGasPrice.ts"],"names":[],"mappings":";;;AAAA,2BAAiC;AACjC,+BAA2B;
|
|
1
|
+
{"version":3,"file":"NaturalGasPrice.js","sourceRoot":"","sources":["../../src/router/services/NaturalGasPrice.ts"],"names":[],"mappings":";;;AAAA,2BAAiC;AACjC,+BAA2B;AAE3B,6DAAiE;AAEjE,MAAa,gBAAgB;IAE3B;QADA,cAAS,GAAc,EAAE,CAAA;QAEvB,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,uBAAuB,CAAC,CAAA;QAClE,MAAM,eAAe,GAAG,IAAA,iBAAY,EAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAC1D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;IAC9C,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAAmB,EAAE,YAAyB;;QACvD,MAAM,YAAY,GAAG,MAAA,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CACpC,0CAAE,KAAK,CAAA;QAER,MAAM,GAAG,GAAG,+GAA+G,YAAY,uDAAuD,CAAA;QAC9L,IAAG,YAAY,CAAC,MAAM,KAAK,qBAAM,CAAC,OAAO,EAAC;YACtC,OAAO,CAAC,GAAG,CAAC,CAAC;SAChB;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;QACjC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC5B,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,CAAC,CAAK;;QACX,MAAM,UAAU,GAAG,CAAA,MAAA,MAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,SAAS,0CAAE,IAAI,0CAAE,QAAQ,0CAAE,KAAK,KAAI,EAAE,CAAC;QAC7D,MAAM,KAAK,GAAG,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,KAAI,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAa,CAAA;QAC/C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,IAAI,KAAK,CAAC,CAAC,CAAC,KAAG,IAAI,EAAC;gBACpB,KAAK,GAAG,CAAC,CAAC;aACT;YACD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAClC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAA;QACF,OAAO;YACH,IAAI,EAAC,IAAI;YACT,eAAe,EAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,IAAE,CAAC,CAAC,GAAC,IAAI,GAAC,IAAI,CAAC;SAC1D,CAAA;IACH,CAAC;CACF;AAzCD,4CAyCC"}
|
|
@@ -92,12 +92,6 @@ class EdifactParser {
|
|
|
92
92
|
const utcEndTime = localEndTime.toUTC();
|
|
93
93
|
// Calculate time distance in milliseconds
|
|
94
94
|
const timeDistance = utcEndTime.toMillis() - utcStartTime.toMillis();
|
|
95
|
-
if (timeDistance < duration && timeSerie.Period.length !== 1) {
|
|
96
|
-
console.log('timeDistance', timeDistance, duration, startIsoString, endIsoString);
|
|
97
|
-
}
|
|
98
|
-
if (timeDistance > duration) {
|
|
99
|
-
//console.log('timeDistance2', timeDistance, duration, startIsoString, endIsoString)
|
|
100
|
-
}
|
|
101
95
|
// Create an array with time distance duration in UTC time using Luxon
|
|
102
96
|
const timeSteps = [];
|
|
103
97
|
for (let i = 0; i <= timeDistance; i += duration) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParseEdifact.js","sourceRoot":"","sources":["../../src/router/services/ParseEdifact.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ParseEdifact.js","sourceRoot":"","sources":["../../src/router/services/ParseEdifact.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ class Hydrofill {
|
|
|
13
13
|
const h = await this.getMaxHydrofill(country.code);
|
|
14
14
|
if (h.max) {
|
|
15
15
|
const GW = Math.round(h.max / 1000) + ' GW';
|
|
16
|
-
console.log(country.name, GW);
|
|
17
16
|
country.hydrofill = {
|
|
18
17
|
min: h.min,
|
|
19
18
|
max: h.max
|
|
@@ -21,7 +20,6 @@ class Hydrofill {
|
|
|
21
20
|
}
|
|
22
21
|
}
|
|
23
22
|
const countryFile = (0, path_1.join)(__dirname, '../../config', 'countrydata.json');
|
|
24
|
-
console.log(countryFile);
|
|
25
23
|
const countryDataFile = (0, path_1.join)((0, process_1.cwd)(), 'data/countrydata.json');
|
|
26
24
|
(0, fs_1.writeFileSync)(countryFile, JSON.stringify(countries, null, 2));
|
|
27
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maxHydrofill.js","sourceRoot":"","sources":["../../../src/router/services/batch/maxHydrofill.ts"],"names":[],"mappings":";;;AAAA,2BAAiD;AACjD,+BAA4B;AAC5B,qCAA8B;AAC9B,2CAA2C;AAC3C,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,GAAG,GAAG,CAAC;AAGlD,MAAa,SAAS;IAGpB,MAAM,CAAC,KAAK,CAAC,KAAK;QAChB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;QAC3C,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE;YAC/B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAClD,IAAI,CAAC,CAAC,GAAG,EAAE;gBACT,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,CAAA;gBAC3C,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"maxHydrofill.js","sourceRoot":"","sources":["../../../src/router/services/batch/maxHydrofill.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/app.ts
CHANGED
|
@@ -11,12 +11,21 @@ import { PowerRouter } from './router/controllers/Router';
|
|
|
11
11
|
const app = express();
|
|
12
12
|
const port = 30000;
|
|
13
13
|
const config: Config = {
|
|
14
|
+
source:'entsoe',
|
|
14
15
|
securityToken: '1c608639-afff-4d73-bfe1-a960fe7ea8da',
|
|
15
16
|
cacheDir: join(cwd(), 'data'),
|
|
16
17
|
entsoeDomain: "https://web-api.tp.entsoe.eu"
|
|
17
18
|
}
|
|
19
|
+
|
|
20
|
+
const configEnergyCharts: Config = {
|
|
21
|
+
source:'energycharts',
|
|
22
|
+
securityToken: '1c608639-afff-4d73-bfe1-a960fe7ea8da',
|
|
23
|
+
cacheDir: join(cwd(), 'data2'),
|
|
24
|
+
entsoeDomain: "https://web-api.tp.entsoe.eu"
|
|
25
|
+
}
|
|
18
26
|
app.use(cors<Request>());
|
|
19
27
|
app.use('/entsoe', PowerRouter.init(config));
|
|
28
|
+
app.use('/energycharts', PowerRouter.init(configEnergyCharts));
|
|
20
29
|
app.use('/public', express.static('public'));
|
|
21
30
|
// app.use('/config', express.static('dist/config', { maxAge: 100000 }));
|
|
22
31
|
|
package/src/genTypes.ts
CHANGED
|
@@ -12,7 +12,7 @@ export class LoadAndParse {
|
|
|
12
12
|
loadService: LoadService;
|
|
13
13
|
|
|
14
14
|
|
|
15
|
-
constructor(config: Config) {
|
|
15
|
+
constructor(private config: Config) {
|
|
16
16
|
const countriesFile = join(__dirname, '../config/countries.json'); // Set the path to your config file
|
|
17
17
|
this.countries = JSON.parse(readFileSync(countriesFile, 'utf8')); // Read the config file from disk
|
|
18
18
|
this.loadService = new LoadService(config)
|
|
@@ -44,19 +44,24 @@ export class LoadAndParse {
|
|
|
44
44
|
throw new Error('Unknown country ' + country)
|
|
45
45
|
}
|
|
46
46
|
if (chartType === 'installed') {
|
|
47
|
-
|
|
47
|
+
console.log('yes')
|
|
48
|
+
return await this.loadService.getInstalled(countryCode, queryOptions);
|
|
48
49
|
}
|
|
49
50
|
if (chartType === 'power') {
|
|
50
|
-
|
|
51
|
+
if(this.config.source==='energycharts'){
|
|
52
|
+
return await this.loadService.getPowerEnergyCharts(countryCode, year, month );
|
|
53
|
+
}else{
|
|
54
|
+
return await this.loadService.getPower(countryCode, year, month, queryOptions);
|
|
55
|
+
}
|
|
51
56
|
}
|
|
52
57
|
if (chartType === 'hydrofill') {
|
|
53
|
-
return await this.loadService.getHydrofill(countryCode,
|
|
58
|
+
return await this.loadService.getHydrofill(countryCode, queryOptions);
|
|
54
59
|
}
|
|
55
60
|
if (chartType === 'fossil') {
|
|
56
|
-
return await this.loadService.getFossil(countryCode);
|
|
61
|
+
return await this.loadService.getFossil(countryCode, queryOptions);
|
|
57
62
|
}
|
|
58
63
|
if (chartType === 'countrydata') {
|
|
59
|
-
return await this.loadService.getCountrydata(countryCode,
|
|
64
|
+
return await this.loadService.getCountrydata(countryCode, queryOptions);
|
|
60
65
|
}
|
|
61
66
|
}
|
|
62
67
|
}
|
|
@@ -54,7 +54,7 @@ export class PowerRouter {
|
|
|
54
54
|
const cacheKey = req.url;
|
|
55
55
|
const cacheFilePath = `${config.cacheDir}/json.gz/${createHash('md5').update(cacheKey).digest('hex')}.json.gz`;
|
|
56
56
|
if (!(req.headers['reload'] === 'full')) {
|
|
57
|
-
|
|
57
|
+
// todo: throttle
|
|
58
58
|
// check if there is a cache file for this request
|
|
59
59
|
try {
|
|
60
60
|
const stats = await stat(cacheFilePath);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
export interface Config
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
export interface Config {
|
|
2
|
+
source: string
|
|
3
|
+
securityToken: string
|
|
4
|
+
cacheDir: string
|
|
5
|
+
entsoeDomain: string
|
|
6
|
+
}
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
import { readFileSync } from 'fs';
|
|
2
|
+
import { join } from 'path';
|
|
3
|
+
import { CommonTimestamps } from './CommonTimestamps';
|
|
4
|
+
|
|
5
|
+
export class EnergyCharts {
|
|
6
|
+
pumpUp = 'Hydro pumped storage consumption';
|
|
7
|
+
trans = [
|
|
8
|
+
{
|
|
9
|
+
energyCharts: 'Hydro pumped storage consumption',
|
|
10
|
+
powerRouter: null,
|
|
11
|
+
},
|
|
12
|
+
{
|
|
13
|
+
energyCharts: 'Cross border electricity trading',
|
|
14
|
+
powerRouter: 'other',
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
energyCharts: 'Nuclear',
|
|
18
|
+
powerRouter: 'nuclear',
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
energyCharts: 'Hydro Run-of-River',
|
|
22
|
+
powerRouter: 'hydroRunOfRiverAndPoundage',
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
energyCharts: 'Biomass',
|
|
26
|
+
powerRouter: 'biomass',
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
energyCharts: 'Fossil brown coal / lignite',
|
|
30
|
+
powerRouter: 'fossilBrownCoalLignite',
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
energyCharts: 'Fossil hard coal',
|
|
34
|
+
powerRouter: 'fossilHardCoal',
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
energyCharts: 'Fossil oil',
|
|
38
|
+
powerRouter: 'fossilOil',
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
energyCharts: 'Fossil gas',
|
|
42
|
+
powerRouter: 'fossilGas',
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
energyCharts: 'Geothermal',
|
|
46
|
+
powerRouter: 'geothermal',
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
energyCharts: 'Hydro water reservoir',
|
|
50
|
+
powerRouter: 'hydroWaterReservoir',
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
energyCharts: 'Hydro pumped storage',
|
|
54
|
+
powerRouter: 'hydroPumpedStorage',
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
energyCharts: 'Others',
|
|
58
|
+
powerRouter: 'other',
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
energyCharts: 'Waste',
|
|
62
|
+
powerRouter: 'waste',
|
|
63
|
+
},
|
|
64
|
+
{
|
|
65
|
+
energyCharts: 'Wind offshore',
|
|
66
|
+
powerRouter: 'windOffshore',
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
energyCharts: 'Wind onshore',
|
|
70
|
+
powerRouter: 'windOnshore',
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
energyCharts: 'Solar',
|
|
74
|
+
powerRouter: 'solar',
|
|
75
|
+
},
|
|
76
|
+
{
|
|
77
|
+
energyCharts: 'Load',
|
|
78
|
+
powerRouter: 'consumption',
|
|
79
|
+
},
|
|
80
|
+
];
|
|
81
|
+
countries: any;
|
|
82
|
+
|
|
83
|
+
constructor() {
|
|
84
|
+
const countryPath = join(__dirname, '..', 'config/countries.json');
|
|
85
|
+
const countriesString = readFileSync(countryPath, 'utf-8');
|
|
86
|
+
this.countries = JSON.parse(countriesString);
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
async load(country: string, startIso: string, endIso: string) {
|
|
90
|
+
const countryShort = this.countries
|
|
91
|
+
.find((item: any) => item.code === country)
|
|
92
|
+
?.short?.toLowerCase();
|
|
93
|
+
const start = encodeURIComponent(startIso);
|
|
94
|
+
const end = encodeURIComponent(endIso);
|
|
95
|
+
const url = `https://api.energy-charts.info/public_power?country=${countryShort}&start=${start}&end=${end}`;
|
|
96
|
+
const response = await fetch(url);
|
|
97
|
+
const json = await response.json();
|
|
98
|
+
//console.log(json);
|
|
99
|
+
const t = this.translate(json);
|
|
100
|
+
const priceTime = await this.getPrices(countryShort, startIso, endIso);
|
|
101
|
+
const rebasedPrice = this.rebase(priceTime, t.time);
|
|
102
|
+
t.price = rebasedPrice.price;
|
|
103
|
+
return t;
|
|
104
|
+
}
|
|
105
|
+
async getPrices(country: string, startIso: string, endIso: string) {
|
|
106
|
+
let zone = country.toUpperCase();
|
|
107
|
+
if (zone === 'DE') {
|
|
108
|
+
zone = 'DE-LU';
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
const start = encodeURIComponent(startIso);
|
|
112
|
+
const end = encodeURIComponent(endIso);
|
|
113
|
+
const url = `https://api.energy-charts.info/price?bzn=${zone}&start=${start}&end=${end}`;
|
|
114
|
+
const response = await fetch(url);
|
|
115
|
+
const json = await response.json();
|
|
116
|
+
if (json?.unix_seconds && json?.price) {
|
|
117
|
+
const r: any = {
|
|
118
|
+
time: json.unix_seconds.map((item: any) => (item || 0) * 1000),
|
|
119
|
+
price: json.price
|
|
120
|
+
};
|
|
121
|
+
return r;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
translate(json: any): any {
|
|
125
|
+
let pumpup: any;
|
|
126
|
+
const r: any = {
|
|
127
|
+
time: json.unix_seconds.map((item: any) => item * 1000),
|
|
128
|
+
};
|
|
129
|
+
json.production_types?.forEach((item: any) => {
|
|
130
|
+
const found = this.trans.find((t) => t.energyCharts === item.name);
|
|
131
|
+
if (found?.powerRouter) {
|
|
132
|
+
r[found.powerRouter] = item.data;
|
|
133
|
+
}
|
|
134
|
+
if (item.name === this.pumpUp) {
|
|
135
|
+
pumpup = item.data;
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
const hydroPumpedStorage = JSON.parse(
|
|
139
|
+
JSON.stringify(r['hydroPumpedStorage'])
|
|
140
|
+
);
|
|
141
|
+
if (pumpup) {
|
|
142
|
+
r['hydroPumpedStorage'] = hydroPumpedStorage.map(
|
|
143
|
+
(item: number, i: number) => (item || 0) + (pumpup?.[i] || 0)
|
|
144
|
+
);
|
|
145
|
+
}
|
|
146
|
+
//console.log(r)
|
|
147
|
+
return r;
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
rebase(data: any, newTime: number[]) {
|
|
151
|
+
const sourceTime = data['time'];
|
|
152
|
+
const result: any = {};
|
|
153
|
+
const keys = Object.keys(data).filter((item) => item !== 'time');
|
|
154
|
+
keys.forEach((key) => {
|
|
155
|
+
result[key] = [];
|
|
156
|
+
});
|
|
157
|
+
newTime.forEach((time) => {
|
|
158
|
+
const [lo, hi] = this.findTime(sourceTime, time);
|
|
159
|
+
const timeDistance = sourceTime[hi] - sourceTime[lo];
|
|
160
|
+
const timeDelta = time - sourceTime[lo];
|
|
161
|
+
keys.forEach((key) => {
|
|
162
|
+
const hiValue = data[key][hi];
|
|
163
|
+
const loValue = data[key][lo];
|
|
164
|
+
const deltaValue = hiValue - loValue;
|
|
165
|
+
const value = loValue + (deltaValue * timeDelta) / timeDistance;
|
|
166
|
+
result[key].push(value);
|
|
167
|
+
});
|
|
168
|
+
});
|
|
169
|
+
// this.changeToEv(result, ev);
|
|
170
|
+
return result;
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
private findTime(sourceTime: number[], time: number): [number, number] {
|
|
174
|
+
let lo = 0;
|
|
175
|
+
let hi = sourceTime.length - 1;
|
|
176
|
+
if (sourceTime.length === 1) {
|
|
177
|
+
return [0, 0];
|
|
178
|
+
}
|
|
179
|
+
if (sourceTime[lo] > time) {
|
|
180
|
+
return [lo, lo + 1];
|
|
181
|
+
}
|
|
182
|
+
if (sourceTime[hi] < time) {
|
|
183
|
+
return [hi - 1, hi];
|
|
184
|
+
}
|
|
185
|
+
while (hi - lo > 1) {
|
|
186
|
+
const mid = Math.trunc((lo + hi) / 2);
|
|
187
|
+
if (sourceTime[mid] < time) {
|
|
188
|
+
lo = mid;
|
|
189
|
+
} else {
|
|
190
|
+
hi = mid;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
return [lo, hi];
|
|
194
|
+
}
|
|
195
|
+
}
|