From 801110698e22c1b677a5520feab07d786003a5fc Mon Sep 17 00:00:00 2001 From: mlibre Date: Sat, 25 May 2024 03:52:00 +0330 Subject: [PATCH] better types --- dist/API/app.js | 6 ------ dist/API/app.js.map | 2 +- package.json | 8 ++++---- src/API/app.ts | 10 +--------- src/global.d.ts | 6 ------ tsconfig.json | 2 +- 6 files changed, 7 insertions(+), 27 deletions(-) diff --git a/dist/API/app.js b/dist/API/app.js index cca5a87..ebd65df 100644 --- a/dist/API/app.js +++ b/dist/API/app.js @@ -39,15 +39,9 @@ function onError(error) { switch (error.code) { case "EACCES": console.error(`${hostPort} requires elevated privileges`); - if (!process.exit(1)) { - console.error("Cant Exit"); - } break; case "EADDRINUSE": console.error(`${hostPort} is already in use`); - if (!process.exit(1)) { - console.error("Cant Exit"); - } break; default: throw error; diff --git a/dist/API/app.js.map b/dist/API/app.js.map index 6ff6c28..c833dca 100644 --- a/dist/API/app.js.map +++ b/dist/API/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/API/app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/API/app.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 6c9a93d..605a090 100755 --- a/package.json +++ b/package.json @@ -12,14 +12,14 @@ "node": ">=20" }, "scripts": { + "3000": "tsx ./src/API/app.ts --host 'http://127.0.0.1:3000' --nodes 'http://127.0.0.1:3001' --dbPath './assets/db/' --minerKeysFile './assets/keys/miner.json' --name 'GoodChain'", + "3001": "tsx ./src/API/app.ts --host 'http://127.0.0.1:3001' --nodes 'http://127.0.0.1:3000' --dbPath './assets/db/' --minerKeysFile './assets/keys/miner.json' --name 'GoodChain'", + "3002": "tsx ./src/API/app.ts --host 'http://127.0.0.1:3002' --nodes 'http://127.0.0.1:3000' --dbPath './assets/db/' --minerKeysFile './assets/keys/miner.json' --name 'GoodChain'", "build": "rm -r dist && tsc", "watch": "rm -r dist && tsc --watch", "dev": "tsc && nodemon ./src/API/app.ts", "start": "tsx ./src/API/app.ts", "startjs": "node ./src/API/app.js", - "3000": "tsx ./src/API/app.ts --host 'http://127.0.0.1:3000' --nodes 'http://127.0.0.1:3001' --dbPath './assets/db/' --minerKeysFile './assets/keys/miner.json' --name 'GoodChain'", - "3001": "tsx ./src/API/app.ts --host 'http://127.0.0.1:3001' --nodes 'http://127.0.0.1:3000' --dbPath './assets/db/' --minerKeysFile './assets/keys/miner.json' --name 'GoodChain'", - "3002": "tsx ./src/API/app.ts --host 'http://127.0.0.1:3002' --nodes 'http://127.0.0.1:3000' --dbPath './assets/db/' --minerKeysFile './assets/keys/miner.json' --name 'GoodChain'", "test": "vitest run", "test-ui": "vitest --ui" }, @@ -69,4 +69,4 @@ "start": "tsc" } } -} \ No newline at end of file +} diff --git a/src/API/app.ts b/src/API/app.ts index c05a0fd..32aa59f 100644 --- a/src/API/app.ts +++ b/src/API/app.ts @@ -40,7 +40,7 @@ function onListening () console.log( "Listening on", ( server.address() as AddressInfo ).address, ( server.address() as AddressInfo ).port ); } -function onError ( error: AnyError ) +function onError ( error: NodeJS.ErrnoException ) { if ( error.syscall !== "listen" ) { @@ -51,17 +51,9 @@ function onError ( error: AnyError ) { case "EACCES": console.error( `${hostPort} requires elevated privileges` ); - if ( !process.exit( 1 ) ) - { - console.error( "Cant Exit" ); - } break; case "EADDRINUSE": console.error( `${hostPort} is already in use` ); - if ( !process.exit( 1 ) ) - { - console.error( "Cant Exit" ); - } break; default: throw error; diff --git a/src/global.d.ts b/src/global.d.ts index 09169a9..24bde1c 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -74,10 +74,4 @@ interface SimpleError message?: string; stack?: string; [key: string]: SimpleError; -} - -interface AnyError extends Error -{ - [x: string]: string; - [key: string]: string; } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index a260912..bc6f5a5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,7 @@ "skipLibCheck": true, "sourceMap": true, "useUnknownInCatchVariables": true, - "noUnusedLocals": true, + "noUnusedLocals": true // "isolatedModules": true }, // "include": [