diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml deleted file mode 100644 index 045af21..0000000 --- a/.github/workflows/codeql.yml +++ /dev/null @@ -1,71 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ "master" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "master" ] -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'javascript' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:${{matrix.language}}" diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index de2b11a..c8630f5 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -3,7 +3,6 @@ name: CI on: push: branches: [ master ] - pull_request: branches: [ master ] @@ -13,4 +12,6 @@ jobs: uses: node-modules/github-actions/.github/workflows/node-test.yml@master with: os: 'ubuntu-latest, macos-latest' - version: '14, 16, 18, 20' + version: '14, 16, 18, 20, 22' + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/README.md b/README.md index 8cc9f1b..cd1bccc 100644 --- a/README.md +++ b/README.md @@ -70,3 +70,17 @@ EGG_AGENT_CLOSE_TIMEOUT: agent worker boot timeout value ## License [MIT](LICENSE) + + + +## Contributors + +|[
popomore](https://github.com/popomore)
|[
fengmk2](https://github.com/fengmk2)
|[
atian25](https://github.com/atian25)
|[
dead-horse](https://github.com/dead-horse)
|[
killagu](https://github.com/killagu)
|[
semantic-release-bot](https://github.com/semantic-release-bot)
| +| :---: | :---: | :---: | :---: | :---: | :---: | +|[
ngot](https://github.com/ngot)
|[
hyj1991](https://github.com/hyj1991)
|[
whxaxes](https://github.com/whxaxes)
|[
iyuq](https://github.com/iyuq)
|[
nightink](https://github.com/nightink)
|[
mansonchor](https://github.com/mansonchor)
| +|[
ImHype](https://github.com/ImHype)
|[
gxcsoccer](https://github.com/gxcsoccer)
|[
waitingsong](https://github.com/waitingsong)
|[
sjfkai](https://github.com/sjfkai)
|[
ahungrynoob](https://github.com/ahungrynoob)
|[
qingdengyue](https://github.com/qingdengyue)
| +[
wenjiasen](https://github.com/wenjiasen)
|[
czy88840616](https://github.com/czy88840616)
|[
gxkl](https://github.com/gxkl)
+ +This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Mon Jun 03 2024 10:59:15 GMT+0800`. + + diff --git a/lib/utils/mode/impl/process/agent.js b/lib/utils/mode/impl/process/agent.js index 659bda8..354c071 100644 --- a/lib/utils/mode/impl/process/agent.js +++ b/lib/utils/mode/impl/process/agent.js @@ -1,7 +1,6 @@ 'use strict'; const childprocess = require('child_process'); -const semver = require('semver'); const sendmessage = require('sendmessage'); const gracefulExit = require('graceful-process'); @@ -45,7 +44,7 @@ class AgentUtils extends BaseAgentUtils { // add debug execArgv const debugPort = process.env.EGG_AGENT_DEBUG_PORT || 5800; - if (this.options.isDebug) opt.execArgv = process.execArgv.concat([ `--${semver.gte(process.version, '8.0.0') ? 'inspect' : 'debug'}-port=${debugPort}` ]); + if (this.options.isDebug) opt.execArgv = process.execArgv.concat([ 'inspect' ]); const worker = this.#worker = childprocess.fork(this.getAgentWorkerFile(), args, opt); const agentWorker = this.instance = new AgentWorker(worker); diff --git a/lib/utils/options.js b/lib/utils/options.js index 3999e47..3fff0f6 100644 --- a/lib/utils/options.js +++ b/lib/utils/options.js @@ -6,7 +6,6 @@ const path = require('path'); const assert = require('assert'); const utils = require('egg-utils'); const is = require('is-type-of'); -const deprecate = require('depd')('egg'); module.exports = function(options) { const defaults = { @@ -46,7 +45,7 @@ module.exports = function(options) { if (is.boolean(options.https)) { // TODO: compatible options.key, options.cert, will remove at next major /* istanbul ignore next */ - deprecate('[master] Please use `https: { key, cert, ca }` instead of `https: true`'); + console.warn('[egg-cluster:deprecated] [master] Please use `https: { key, cert, ca }` instead of `https: true`'); options.https = { key: options.key, cert: options.cert, @@ -61,7 +60,7 @@ module.exports = function(options) { options.workers = parseInt(options.workers, 10); if (options.require) options.require = [].concat(options.require); - // don't print depd message in production env. + // don't print deprecated message in production env. // it will print to stderr. if (process.env.NODE_ENV === 'production') { process.env.NO_DEPRECATION = '*'; diff --git a/package.json b/package.json index b89eee6..c76fdba 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "test": "npm run lint -- --fix && npm run test-local", "test-local": "egg-bin test --ts false", "cov": "egg-bin cov --prerequire --timeout 100000 --ts false", - "ci": "npm run lint && npm run cov" + "ci": "npm run lint && npm run cov", + "contributor": "git-contributor" }, "files": [ "index.js", @@ -33,7 +34,6 @@ "await-event": "^2.1.0", "cfork": "^1.7.1", "cluster-reload": "^1.0.2", - "depd": "^2.0.0", "detect-port": "^1.3.0", "egg-logger": "^3.3.0", "egg-utils": "^2.4.1", @@ -41,7 +41,6 @@ "graceful-process": "^1.2.0", "is-type-of": "^1.2.1", "ps-tree": "^1.2.0", - "semver": "^5.6.0", "sendmessage": "^1.1.0", "terminal-link": "^2.1.1", "utility": "^1.15.0" @@ -55,6 +54,7 @@ "egg-mock": "^5.4.0", "eslint": "^8.26.0", "eslint-config-egg": "^12.1.0", + "git-contributor": "^2.1.5", "pedding": "^1.1.0", "supertest": "^4.0.0", "ts-node": "^10.9.1", diff --git a/test/master.test.js b/test/master.test.js index 1496f80..abf32c6 100644 --- a/test/master.test.js +++ b/test/master.test.js @@ -6,7 +6,6 @@ const cp = require('child_process'); const pedding = require('pedding'); const mm = require('egg-mock'); const request = require('supertest'); -const semver = require('semver'); const awaitEvent = require('await-event'); const utils = require('./utils'); const { sleep } = require('../lib/utils/timer'); @@ -688,9 +687,8 @@ describe('test/master.test.js', () => { let app; afterEach(() => app.close()); - // 6.x: Debugger listening on [::]:5858 - // 8.x: Debugger listening on ws://127.0.0.1:9229/221caad4-e2d0-4630-b0bb-f7fb27b81ff6 - const debugProtocol = semver.gte(process.version, '8.0.0') ? 'inspect' : 'debug'; + // Debugger listening on ws://127.0.0.1:9229/221caad4-e2d0-4630-b0bb-f7fb27b81ff6 + const debugProtocol = 'inspect'; it('should debug', () => { app = utils.cluster('apps/debug-port', { workers: 2, opt: { execArgv: [ `--${debugProtocol}` ] } });