owebjs 1.5.2-dev → 1.5.4-dev

package/dist/uwebsocket/response.js

@@ -4,6 +4,7 @@ import {
 import { Writable } from "stream";
 import { toLowerCase } from "./utils/string.js";
 import HttpResponseSocket from './responseSocket.js';
+import http from "node:http";
 class HttpResponse extends Writable {
   static {
     __name(this, "HttpResponse");
@@ -22,7 +23,7 @@ class HttpResponse extends Writable {
     this.res = uResponse;
     this.server = uServer;
     this.statusCode = 200;
-    this.statusMessage = "OK";
+    this.statusMessage = null;
     this.__headers = {};
     this.headersSent = false;
     this.socket = new HttpResponseSocket(uResponse);
@@ -50,7 +51,8 @@ class HttpResponse extends Writable {
   }
   _flushHeaders() {
     if (this.headersSent) return;
-    this.res.writeStatus(`${this.statusCode} ${this.statusMessage}`);
+    const message = this.statusMessage || http.STATUS_CODES[this.statusCode] || "Unknown";
+    this.res.writeStatus(`${this.statusCode} ${message}`);
     const keys = Object.keys(this.__headers);
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i];

package/dist/uwebsocket/server.js

@@ -5,6 +5,7 @@ import { EventEmitter } from "node:events";
 const REQUEST_EVENT = "request";
 import HttpRequest from './request.js';
 import HttpResponse from './response.js';
+import http from "node:http";
 async function server_default({ cert_file_name, key_file_name }) {
   let uWS;
   uWS = (await import("uWebSockets.js")).default;
@@ -84,51 +85,51 @@ async function server_default({ cert_file_name, key_file_name }) {
       };
     }
     close(cb) {
-      uWS.us_listen_socket_close(uServer._socket);
-      if (!cb) return;
-      return cb();
+      if (uServer._socket) {
+        uWS.us_listen_socket_close(uServer._socket);
+        uServer._socket = null;
+      }
+      if (cb) cb();
     }
     start(host, port, cb) {
-      let args;
-      const callbackFunction = /* @__PURE__ */ __name(function(socket) {
-        uServer._socket = socket;
-        if (cb) cb(socket);
+      const callbackFunction = /* @__PURE__ */ __name(function(token) {
+        uServer._socket = token;
+        if (cb) cb(token);
       }, "callbackFunction");
-      if (host && port && cb) {
-        args = [
-          host,
-          port,
-          callbackFunction
-        ];
-      }
-      if (!cb && (!port || typeof port === "function")) {
-        cb = port;
-        port = host;
-        args = [
-          port,
-          callbackFunction
-        ];
+      if (host && port) {
+        return uServer.listen(host, port, callbackFunction);
+      } else {
+        return uServer.listen(port || host, callbackFunction);
       }
-      return uServer.listen(...args);
     }
     listen(host, port, cb) {
       if (typeof host === "object") {
         const listenOptions = host;
         port = listenOptions.port;
         cb = listenOptions.cb;
-        host = listenOptions.host;
-        return this.start(host, port, (socket) => {
-          uServer._socket = socket;
-          if (cb) cb(socket);
+        host = listenOptions.host || "0.0.0.0";
+        return this.start(host, port, (token) => {
+          if (token) {
+            uServer._socket = token;
+            if (cb) cb(null, `http://${host}:${port}`);
+          } else {
+            if (cb) cb(new Error(`Failed to listen on ${host}:${port}`));
+          }
         });
       } else {
         if ((!port || typeof port === "function") && !cb) {
           cb = port;
           port = host;
-          return this.start(port, cb);
-        } else {
-          return this.start(host, port, cb);
+          host = "0.0.0.0";
         }
+        return this.start(host, port, (token) => {
+          if (token) {
+            uServer._socket = token;
+            if (cb) cb(null, `http://${host}:${port}`);
+          } else {
+            if (cb) cb(new Error(`Failed to listen on ${host}:${port}`));
+          }
+        });
       }
     }
     ws(pattern, behaviors, hooks = []) {
@@ -195,7 +196,8 @@ async function server_default({ cert_file_name, key_file_name }) {
             send(payload) {
               if (aborted || this.finished) return;
               this.finished = true;
-              res.writeStatus(`${this.statusCode} Response`);
+              const message = http.STATUS_CODES[this.statusCode] || "Response";
+              res.writeStatus(`${this.statusCode} ${message}`);
               for (const [k, v] of Object.entries(this._headers)) {
                 res.writeHeader(k, String(v));
               }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "owebjs",
-    "version": "1.5.2-dev",
+    "version": "1.5.4-dev",
     "description": "A flexible and modern web framework built on top of Fastify",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",