@breadc/death 0.9.4 → 0.9.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 (5) hide show
  1. package/README.md +1 -1
  2. package/dist/index.cjs +62 -32
  3. package/dist/index.d.ts +1 -0
  4. package/dist/index.mjs +62 -32
  5. package/package.json +3 -3
package/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # @breadc/death
2
2
 
3
- [![version](https://img.shields.io/npm/v/@breadc/death&label=@breadc/death)](https://www.npmjs.com/package/@breadc/death) [![CI](https://github.com/yjl9903/Breadc/actions/workflows/ci.yml/badge.svg)](https://github.com/yjl9903/Breadc/actions/workflows/ci.yml)
3
+ [![version](https://img.shields.io/npm/v/@breadc/death?label=@breadc/death)](https://www.npmjs.com/package/@breadc/death) [![CI](https://github.com/yjl9903/Breadc/actions/workflows/ci.yml/badge.svg)](https://github.com/yjl9903/Breadc/actions/workflows/ci.yml)
4
4
 
5
5
  Easily register termination signals callbacks.
6
6
 
package/dist/index.cjs CHANGED
@@ -3,27 +3,30 @@
3
3
  const node_events = require('node:events');
4
4
 
5
5
  const emitter = new node_events.EventEmitter();
6
+ const context = {
7
+ triggered: false,
8
+ terminate: "kill",
9
+ exit: void 0,
10
+ kill: void 0
11
+ };
6
12
  const handlers = {
7
- SIGINT: makeHandler(),
8
- SIGTERM: makeHandler(),
9
- SIGQUIT: makeHandler()
13
+ SIGINT: makeHandler("SIGINT"),
14
+ SIGTERM: makeHandler("SIGTERM"),
15
+ SIGQUIT: makeHandler("SIGQUIT")
10
16
  };
11
17
  function onDeath(callback, { SIGINT = true, SIGTERM = true, SIGQUIT = true } = {}) {
12
18
  const cleanUps = [];
13
19
  if (SIGINT) {
14
20
  registerCallback("SIGINT", handlers.SIGINT);
15
- emitter.addListener("SIGINT", callback);
16
- cleanUps.push(() => emitter.removeListener("SIGINT", callback));
21
+ cleanUps.push(handlers.SIGINT.addCallback(callback));
17
22
  }
18
23
  if (SIGTERM) {
19
24
  registerCallback("SIGTERM", handlers.SIGTERM);
20
- emitter.addListener("SIGTERM", callback);
21
- cleanUps.push(() => emitter.removeListener("SIGTERM", callback));
25
+ cleanUps.push(handlers.SIGTERM.addCallback(callback));
22
26
  }
23
27
  if (SIGQUIT) {
24
28
  registerCallback("SIGQUIT", handlers.SIGQUIT);
25
- emitter.addListener("SIGQUIT", callback);
26
- cleanUps.push(() => emitter.removeListener("SIGQUIT", callback));
29
+ cleanUps.push(handlers.SIGQUIT.addCallback(callback));
27
30
  }
28
31
  return () => {
29
32
  for (const cleanUp of cleanUps) {
@@ -31,32 +34,59 @@ function onDeath(callback, { SIGINT = true, SIGTERM = true, SIGQUIT = true } = {
31
34
  }
32
35
  };
33
36
  }
34
- function registerCallback(signal, callback) {
35
- process.on(signal, callback);
36
- return () => {
37
- process.off(signal, callback);
38
- };
37
+ function registerCallback(signal, handler) {
38
+ if (handler.count === 0) {
39
+ handler.count += 1;
40
+ process.addListener(signal, handler.listener);
41
+ }
39
42
  }
40
43
  function makeHandler(signal) {
41
- return async (signal2) => {
42
- const listeners = emitter.listeners(signal2);
43
- const context = {
44
- terminate: "kill",
45
- exit: void 0,
46
- kill: signal2
47
- };
48
- for (const listener of listeners.reverse()) {
49
- await listener(signal2, context);
50
- }
51
- if (context.terminate === "kill" || context.terminate === "exit") {
52
- process.removeListener("SIGINT", handlers.SIGINT);
53
- process.removeListener("SIGTERM", handlers.SIGTERM);
54
- process.removeListener("SIGQUIT", handlers.SIGQUIT);
55
- if (context.terminate === "kill") {
56
- process.kill(process.pid, context.kill);
57
- } else {
58
- process.exit(context.exit);
44
+ const callbacks = /* @__PURE__ */ new WeakMap();
45
+ return {
46
+ count: 0,
47
+ callbacks,
48
+ addCallback(callback) {
49
+ {
50
+ const count = callbacks.get(callback);
51
+ if (count !== void 0) {
52
+ callbacks.set(callback, count + 1);
53
+ } else {
54
+ callbacks.set(callback, 1);
55
+ emitter.addListener(signal, callback);
56
+ }
57
+ }
58
+ return () => {
59
+ const count = callbacks.get(callback);
60
+ if (count === void 0 || count <= 1) {
61
+ callbacks.delete(callback);
62
+ emitter.removeListener(signal, callback);
63
+ } else {
64
+ callbacks.set(callback, count - 1);
65
+ }
66
+ };
67
+ },
68
+ async listener(signal2) {
69
+ if (context.triggered) {
70
+ return;
71
+ }
72
+ context.triggered = true;
73
+ context.kill = signal2;
74
+ const listeners = [...emitter.listeners(signal2)];
75
+ for (const listener of listeners.reverse()) {
76
+ await listener(signal2, context);
77
+ }
78
+ if (context.terminate === "kill" || context.terminate === "exit") {
79
+ process.removeListener("SIGINT", handlers.SIGINT.listener);
80
+ process.removeListener("SIGTERM", handlers.SIGTERM.listener);
81
+ process.removeListener("SIGQUIT", handlers.SIGQUIT.listener);
82
+ if (context.terminate === "kill") {
83
+ process.kill(process.pid, context.kill);
84
+ } else {
85
+ process.exit(context.exit);
86
+ }
59
87
  }
88
+ context.triggered = false;
89
+ context.kill = void 0;
60
90
  }
61
91
  };
62
92
  }
package/dist/index.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  type DeathSignals = 'SIGINT' | 'SIGTERM' | 'SIGQUIT';
2
2
  interface OnDeathContext {
3
+ triggered: boolean;
3
4
  terminate: 'exit' | 'kill' | false;
4
5
  exit: number | undefined;
5
6
  kill: NodeJS.Signals | undefined;
package/dist/index.mjs CHANGED
@@ -1,27 +1,30 @@
1
1
  import { EventEmitter } from 'node:events';
2
2
 
3
3
  const emitter = new EventEmitter();
4
+ const context = {
5
+ triggered: false,
6
+ terminate: "kill",
7
+ exit: void 0,
8
+ kill: void 0
9
+ };
4
10
  const handlers = {
5
- SIGINT: makeHandler(),
6
- SIGTERM: makeHandler(),
7
- SIGQUIT: makeHandler()
11
+ SIGINT: makeHandler("SIGINT"),
12
+ SIGTERM: makeHandler("SIGTERM"),
13
+ SIGQUIT: makeHandler("SIGQUIT")
8
14
  };
9
15
  function onDeath(callback, { SIGINT = true, SIGTERM = true, SIGQUIT = true } = {}) {
10
16
  const cleanUps = [];
11
17
  if (SIGINT) {
12
18
  registerCallback("SIGINT", handlers.SIGINT);
13
- emitter.addListener("SIGINT", callback);
14
- cleanUps.push(() => emitter.removeListener("SIGINT", callback));
19
+ cleanUps.push(handlers.SIGINT.addCallback(callback));
15
20
  }
16
21
  if (SIGTERM) {
17
22
  registerCallback("SIGTERM", handlers.SIGTERM);
18
- emitter.addListener("SIGTERM", callback);
19
- cleanUps.push(() => emitter.removeListener("SIGTERM", callback));
23
+ cleanUps.push(handlers.SIGTERM.addCallback(callback));
20
24
  }
21
25
  if (SIGQUIT) {
22
26
  registerCallback("SIGQUIT", handlers.SIGQUIT);
23
- emitter.addListener("SIGQUIT", callback);
24
- cleanUps.push(() => emitter.removeListener("SIGQUIT", callback));
27
+ cleanUps.push(handlers.SIGQUIT.addCallback(callback));
25
28
  }
26
29
  return () => {
27
30
  for (const cleanUp of cleanUps) {
@@ -29,32 +32,59 @@ function onDeath(callback, { SIGINT = true, SIGTERM = true, SIGQUIT = true } = {
29
32
  }
30
33
  };
31
34
  }
32
- function registerCallback(signal, callback) {
33
- process.on(signal, callback);
34
- return () => {
35
- process.off(signal, callback);
36
- };
35
+ function registerCallback(signal, handler) {
36
+ if (handler.count === 0) {
37
+ handler.count += 1;
38
+ process.addListener(signal, handler.listener);
39
+ }
37
40
  }
38
41
  function makeHandler(signal) {
39
- return async (signal2) => {
40
- const listeners = emitter.listeners(signal2);
41
- const context = {
42
- terminate: "kill",
43
- exit: void 0,
44
- kill: signal2
45
- };
46
- for (const listener of listeners.reverse()) {
47
- await listener(signal2, context);
48
- }
49
- if (context.terminate === "kill" || context.terminate === "exit") {
50
- process.removeListener("SIGINT", handlers.SIGINT);
51
- process.removeListener("SIGTERM", handlers.SIGTERM);
52
- process.removeListener("SIGQUIT", handlers.SIGQUIT);
53
- if (context.terminate === "kill") {
54
- process.kill(process.pid, context.kill);
55
- } else {
56
- process.exit(context.exit);
42
+ const callbacks = /* @__PURE__ */ new WeakMap();
43
+ return {
44
+ count: 0,
45
+ callbacks,
46
+ addCallback(callback) {
47
+ {
48
+ const count = callbacks.get(callback);
49
+ if (count !== void 0) {
50
+ callbacks.set(callback, count + 1);
51
+ } else {
52
+ callbacks.set(callback, 1);
53
+ emitter.addListener(signal, callback);
54
+ }
55
+ }
56
+ return () => {
57
+ const count = callbacks.get(callback);
58
+ if (count === void 0 || count <= 1) {
59
+ callbacks.delete(callback);
60
+ emitter.removeListener(signal, callback);
61
+ } else {
62
+ callbacks.set(callback, count - 1);
63
+ }
64
+ };
65
+ },
66
+ async listener(signal2) {
67
+ if (context.triggered) {
68
+ return;
69
+ }
70
+ context.triggered = true;
71
+ context.kill = signal2;
72
+ const listeners = [...emitter.listeners(signal2)];
73
+ for (const listener of listeners.reverse()) {
74
+ await listener(signal2, context);
75
+ }
76
+ if (context.terminate === "kill" || context.terminate === "exit") {
77
+ process.removeListener("SIGINT", handlers.SIGINT.listener);
78
+ process.removeListener("SIGTERM", handlers.SIGTERM.listener);
79
+ process.removeListener("SIGQUIT", handlers.SIGQUIT.listener);
80
+ if (context.terminate === "kill") {
81
+ process.kill(process.pid, context.kill);
82
+ } else {
83
+ process.exit(context.exit);
84
+ }
57
85
  }
86
+ context.triggered = false;
87
+ context.kill = void 0;
58
88
  }
59
89
  };
60
90
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@breadc/death",
3
- "version": "0.9.4",
3
+ "version": "0.9.6",
4
4
  "description": "Easily register termination signals callbacks.",
5
5
  "keywords": [
6
6
  "breadc",
@@ -37,8 +37,8 @@
37
37
  "dist"
38
38
  ],
39
39
  "devDependencies": {
40
- "@types/node": "^18.16.7",
41
- "vitest": "^0.31.0"
40
+ "@types/node": "^18.16.18",
41
+ "vitest": "^0.32.2"
42
42
  },
43
43
  "scripts": {
44
44
  "build": "unbuild",