@standardserver/core 0.0.10 → 0.0.12

package/dist/event-stream/index.d.mts

@@ -31,6 +31,7 @@ declare function decodeEventStreamMessage(encoded: string): EventStreamMessage;
 declare class EventStreamDecoder {
     private readonly onEvent;
     private incomplete;
+    private trailingCR;
     constructor(onEvent: (event: EventStreamMessage) => void);
     feed(chunk: string): void;
     end(): void;

package/dist/event-stream/index.d.ts

@@ -31,6 +31,7 @@ declare function decodeEventStreamMessage(encoded: string): EventStreamMessage;
 declare class EventStreamDecoder {
     private readonly onEvent;
     private incomplete;
+    private trailingCR;
     constructor(onEvent: (event: EventStreamMessage) => void);
     feed(chunk: string): void;
     end(): void;

package/dist/event-stream/index.mjs

@@ -11,13 +11,16 @@ class EventIteratorErrorEvent extends Error {
   }
 }
 
+const EVENT_STREAM_LINE_DELIMITER_REGEX = /\r\n|[\n\r]/;
+const EVENT_STREAM_DELIMITER_REGEX = /(?:\r\n|\r(?!\n)|\n)(?:\r\n|\r(?!\n)|\n)/;
+const LEADING_WHITESPACE_REGEX = /^\s/;
 function decodeEventStreamMessage(encoded) {
-  const lines = encoded.replace(/\n+$/, "").split(/\n/);
+  const lines = encoded.split(EVENT_STREAM_LINE_DELIMITER_REGEX);
   const message = {};
   for (const line of lines) {
     const index = line.indexOf(":");
     const key = index === -1 ? line : line.slice(0, index);
-    const value = index === -1 ? "" : line.slice(index + 1).replace(/^\s/, "");
+    const value = index === -1 ? "" : line.slice(index + 1).replace(LEADING_WHITESPACE_REGEX, "");
     if (index === 0) {
       message.comments ??= [];
       message.comments.push(value);
@@ -46,18 +49,17 @@ class EventStreamDecoder {
     this.onEvent = onEvent;
   }
   incomplete = "";
+  trailingCR = false;
   feed(chunk) {
-    this.incomplete += chunk;
-    const lastCompleteIndex = this.incomplete.lastIndexOf("\n\n");
-    if (lastCompleteIndex === -1) {
-      return;
+    if (this.trailingCR && chunk.startsWith("\n")) {
+      chunk = chunk.slice(1);
     }
-    const completes = this.incomplete.slice(0, lastCompleteIndex).split(/\n\n/);
-    this.incomplete = this.incomplete.slice(lastCompleteIndex + 2);
-    for (const encoded of completes) {
-      const message = decodeEventStreamMessage(`${encoded}
-
-`);
+    this.trailingCR = chunk.endsWith("\r");
+    this.incomplete += chunk;
+    const parts = this.incomplete.split(EVENT_STREAM_DELIMITER_REGEX);
+    this.incomplete = parts.pop();
+    for (const encoded of parts) {
+      const message = decodeEventStreamMessage(encoded);
       this.onEvent(message);
     }
   }
@@ -86,14 +88,18 @@ class EventStreamDecoderStream extends TransformStream {
   }
 }
 
+const EVENT_STREAM_LINE_ENDING_REGEX = /\r\n|[\n\r]/;
+function containsEventStreamLineBreak(value) {
+  return EVENT_STREAM_LINE_ENDING_REGEX.test(value);
+}
 function assertEventStreamMessageId(id) {
-  if (id.includes("\n")) {
-    throw new EventStreamEncoderError("Event's id must not contain a newline character");
+  if (containsEventStreamLineBreak(id)) {
+    throw new EventStreamEncoderError("Event's id must not contain a carriage return or newline character");
   }
 }
 function assertEventStreamMessageName(event) {
-  if (event.includes("\n")) {
-    throw new EventStreamEncoderError("Event's event must not contain a newline character");
+  if (containsEventStreamLineBreak(event)) {
+    throw new EventStreamEncoderError("Event's event must not contain a carriage return or newline character");
   }
 }
 function assertEventStreamMessageRetry(retry) {
@@ -102,16 +108,18 @@ function assertEventStreamMessageRetry(retry) {
   }
 }
 function assertEventStreamMessageComment(comment) {
-  if (comment.includes("\n")) {
-    throw new EventStreamEncoderError("Event's comment must not contain a newline character");
+  if (containsEventStreamLineBreak(comment)) {
+    throw new EventStreamEncoderError("Event's comment must not contain a carriage return or newline character");
   }
 }
 function encodeEventStreamMessageData(data) {
-  const lines = data?.split(/\n/) ?? [];
   let output = "";
-  for (const line of lines) {
-    output += `data: ${line}
+  if (data !== void 0) {
+    const lines = data.split(EVENT_STREAM_LINE_ENDING_REGEX);
+    for (const line of lines) {
+      output += `data: ${line}
 `;
+    }
   }
   return output;
 }

package/dist/index.d.mts

@@ -21,7 +21,7 @@ interface StandardRequest {
     /**
      * The body has been parsed based on the content headers.
      */
-    body?: StandardBody | undefined;
+    body: StandardBody | undefined;
     /**
      * An AbortSignal to communicate aborting of request.
      */
@@ -50,7 +50,7 @@ interface StandardResponse {
     /**
      * The body has been parsed based on the content headers.
      */
-    body?: StandardBody | undefined;
+    body: StandardBody | undefined;
 }
 interface StandardLazyResponse extends Omit<StandardResponse, 'body'> {
     /**

package/dist/index.d.ts

@@ -21,7 +21,7 @@ interface StandardRequest {
     /**
      * The body has been parsed based on the content headers.
      */
-    body?: StandardBody | undefined;
+    body: StandardBody | undefined;
     /**
      * An AbortSignal to communicate aborting of request.
      */
@@ -50,7 +50,7 @@ interface StandardResponse {
     /**
      * The body has been parsed based on the content headers.
      */
-    body?: StandardBody | undefined;
+    body: StandardBody | undefined;
 }
 interface StandardLazyResponse extends Omit<StandardResponse, 'body'> {
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardserver/core",
   "type": "module",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "license": "MIT",
   "homepage": "https://standardserver.dev",
   "repository": {
@@ -9,6 +9,7 @@
     "url": "git+https://github.com/standardserver/standardserver.git",
     "directory": "packages/core"
   },
+  "sideEffects": false,
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -25,7 +26,7 @@
     "dist"
   ],
   "dependencies": {
-    "@standardserver/shared": "0.0.10"
+    "@standardserver/shared": "0.0.12"
   },
   "scripts": {
     "build": "unbuild",