owebjs 1.5.3-dev → 1.5.5-dev

package/dist/utils/assignRoutes.js

@@ -251,28 +251,39 @@ function inner(oweb, route) {
         }
         return;
       }
+      if (res.sent) return;
       const isIterable = result && typeof result[Symbol.iterator] === "function";
       const isAsyncIterable = result && typeof result[Symbol.asyncIterator] === "function";
-      if ((isIterable || isAsyncIterable) && !res.sent) {
+      if (isIterable || isAsyncIterable) {
+        const iterator = isAsyncIterable ? result[Symbol.asyncIterator]() : result[Symbol.iterator]();
+        let firstChunk;
+        try {
+          firstChunk = await iterator.next();
+        } catch (err) {
+          if (routeFunc?.handleError) routeFunc.handleError(req, res, err);
+          else oweb._options.OWEB_INTERNAL_ERROR_HANDLER(req, res, err);
+          return;
+        }
+        if (res.sent) return;
+        if (firstChunk.done) {
+          if (firstChunk.value !== void 0) res.send(firstChunk.value);
+          return;
+        }
         const rawObj = res.raw;
         const uwsRes = rawObj.res && typeof rawObj.res.cork === "function" ? rawObj.res : null;
         const corkedOp = /* @__PURE__ */ __name((op) => {
-          if (uwsRes) {
-            uwsRes.cork(op);
-          } else {
-            op();
-          }
+          if (uwsRes) uwsRes.cork(op);
+          else op();
         }, "corkedOp");
         corkedOp(() => {
-          res.raw.writeHead(200, {
+          const headers = {
             ...res.getHeaders(),
             "Content-Type": "text/event-stream",
             "Cache-Control": "no-cache",
             Connection: "keep-alive"
-          });
-          if (res.raw.flushHeaders) {
-            res.raw.flushHeaders();
-          }
+          };
+          res.raw.writeHead(200, headers);
+          if (res.raw.flushHeaders) res.raw.flushHeaders();
         });
         let aborted = false;
         const onAborted = /* @__PURE__ */ __name(() => {
@@ -285,20 +296,16 @@ function inner(oweb, route) {
           rawObj["onAborted"](onAborted);
         }
         try {
-          if (isAsyncIterable) {
-            for await (const chunk of result) {
-              if (aborted || res.raw.destroyed) break;
-              corkedOp(() => {
-                res.raw.write(formatSSE(chunk));
-              });
-            }
-          } else {
-            for (const chunk of result) {
-              if (aborted || res.raw.destroyed) break;
-              corkedOp(() => {
-                res.raw.write(formatSSE(chunk));
-              });
-            }
+          corkedOp(() => {
+            res.raw.write(formatSSE(firstChunk.value));
+          });
+          while (true) {
+            if (aborted || res.raw.destroyed) break;
+            const chunk = await iterator.next();
+            if (chunk.done) break;
+            corkedOp(() => {
+              res.raw.write(formatSSE(chunk.value));
+            });
           }
         } catch (err) {
           error(`Error while streaming response for ${route.method.toUpperCase()}:${route.url} - ${err.message}`, "SSE");

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);
@@ -30,6 +31,9 @@ class HttpResponse extends Writable {
       this.finished = this.res.finished = true;
     });
   }
+  get sent() {
+    return this.finished;
+  }
   setHeader(name, value) {
     this.__headers[toLowerCase(name)] = value;
   }
@@ -50,7 +54,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;
@@ -184,6 +185,9 @@ async function server_default({ cert_file_name, key_file_name }) {
             statusCode: 200,
             _headers: {},
             finished: false,
+            get sent() {
+              return this.finished;
+            },
             header(key, value) {
               this._headers[key.toLowerCase()] = value;
               return this;
@@ -195,7 +199,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.3-dev",
+    "version": "1.5.5-dev",
     "description": "A flexible and modern web framework built on top of Fastify",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",