feat: support cjs and esm both by tshy (#8)

BREAKING CHANGE: drop Node.js < 18.19.0 support

part of eggjs/egg#3644

eggjs/egg#5257

Author: fengmk2

.eslintrc

@@ -0,0 +1,6 @@
+{
+  "extends": [
+    "eslint-config-egg/typescript",
+    "eslint-config-egg/lib/rules/enforce-node-prefix"
+  ]
+}

.github/workflows/nodejs.yml

@@ -3,16 +3,15 @@ name: CI
 on:
   push:
     branches: [ master ]
-
   pull_request:
     branches: [ master ]
 
-  workflow_dispatch: {}
-
 jobs:
   Job:
     name: Node.js
-    uses: artusjs/github-actions/.github/workflows/node-test.yml@v1
+    uses: node-modules/github-actions/.github/workflows/node-test.yml@master
     with:
-      os: 'ubuntu-latest'
-      version: '8, 10, 12, 14, 16, 18, 19'
+      os: 'ubuntu-latest, macos-latest, windows-latest'
+      version: '18.19.0, 18, 20, 22'
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pkg.pr.new.yml

@@ -0,0 +1,23 @@
+name: Publish Any Commit
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - run: corepack enable
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build
+        run: npm run prepublishOnly --if-present
+
+      - run: npx pkg-pr-new publish

.github/workflows/release.yml

@@ -1,19 +1,13 @@
 name: Release
 
 on:
-  # 合并后自动发布
   push:
     branches: [ master ]
 
-  # 手动发布
-  workflow_dispatch: {}
-
 jobs:
   release:
     name: Node.js
-    uses: artusjs/github-actions/.github/workflows/node-release.yml@v1
+    uses: node-modules/github-actions/.github/workflows/node-release.yml@master
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
-    with:
-      checkTest: false

.gitignore

@@ -12,5 +12,8 @@ results
 
 node_modules
 npm-debug.log
-coverage/
 .vscode
+.tshy*
+.eslintcache
+dist
+coverage

History.md CHANGELOG.md

@@ -1,10 +1,10 @@
-cluster-reload
-=======
+# cluster-reload
 
 [![NPM version][npm-image]][npm-url]
 [![npm download][download-image]][download-url]
 [![Node.js CI](https://github.com/node-modules/cluster-reload/actions/workflows/nodejs.yml/badge.svg)](https://github.com/node-modules/cluster-reload/actions/workflows/nodejs.yml)
 [![Test coverage][codecov-image]][codecov-url]
+[![Node.js Version](https://img.shields.io/node/v/cluster-reload.svg?style=flat)](https://nodejs.org/en/download/)
 
 [npm-image]: https://img.shields.io/npm/v/cluster-reload.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/cluster-reload
@@ -18,9 +18,15 @@ Easy and safe reload your workers.
 ## Installation
 
 ```bash
-npm install cluster-reload --save
+npm install cluster-reload
 ```
 
 ## License
 
 [MIT](LICENSE)
+
+## Contributors
+
+[![Contributors](https://contrib.rocks/image?repo=node-modules/cluster-reload)](https://github.com/node-modules/cluster-reload/graphs/contributors)
+
+Made with [contributors-img](https://contrib.rocks).

README.md

@@ -2,20 +2,6 @@
   "name": "cluster-reload",
   "version": "1.1.0",
   "description": "cluster workers reload",
-  "main": "index.js",
-  "files": [
-    "index.js"
-  ],
-  "scripts": {
-    "lint": "echo 'ignore'",
-    "test": "egg-bin test",
-    "ci": "egg-bin cov"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "egg-bin": "^4.20.0",
-    "urllib": "^2.40.0"
-  },
   "homepage": "https://github.com/node-modules/cluster-reload",
   "repository": {
     "type": "git",
@@ -27,9 +13,58 @@
   "keywords": [
     "cluster-reload"
   ],
+  "author": "fengmk2 <[email protected]> (https://github.com/fengmk2)",
+  "license": "MIT",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">= 18.19.0"
   },
-  "author": "fengmk2 <[email protected]> (https://github.com/fengmk2)",
-  "license": "MIT"
+  "dependencies": {},
+  "devDependencies": {
+    "@arethetypeswrong/cli": "^0.17.1",
+    "@eggjs/tsconfig": "1",
+    "@types/mocha": "10",
+    "@types/node": "22",
+    "egg-bin": "6",
+    "eslint": "8",
+    "eslint-config-egg": "14",
+    "tshy": "3",
+    "tshy-after": "1",
+    "typescript": "5",
+    "urllib": "^4.6.8"
+  },
+  "scripts": {
+    "lint": "eslint --cache src test --ext .ts",
+    "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",
+  "tshy": {
+    "exports": {
+      ".": "./src/index.ts",
+      "./package.json": "./package.json"
+    }
+  },
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/index.d.ts",
+        "default": "./dist/commonjs/index.js"
+      }
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
+  "types": "./dist/commonjs/index.d.ts",
+  "main": "./dist/commonjs/index.js",
+  "module": "./dist/esm/index.js"
 }

package.json

@@ -1,38 +1,38 @@
-const cluster = require('cluster');
-
-module.exports = reload;
+import cluster, { type Worker } from 'node:cluster';
+import { cpus } from 'node:os';
 
 // Windows not support SIGQUIT https://nodejs.org/api/process.html#process_signal_events
 const KILL_SIGNAL = 'SIGTERM';
 let reloading = false;
-let reloadPedding = false;
-function reload(count) {
+let reloadPadding = false;
+
+export function reload(count?: number) {
   if (reloading) {
-    reloadPedding = true;
+    reloadPadding = true;
     return;
   }
   if (!count) {
-    count = require('os').cpus().length;
+    count = cpus().length;
   }
   reloading = true;
   // find out all alive workers
   const aliveWorkers = [];
-  let worker;
   for (const id in cluster.workers) {
-    worker = cluster.workers[id];
-    if (worker.state === 'disconnected') {
+    const worker = cluster.workers[id]!;
+    const state = Reflect.get(worker, 'state');
+    if (state === 'disconnected') {
       continue;
     }
     aliveWorkers.push(worker);
   }
 
-  let firstWorker;
-  let newWorker;
+  let firstWorker: Worker;
+  let newWorker: Worker;
 
   function reset() {
     // don't leak
     newWorker.removeListener('listening', reset);
-    newWorker.removeListener('error', reset);
+    newWorker.removeListener('exit', reset);
 
     if (firstWorker) {
       // console.log('firstWorker %s %s', firstWorker.id, firstWorker.state);
@@ -42,9 +42,9 @@ function reload(count) {
       }, 100);
     }
     reloading = false;
-    if (reloadPedding) {
+    if (reloadPadding) {
       // has reload jobs, reload again
-      reloadPedding = false;
+      reloadPadding = false;
       reload(count);
     }
   }
@@ -54,8 +54,7 @@ function reload(count) {
   newWorker.on('listening', reset).on('exit', reset);
 
   // kill other workers
-  for (let i = 1; i < aliveWorkers.length; i++) {
-    worker = aliveWorkers[i];
+  for (const worker of aliveWorkers) {
     // console.log('worker %s %s', worker.id, worker.state);
     worker.kill(KILL_SIGNAL);
   }