@powercalc/power-router 1.1.28 → 1.1.29
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/services/Loader.js
CHANGED
|
@@ -2,8 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EntsoeLoader = void 0;
|
|
4
4
|
const xml2js_1 = require("xml2js");
|
|
5
|
-
const promises_1 = require("node:fs/promises");
|
|
6
|
-
const node_path_1 = require("node:path");
|
|
7
5
|
const date_fns_1 = require("date-fns");
|
|
8
6
|
const queryoptions_1 = require("../interfaces/queryoptions");
|
|
9
7
|
class EntsoeLoader {
|
|
@@ -106,32 +104,34 @@ class EntsoeLoader {
|
|
|
106
104
|
});
|
|
107
105
|
}
|
|
108
106
|
async fetchAndCache(url, reload) {
|
|
109
|
-
const simpleUrl = url.replace(/[\W_]+/g, "_");
|
|
107
|
+
//const simpleUrl = url.replace(/[\W_]+/g, "_");
|
|
108
|
+
/*
|
|
110
109
|
let filename;
|
|
111
110
|
if (this.config.cacheDir) {
|
|
112
|
-
|
|
111
|
+
filename = join(this.config.cacheDir,'entsoe', simpleUrl + '.json');
|
|
113
112
|
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
113
|
+
if (reload || !filename) {
|
|
114
|
+
throw Error('go for full reload');
|
|
115
|
+
}
|
|
116
|
+
console.log('read', filename)
|
|
117
|
+
const jsonString = await readFile(filename, 'utf-8')
|
|
118
|
+
return JSON.parse(jsonString) as Entsoe;
|
|
119
|
+
} catch (e) {
|
|
120
|
+
*/
|
|
121
|
+
const urlWithToken = `${url}&securityToken=${this.config.securityToken}`;
|
|
122
|
+
const response = await fetch(urlWithToken);
|
|
123
|
+
if (response.status !== 200) {
|
|
124
|
+
return Promise.reject(new Error(`${response.status} ${response.statusText}`));
|
|
121
125
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
}
|
|
128
|
-
const data = await response.text();
|
|
129
|
-
const json = await (0, xml2js_1.parseStringPromise)(data);
|
|
130
|
-
if (filename) {
|
|
131
|
-
//writeFile(filename, JSON.stringify(json), 'utf-8')
|
|
132
|
-
}
|
|
133
|
-
return json;
|
|
126
|
+
const data = await response.text();
|
|
127
|
+
const json = await (0, xml2js_1.parseStringPromise)(data);
|
|
128
|
+
/*
|
|
129
|
+
if (filename) {
|
|
130
|
+
//writeFile(filename, JSON.stringify(json), 'utf-8')
|
|
134
131
|
}
|
|
132
|
+
*/
|
|
133
|
+
return json;
|
|
134
|
+
//}
|
|
135
135
|
}
|
|
136
136
|
filterURLs(obj, keys) {
|
|
137
137
|
return keys.reduce((acc, key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../src/router/services/Loader.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;
|
|
1
|
+
{"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../src/router/services/Loader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -143,12 +143,12 @@ export class EntsoeLoader {
|
|
|
143
143
|
}
|
|
144
144
|
|
|
145
145
|
async fetchAndCache(url: string, reload?: boolean): Promise<Entsoe> {
|
|
146
|
-
const simpleUrl = url.replace(/[\W_]+/g, "_");
|
|
146
|
+
//const simpleUrl = url.replace(/[\W_]+/g, "_");
|
|
147
|
+
/*
|
|
147
148
|
let filename;
|
|
148
149
|
if (this.config.cacheDir) {
|
|
149
150
|
filename = join(this.config.cacheDir,'entsoe', simpleUrl + '.json');
|
|
150
151
|
}
|
|
151
|
-
try {
|
|
152
152
|
if (reload || !filename) {
|
|
153
153
|
throw Error('go for full reload');
|
|
154
154
|
}
|
|
@@ -156,6 +156,7 @@ export class EntsoeLoader {
|
|
|
156
156
|
const jsonString = await readFile(filename, 'utf-8')
|
|
157
157
|
return JSON.parse(jsonString) as Entsoe;
|
|
158
158
|
} catch (e) {
|
|
159
|
+
*/
|
|
159
160
|
const urlWithToken = `${url}&securityToken=${this.config.securityToken}`
|
|
160
161
|
const response = await fetch(urlWithToken);
|
|
161
162
|
if (response.status !== 200) {
|
|
@@ -164,11 +165,13 @@ export class EntsoeLoader {
|
|
|
164
165
|
}
|
|
165
166
|
const data = await response.text();
|
|
166
167
|
const json = await parseStringPromise(data) as Entsoe;
|
|
168
|
+
/*
|
|
167
169
|
if (filename) {
|
|
168
170
|
//writeFile(filename, JSON.stringify(json), 'utf-8')
|
|
169
171
|
}
|
|
172
|
+
*/
|
|
170
173
|
return json;
|
|
171
|
-
}
|
|
174
|
+
//}
|
|
172
175
|
}
|
|
173
176
|
filterURLs(obj: KV, keys: string[]) {
|
|
174
177
|
return keys.reduce((acc: KV, key: string) => {
|