@webtypen/webframez-core 0.0.11 → 0.0.12
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/lib/Router/Router.js +7 -6
- package/lib/WebApplication.d.ts +1 -1
- package/lib/WebApplication.js +4 -3
- package/package.json +1 -1
- package/src/Router/Router.ts +18 -18
- package/src/WebApplication.ts +4 -3
package/lib/Router/Router.js
CHANGED
|
@@ -91,16 +91,16 @@ class RouterFacade {
|
|
|
91
91
|
return this.dissolveRoute(this.routesDELETE, req.url);
|
|
92
92
|
}
|
|
93
93
|
else if (req.method === "OPTIONS") {
|
|
94
|
-
if (req.headers[
|
|
94
|
+
if (req.headers["access-control-request-method"] === "GET") {
|
|
95
95
|
return this.dissolveRoute(this.routesGET, req.url);
|
|
96
96
|
}
|
|
97
|
-
else if (req.headers[
|
|
97
|
+
else if (req.headers["access-control-request-method"] === "POST") {
|
|
98
98
|
return this.dissolveRoute(this.routesPOST, req.url);
|
|
99
99
|
}
|
|
100
|
-
else if (req.headers[
|
|
100
|
+
else if (req.headers["access-control-request-method"] === "PUT") {
|
|
101
101
|
return this.dissolveRoute(this.routesPUT, req.url);
|
|
102
102
|
}
|
|
103
|
-
else if (req.headers[
|
|
103
|
+
else if (req.headers["access-control-request-method"] === "DELETE") {
|
|
104
104
|
return this.dissolveRoute(this.routesDELETE, req.url);
|
|
105
105
|
}
|
|
106
106
|
}
|
|
@@ -206,7 +206,7 @@ class RouterFacade {
|
|
|
206
206
|
// Handle OPTIONS-Request
|
|
207
207
|
if (req.method === "OPTIONS") {
|
|
208
208
|
res.statusCode = 200;
|
|
209
|
-
res.setHeader(
|
|
209
|
+
res.setHeader("Content-Length", "0");
|
|
210
210
|
res.end();
|
|
211
211
|
return;
|
|
212
212
|
}
|
|
@@ -238,7 +238,8 @@ class RouterFacade {
|
|
|
238
238
|
yield route.component({
|
|
239
239
|
body: bodyPlain &&
|
|
240
240
|
req.headers["content-type"] === "application/json" &&
|
|
241
|
-
(bodyPlain.trim().substring(0, 1) === "[" ||
|
|
241
|
+
(bodyPlain.trim().substring(0, 1) === "[" ||
|
|
242
|
+
bodyPlain.trim().substring(0, 1) === "{")
|
|
242
243
|
? JSON.parse(bodyPlain)
|
|
243
244
|
: bodyPlain
|
|
244
245
|
? qs_1.default.parse(bodyPlain)
|
package/lib/WebApplication.d.ts
CHANGED
package/lib/WebApplication.js
CHANGED
|
@@ -10,14 +10,15 @@ class WebApplication {
|
|
|
10
10
|
/**
|
|
11
11
|
* Init the routes and start the http-server
|
|
12
12
|
*/
|
|
13
|
-
boot() {
|
|
13
|
+
boot(options) {
|
|
14
14
|
Router_1.Router.init();
|
|
15
|
+
const port = options && options.port ? options.port : 3000;
|
|
15
16
|
this.server = http_1.default
|
|
16
17
|
.createServer((req, res) => {
|
|
17
18
|
Router_1.Router.handleRequest(req, res);
|
|
18
19
|
})
|
|
19
|
-
.listen(
|
|
20
|
-
console.log("Server started and listening on port
|
|
20
|
+
.listen(port, () => {
|
|
21
|
+
console.log("Server started and listening on port " + port);
|
|
21
22
|
});
|
|
22
23
|
}
|
|
23
24
|
}
|
package/package.json
CHANGED
package/src/Router/Router.ts
CHANGED
|
@@ -113,13 +113,13 @@ class RouterFacade {
|
|
|
113
113
|
} else if (req.method === "DELETE") {
|
|
114
114
|
return this.dissolveRoute(this.routesDELETE, req.url);
|
|
115
115
|
} else if (req.method === "OPTIONS") {
|
|
116
|
-
if (req.headers[
|
|
116
|
+
if (req.headers["access-control-request-method"] === "GET") {
|
|
117
117
|
return this.dissolveRoute(this.routesGET, req.url);
|
|
118
|
-
} else if(req.headers[
|
|
118
|
+
} else if (req.headers["access-control-request-method"] === "POST") {
|
|
119
119
|
return this.dissolveRoute(this.routesPOST, req.url);
|
|
120
|
-
} else if(req.headers[
|
|
120
|
+
} else if (req.headers["access-control-request-method"] === "PUT") {
|
|
121
121
|
return this.dissolveRoute(this.routesPUT, req.url);
|
|
122
|
-
} else if(req.headers[
|
|
122
|
+
} else if (req.headers["access-control-request-method"] === "DELETE") {
|
|
123
123
|
return this.dissolveRoute(this.routesDELETE, req.url);
|
|
124
124
|
}
|
|
125
125
|
}
|
|
@@ -189,10 +189,10 @@ class RouterFacade {
|
|
|
189
189
|
* @param res
|
|
190
190
|
*/
|
|
191
191
|
async handleRequest(req: IncomingMessage, res: ServerResponse) {
|
|
192
|
-
const route = this.dissolve(req);
|
|
192
|
+
const route = this.dissolve(req);
|
|
193
193
|
const response = new Response();
|
|
194
194
|
response.setServerResponse(res);
|
|
195
|
-
|
|
195
|
+
|
|
196
196
|
// Check-Middleware
|
|
197
197
|
if (
|
|
198
198
|
route &&
|
|
@@ -210,7 +210,6 @@ class RouterFacade {
|
|
|
210
210
|
);
|
|
211
211
|
}
|
|
212
212
|
|
|
213
|
-
|
|
214
213
|
try {
|
|
215
214
|
await new Promise((resolve, reject) => {
|
|
216
215
|
try {
|
|
@@ -254,10 +253,10 @@ class RouterFacade {
|
|
|
254
253
|
|
|
255
254
|
// Handle OPTIONS-Request
|
|
256
255
|
if (req.method === "OPTIONS") {
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
256
|
+
res.statusCode = 200;
|
|
257
|
+
res.setHeader("Content-Length", "0");
|
|
258
|
+
res.end();
|
|
259
|
+
return;
|
|
261
260
|
}
|
|
262
261
|
|
|
263
262
|
// Resolve route-component (handle controller definition)
|
|
@@ -291,13 +290,14 @@ class RouterFacade {
|
|
|
291
290
|
await route.component(
|
|
292
291
|
{
|
|
293
292
|
body:
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
293
|
+
bodyPlain &&
|
|
294
|
+
req.headers["content-type"] === "application/json" &&
|
|
295
|
+
(bodyPlain.trim().substring(0, 1) === "[" ||
|
|
296
|
+
bodyPlain.trim().substring(0, 1) === "{")
|
|
297
|
+
? JSON.parse(bodyPlain)
|
|
298
|
+
: bodyPlain
|
|
299
|
+
? qs.parse(bodyPlain)
|
|
300
|
+
: {},
|
|
301
301
|
bodyPlain: bodyPlain,
|
|
302
302
|
params: route.params,
|
|
303
303
|
httpVersionMajor: req.httpVersionMajor,
|
package/src/WebApplication.ts
CHANGED
|
@@ -7,15 +7,16 @@ export class WebApplication {
|
|
|
7
7
|
/**
|
|
8
8
|
* Init the routes and start the http-server
|
|
9
9
|
*/
|
|
10
|
-
boot() {
|
|
10
|
+
boot(options?: any) {
|
|
11
11
|
Router.init();
|
|
12
12
|
|
|
13
|
+
const port = options && options.port ? options.port : 3000;
|
|
13
14
|
this.server = http
|
|
14
15
|
.createServer((req, res) => {
|
|
15
16
|
Router.handleRequest(req, res);
|
|
16
17
|
})
|
|
17
|
-
.listen(
|
|
18
|
-
console.log("Server started and listening on port
|
|
18
|
+
.listen(port, () => {
|
|
19
|
+
console.log("Server started and listening on port " + port);
|
|
19
20
|
});
|
|
20
21
|
}
|
|
21
22
|
}
|