velocious 1.0.81 → 1.0.83

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.81",
+  "version": "1.0.83",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",

package/src/controller.js

@@ -86,7 +86,7 @@ export default class VelociousController {
   renderJsonArg(json) {
     const body = JSON.stringify(json)
 
-    this._response.addHeader("Content-Type", "application/json")
+    this._response.setHeader("Content-Type", "application/json; charset=UTF-8")
     this._response.setBody(body)
   }
 
@@ -100,7 +100,7 @@ export default class VelociousController {
         if (err) {
           reject(err)
         } else {
-          this._response.addHeader("Content-Type", "text/html")
+          this._response.setHeader("Content-Type", "text/html; charset=UTF-8")
           this._response.setBody(str)
 
           resolve()

package/src/http-server/client/index.js

@@ -87,16 +87,16 @@ export default class VeoliciousHttpServerClient {
     this.logger.debug("sendResponse", {clientCount: this.clientCount, connectionHeader, httpVersion})
 
     if (httpVersion == "1.0" && connectionHeader == "keep-alive") {
-      response.addHeader("Connection", "Keep-Alive")
+      response.setHeader("Connection", "Keep-Alive")
     } else {
-      response.addHeader("Connection", "Close")
+      response.setHeader("Connection", "Close")
     }
 
-    const textEncoded = new TextEncoder().encode(body)
+    const contentLength = new TextEncoder().encode(body).length
 
-    response.addHeader("Content-Length", textEncoded.length)
-    response.addHeader("Date", date.toUTCString())
-    response.addHeader("Server", "Velocious")
+    response.setHeader("Content-Length", contentLength)
+    response.setHeader("Date", date.toUTCString())
+    response.setHeader("Server", "Velocious")
 
     let headers = ""
 

package/src/http-server/client/response.js

@@ -14,6 +14,10 @@ export default class VelociousHttpServerClientResponse {
     this.headers[key].push(value)
   }
 
+  setHeader(key, value) {
+    this.headers[key] = [value]
+  }
+
   getBody() {
     if (this.body !== undefined) {
       return this.body
@@ -35,8 +39,8 @@ export default class VelociousHttpServerClientResponse {
   }
 
   setErrorBody(error) {
-    this.body = `${error.message}\n\n${error.stack}`
-    this.addHeader("Content-Type", "text/plain")
+    this.setHeader("Content-Type", "text/plain; charset=UTF-8")
+    this.setBody(`${error.message}\n\n${error.stack}`)
   }
 
   setStatus(status) {

package/src/http-server/index.js

@@ -52,11 +52,15 @@ export default class VelociousHttpServer {
   }
 
   async stopClients() {
+    const promises = []
+
     for (const clientCount in this.clients) {
       const client = this.clients[clientCount]
 
-      await client.close()
+      promises.push(client.end())
     }
+
+    await Promise.all(promises)
   }
 
   stopServer() {

package/src/http-server/server-client.js

@@ -17,9 +17,11 @@ export default class ServerClient {
 
   listen = () => this.socket.on("data", this.onSocketData)
 
-  close() {
-    this.socket.destroy()
-    this.events.emit("close", this)
+  end() {
+    return new Promise((resolve) => {
+      this.socket.once("close", () => resolve())
+      this.socket.end()
+    })
   }
 
   onSocketData = (chunk) => {
@@ -37,8 +39,12 @@ export default class ServerClient {
     this.events.emit("close", this)
   }
 
-  send(data) {
-    this.logger.debug("Send", data)
-    this.socket.write(data)
+  async send(data) {
+    return new Promise((resolve) => {
+      this.logger.debug("Send", data)
+      this.socket.write(data, () => {
+        resolve()
+      })
+    })
   }
 }

package/src/http-server/worker-handler/index.js

@@ -78,7 +78,7 @@ export default class VelociousHttpServerWorker {
     } else if (command == "clientClose") {
       const {clientCount} = digs(data, "clientCount")
 
-      this.clients[clientCount]?.close()
+      this.clients[clientCount]?.end()
     } else {
       throw new Error(`Unknown command: ${command}`)
     }