@powercalc/power-router 1.2.8 → 1.2.10
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.
|
@@ -15,7 +15,6 @@ class PowerRouter {
|
|
|
15
15
|
//console.log('init', config)
|
|
16
16
|
const router = (0, express_1.Router)();
|
|
17
17
|
router.get(`/:country/:year/:month`, async (req, res) => {
|
|
18
|
-
res.set('Vary', 'Accept-Encoding');
|
|
19
18
|
await this.load(config, req, res, 'power');
|
|
20
19
|
});
|
|
21
20
|
router.get(`/:country/congestion/:year/:month`, async (req, res) => {
|
|
@@ -32,7 +31,6 @@ class PowerRouter {
|
|
|
32
31
|
});
|
|
33
32
|
router.get(`/:country/countrydata`, async (req, res) => {
|
|
34
33
|
res.set('Cache-Control', 'public, max-age=604800, immutable');
|
|
35
|
-
res.set('Vary', 'Accept-Encoding');
|
|
36
34
|
await this.load(config, req, res, 'countrydata');
|
|
37
35
|
});
|
|
38
36
|
router.get('/types', async (req, res) => {
|
|
@@ -62,7 +60,7 @@ class PowerRouter {
|
|
|
62
60
|
const entsoeLoader = new LoadAndParse_1.LoadAndParse(config);
|
|
63
61
|
const cacheTime = this.calcCacheTime(req);
|
|
64
62
|
const successHeaders = {
|
|
65
|
-
'Cache-Control': `public, max-age=${cacheTime}
|
|
63
|
+
'Cache-Control': `public, max-age=${cacheTime}`,
|
|
66
64
|
'Content-Encoding': 'gzip',
|
|
67
65
|
'Content-Type': 'application/json',
|
|
68
66
|
};
|
|
@@ -91,6 +89,7 @@ class PowerRouter {
|
|
|
91
89
|
return;
|
|
92
90
|
}
|
|
93
91
|
res.setHeader('Last-Modified', new Date(modtime).toUTCString());
|
|
92
|
+
res.set('Access-Control-Allow-Headers', 'If-Modified-Since');
|
|
94
93
|
res.set(successHeaders);
|
|
95
94
|
// console.log('cached')
|
|
96
95
|
(0, fs_1.createReadStream)(cacheFilePath).pipe(res);
|
|
@@ -119,7 +118,8 @@ class PowerRouter {
|
|
|
119
118
|
else {
|
|
120
119
|
console.log('failed', cacheFilePath, Object.keys(body));
|
|
121
120
|
}
|
|
122
|
-
res.
|
|
121
|
+
res.set('Last-Modified', new Date().toUTCString());
|
|
122
|
+
res.set('Access-Control-Allow-Headers', 'If-Modified-Since');
|
|
123
123
|
res.set(successHeaders);
|
|
124
124
|
res.send(cacheDataBuffer);
|
|
125
125
|
}
|
|
@@ -137,7 +137,8 @@ class PowerRouter {
|
|
|
137
137
|
return 5 * 60;
|
|
138
138
|
}
|
|
139
139
|
else {
|
|
140
|
-
return
|
|
140
|
+
return 7200;
|
|
141
|
+
//return 3600 * 24 * 1 - 1;
|
|
141
142
|
}
|
|
142
143
|
}
|
|
143
144
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../src/router/controllers/Router.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AACpD,mCAAoC;AACpC,0CAA+D;AAC/D,+BAAgC;AAChC,6CAAqC;AACrC,2BAAkD;AAClD,iDAA8C;AAC9C,+BAAqC;AAErC,yCAAsC;AAEtC,MAAa,WAAW;IACtB,MAAM,CAAC,IAAI,CAAC,MAAc;QACxB,6BAA6B;QAC7B,MAAM,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QACxB,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACtD,
|
|
1
|
+
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../src/router/controllers/Router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -14,7 +14,6 @@ export class PowerRouter {
|
|
|
14
14
|
//console.log('init', config)
|
|
15
15
|
const router = Router();
|
|
16
16
|
router.get(`/:country/:year/:month`, async (req, res) => {
|
|
17
|
-
res.set('Vary', 'Accept-Encoding');
|
|
18
17
|
await this.load(config, req, res, 'power');
|
|
19
18
|
});
|
|
20
19
|
router.get(`/:country/congestion/:year/:month`, async (req, res) => {
|
|
@@ -32,7 +31,6 @@ export class PowerRouter {
|
|
|
32
31
|
|
|
33
32
|
router.get(`/:country/countrydata`, async (req, res) => {
|
|
34
33
|
res.set('Cache-Control', 'public, max-age=604800, immutable');
|
|
35
|
-
res.set('Vary', 'Accept-Encoding');
|
|
36
34
|
await this.load(config, req, res, 'countrydata');
|
|
37
35
|
});
|
|
38
36
|
router.get('/types', async (req, res) => {
|
|
@@ -62,7 +60,7 @@ export class PowerRouter {
|
|
|
62
60
|
const entsoeLoader = new LoadAndParse(config);
|
|
63
61
|
const cacheTime = this.calcCacheTime(req);
|
|
64
62
|
const successHeaders = {
|
|
65
|
-
'Cache-Control': `public, max-age=${cacheTime}
|
|
63
|
+
'Cache-Control': `public, max-age=${cacheTime}`,
|
|
66
64
|
'Content-Encoding': 'gzip',
|
|
67
65
|
'Content-Type': 'application/json',
|
|
68
66
|
};
|
|
@@ -95,6 +93,7 @@ export class PowerRouter {
|
|
|
95
93
|
return;
|
|
96
94
|
}
|
|
97
95
|
res.setHeader('Last-Modified', new Date(modtime).toUTCString());
|
|
96
|
+
res.set('Access-Control-Allow-Headers', 'If-Modified-Since');
|
|
98
97
|
res.set(successHeaders);
|
|
99
98
|
// console.log('cached')
|
|
100
99
|
createReadStream(cacheFilePath).pipe(res);
|
|
@@ -125,7 +124,8 @@ export class PowerRouter {
|
|
|
125
124
|
} else {
|
|
126
125
|
console.log('failed', cacheFilePath, Object.keys(body));
|
|
127
126
|
}
|
|
128
|
-
res.
|
|
127
|
+
res.set('Last-Modified', new Date().toUTCString());
|
|
128
|
+
res.set('Access-Control-Allow-Headers', 'If-Modified-Since');
|
|
129
129
|
res.set(successHeaders);
|
|
130
130
|
res.send(cacheDataBuffer);
|
|
131
131
|
}
|
|
@@ -141,7 +141,8 @@ export class PowerRouter {
|
|
|
141
141
|
if (reqMonth === nowMonth) {
|
|
142
142
|
return 5 * 60;
|
|
143
143
|
} else {
|
|
144
|
-
return
|
|
144
|
+
return 7200;
|
|
145
|
+
//return 3600 * 24 * 1 - 1;
|
|
145
146
|
}
|
|
146
147
|
}
|
|
147
148
|
}
|