@wooksjs/event-http 0.5.5 → 0.5.6

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 (4) hide show
  1. package/dist/index.cjs +3 -14
  2. package/dist/index.d.ts +0 -11
  3. package/dist/index.mjs +3 -14
  4. package/package.json +3 -3
package/dist/index.cjs CHANGED
@@ -579,7 +579,7 @@ class HttpErrorRenderer extends BaseHttpResponseRenderer {
579
579
  `<head><title>${data.statusCode} ${httpStatusCodes[data.statusCode]}</title></head>` +
580
580
  `<body><center><h1>${data.statusCode} ${httpStatusCodes[data.statusCode]}</h1></center>` +
581
581
  `<center><h4>${data.message}</h1></center><hr color="#666">` +
582
- `<center style="color: #666;"> Wooks v${"0.5.5"} </center>` +
582
+ `<center style="color: #666;"> Wooks v${"0.5.6"} </center>` +
583
583
  `${keys.length > 0
584
584
  ? `<pre style="${preStyles}">${JSON.stringify({
585
585
  ...data,
@@ -769,7 +769,6 @@ class BaseHttpResponse {
769
769
  throw error;
770
770
  }
771
771
  async respond() {
772
- const { endEvent } = useHttpContext();
773
772
  const { rawResponse, hasResponded } = useResponse();
774
773
  const { method, rawRequest } = useRequest();
775
774
  const logger = eventCore.useEventLogger('http-response') || console;
@@ -788,20 +787,17 @@ class BaseHttpResponse {
788
787
  stream.destroy();
789
788
  });
790
789
  if (method === 'HEAD') {
791
- endEvent();
792
790
  stream.destroy();
793
791
  res.end();
794
792
  }
795
793
  else {
796
794
  return new Promise((resolve, reject) => {
797
795
  stream.on('error', e => {
798
- endEvent();
799
796
  stream.destroy();
800
797
  res.end();
801
798
  reject(e);
802
799
  });
803
800
  stream.on('close', () => {
804
- endEvent();
805
801
  stream.destroy();
806
802
  resolve(undefined);
807
803
  });
@@ -812,7 +808,6 @@ class BaseHttpResponse {
812
808
  else if (globalThis.Response && this.body instanceof Response) {
813
809
  this.mergeFetchStatus(this.body.status);
814
810
  if (method === 'HEAD') {
815
- endEvent();
816
811
  res.end();
817
812
  }
818
813
  else {
@@ -823,7 +818,6 @@ class BaseHttpResponse {
823
818
  if (this.body.headers.get('content-type')) {
824
819
  additionalHeaders['content-type'] = this.body.headers.get('content-type');
825
820
  }
826
- endEvent();
827
821
  res.writeHead(this.status, {
828
822
  ...additionalHeaders,
829
823
  ...this._headers,
@@ -834,7 +828,6 @@ class BaseHttpResponse {
834
828
  else {
835
829
  const renderedBody = this.renderer.render(this);
836
830
  this.mergeStatus(renderedBody);
837
- endEvent();
838
831
  res
839
832
  .writeHead(this.status, {
840
833
  'content-length': Buffer.byteLength(renderedBody),
@@ -951,13 +944,9 @@ class WooksHttp extends wooks.WooksAdapterBase {
951
944
  this.server = server;
952
945
  }
953
946
  respond(data) {
954
- const { endEvent } = useHttpContext();
955
- void this.responder
956
- .respond(data)
957
- ?.catch(e => {
947
+ void this.responder.respond(data)?.catch(e => {
958
948
  this.logger.error('Uncought response exception', e);
959
- })
960
- .finally(() => endEvent());
949
+ });
961
950
  }
962
951
  getServerCb() {
963
952
  return (req, res) => {
package/dist/index.d.ts CHANGED
@@ -386,7 +386,6 @@ declare function createHttpContext(data: THttpEventData, options: TEventOptions)
386
386
  */
387
387
  declare function useHttpContext<T extends TEmpty>(): {
388
388
  getCtx: () => THttpContextStore & T & _wooksjs_event_core.TGenericContextStore<THttpEventData>;
389
- endEvent: (abortReason?: string | undefined) => void;
390
389
  store: <K extends keyof THttpContextStore | keyof _wooksjs_event_core.TGenericContextStore<THttpEventData> | keyof T>(key: K) => {
391
390
  value: (THttpContextStore & T & _wooksjs_event_core.TGenericContextStore<THttpEventData>)[K];
392
391
  hook: <K2 extends keyof Required<THttpContextStore & T & _wooksjs_event_core.TGenericContextStore<THttpEventData>>[K]>(key2: K2) => {
@@ -407,7 +406,6 @@ declare function useHttpContext<T extends TEmpty>(): {
407
406
  hasParentCtx: () => boolean;
408
407
  getParentCtx: <T2 = THttpContextStore & T & _wooksjs_event_core.TGenericContextStore<THttpEventData>>() => {
409
408
  getCtx: () => T2;
410
- endEvent: (abortReason?: string | undefined) => void;
411
409
  store: <K_3 extends keyof T2>(key: K_3) => {
412
410
  value: T2[K_3];
413
411
  hook: <K2_6 extends keyof Required<T2>[K_3]>(key2: K2_6) => {
@@ -428,7 +426,6 @@ declare function useHttpContext<T extends TEmpty>(): {
428
426
  hasParentCtx: () => boolean;
429
427
  getParentCtx: <T2_1 = T2>() => {
430
428
  getCtx: () => T2_1;
431
- endEvent: (abortReason?: string | undefined) => void;
432
429
  store: <K_6 extends keyof T2_1>(key: K_6) => {
433
430
  value: T2_1[K_6];
434
431
  hook: <K2_12 extends keyof Required<T2_1>[K_6]>(key2: K2_12) => {
@@ -449,7 +446,6 @@ declare function useHttpContext<T extends TEmpty>(): {
449
446
  hasParentCtx: () => boolean;
450
447
  getParentCtx: <T2_2 = T2_1>() => {
451
448
  getCtx: () => T2_2;
452
- endEvent: (abortReason?: string | undefined) => void;
453
449
  store: <K_9 extends keyof T2_2>(key: K_9) => {
454
450
  value: T2_2[K_9];
455
451
  hook: <K2_18 extends keyof Required<T2_2>[K_9]>(key2: K2_18) => {
@@ -470,7 +466,6 @@ declare function useHttpContext<T extends TEmpty>(): {
470
466
  hasParentCtx: () => boolean;
471
467
  getParentCtx: <T2_3 = T2_2>() => {
472
468
  getCtx: () => T2_3;
473
- endEvent: (abortReason?: string | undefined) => void;
474
469
  store: <K_12 extends keyof T2_3>(key: K_12) => {
475
470
  value: T2_3[K_12];
476
471
  hook: <K2_24 extends keyof Required<T2_3>[K_12]>(key2: K2_24) => {
@@ -491,7 +486,6 @@ declare function useHttpContext<T extends TEmpty>(): {
491
486
  hasParentCtx: () => boolean;
492
487
  getParentCtx: <T2_4 = T2_3>() => {
493
488
  getCtx: () => T2_4;
494
- endEvent: (abortReason?: string | undefined) => void;
495
489
  store: <K_15 extends keyof T2_4>(key: K_15) => {
496
490
  value: T2_4[K_15];
497
491
  hook: <K2_30 extends keyof Required<T2_4>[K_15]>(key2: K2_30) => {
@@ -512,7 +506,6 @@ declare function useHttpContext<T extends TEmpty>(): {
512
506
  hasParentCtx: () => boolean;
513
507
  getParentCtx: <T2_5 = T2_4>() => {
514
508
  getCtx: () => T2_5;
515
- endEvent: (abortReason?: string | undefined) => void;
516
509
  store: <K_18 extends keyof T2_5>(key: K_18) => {
517
510
  value: T2_5[K_18];
518
511
  hook: <K2_36 extends keyof Required<T2_5>[K_18]>(key2: K2_36) => {
@@ -533,7 +526,6 @@ declare function useHttpContext<T extends TEmpty>(): {
533
526
  hasParentCtx: () => boolean;
534
527
  getParentCtx: <T2_6 = T2_5>() => {
535
528
  getCtx: () => T2_6;
536
- endEvent: (abortReason?: string | undefined) => void;
537
529
  store: <K_21 extends keyof T2_6>(key: K_21) => {
538
530
  value: T2_6[K_21];
539
531
  hook: <K2_42 extends keyof Required<T2_6>[K_21]>(key2: K2_42) => {
@@ -554,7 +546,6 @@ declare function useHttpContext<T extends TEmpty>(): {
554
546
  hasParentCtx: () => boolean;
555
547
  getParentCtx: <T2_7 = T2_6>() => {
556
548
  getCtx: () => T2_7;
557
- endEvent: (abortReason?: string | undefined) => void;
558
549
  store: <K_24 extends keyof T2_7>(key: K_24) => {
559
550
  value: T2_7[K_24];
560
551
  hook: <K2_48 extends keyof Required<T2_7>[K_24]>(key2: K2_48) => {
@@ -575,7 +566,6 @@ declare function useHttpContext<T extends TEmpty>(): {
575
566
  hasParentCtx: () => boolean;
576
567
  getParentCtx: <T2_8 = T2_7>() => {
577
568
  getCtx: () => T2_8;
578
- endEvent: (abortReason?: string | undefined) => void;
579
569
  store: <K_27 extends keyof T2_8>(key: K_27) => {
580
570
  value: T2_8[K_27];
581
571
  hook: <K2_54 extends keyof Required<T2_8>[K_27]>(key2: K2_54) => {
@@ -596,7 +586,6 @@ declare function useHttpContext<T extends TEmpty>(): {
596
586
  hasParentCtx: () => boolean;
597
587
  getParentCtx: <T2_9 = T2_8>() => {
598
588
  getCtx: () => T2_9;
599
- endEvent: (abortReason?: string | undefined) => void;
600
589
  store: <K_30 extends keyof T2_9>(key: K_30) => {
601
590
  value: T2_9[K_30];
602
591
  hook: <K2_60 extends keyof Required<T2_9>[K_30]>(key2: K2_60) => {
package/dist/index.mjs CHANGED
@@ -577,7 +577,7 @@ class HttpErrorRenderer extends BaseHttpResponseRenderer {
577
577
  `<head><title>${data.statusCode} ${httpStatusCodes[data.statusCode]}</title></head>` +
578
578
  `<body><center><h1>${data.statusCode} ${httpStatusCodes[data.statusCode]}</h1></center>` +
579
579
  `<center><h4>${data.message}</h1></center><hr color="#666">` +
580
- `<center style="color: #666;"> Wooks v${"0.5.5"} </center>` +
580
+ `<center style="color: #666;"> Wooks v${"0.5.6"} </center>` +
581
581
  `${keys.length > 0
582
582
  ? `<pre style="${preStyles}">${JSON.stringify({
583
583
  ...data,
@@ -767,7 +767,6 @@ class BaseHttpResponse {
767
767
  throw error;
768
768
  }
769
769
  async respond() {
770
- const { endEvent } = useHttpContext();
771
770
  const { rawResponse, hasResponded } = useResponse();
772
771
  const { method, rawRequest } = useRequest();
773
772
  const logger = useEventLogger('http-response') || console;
@@ -786,20 +785,17 @@ class BaseHttpResponse {
786
785
  stream.destroy();
787
786
  });
788
787
  if (method === 'HEAD') {
789
- endEvent();
790
788
  stream.destroy();
791
789
  res.end();
792
790
  }
793
791
  else {
794
792
  return new Promise((resolve, reject) => {
795
793
  stream.on('error', e => {
796
- endEvent();
797
794
  stream.destroy();
798
795
  res.end();
799
796
  reject(e);
800
797
  });
801
798
  stream.on('close', () => {
802
- endEvent();
803
799
  stream.destroy();
804
800
  resolve(undefined);
805
801
  });
@@ -810,7 +806,6 @@ class BaseHttpResponse {
810
806
  else if (globalThis.Response && this.body instanceof Response) {
811
807
  this.mergeFetchStatus(this.body.status);
812
808
  if (method === 'HEAD') {
813
- endEvent();
814
809
  res.end();
815
810
  }
816
811
  else {
@@ -821,7 +816,6 @@ class BaseHttpResponse {
821
816
  if (this.body.headers.get('content-type')) {
822
817
  additionalHeaders['content-type'] = this.body.headers.get('content-type');
823
818
  }
824
- endEvent();
825
819
  res.writeHead(this.status, {
826
820
  ...additionalHeaders,
827
821
  ...this._headers,
@@ -832,7 +826,6 @@ class BaseHttpResponse {
832
826
  else {
833
827
  const renderedBody = this.renderer.render(this);
834
828
  this.mergeStatus(renderedBody);
835
- endEvent();
836
829
  res
837
830
  .writeHead(this.status, {
838
831
  'content-length': Buffer.byteLength(renderedBody),
@@ -949,13 +942,9 @@ class WooksHttp extends WooksAdapterBase {
949
942
  this.server = server;
950
943
  }
951
944
  respond(data) {
952
- const { endEvent } = useHttpContext();
953
- void this.responder
954
- .respond(data)
955
- ?.catch(e => {
945
+ void this.responder.respond(data)?.catch(e => {
956
946
  this.logger.error('Uncought response exception', e);
957
- })
958
- .finally(() => endEvent());
947
+ });
959
948
  }
960
949
  getServerCb() {
961
950
  return (req, res) => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wooksjs/event-http",
3
- "version": "0.5.5",
3
+ "version": "0.5.6",
4
4
  "description": "@wooksjs/event-http",
5
5
  "main": "dist/index.cjs",
6
6
  "module": "dist/index.mjs",
@@ -39,9 +39,9 @@
39
39
  "url": "https://github.com/wooksjs/wooksjs/issues"
40
40
  },
41
41
  "peerDependencies": {
42
- "wooks": "0.5.5",
42
+ "wooks": "0.5.6",
43
43
  "@prostojs/router": "^0.2.1",
44
- "@wooksjs/event-core": "0.5.5"
44
+ "@wooksjs/event-core": "0.5.6"
45
45
  },
46
46
  "dependencies": {
47
47
  "@prostojs/logger": "^0.4.0"