f

Author: fengmk2

package.json

@@ -16,27 +16,27 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "coffee": "^4.1.0",
-    "cross-env": "^5.0.1",
-    "fkill": "^7.2.1",
-    "mm": "^2.2.0",
-    "mz-modules": "^2.1.0",
-    "urllib": "^2.26.0",
     "@arethetypeswrong/cli": "^0.17.1",
     "@eggjs/tsconfig": "1",
-    "@types/node": "22",
     "@types/mocha": "10",
+    "@types/node": "22",
+    "coffee": "^5.5.1",
     "egg-bin": "6",
     "eslint": "8",
     "eslint-config-egg": "14",
+    "fkill": "^7.2.1",
+    "mm": "^3.4.0",
     "tshy": "3",
     "tshy-after": "1",
-    "typescript": "5"
+    "typescript": "5",
+    "urllib": "^4.6.8"
   },
   "scripts": {
     "lint": "eslint --cache src test --ext .ts",
-    "test": "npm run lint -- --fix && egg-bin test",
-    "ci": "npm run lint && egg-bin cov && npm run prepublishOnly && attw --pack",
+    "pretest": "npm run lint -- --fix && npm run prepublishOnly",
+    "test": "egg-bin test",
+    "preci": "npm run lint && npm run prepublishOnly",
+    "ci": "egg-bin cov && attw --pack",
     "prepublishOnly": "tshy && tshy-after"
   },
   "type": "module",

src/exit.ts

@@ -2,6 +2,8 @@ import assert from 'node:assert';
 import { setTimeout } from 'node:timers/promises';
 import type { Logger, BeforeExit } from './types.js';
 
+const TIMEOUT = Symbol('before exit timeout');
+
 export function getExitFunction(logger: Logger, label: string, timeout: number, beforeExit?: BeforeExit) {
   if (beforeExit) {
     assert(typeof beforeExit === 'function', 'beforeExit only support function');
@@ -19,14 +21,17 @@ export function getExitFunction(logger: Logger, label: string, timeout: number,
 
   return async function exitFunction(code: number) {
     try {
-      await Promise.race([
+      const result = await Promise.race([
         handler(),
-        setTimeout(timeout),
+        setTimeout(timeout, TIMEOUT),
       ]);
+      if (result === TIMEOUT) {
+        throw new Error(`Timeout ${timeout}ms`);
+      }
       logger.info('[%s] beforeExit success', label);
       process.exit(code);
-    } catch (err) {
-      logger.error('[%s] beforeExit fail, error: %s', label, err);
+    } catch (err: any) {
+      logger.error('[%s] beforeExit fail, error: %s', label, err.message);
       process.exit(code);
     }
   };

test/fixtures/_async.js renamed to test/fixtures/_async.cjs

@@ -1,6 +1,5 @@
-'use strict';
-
-const sleep = require('mz-modules/sleep');
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { setTimeout: sleep } = require('node:timers/promises');
 
 module.exports = async () => {
   console.log('process exiting');

test/fixtures/_async_error.cjs

@@ -0,0 +1,7 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { setTimeout: sleep } = require('node:timers/promises');
+
+module.exports = async () => {
+  await sleep(1000);
+  throw new Error('reject');
+};

test/fixtures/_async_error.js

@@ -1,7 +1,7 @@
-'use strict';
-
-const http = require('http');
-const sleep = require('mz-modules/sleep');
+/* eslint-disable @typescript-eslint/no-var-requires */
+const http = require('node:http');
+const { setTimeout: sleep } = require('node:timers/promises');
+const { graceful } = require('../..');
 
 http.createServer((req, res) => {
   res.writeHead(200);
@@ -11,10 +11,10 @@ http.createServer((req, res) => {
 let beforeExit;
 switch (process.env.MODE) {
   case 'async':
-    beforeExit = require('./_async');
+    beforeExit = require('./_async.cjs');
     break;
   case 'async-error':
-    beforeExit = require('./_async_error');
+    beforeExit = require('./_async_error.cjs');
     break;
   case 'promise':
     beforeExit = () => {
@@ -42,10 +42,10 @@ switch (process.env.MODE) {
 }
 
 console.log(`Worker ${process.pid} started`);
-require('../..')({
+graceful({
   logger: console,
   beforeExit,
 });
 
 // run again should work
-require('../..')();
+graceful();

test/fixtures/before-exit.js renamed to test/fixtures/before-exit.cjs

@@ -1,17 +1,18 @@
-'use strict';
-
-const http = require('http');
+/* eslint-disable @typescript-eslint/no-var-requires */
+const http = require('node:http');
+const { graceful } = require('../..');
 
 http.createServer((req, res) => {
   res.writeHead(200);
   res.end('hello world\n');
 }).listen(8000);
 
 console.log(`Worker ${process.pid} started`);
-require('../..')({
+graceful({
   logger: console,
   label: 'test-child',
   logLevel: process.env.NODE_LOG_LEVEL,
 });
+
 // run again should work
-require('../..')();
+graceful();

test/fixtures/child.js renamed to test/fixtures/child.cjs

@@ -1,7 +1,6 @@
-'use strict';
-
-const cluster = require('cluster');
-const http = require('http');
+/* eslint-disable @typescript-eslint/no-var-requires */
+const cluster = require('node:cluster');
+const http = require('node:http');
 
 if (cluster.isMaster) {
   console.log(`Master ${process.pid} is running`);
@@ -35,7 +34,8 @@ if (cluster.isMaster) {
   }).listen(8000);
 
   console.log(`Worker ${process.pid} started`);
-  require('../..')({
+  const { graceful } = require('../..');
+  graceful({
     label: 'app-worker-' + cluster.worker.id,
     logLevel: process.env.NODE_LOG_LEVEL,
   });

test/fixtures/cluster.js renamed to test/fixtures/cluster.cjs

@@ -1,9 +1,8 @@
-'use strict';
+/* eslint-disable @typescript-eslint/no-var-requires */
+const childProcess = require('node:child_process');
+const path = require('node:path');
 
-const childProcess = require('child_process');
-const path = require('path');
-
-const childFile = path.join(__dirname, 'child.js');
+const childFile = path.join(__dirname, 'child.cjs');
 
 childProcess.spawn(process.execPath, [ childFile ], {
   stdio: 'inherit',

test/fixtures/master-spawn.js

@@ -0,0 +1,9 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const childProcess = require('node:child_process');
+const path = require('node:path');
+
+const childFile = path.join(__dirname, 'child.cjs');
+
+childProcess.fork(childFile);
+
+console.log('master fork %s done', childFile);