@powercalc/power-router 1.0.66 → 1.0.69

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.
@@ -90,30 +90,61 @@ class EnergyCharts {
90
90
  .find((item) => item.code === country)) === null || _a === void 0 ? void 0 : _a.short) === null || _b === void 0 ? void 0 : _b.toLowerCase();
91
91
  const start = encodeURIComponent(startIso);
92
92
  const end = encodeURIComponent(endIso);
93
- const url = `https://api.energy-charts.info/public_power?country=${countryShort}&start=${start}&end=${end}`;
94
- const response = await fetch(url);
95
- const json = await response.json();
96
- //console.log(json);
97
- const t = this.translate(json);
98
- const priceTime = await this.getPrices(countryShort, startIso, endIso);
99
- const rebasedPrice = this.rebase(priceTime, t.time);
100
- t.price = rebasedPrice.price;
101
- return t;
93
+ try {
94
+ const url = `https://api.energy-charts.info/public_power?country=${countryShort}&start=${start}&end=${end}`;
95
+ const response = await fetch(url);
96
+ const text = await response.text();
97
+ if (!text)
98
+ return;
99
+ const json = JSON.parse(text);
100
+ const t = this.translate(json);
101
+ try {
102
+ const priceTime = await this.getPrices(countryShort, startIso, endIso);
103
+ if (priceTime) {
104
+ const rebasedPrice = this.rebase(priceTime, t.time);
105
+ t.price = rebasedPrice.price;
106
+ }
107
+ }
108
+ catch (e) {
109
+ console.error(e);
110
+ }
111
+ return t;
112
+ }
113
+ catch (e) {
114
+ console.error(e);
115
+ }
102
116
  }
103
117
  async getPrices(country, startIso, endIso) {
104
118
  let zone = country.toUpperCase();
105
119
  if (zone === 'DE') {
106
120
  zone = 'DE-LU';
107
121
  }
122
+ if (zone === 'DK') {
123
+ zone = 'DK1';
124
+ }
125
+ if (zone === 'IT') {
126
+ zone = 'IT-North';
127
+ }
128
+ if (zone === 'NO') {
129
+ zone = 'NO1';
130
+ }
131
+ if (zone === 'SE') {
132
+ zone = 'SE1';
133
+ }
108
134
  const start = encodeURIComponent(startIso);
109
135
  const end = encodeURIComponent(endIso);
110
136
  const url = `https://api.energy-charts.info/price?bzn=${zone}&start=${start}&end=${end}`;
137
+ console.log(url);
111
138
  const response = await fetch(url);
112
- const json = await response.json();
139
+ const text = await response.text();
140
+ //console.log(text);
141
+ if (!text)
142
+ return;
143
+ const json = JSON.parse(text);
113
144
  if ((json === null || json === void 0 ? void 0 : json.unix_seconds) && (json === null || json === void 0 ? void 0 : json.price)) {
114
145
  const r = {
115
146
  time: json.unix_seconds.map((item) => (item || 0) * 1000),
116
- price: json.price
147
+ price: json.price,
117
148
  };
118
149
  return r;
119
150
  }
@@ -133,8 +164,8 @@ class EnergyCharts {
133
164
  pumpup = item.data;
134
165
  }
135
166
  });
