@jsenv/core 39.14.3 → 40.0.1

package/src/plugins/server_events/jsenv_plugin_server_events.js

@@ -4,7 +4,7 @@
  */
 
 import { injectJsenvScript, parseHtml, stringifyHtmlAst } from "@jsenv/ast";
-import { createServerEventsDispatcher } from "./server_events_dispatcher.js";
+import { ServerEvents } from "@jsenv/server";
 
 const serverEventsClientFileUrl = new URL(
   "./client/server_events_client.js",
@@ -12,8 +12,9 @@ const serverEventsClientFileUrl = new URL(
 ).href;
 
 export const jsenvPluginServerEvents = ({ clientAutoreload }) => {
-  let serverEventsDispatcher;
-
+  let serverEvents = new ServerEvents({
+    actionOnClientLimitReached: "kick-oldest",
+  });
   const { clientServerEventsConfig } = clientAutoreload;
   const { logs = true } = clientServerEventsConfig;
 
@@ -37,9 +38,9 @@ export const jsenvPluginServerEvents = ({ clientAutoreload }) => {
       if (serverEventNames.length === 0) {
         return false;
       }
-      serverEventsDispatcher = createServerEventsDispatcher();
+
       const onabort = () => {
-        serverEventsDispatcher.destroy();
+        serverEvents.close();
       };
       kitchenContext.signal.addEventListener("abort", onabort);
       for (const serverEventName of Object.keys(allServerEvents)) {
@@ -48,14 +49,14 @@ export const jsenvPluginServerEvents = ({ clientAutoreload }) => {
           // serverEventsDispatcher variable is safe, we can disable esling warning
           // eslint-disable-next-line no-loop-func
           sendServerEvent: (data) => {
-            if (!serverEventsDispatcher) {
+            if (!serverEvents) {
               // this can happen if a plugin wants to send a server event but
               // server is closing or the plugin got destroyed but still wants to do things
               // if plugin code is correctly written it is never supposed to happen
               // because it means a plugin is still trying to do stuff after being destroyed
               return;
             }
-            serverEventsDispatcher.dispatch({
+            serverEvents.sendEventToAllClients({
               type: serverEventName,
               data,
             });
@@ -66,17 +67,10 @@ export const jsenvPluginServerEvents = ({ clientAutoreload }) => {
       }
       return () => {
         kitchenContext.signal.removeEventListener("abort", onabort);
-        serverEventsDispatcher.destroy();
-        serverEventsDispatcher = undefined;
+        serverEvents.close();
+        serverEvents = undefined;
       };
     },
-    serveWebsocket: async ({ websocket, request }) => {
-      if (request.headers["sec-websocket-protocol"] !== "jsenv") {
-        return false;
-      }
-      serverEventsDispatcher.addWebsocket(websocket, request);
-      return true;
-    },
     transformUrlContent: {
       html: (urlInfo) => {
         const htmlAst = parseHtml({
@@ -96,5 +90,13 @@ export const jsenvPluginServerEvents = ({ clientAutoreload }) => {
         return stringifyHtmlAst(htmlAst);
       },
     },
+    devServerRoutes: [
+      {
+        endpoint: "GET /.internal/events.websocket",
+        description: `Jsenv dev server emit server events on this endpoint. When a file is saved the "reload" event is sent here.`,
+        fetch: serverEvents.fetch,
+        declarationSource: import.meta.url,
+      },
+    ],
   };
 };