perf(cli): main entry error catch

searchfe · Aug 16, 2021 · 520cf9c · 520cf9c
1 parent 008e444
commit 520cf9c
Show file tree

Hide file tree

Showing 4 changed files with 1,062 additions and 910 deletions.
diff --git a/example/hoth-quickstart/src/plugin/foo/index.ts b/example/hoth-quickstart/src/plugin/foo/index.ts
@@ -6,6 +6,7 @@ import type {FastifyInstance} from 'fastify';
 
 export default async function (fastify: FastifyInstance, opts: typeof autoConfig) {
     console.log('foo plugin options', opts);
+    // throw new Error('test');
 }
 
 export const autoConfig = {

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -26,8 +26,8 @@
   },
   "homepage": "https://github.com/cxtom/hoth#readme",
   "dependencies": {
-    "@hoth/app-autoload": "^1.1.9",
-    "@hoth/logger": "^1.1.7",
+    "@hoth/app-autoload": "^1.1.15",
+    "@hoth/logger": "^1.1.8",
     "@hoth/utils": "^1.1.4",
     "chalk": "^4.1.0",
     "close-with-grace": "^1.1.0",

diff --git a/packages/cli/src/start.ts b/packages/cli/src/start.ts
@@ -20,6 +20,7 @@ import closeWithGrace from 'close-with-grace';
 
 const listenAddressDocker = '0.0.0.0';
 
+// eslint-disable-next-line @typescript-eslint/init-declarations
 let fastify: typeof Fastify;
 
 // 初始化全局变量
@@ -74,11 +75,6 @@ async function runFastify(opts: Args) {
         pluginTimeout: 60 * 1000,
     });
 
-    // eslint-disable-next-line
-    require('make-promises-safe').logError = function (error: Error | string) {
-        fastifyInstance.log.fatal(error instanceof Error ? {err: error} : error);
-    };
-
     await fastifyInstance.register(appAutoload, {
         apps,
     });
@@ -99,6 +95,12 @@ async function runFastify(opts: Args) {
         await fastifyInstance.close();
     } as closeWithGrace.CloseWithGraceAsyncCallback);
 
+    // eslint-disable-next-line
+    require('make-promises-safe').logError = async function (error: Error | string) {
+        finalLogger(error instanceof Error ? error : null, error);
+        await fastifyInstance.close();
+    };
+
     fastifyInstance.addHook('onClose', async () => {
         closeListeners.uninstall();
     });
@@ -107,10 +109,15 @@ async function runFastify(opts: Args) {
     if (existsSync(rootEntryPath)) {
         const entryMod = await loadModule(rootEntryPath);
         entryMod[Symbol.for('skip-override')] = true;
-        await fastifyInstance.register(entryMod, {
-            apps,
-            rootPath
-        });
+        try {
+            await fastifyInstance.register(entryMod, {
+                apps,
+                rootPath
+            });
+        }
+        catch (err) {
+            finalLogger(err);
+        }
     }
 
     // warmup
@@ -123,7 +130,7 @@ async function runFastify(opts: Args) {
         process.exit(-1);
     }
 
-    let address;
+    let address = '';
     if (opts.address) {
         address = await fastifyInstance.listen(opts.port, opts.address);
     }