136
- const hydroPumpedStorage = JSON.parse(JSON.stringify(r['hydroPumpedStorage']));
137
- if (pumpup) {
167
+ if (pumpup && r.hydroPumpedStorage) {
168
+ const hydroPumpedStorage = JSON.parse(JSON.stringify(r['hydroPumpedStorage']));
138
169
  r['hydroPumpedStorage'] = hydroPumpedStorage.map((item, i) => (item || 0) + ((pumpup === null || pumpup === void 0 ? void 0 : pumpup[i]) || 0));
139
170
  }
140
171
  //console.log(r)
@@ -1 +1 @@
1
- {"version":3,"file":"EnergyCharts.js","sourceRoot":"","sources":["../../src/router/services/EnergyCharts.ts"],"names":[],"mappings":";;;AAAA,2BAAkC;AAClC,+BAA4B;AAG5B,MAAa,YAAY;IA8EvB;QA7EA,WAAM,GAAG,kCAAkC,CAAC;QAC5C,UAAK,GAAG;YACN;gBACE,YAAY,EAAE,kCAAkC;gBAChD,WAAW,EAAE,IAAI;aAClB;YACD;gBACE,YAAY,EAAE,kCAAkC;gBAChD,WAAW,EAAE,OAAO;aACrB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,WAAW,EAAE,SAAS;aACvB;YACD;gBACE,YAAY,EAAE,oBAAoB;gBAClC,WAAW,EAAE,4BAA4B;aAC1C;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,WAAW,EAAE,SAAS;aACvB;YACD;gBACE,YAAY,EAAE,6BAA6B;gBAC3C,WAAW,EAAE,wBAAwB;aACtC;YACD;gBACE,YAAY,EAAE,kBAAkB;gBAChC,WAAW,EAAE,gBAAgB;aAC9B;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,WAAW;aACzB;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,WAAW;aACzB;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,YAAY;aAC1B;YACD;gBACE,YAAY,EAAE,uBAAuB;gBACrC,WAAW,EAAE,qBAAqB;aACnC;YACD;gBACE,YAAY,EAAE,sBAAsB;gBACpC,WAAW,EAAE,oBAAoB;aAClC;YACD;gBACE,YAAY,EAAE,QAAQ;gBACtB,WAAW,EAAE,OAAO;aACrB;YACD;gBACE,YAAY,EAAE,OAAO;gBACrB,WAAW,EAAE,OAAO;aACrB;YACD;gBACE,YAAY,EAAE,eAAe;gBAC7B,WAAW,EAAE,cAAc;aAC5B;YACD;gBACE,YAAY,EAAE,cAAc;gBAC5B,WAAW,EAAE,aAAa;aAC3B;YACD;gBACE,YAAY,EAAE,OAAO;gBACrB,WAAW,EAAE,OAAO;aACrB;YACD;gBACE,YAAY,EAAE,MAAM;gBACpB,WAAW,EAAE,aAAa;aAC3B;SACF,CAAC;QAIA,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,uBAAuB,CAAC,CAAC;QACnE,MAAM,eAAe,GAAG,IAAA,iBAAY,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAe,EAAE,QAAgB,EAAE,MAAc;;QAC1D,MAAM,YAAY,GAAG,MAAA,MAAA,IAAI,CAAC,SAAS;aAChC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,0CACzC,KAAK,0CAAE,WAAW,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,uDAAuD,YAAY,UAAU,KAAK,QAAQ,GAAG,EAAE,CAAC;QAC5G,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,oBAAoB;QACpB,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACvE,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;QAC7B,OAAO,CAAC,CAAC;IACX,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,QAAgB,EAAE,MAAc;QAC/D,IAAI,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QACjC,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,IAAI,GAAG,OAAO,CAAC;SAChB;QAED,MAAM,KAAK,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,4CAA4C,IAAI,UAAU,KAAK,QAAQ,GAAG,EAAE,CAAC;QACzF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,MAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAA,EAAE;YACrC,MAAM,CAAC,GAAQ;gBACb,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;gBAC9D,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC;YACF,OAAO,CAAC,CAAC;SACV;IACH,CAAC;IACD,SAAS,CAAC,IAAS;;QACjB,IAAI,MAAW,CAAC;QAChB,MAAM,CAAC,GAAQ;YACb,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC;SACxD,CAAC;QACF,MAAA,IAAI,CAAC,gBAAgB,0CAAE,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;YAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;YACnE,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,EAAE;gBACtB,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aAClC;YACD,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,EAAE;gBAC7B,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACnC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CACxC,CAAC;QACF,IAAI,MAAM,EAAE;YACV,CAAC,CAAC,oBAAoB,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAC9C,CAAC,IAAY,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAAC,KAAI,CAAC,CAAC,CAC9D,CAAC;SACH;QACD,gBAAgB;QAChB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,CAAC,IAAS,EAAE,OAAiB;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACvB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,YAAY,GAAG,UAAU,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;YACrD,MAAM,SAAS,GAAG,IAAI,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9B,MAAM,UAAU,GAAG,OAAO,GAAG,OAAO,CAAC;gBACrC,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,UAAU,GAAG,SAAS,CAAC,GAAG,YAAY,CAAC;gBAChE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,+BAA+B;QAC/B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,QAAQ,CAAC,UAAoB,EAAE,IAAY;QACjD,IAAI,EAAE,GAAG,CAAC,CAAC;QACX,IAAI,EAAE,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/B,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACf;QACD,IAAI,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE;YACzB,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;SACrB;QACD,IAAI,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE;YACzB,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;SACrB;QACD,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE;YAClB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YACtC,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE;gBAC1B,EAAE,GAAG,GAAG,CAAC;aACV;iBAAM;gBACL,EAAE,GAAG,GAAG,CAAC;aACV;SACF;QACD,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAClB,CAAC;CACF;AA9LD,oCA8LC"}
1
+ {"version":3,"file":"EnergyCharts.js","sourceRoot":"","sources":["../../src/router/services/EnergyCharts.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@powercalc/power-router",
3
- "version": "1.0.66",
3
+ "version": "1.0.69",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -1,6 +1,5 @@
1
1
  import { readFileSync } from 'fs';
2
2
  import { join } from 'path';
3
- import { CommonTimestamps } from './CommonTimestamps';
4
3
 
5
4
  export class EnergyCharts {
6
5
  pumpUp = 'Hydro pumped storage consumption';
@@ -92,35 +91,64 @@ export class EnergyCharts {
92
91
  ?.short?.toLowerCase();
93
92
  const start = encodeURIComponent(startIso);
94
93
  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;
94
+ try {
95
+ const url = `https://api.energy-charts.info/public_power?country=${countryShort}&start=${start}&end=${end}`;
96
+ const response = await fetch(url);
97
+ const text = await response.text();
98
+ if (!text) return;
99
+ const json = JSON.parse(text);
100
+ const t = this.translate(json);
101
+ try {
102
+ const priceTime = await this.getPrices(countryShort, startIso, endIso);
103
+ if (priceTime) {
104
+ const rebasedPrice = this.rebase(priceTime, t.time);
105
+ t.price = rebasedPrice.price;
106
+ }
107
+ } catch (e) {
108
+ console.error(e);
109
+ }
110
+ return t;
111
+ } catch (e) {
112
+ console.error(e);
113
+ }
104
114
  }
115
+
105
116
  async getPrices(country: string, startIso: string, endIso: string) {
106
117
  let zone = country.toUpperCase();
107
118
  if (zone === 'DE') {
108
119
  zone = 'DE-LU';
109
120
  }
121
+ if (zone === 'DK') {
122
+ zone = 'DK1';
123
+ }
124
+ if (zone === 'IT') {
125
+ zone = 'IT-North';
126
+ }
127
+ if (zone === 'NO') {
128
+ zone = 'NO1';
129
+ }
130
+ if (zone === 'SE') {
131
+ zone = 'SE1';
132
+ }
110
133
 
111
134
  const start = encodeURIComponent(startIso);
112
135
  const end = encodeURIComponent(endIso);
113
136
  const url = `https://api.energy-charts.info/price?bzn=${zone}&start=${start}&end=${end}`;
137
+ console.log(url);
114
138
  const response = await fetch(url);
115
- const json = await response.json();
139
+ const text = await response.text();
140
+ //console.log(text);
141
+ if (!text) return;
142
+ const json = JSON.parse(text);
116
143
  if (json?.unix_seconds && json?.price) {
117
144
  const r: any = {
118
145
  time: json.unix_seconds.map((item: any) => (item || 0) * 1000),
119
- price: json.price
146
+ price: json.price,
120
147
  };
121
148
  return r;
122
149
  }
123
150
  }
151
+
124
152
  translate(json: any): any {
125
153
  let pumpup: any;
126
154
  const r: any = {
@@ -135,10 +163,10 @@ export class EnergyCharts {
135
163
  pumpup = item.data;
136
164
  }
137
165
  });
138
- const hydroPumpedStorage = JSON.parse(
139
- JSON.stringify(r['hydroPumpedStorage'])
140
- );
141
- if (pumpup) {
166
+ if (pumpup && r.hydroPumpedStorage) {
167
+ const hydroPumpedStorage = JSON.parse(
168
+ JSON.stringify(r['hydroPumpedStorage'])
169
+ );
142
170
  r['hydroPumpedStorage'] = hydroPumpedStorage.map(
143
171
  (item: number, i: number) => (item || 0) + (pumpup?.[i] || 0)
144
172
  );