@naturalcycles/backend-lib 2.60.4 → 2.61.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [2.61.0](https://github.com/NaturalCycles/backend-lib/compare/v2.60.4...v2.61.0) (2021-10-23)
+
+
+### Features
+
+* clarify startServer cfg, use process.uptime() ([9185603](https://github.com/NaturalCycles/backend-lib/commit/9185603bec23f5bcccfe764125d8af1efcfc3c11))
+
 ## [2.60.4](https://github.com/NaturalCycles/backend-lib/compare/v2.60.3...v2.60.4) (2021-10-21)
 
 

package/dist/server/startServer.js

@@ -10,7 +10,7 @@ class BackendServer {
         this.cfg = cfg;
     }
     async start() {
-        const { bootstrapStartedAt = Date.now(), port: cfgPort, expressApp } = this.cfg;
+        const { port: cfgPort, expressApp } = this.cfg;
         // 1. Register error handlers, etc.
         process.on('uncaughtException', err => {
             log_1.log.error('uncaughtException:', err);
@@ -32,15 +32,21 @@ class BackendServer {
         });
         // This is to fix GCP LoadBalancer race condition
         this.server.keepAliveTimeout = 600 * 1000; // 10 minutes
-        const serverStartedAt = Date.now();
-        const bootstrapMillis = serverStartedAt - bootstrapStartedAt;
-        (0, log_1.log)(`serverStarted on port ${(0, colors_1.white)(String(port))}, bootstrapTime ${(0, colors_1.dimGrey)((0, js_lib_1._ms)(bootstrapMillis))}`);
+        let address = `http://localhost:${port}`; // default
+        const addr = this.server.address();
+        if (addr) {
+            if (typeof addr === 'string') {
+                address = addr;
+            }
+            else if (addr.address !== '::') {
+                address = `http://${addr.address}:${port}`;
+            }
+        }
+        (0, log_1.log)(`serverStarted on ${(0, colors_1.white)(address)} in ${(0, colors_1.dimGrey)((0, js_lib_1._ms)(process.uptime() * 1000))}`);
         return {
             port,
-            bootstrapStartedAt,
-            serverStartedAt,
-            bootstrapMillis,
             server: this.server,
+            address,
         };
     }
     /**
@@ -53,9 +59,7 @@ class BackendServer {
             (0, log_1.log)((0, colors_1.boldGrey)('Forceful shutdown after timeout'));
             process.exit(1);
         }, this.cfg.forceShutdownTimeout || 3000);
-        if (this.cfg.onShutdown) {
-            void this.cfg.onShutdown();
-        }
+        void this.cfg.onShutdown?.();
         try {
             if (this.server) {
                 await new Promise(r => this.server.close(r));
@@ -64,7 +68,7 @@ class BackendServer {
             process.exit(0);
         }
         catch (err) {
-            log_1.log.error(err);
+            console.error(err);
             process.exit(1);
         }
     }

package/dist/server/startServer.model.d.ts

@@ -6,12 +6,6 @@ export interface StartServerCfg {
      * @default process.env.PORT || 8080
      */
     port?: number;
-    /**
-     * Unix millisecond timestamp of when bootstrap has started.
-     *
-     * @default to Date.now()
-     */
-    bootstrapStartedAt?: number;
     expressApp: Application;
     /**
      * Server will wait for promise to resolve until shutting down.
@@ -25,8 +19,9 @@ export interface StartServerCfg {
 }
 export interface StartServerData {
     port: number;
-    bootstrapStartedAt: number;
-    serverStartedAt: number;
-    bootstrapMillis: number;
     server: Server;
+    /**
+     * "Processed" server.address() as a string, ready to Cmd+click in MacOS Terminal
+     */
+    address: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "2.60.4",
+  "version": "2.61.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",

package/src/server/startServer.model.ts

@@ -7,13 +7,6 @@ export interface StartServerCfg {
    */
   port?: number
 
-  /**
-   * Unix millisecond timestamp of when bootstrap has started.
-   *
-   * @default to Date.now()
-   */
-  bootstrapStartedAt?: number
-
   expressApp: Application
 
   /**
@@ -30,8 +23,9 @@ export interface StartServerCfg {
 
 export interface StartServerData {
   port: number
-  bootstrapStartedAt: number
-  serverStartedAt: number
-  bootstrapMillis: number
   server: Server
+  /**
+   * "Processed" server.address() as a string, ready to Cmd+click in MacOS Terminal
+   */
+  address: string
 }

package/src/server/startServer.ts

@@ -10,7 +10,7 @@ export class BackendServer {
   server?: Server
 
   async start(): Promise<StartServerData> {
-    const { bootstrapStartedAt = Date.now(), port: cfgPort, expressApp } = this.cfg
+    const { port: cfgPort, expressApp } = this.cfg
 
     // 1. Register error handlers, etc.
     process.on('uncaughtException', err => {
@@ -39,21 +39,23 @@ export class BackendServer {
     // This is to fix GCP LoadBalancer race condition
     this.server.keepAliveTimeout = 600 * 1000 // 10 minutes
 
-    const serverStartedAt = Date.now()
+    let address = `http://localhost:${port}` // default
 
-    const bootstrapMillis = serverStartedAt - bootstrapStartedAt
-    log(
-      `serverStarted on port ${white(String(port))}, bootstrapTime ${dimGrey(
-        _ms(bootstrapMillis),
-      )}`,
-    )
+    const addr = this.server.address()
+    if (addr) {
+      if (typeof addr === 'string') {
+        address = addr
+      } else if (addr.address !== '::') {
+        address = `http://${addr.address}:${port}`
+      }
+    }
+
+    log(`serverStarted on ${white(address)} in ${dimGrey(_ms(process.uptime() * 1000))}`)
 
     return {
       port,
-      bootstrapStartedAt,
-      serverStartedAt,
-      bootstrapMillis,
       server: this.server,
+      address,
     }
   }
 
@@ -70,9 +72,7 @@ export class BackendServer {
       process.exit(1)
     }, this.cfg.forceShutdownTimeout || 3000)
 
-    if (this.cfg.onShutdown) {
-      void this.cfg.onShutdown()
-    }
+    void this.cfg.onShutdown?.()
 
     try {
       if (this.server) {
@@ -81,7 +81,7 @@ export class BackendServer {
       log(dimGrey('Shutdown completed.'))
       process.exit(0)
     } catch (err) {
-      log.error(err)
+      console.error(err)
       process.exit(1)
     }
   }