astro-integration-pocketbase 1.2.0-next.2 → 1.3.0-next.1

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "astro-integration-pocketbase",
-  "version": "1.2.0-next.2",
+  "version": "1.3.0-next.1",
+  "description": "An Astro integration to support developers working with astro-loader-pocketbase.",
   "license": "MIT",
   "author": "Luis Wolf <development@pawcode.de> (https://pawcode.de)",
   "homepage": "https://github.com/pawcoding/astro-integration-pocketbase",
@@ -36,6 +37,10 @@
     "astro",
     "astro-integration",
     "pocketbase",
-    "withastro"
+    "withastro",
+    "devtools",
+    "dev-overlay",
+    "dev-toolbar",
+    "tooling"
   ]
 }

package/src/core/refresh-collections-realtime.ts

@@ -69,7 +69,7 @@ export function refreshCollectionsRealtime(
 
   // Add event listeners for all collections
   for (const collection of remoteCollections) {
-    eventSource.addEventListener(`${collection}/*`, async () => {
+    eventSource.addEventListener(`${collection}/*`, async (event) => {
       // Do not refresh if the refresh is disabled
       if (!refreshEnabled) {
         return;
@@ -81,7 +81,8 @@ export function refreshCollectionsRealtime(
         loaders: ["pocketbase-loader"],
         context: {
           source: "astro-integration-pocketbase",
-          collection: collectionsMap.get(collection)
+          collection: collectionsMap.get(collection),
+          data: JSON.parse(event.data)
         }
       });
     });

package/src/middleware/is-pocketbase-entry.ts

@@ -6,11 +6,9 @@ import { z } from "astro/zod";
 const pocketbaseEntrySchema = z.object({
   id: z.string(),
   data: z.object({
-    id: z.string().length(15),
-    collectionId: z.string().length(15),
-    collectionName: z.string(),
-    updated: z.optional(z.date()),
-    created: z.optional(z.date())
+    id: z.string(),
+    collectionId: z.string(),
+    collectionName: z.string()
   }),
   digest: z.string().length(16),
   collection: z.string()

package/src/pocketbase-integration.ts

@@ -9,6 +9,7 @@ export function pocketbaseIntegration(
   options: PocketBaseIntegrationOptions
 ): AstroIntegration {
   let eventSource: EventSource | undefined = undefined;
+  let initialSetupDone = false;
 
   return {
     name: "pocketbase-integration",
@@ -34,10 +35,16 @@ export function pocketbaseIntegration(
         });
       },
       "astro:server:setup": (setupOptions) => {
-        // Listen for the refresh event of the toolbar
-        handleRefreshCollections(setupOptions);
+        if (!initialSetupDone) {
+          // Listen for the refresh event of the toolbar
+          handleRefreshCollections(setupOptions);
+        }
 
         // Subscribe to PocketBase realtime API
+        if (eventSource) {
+          eventSource.close();
+          eventSource = undefined;
+        }
         eventSource = refreshCollectionsRealtime(options, setupOptions);
 
         // Send settings to the toolbar on initialization
@@ -48,11 +55,15 @@ export function pocketbaseIntegration(
             baseUrl: options.url
           } satisfies ToolbarOptions);
         });
+
+        initialSetupDone = true;
       },
-      "astro:server:done": () => {
+      "astro:server:done": ({ logger }) => {
         // Close the EventSource connection when the server is done
         if (eventSource) {
+          logger.info("Closing EventSource connection");
           eventSource.close();
+          eventSource = undefined;
         }
       }
     }