feat:add close function.

chizukicn · Aug 1, 2022 · f10dc8d · f10dc8d
1 parent 8ee823f
commit f10dc8d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
@@ -42,6 +42,8 @@ export interface FourzeApp extends EventEmitter {
     createServer(): Server
 
     listen(port?: number, host?: string): Promise<Server>
+
+    close(): void
 }
 
 export interface FouzeServerContext {
@@ -229,6 +231,10 @@ export function createApp(options: FourzeAppOptions = {}) {
         })
     }
 
+    app.close = function () {
+        this.server?.close()
+    }
+
     Object.defineProperties(app, {
         port: {
             get() {
@@ -247,10 +253,5 @@ export function createApp(options: FourzeAppOptions = {}) {
         }
     })
 
-    process.on("SIGINT", () => {
-        logger.info(`Server process [${process.pid}] is shutting down...`)
-        _server?.close()
-        process.exit(0)
-    })
     return app
 }
diff --git a/packages/server/src/router.ts b/packages/server/src/router.ts
@@ -95,9 +95,8 @@ export function createRouter(params: FourzeRouterOptions | FourzeSetup): FourzeR
             const route = module?.exports?.default ?? module?.default
             if (isFourze(route) || isRoute(route) || (Array.isArray(route) && route.some(isRoute))) {
                 moduleNames.add(mod)
-                logger.info("register route", route)
             } else {
-                logger.error("find not route", mod, route, typeof route, isFourze(route))
+                logger.error(`find not route with "${mod}" `, route)
             }
         }
 
@@ -140,8 +139,6 @@ export function createRouter(params: FourzeRouterOptions | FourzeSetup): FourzeR
             }
             await loadModule(moduleName)
         }
-
-        logger.info("load module done", moduleName)
     }
 
     router.watch = function watch(this: FourzeRouter, dir?: string | FSWatcher, customWatcher?: FSWatcher) {

diff --git a/packages/unplugin/src/index.ts b/packages/unplugin/src/index.ts
@@ -156,23 +156,26 @@ export default createUnplugin((options: UnpluginFourzeOptions = {}) => {
             config(config, env) {
                 options.mock = options.mock ?? (env.command == "build" || env.mode === "mock")
 
-                newServer = options.server?.port != config.server?.port || options.server?.host != config.server?.host
-
                 return {
                     define: {
                         VITE_PLUGIN_FOURZE_MOCK: options.mock
                     }
                 }
             },
-            configureServer({ middlewares, watcher }) {
+            configureServer({ middlewares, httpServer, watcher }) {
                 if (hmr) {
                     router.watch(watcher)
                 }
-                if (newServer) {
-                    app.listen(options.server?.port, options.server?.host)
+
+                if (options.server) {
+                    try {
+                        app.listen(options.server?.port, options.server?.host)
+                    } catch (error) {
+                        logger.error("Server listen failed.", error)
+                    }
                 } else {
-                    console.log(router.routes)
                     middlewares.use(app)
+                    logger.info("Fourze middleware was installed!")
                 }
             }
         }

diff --git a/playgrounds/vite/vite.config.ts b/playgrounds/vite/vite.config.ts
@@ -5,6 +5,10 @@ import path from "path"
 import { defineConfig } from "vite"
 
 export default defineConfig({
+    server: {
+        port: 8000,
+        host: "0.0.0.0"
+    },
     plugins: [
         vue(),
         jsx(),