@samitouri / QOSami-HFS-1 / commits / 400d494c

tell user what process is keeping port busy

Massimo Melina committed Feb 12, 2022 at 11:55 UTC 400d494cb6208eded4b027749c319077864fa7ab
3 files changed +62 -24
package-lock.json
+40 -15
@@ -13,6 +13,7 @@
13 "@node-rs/crc32": "^1.3.1",
14 "buffer-crc32": "https://github.com/rejetto/buffer-crc32.git",
15 "fast-glob": "^3.2.7",
16 + "find-process": "^1.4.7",
17 "koa": "^2.13.4",
18 "koa-compress": "^5.1.0",
19 "koa-mount": "^4.0.0",
@@ -803,7 +804,6 @@
804 "version": "4.3.0",
805 "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
806 "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
806 - "dev": true,
807 "dependencies": {
808 "color-convert": "^2.0.1"
809 },
@@ -1075,7 +1075,6 @@
1075 "version": "4.1.2",
1076 "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
1077 "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
1078 - "dev": true,
1078 "dependencies": {
1079 "ansi-styles": "^4.1.0",
1080 "supports-color": "^7.1.0"
@@ -1091,7 +1090,6 @@
1090 "version": "4.0.0",
1091 "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
1092 "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
1094 - "dev": true,
1093 "engines": {
1094 "node": ">=8"
1095 }
@@ -1100,7 +1098,6 @@
1098 "version": "7.2.0",
1099 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
1100 "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
1103 - "dev": true,
1101 "dependencies": {
1102 "has-flag": "^4.0.0"
1103 },
@@ -1180,7 +1177,6 @@
1177 "version": "2.0.1",
1178 "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
1179 "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
1183 - "dev": true,
1180 "dependencies": {
1181 "color-name": "~1.1.4"
1182 },
@@ -1191,8 +1187,7 @@
1187 "node_modules/color-name": {
1188 "version": "1.1.4",
1189 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
1194 - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
1195 - "dev": true
1190 + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
1191 },
1192 "node_modules/colors": {
1193 "version": "1.0.3",
@@ -1203,6 +1198,14 @@
1198 "node": ">=0.1.90"
1199 }
1200 },
1201 + "node_modules/commander": {
1202 + "version": "5.1.0",
1203 + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
1204 + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
1205 + "engines": {
1206 + "node": ">= 6"
1207 + }
1208 + },
1209 "node_modules/compressible": {
1210 "version": "2.0.18",
1211 "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -1585,6 +1588,19 @@
1588 "node": ">=8"
1589 }
1590 },
1591 + "node_modules/find-process": {
1592 + "version": "1.4.7",
1593 + "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
1594 + "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
1595 + "dependencies": {
1596 + "chalk": "^4.0.0",
1597 + "commander": "^5.1.0",
1598 + "debug": "^4.1.1"
1599 + },
1600 + "bin": {
1601 + "find-process": "bin/find-process.js"
1602 + }
1603 + },
1604 "node_modules/find-root": {
1605 "version": "1.1.0",
1606 "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
@@ -4769,7 +4785,6 @@
4785 "version": "4.3.0",
4786 "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
4787 "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
4772 - "dev": true,
4788 "requires": {
4789 "color-convert": "^2.0.1"
4790 }
@@ -4956,7 +4971,6 @@
4971 "version": "4.1.2",
4972 "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
4973 "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
4959 - "dev": true,
4974 "requires": {
4975 "ansi-styles": "^4.1.0",
4976 "supports-color": "^7.1.0"
@@ -4965,14 +4979,12 @@
4979 "has-flag": {
4980 "version": "4.0.0",
4981 "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
4968 - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
4969 - "dev": true
4982 + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
4983 },
4984 "supports-color": {
4985 "version": "7.2.0",
4986 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
4987 "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
4975 - "dev": true,
4988 "requires": {
4989 "has-flag": "^4.0.0"
4990 }
@@ -5036,7 +5048,6 @@
5048 "version": "2.0.1",
5049 "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
5050 "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
5039 - "dev": true,
5051 "requires": {
5052 "color-name": "~1.1.4"
5053 }
@@ -5044,8 +5055,7 @@
5055 "color-name": {
5056 "version": "1.1.4",
5057 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
5047 - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
5048 - "dev": true
5058 + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
5059 },
5060 "colors": {
5061 "version": "1.0.3",
@@ -5053,6 +5063,11 @@
5063 "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
5064 "dev": true
5065 },
5066 + "commander": {
5067 + "version": "5.1.0",
5068 + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
5069 + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="
5070 + },
5071 "compressible": {
5072 "version": "2.0.18",
5073 "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -5351,6 +5366,16 @@
5366 "to-regex-range": "^5.0.1"
5367 }
5368 },
5369 + "find-process": {
5370 + "version": "1.4.7",
5371 + "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
5372 + "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
5373 + "requires": {
5374 + "chalk": "^4.0.0",
5375 + "commander": "^5.1.0",
5376 + "debug": "^4.1.1"
5377 + }
5378 + },
5379 "find-root": {
5380 "version": "1.1.0",
5381 "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
package.json
+5 -1
@@ -37,7 +37,10 @@
37 "hfs": "dist/src/index.js"
38 },
39 "pkg": {
40 - "assets": ["dist/admin/**/*", "dist/frontend/**/*"],
40 + "assets": [
41 + "dist/admin/**/*",
42 + "dist/frontend/**/*"
43 + ],
44 "targets": [
45 "node16-win"
46 ],
@@ -48,6 +51,7 @@
51 "@node-rs/crc32": "^1.3.1",
52 "buffer-crc32": "https://github.com/rejetto/buffer-crc32.git",
53 "fast-glob": "^3.2.7",
54 + "find-process": "^1.4.7",
55 "koa": "^2.13.4",
56 "koa-compress": "^5.1.0",
57 "koa-mount": "^4.0.0",
src/listen.ts
+17 -8
@@ -8,10 +8,12 @@ import { newConnection } from './connections'
8 import open from 'open'
9 import { debounceAsync } from './misc'
10 import { DEV } from './const'
11 +import findProcess from 'find-process'
12
12 -let httpSrv: http.Server
13 -let httpsSrv: http.Server
14 -let adminSrv: http.Server
13 +interface ServerExtra { error?: string, busy?: string }
14 +let httpSrv: http.Server & ServerExtra
15 +let httpsSrv: http.Server & ServerExtra
16 +let adminSrv: http.Server & ServerExtra
17 let cert:string, key: string
18
19 subscribeConfig<number>({ k:'port', defaultValue: 80 }, async port => {
@@ -77,7 +79,7 @@ subscribeConfig({ k:'private_key' }, async (v: string) => {
79 })
80
81 const CFG_HTTPS_PORT = 'https_port'
80 -subscribeConfig({ k:CFG_HTTPS_PORT, defaultValue: 443 }, considerHttps)
82 +subscribeConfig({ k:CFG_HTTPS_PORT, defaultValue: -1 }, considerHttps)
83
84 async function considerHttps() {
85 await stopServer(httpsSrv)
@@ -93,7 +95,7 @@ async function considerHttps() {
95 }
96
97 interface StartServer { port: number, name:string, net?:string }
96 -function startServer(srv: http.Server, { port, name, net='0.0.0.0' }: StartServer) {
98 +function startServer(srv: typeof httpSrv, { port, name, net='0.0.0.0' }: StartServer) {
99 return new Promise<number>((resolve, reject) => {
100 try {
101 if (port < 0)
@@ -108,14 +110,21 @@ function startServer(srv: http.Server, { port, name, net='0.0.0.0' }: StartServe
110 }
111 console.log(name, "serving on", net, ':', ad.port)
112 resolve(ad.port)
111 - }).on('error', e => {
113 + }).on('error', async e => {
114 + srv.error = String(e)
115 const { code } = e as any
113 - console.error(code === 'EADDRINUSE' ? `couldn't listen on busy port ${port}` : String(e))
116 + if (code === 'EADDRINUSE') {
117 + const res = await findProcess('port', port)
118 + srv.busy = res[0]?.name
119 + srv.error = `couldn't listen on port ${port} used by ${srv.busy}`
120 + }
121 + console.error(name, srv.error)
122 resolve(0)
123 })
124 }
125 catch(e) {
118 - console.error("couldn't listen on port", port, String(e))
126 + srv.error = String(e)
127 + console.error(name, "couldn't listen on port", port, srv.error)
128 resolve(0)
129 }
130 })