@webtypen/webframez-core 0.0.56 → 0.0.58

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.
Files changed (7) hide show
  1. package/lib/Router/Request.d.ts +1 -0
  2. package/lib/Router/Response.d.ts +2 -2
  3. package/lib/Router/Router.js +10 -8
  4. package/package.json +1 -1
  5. package/src/Router/Request.ts +1 -0
  6. package/src/Router/Response.ts +2 -2
  7. package/src/Router/Router.ts +10 -8
package/lib/Router/Request.d.ts CHANGED
@@ -10,4 +10,5 @@ export type Request = {
10
10
  rawHeaders: object;
11
11
  url: string;
12
12
  method: string;
13
+ on?: any;
13
14
  };
package/lib/Router/Response.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /// <reference types="node" />
2
- import { IncomingMessage, ServerResponse } from "http";
2
+ import { ServerResponse } from "http";
3
3
  export declare class Response {
4
4
  res?: ServerResponse;
5
5
  statusCode: number;
@@ -49,5 +49,5 @@ export declare class Response {
49
49
  * @param req
50
50
  * @param payload
51
51
  */
52
- handleEvents(eventKey: string, req: IncomingMessage, payload: any): Promise<void>;
52
+ handleEvents(eventKey: string, req: any, payload: any): Promise<void>;
53
53
  }
package/lib/Router/Router.js CHANGED
@@ -266,6 +266,7 @@ class RouterFacade {
266
266
  urlParams: customRequest.urlParams,
267
267
  headers: customRequest.headers,
268
268
  method: customRequest.method,
269
+ on: req ? req.on : undefined,
269
270
  }
270
271
  : req
271
272
  ? {
@@ -287,6 +288,7 @@ class RouterFacade {
287
288
  url: req.url,
288
289
  method: req.method,
289
290
  socket: req.socket,
291
+ on: req.on,
290
292
  }
291
293
  : null;
292
294
  // Check-Middleware
@@ -294,7 +296,7 @@ class RouterFacade {
294
296
  for (let middlewareKey of route.options.middleware) {
295
297
  const middleware = this.kernel.middleware[middlewareKey];
296
298
  if (!middleware) {
297
- this.handleResponseAfter(response, req, { status: 500 });
299
+ this.handleResponseAfter(response, request, { status: 500 });
298
300
  if (this.mode === "aws-lambda") {
299
301
  return {
300
302
  statusCode: 500,
@@ -319,7 +321,7 @@ class RouterFacade {
319
321
  }
320
322
  catch (e) {
321
323
  console.error(e);
322
- this.handleResponseAfter(response, req, { status: 500 });
324
+ this.handleResponseAfter(response, request, { status: 500 });
323
325
  if (this.mode === "aws-lambda") {
324
326
  return {
325
327
  statusCode: 500,
@@ -338,7 +340,7 @@ class RouterFacade {
338
340
  });
339
341
  }
340
342
  catch (e) {
341
- this.handleResponseAfter(response, req, { status: 500, error: typeof e.data === "object" ? JSON.stringify(e.data) : e.data ? e.data : undefined });
343
+ this.handleResponseAfter(response, request, { status: 500, error: typeof e.data === "object" ? JSON.stringify(e.data) : e.data ? e.data : undefined });
342
344
  // Send Middleware-Abort
343
345
  if (this.mode === "aws-lambda") {
344
346
  return {
@@ -377,7 +379,7 @@ class RouterFacade {
377
379
  const split = route.component.split("@");
378
380
  const controller = this.kernel.controller[split[0]];
379
381
  if (!controller) {
380
- this.handleResponseAfter(response, req, { status: 500, error: "Controller `" + split[0] + "` not found ..." });
382
+ this.handleResponseAfter(response, request, { status: 500, error: "Controller `" + split[0] + "` not found ..." });
381
383
  if (this.mode === "aws-lambda") {
382
384
  return {
383
385
  statusCode: 500,
@@ -397,7 +399,7 @@ class RouterFacade {
397
399
  // Set Controller method as route-component
398
400
  const controllerInstance = new controller();
399
401
  if (!controllerInstance || !split || !split[1] || !controllerInstance[split[1]]) {
400
- this.handleResponseAfter(response, req, { status: 500, error: "controllerInstance `" + split[1] + "` not found ..." });
402
+ this.handleResponseAfter(response, request, { status: 500, error: "controllerInstance `" + split[1] + "` not found ..." });
401
403
  throw new Error("controllerInstance " + split[1] + " not found ...");
402
404
  }
403
405
  route.component = controllerInstance[split[1]].bind(controllerInstance);
@@ -405,7 +407,7 @@ class RouterFacade {
405
407
  if (route && route.component !== undefined) {
406
408
  try {
407
409
  yield route.component(request, response);
408
- this.handleResponseAfter(response, req, { status: response.statusCode });
410
+ this.handleResponseAfter(response, request, { status: response.statusCode });
409
411
  if (this.mode === "aws-lambda") {
410
412
  return {
411
413
  statusCode: response.statusCode,
@@ -422,7 +424,7 @@ class RouterFacade {
422
424
  if (process.env.APP_DEBUG_CONSOLE) {
423
425
  console.error(e);
424
426
  }
425
- this.handleResponseAfter(response, req, { status: 500, error: e && e.stack && e.stack.toString().trim() !== '' ? e.stack : e && e.toString() !== '' ? e.toString() : "Error running the component ..." });
427
+ this.handleResponseAfter(response, request, { status: 500, error: e && e.stack && e.stack.toString().trim() !== '' ? e.stack : e && e.toString() !== '' ? e.toString() : "Error running the component ..." });
426
428
  if (this.mode === "aws-lambda") {
427
429
  return {
428
430
  statusCode: 500,
@@ -441,7 +443,7 @@ class RouterFacade {
441
443
  }
442
444
  }
443
445
  else {
444
- this.handleResponseAfter(response, req, { status: 500, error: "Route component not found ..." });
446
+ this.handleResponseAfter(response, request, { status: 500, error: "Route component not found ..." });
445
447
  if (this.mode === "aws-lambda") {
446
448
  return {
447
449
  statusCode: 500,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webtypen/webframez-core",
3
- "version": "0.0.56",
3
+ "version": "0.0.58",
4
4
  "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
5
5
  "homepage": "https://webtypen.de/",
6
6
  "license": "MIT",
package/src/Router/Request.ts CHANGED
@@ -10,4 +10,5 @@ export type Request = {
10
10
  rawHeaders: object;
11
11
  url: string;
12
12
  method: string;
13
+ on?: any;
13
14
  };
package/src/Router/Response.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { IncomingMessage, ServerResponse } from "http";
1
+ import { ServerResponse } from "http";
2
2
 
3
3
  export class Response {
4
4
  res?: ServerResponse;
@@ -94,7 +94,7 @@ export class Response {
94
94
  * @param req
95
95
  * @param payload
96
96
  */
97
- async handleEvents(eventKey: string, req: IncomingMessage, payload: any) {
97
+ async handleEvents(eventKey: string, req: any, payload: any) {
98
98
  if (!this.events || !this.events[eventKey] || this.events[eventKey].length < 1) {
99
99
  return;
100
100
  }
package/src/Router/Router.ts CHANGED
@@ -305,6 +305,7 @@ class RouterFacade {
305
305
  urlParams: customRequest.urlParams,
306
306
  headers: customRequest.headers,
307
307
  method: customRequest.method,
308
+ on: req ? req.on : undefined,
308
309
  }
309
310
  : req
310
311
  ? {
@@ -327,6 +328,7 @@ class RouterFacade {
327
328
  url: req.url,
328
329
  method: req.method,
329
330
  socket: req.socket,
331
+ on: req.on,
330
332
  }
331
333
  : null;
332
334
 
@@ -335,7 +337,7 @@ class RouterFacade {
335
337
  for (let middlewareKey of route.options.middleware) {
336
338
  const middleware = this.kernel.middleware[middlewareKey];
337
339
  if (!middleware) {
338
- this.handleResponseAfter(response, req, { status: 500 });
340
+ this.handleResponseAfter(response, request, { status: 500 });
339
341
 
340
342
  if (this.mode === "aws-lambda") {
341
343
  return {
@@ -366,7 +368,7 @@ class RouterFacade {
366
368
  } catch (e) {
367
369
  console.error(e);
368
370
 
369
- this.handleResponseAfter(response, req, { status: 500 });
371
+ this.handleResponseAfter(response, request, { status: 500 });
370
372
  if (this.mode === "aws-lambda") {
371
373
  return {
372
374
  statusCode: 500,
@@ -383,7 +385,7 @@ class RouterFacade {
383
385
  }
384
386
  });
385
387
  } catch (e: any) {
386
- this.handleResponseAfter(response, req, { status: 500, error: typeof e.data === "object" ? JSON.stringify(e.data) : e.data ? e.data : undefined });
388
+ this.handleResponseAfter(response, request, { status: 500, error: typeof e.data === "object" ? JSON.stringify(e.data) : e.data ? e.data : undefined });
387
389
 
388
390
  // Send Middleware-Abort
389
391
  if (this.mode === "aws-lambda") {
@@ -426,7 +428,7 @@ class RouterFacade {
426
428
  const split = route.component.split("@");
427
429
  const controller = this.kernel.controller[split[0]];
428
430
  if (!controller) {
429
- this.handleResponseAfter(response, req, { status: 500, error: "Controller `" + split[0] + "` not found ..." });
431
+ this.handleResponseAfter(response, request, { status: 500, error: "Controller `" + split[0] + "` not found ..." });
430
432
 
431
433
  if (this.mode === "aws-lambda") {
432
434
  return {
@@ -447,7 +449,7 @@ class RouterFacade {
447
449
  // Set Controller method as route-component
448
450
  const controllerInstance = new controller();
449
451
  if (!controllerInstance || !split || !split[1] || !controllerInstance[split[1]]) {
450
- this.handleResponseAfter(response, req, { status: 500, error: "controllerInstance `" + split[1] + "` not found ..." });
452
+ this.handleResponseAfter(response, request, { status: 500, error: "controllerInstance `" + split[1] + "` not found ..." });
451
453
  throw new Error("controllerInstance " + split[1] + " not found ...");
452
454
  }
453
455
  route.component = controllerInstance[split[1]].bind(controllerInstance);
@@ -457,7 +459,7 @@ class RouterFacade {
457
459
  try {
458
460
  await route.component(request, response);
459
461
 
460
- this.handleResponseAfter(response, req, { status: response.statusCode });
462
+ this.handleResponseAfter(response, request, { status: response.statusCode });
461
463
  if (this.mode === "aws-lambda") {
462
464
  return {
463
465
  statusCode: response.statusCode,
@@ -473,7 +475,7 @@ class RouterFacade {
473
475
  console.error(e);
474
476
  }
475
477
 
476
- this.handleResponseAfter(response, req, { status: 500, error: e && e.stack && e.stack.toString().trim() !== '' ? e.stack : e && e.toString() !== '' ? e.toString() : "Error running the component ..." });
478
+ this.handleResponseAfter(response, request, { status: 500, error: e && e.stack && e.stack.toString().trim() !== '' ? e.stack : e && e.toString() !== '' ? e.toString() : "Error running the component ..." });
477
479
  if (this.mode === "aws-lambda") {
478
480
  return {
479
481
  statusCode: 500,
@@ -490,7 +492,7 @@ class RouterFacade {
490
492
  }
491
493
  }
492
494
  } else {
493
- this.handleResponseAfter(response, req, { status: 500, error: "Route component not found ..." });
495
+ this.handleResponseAfter(response, request, { status: 500, error: "Route component not found ..." });
494
496
  if (this.mode === "aws-lambda") {
495
497
  return {
496
498
  statusCode: 500,