From d319d93cec14914b2e3e578f03d01cdeb9cb502d Mon Sep 17 00:00:00 2001 From: Cris Stringfellow <22254235+crislin2046@users.noreply.github.com> Date: Sun, 15 Jan 2023 01:12:35 +0800 Subject: [PATCH] Works --- package-lock.json | 18 ++++++------------ package.json | 2 +- scripts/build_only.sh | 1 - src/app.js | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c73a33..e26fd5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "2.7.0", "license": "PolyForm Strict 1.0", "dependencies": { + "@667/ps-list": "^1.1.3", "chrome-launcher": "latest", "express": "latest", "flexsearch": "^0.7.21", @@ -19,7 +20,6 @@ "ndx-query": "^1.0.1", "ndx-serializable": "^1.0.0", "node-fetch": "latest", - "ps-list-commonjs": "^8.1.2", "ukkonen": "^1.4.0", "ws": "latest" }, @@ -32,6 +32,11 @@ "nodemon": "latest" } }, + "node_modules/@667/ps-list": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@667/ps-list/-/ps-list-1.1.3.tgz", + "integrity": "sha512-WQ/PkHADBTpuYqN0CRB901lc+VBbD1DW51/u2IFwRKoWWPsclqa1a0W5U0OEDvAa4kMFs+uVjbCS3k2V81OVFA==" + }, "node_modules/@esbuild/android-arm": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", @@ -2190,17 +2195,6 @@ "node": ">= 0.10" } }, - "node_modules/ps-list-commonjs": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/ps-list-commonjs/-/ps-list-commonjs-8.1.2.tgz", - "integrity": "sha512-oi6mjAlkxFcHq3cQSplb5EgRZdkrfspG3Rem8jBS1sLza3sdCl58uYlvrqeIMXd++YdBpZydP5LjK/Ds1c2ntw==", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", diff --git a/package.json b/package.json index d8806e7..b0afdc5 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ }, "homepage": "https://github.com/dosyago/DiskerNet#readme", "dependencies": { + "@667/ps-list": "^1.1.3", "chrome-launcher": "latest", "express": "latest", "flexsearch": "^0.7.21", @@ -57,7 +58,6 @@ "ndx-query": "^1.0.1", "ndx-serializable": "^1.0.0", "node-fetch": "latest", - "ps-list-commonjs": "^8.1.2", "ukkonen": "^1.4.0", "ws": "latest" }, diff --git a/scripts/build_only.sh b/scripts/build_only.sh index 0f2e23d..52505a6 100755 --- a/scripts/build_only.sh +++ b/scripts/build_only.sh @@ -6,5 +6,4 @@ echo "#!/usr/bin/env node" > build/diskernet.cjs cat build/out.cjs >> build/diskernet.cjs chmod +x build/diskernet.cjs -cp -r node_modules/ps-list-commonjs/vendor build/ diff --git a/src/app.js b/src/app.js index a8236d1..f42569c 100644 --- a/src/app.js +++ b/src/app.js @@ -5,7 +5,7 @@ import util from 'util'; import {stdin as input, stdout as output} from 'process'; import ChromeLauncher from 'chrome-launcher'; -import psList from 'ps-list-commonjs'; +import psList from '@667/ps-list'; import {DEBUG, sleep, NO_SANDBOX, GO_SECURE} from './common.js';