astro-integration-pocketbase 2.1.4-next.2 → 2.1.4-next.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-integration-pocketbase",
-  "version": "2.1.4-next.2",
+  "version": "2.1.4-next.4",
   "description": "An Astro integration to support developers working with astro-loader-pocketbase.",
   "keywords": [
     "astro",
@@ -33,21 +33,22 @@
   "scripts": {
     "format": "npx prettier . --write --cache",
     "format:check": "npx prettier . --check --cache",
-    "lint": "oxlint",
-    "lint:fix": "oxlint --fix",
+    "lint": "oxlint --type-aware",
+    "lint:fix": "oxlint --type-aware --fix",
     "prepare": "husky",
     "typecheck": "npx tsc --noEmit"
   },
   "devDependencies": {
     "@commitlint/cli": "20.1.0",
     "@commitlint/config-conventional": "20.0.0",
-    "@types/node": "24.9.1",
-    "astro": "5.15.1",
+    "@types/node": "24.9.2",
+    "astro": "5.15.3",
     "eventsource": "4.0.0",
     "globals": "16.4.0",
     "husky": "9.1.7",
     "lint-staged": "16.2.6",
-    "oxlint": "1.24.0",
+    "oxlint": "1.25.0",
+    "oxlint-tsgolint": "0.4.0",
     "prettier": "3.6.2",
     "prettier-plugin-organize-imports": "4.3.0",
     "prettier-plugin-packagejson": "2.5.19",

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

@@ -66,38 +66,45 @@ export function refreshCollectionsRealtime(
 
   // Add event listeners for all collections
   for (const collection of remoteCollections) {
-    eventSource.addEventListener(`${collection}/*`, async (event) => {
-      // Do not refresh if the refresh is disabled
-      if (!refreshEnabled) {
-        return;
-      }
-
-      // Refresh the content
-      logger.info(`Received update for ${collection}. Refreshing content...`);
-      await refreshContent({
-        loaders: ["pocketbase-loader"],
-        context: {
-          source: "astro-integration-pocketbase",
-          collection: collectionsMap.get(collection),
-          data: JSON.parse(event.data)
+    eventSource.addEventListener(
+      `${collection}/*`,
+      async (event: MessageEvent<string>) => {
+        // Do not refresh if the refresh is disabled
+        if (!refreshEnabled) {
+          return;
         }
-      });
-    });
+
+        // Refresh the content
+        logger.info(`Received update for ${collection}. Refreshing content...`);
+        await refreshContent({
+          loaders: ["pocketbase-loader"],
+          context: {
+            source: "astro-integration-pocketbase",
+            collection: collectionsMap.get(collection),
+            // oxlint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            data: JSON.parse(event.data)
+          }
+        });
+      }
+    );
   }
 
   // Add event listener for the connection event
-  eventSource.addEventListener("PB_CONNECT", async (event) => {
-    isConnected = await handleConnectEvent(
-      event,
-      remoteCollections,
-      wasConnectedOnce,
-      options,
-      logger
-    );
-    if (isConnected) {
-      wasConnectedOnce = true;
+  eventSource.addEventListener(
+    "PB_CONNECT",
+    async (event: MessageEvent<void>) => {
+      isConnected = await handleConnectEvent(
+        event,
+        remoteCollections,
+        wasConnectedOnce,
+        options,
+        logger
+      );
+      if (isConnected) {
+        wasConnectedOnce = true;
+      }
     }
-  });
+  );
 
   return eventSource;
 }

package/src/toolbar/dom/create-header.ts

@@ -120,9 +120,8 @@ export function createHeader(
 
   if (hasContentLoader) {
     // Add click listeners to the refresh button
-    const refresh = windowElement.querySelector(
-      "#refresh-content"
-    ) as DevToolbarButton | null;
+    const refresh =
+      windowElement.querySelector<DevToolbarButton>("#refresh-content");
     if (!refresh) {
       throw new Error("The refresh button is missing");
     }

package/src/types/pocketbase-api-response.type.ts

@@ -0,0 +1,21 @@
+import { z } from "astro/zod";
+
+/**
+ * The schema for a PocketBase error response.
+ */
+export const pocketBaseErrorResponse = z.object({
+  /**
+   * The error message returned by PocketBase.
+   */
+  message: z.string()
+});
+
+/**
+ * The schema for a PocketBase login response.
+ */
+export const pocketBaseLoginResponse = z.object({
+  /**
+   * The authentication token returned by PocketBase.
+   */
+  token: z.string()
+});

package/src/utils/get-superuser-token.ts

@@ -1,4 +1,8 @@
 import type { AstroIntegrationLogger } from "astro";
+import {
+  pocketBaseErrorResponse,
+  pocketBaseLoginResponse
+} from "../types/pocketbase-api-response.type";
 
 /**
  * This function will get a superuser token from the given PocketBase instance.
@@ -35,12 +39,28 @@ export async function getSuperuserToken(
 
   // If the login request was not successful, print the error message and return undefined
   if (!loginRequest.ok) {
-    const reason = await loginRequest.json().then((data) => data.message);
-    const errorMessage = `The given email / password for ${url} was not correct. Astro may not have access to all resources and permissions.\nReason: ${reason}`;
+    if (loginRequest.status === 429) {
+      const info =
+        "A rate limit was hit while trying to authenticate with PocketBase. Consider using an `impersonateToken` as credentials to avoid this issue.";
+      logger.info(info);
+
+      // Random wait between 3 (default rate limit interval) and 8 seconds
+      const retryAfter = Math.random() * 5 + 3;
+      // oxlint-disable-next-line promise/avoid-new
+      await new Promise((resolve) => setTimeout(resolve, retryAfter * 1000));
+
+      return getSuperuserToken(url, superuserCredentials, logger);
+    }
+
+    const errorResponse = pocketBaseErrorResponse.parse(
+      await loginRequest.json()
+    );
+    const errorMessage = `The given email / password for ${url} was not correct. Astro can't generate type definitions automatically and may not have access to all resources.\nReason: ${errorResponse.message}`;
     logger.error(errorMessage);
     return undefined;
   }
 
   // Return the token
-  return await loginRequest.json().then((data) => data.token);
+  const response = pocketBaseLoginResponse.parse(await loginRequest.json());
+  return response.token;
 }