@tsed/config 8.9.2 → 8.9.3

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.
@@ -1,6 +1,6 @@
1
1
  import "@tsed/ajv";
2
- import { configuration, constant, inject, injectable, logger } from "@tsed/di";
3
- import { $on } from "@tsed/hooks";
2
+ import { configuration, constant, injectable, logger } from "@tsed/di";
3
+ import { $off, $on, $once } from "@tsed/hooks";
4
4
  import { CONFIG_SOURCES } from "../constants/constants.js";
5
5
  import { getConfigSources } from "../utils/getConfigSources.js";
6
6
  import { validate } from "../utils/validate.js";
@@ -8,6 +8,8 @@ export async function afterResolveConfiguration() {
8
8
  const sources = getConfigSources(constant("extends", []));
9
9
  for (const source of sources.values()) {
10
10
  const { instance, watch, refreshOn, name, validationSchema } = source;
11
+ const seed = Math.floor(Math.random() * 10000);
12
+ const ref = name + "-" + seed;
11
13
  if (instance?.$onInit) {
12
14
  await instance.$onInit();
13
15
  }
@@ -26,17 +28,15 @@ export async function afterResolveConfiguration() {
26
28
  // manage watcher
27
29
  if (watch && instance?.watch) {
28
30
  const closer = await instance.watch(refresh);
29
- closer && $on("$onDestroy", closer);
31
+ closer && $once("$onDestroy", ref, closer);
30
32
  }
31
33
  // manager refresh on request
32
34
  if (refreshOn === "request") {
33
- $on("$onRequest", () => {
34
- return refresh();
35
- });
35
+ $on("$onRequest", ref, refresh);
36
36
  }
37
37
  // manager refresh on response
38
38
  if (refreshOn === "response") {
39
- $on("$onResponse", () => {
39
+ const onResponse = () => {
40
40
  refresh().catch((error) => {
41
41
  logger().error({
42
42
  event: "CONFIG_SOURCE_REFRESH_ERROR",
@@ -46,8 +46,16 @@ export async function afterResolveConfiguration() {
46
46
  error_stack: error.stack
47
47
  });
48
48
  });
49
- });
49
+ };
50
+ $on("$onResponse", ref, onResponse);
50
51
  }
52
+ $once("$onDestroy", ref, () => {
53
+ if (instance?.$onDestroy) {
54
+ // clean all event related to the same ref
55
+ $off(ref);
56
+ return instance.$onDestroy();
57
+ }
58
+ });
51
59
  }
52
60
  const configs = Object.fromEntries([...sources.entries()].map(([key, source]) => {
53
61
  return [key, source.instance];
@@ -55,11 +63,4 @@ export async function afterResolveConfiguration() {
55
63
  injectable(CONFIG_SOURCES).value(configs);
56
64
  }
57
65
  $on("$afterResolveConfiguration", afterResolveConfiguration);
58
- $on("$onDestroy", () => {
59
- const configs = inject(CONFIG_SOURCES);
60
- const promises = Object.values(configs).map((config) => {
61
- return config.$onDestroy?.();
62
- });
63
- return Promise.all(promises);
64
- });
65
66
  //# sourceMappingURL=afterResolveConfiguration.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"afterResolveConfiguration.js","sourceRoot":"","sources":["../../../src/hooks/afterResolveConfiguration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"afterResolveConfiguration.js","sourceRoot":"","sources":["../../../src/hooks/afterResolveConfiguration.ts"],"names":[],"mappings":"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"}