@jamwidgets/astro 0.2.3 → 0.3.2

package/README.md

@@ -17,6 +17,7 @@ Add your JamWidgets site key to your `.env`:
 
 ```
 JAMWIDGETS_SITE_KEY=your_site_key_here
+SITE_URL=https://example.com
 ```
 
 ## Content Loader (Posts)
@@ -31,12 +32,16 @@ import { jamwidgetsPostsLoader } from "@jamwidgets/astro/loader";
 const posts = defineCollection({
   loader: jamwidgetsPostsLoader({
     siteKey: import.meta.env.JAMWIDGETS_SITE_KEY,
+    origin: import.meta.env.SITE_URL,
   }),
 });
 
 export const collections = { posts };
 ```
 
+Set `origin` to an allowed origin for production builds. JamWidgets rejects the
+request when the site restricts origins and the loader omits it.
+
 Then use in your pages:
 
 ```astro
@@ -59,6 +64,7 @@ const posts = await getCollection("posts");
 jamwidgetsPostsLoader({
   siteKey: string;        // Required - your JamWidgets site key
   endpoint?: string;      // Default: 'https://jamwidgets.com'
+  origin?: string;        // Site URL used for allowed-origin validation
   tag?: string;           // Filter posts by tag
   limit?: number;         // Max posts to fetch (default: 500)
   onError?: 'throw' | 'warn' | 'ignore';  // Error handling

package/dist/loader.d.ts

@@ -26,6 +26,8 @@ export interface JamwidgetsPostsLoaderOptions {
     siteKey: string;
     /** Base URL of your Jamwidgets instance (default: 'https://jamwidgets.com') */
     endpoint?: string;
+    /** Site origin sent for allowed-origin validation */
+    origin?: string;
     /** Filter posts by tag */
     tag?: string;
     /** Maximum number of posts to fetch (default: 500) */

package/dist/loader.js

@@ -24,7 +24,7 @@ export { coreFetchPosts as fetchPosts, coreFetchPost as fetchPost };
  * Posts are fetched at build time and cached by Astro.
  */
 export function jamwidgetsPostsLoader(options) {
-    const { endpoint = DEFAULT_ENDPOINT, tag, limit = 500, onError = "throw", } = options;
+    const { endpoint = DEFAULT_ENDPOINT, origin, tag, limit = 500, onError = "throw", } = options;
     const siteKey = getSiteKey({ siteKey: options.siteKey });
     const baseUrl = endpoint.replace(/\/+$/, "") + API_PATH;
     return {
@@ -41,10 +41,9 @@ export function jamwidgetsPostsLoader(options) {
                 const response = await fetch(url.toString(), {
                     headers: {
                         "X-Jamwidgets-Key": siteKey,
-                        // Legacy headers for backward compatibility
                         "X-Seriph-Key": siteKey,
-                        // User-Agent to avoid bot detection (Cloudflare, etc.)
                         "User-Agent": "JamwidgetsAstroLoader/1.0",
+                        ...(origin ? { Origin: origin } : {}),
                     },
                 });
                 if (!response.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jamwidgets/astro",
-  "version": "0.2.3",
+  "version": "0.3.2",
   "description": "Astro components and content loader for Jamwidgets (forms, comments, reactions, posts)",
   "repository": {
     "type": "git",
@@ -26,6 +26,7 @@
     "./PoweredBy": "./src/PoweredBy.astro",
     "./Reactions": "./src/Reactions.astro",
     "./Views": "./src/Views.astro",
+    "./Analytics": "./src/Analytics.astro",
     "./Poll": "./src/Poll.astro",
     "./Subscribe": "./src/Subscribe.astro",
     "./SubscribeForm": "./src/SubscribeForm.astro",
@@ -40,7 +41,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "dev": "tsc --watch"
+    "dev": "tsc --watch",
+    "test": "vitest run test/loader.test.ts"
   },
   "keywords": [
     "astro",
@@ -55,13 +57,14 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@jamwidgets/core": "^0.2.2"
+    "@jamwidgets/core": "^0.3.1"
   },
   "peerDependencies": {
     "astro": "^5.0.0 || ^6.0.0 || ^7.0.0"
   },
   "devDependencies": {
     "astro": "^7.1.3",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.10"
   }
 }

package/src/Analytics.astro

@@ -0,0 +1,30 @@
+---
+interface Props {
+  /** Falls back to the `jamwidgets-site-key` meta tag. */
+  siteKey?: string;
+  /** Defaults to `https://jamwidgets.com`. */
+  endpoint?: string;
+}
+
+const { siteKey = "", endpoint = "" } = Astro.props;
+---
+
+<div
+  data-jamwidgets-analytics
+  data-site-key={siteKey}
+  data-endpoint={endpoint}
+  hidden
+>
+</div>
+
+<script>
+  import { initAnalytics } from "@jamwidgets/core";
+
+  const el = document.querySelector("[data-jamwidgets-analytics]") as
+    | HTMLElement
+    | null;
+  initAnalytics({
+    siteKey: el?.dataset.siteKey || undefined,
+    endpoint: el?.dataset.endpoint || undefined,
+  });
+</script>

package/src/Comments.astro

@@ -92,6 +92,8 @@ import PoweredBy from "./PoweredBy.astro";
 </div>
 
 <script>
+  import { getAttributionHeaders, getVisitorId } from "@jamwidgets/core";
+
   interface Comment {
     id: string;
     authorName: string;
@@ -100,17 +102,6 @@ import PoweredBy from "./PoweredBy.astro";
     replies: Comment[];
   }
 
-  // Get or create a visitor ID for anonymous users
-  const VISITOR_KEY = "jamwidgets_visitor_id";
-  function getVisitorId(): string {
-    let id = localStorage.getItem(VISITOR_KEY);
-    if (!id) {
-      id = crypto.randomUUID();
-      localStorage.setItem(VISITOR_KEY, id);
-    }
-    return id;
-  }
-
   // Store form load timestamps for spam detection
   const formTimestamps = new WeakMap<Element, number>();
 
@@ -130,6 +121,7 @@ import PoweredBy from "./PoweredBy.astro";
 
     const visitorId = getVisitorId();
     const headers = {
+      ...getAttributionHeaders(pageId),
       "X-JamWidgets-Key": siteKey,
       "X-JamWidgets-Visitor": visitorId,
     };

package/src/Form.astro

@@ -65,22 +65,13 @@ import PoweredBy from "./PoweredBy.astro";
 </form>
 
 <script>
+  import { getAttributionHeaders, getVisitorId } from "@jamwidgets/core";
+
   interface FormSubmitResponse {
     success: boolean;
     message: string;
   }
 
-  // Get or create a visitor ID for anonymous users
-  const VISITOR_KEY = "jamwidgets_visitor_id";
-  function getVisitorId(): string {
-    let id = localStorage.getItem(VISITOR_KEY);
-    if (!id) {
-      id = crypto.randomUUID();
-      localStorage.setItem(VISITOR_KEY, id);
-    }
-    return id;
-  }
-
   // Store form load timestamps for spam detection
   const formTimestamps = new WeakMap<Element, number>();
 
@@ -134,6 +125,7 @@ import PoweredBy from "./PoweredBy.astro";
         const response = await fetch(`${endpoint}/forms/${formSlug}/submit`, {
           method: "POST",
           headers: {
+            ...getAttributionHeaders(),
             "Content-Type": "application/json",
             "X-JamWidgets-Key": siteKey,
             "X-JamWidgets-Visitor": getVisitorId(),

package/src/Reactions.astro

@@ -87,16 +87,7 @@ const baseUrl = endpoint.replace(/\/+$/, "") + API_PATH;
 </div>
 
 <script>
-  // Get or create a visitor ID for anonymous users
-  const VISITOR_KEY = "jamwidgets_visitor_id";
-  function getVisitorId(): string {
-    let id = localStorage.getItem(VISITOR_KEY);
-    if (!id) {
-      id = crypto.randomUUID();
-      localStorage.setItem(VISITOR_KEY, id);
-    }
-    return id;
-  }
+  import { getAttributionHeaders, getVisitorId } from "@jamwidgets/core";
 
   document.querySelectorAll("[data-jamwidgets-reactions]").forEach((container) => {
     const endpoint = (container as HTMLElement).dataset.endpoint;
@@ -107,6 +98,7 @@ const baseUrl = endpoint.replace(/\/+$/, "") + API_PATH;
 
     const visitorId = getVisitorId();
     const headers = {
+      ...getAttributionHeaders(pageId),
       "X-JamWidgets-Key": siteKey,
       "X-JamWidgets-Visitor": visitorId,
     };

package/src/SubscribeForm.astro

@@ -71,22 +71,13 @@ const baseUrl = endpoint.replace(/\/+$/, "") + API_PATH;
 </form>
 
 <script>
+  import { getAttributionHeaders, getVisitorId } from "@jamwidgets/core";
+
   interface SubscribeResponse {
     success: boolean;
     message: string;
   }
 
-  // Get or create a visitor ID for anonymous users
-  const VISITOR_KEY = "jamwidgets_visitor_id";
-  function getVisitorId(): string {
-    let id = localStorage.getItem(VISITOR_KEY);
-    if (!id) {
-      id = crypto.randomUUID();
-      localStorage.setItem(VISITOR_KEY, id);
-    }
-    return id;
-  }
-
   document.querySelectorAll("[data-jamwidgets-subscribe-form]").forEach((form) => {
     form.addEventListener("submit", async (e) => {
       e.preventDefault();
@@ -114,6 +105,7 @@ const baseUrl = endpoint.replace(/\/+$/, "") + API_PATH;
         const response = await fetch(`${endpoint}/subscribe`, {
           method: "POST",
           headers: {
+            ...getAttributionHeaders(),
             "Content-Type": "application/json",
             "X-JamWidgets-Key": siteKey,
             "X-JamWidgets-Visitor": getVisitorId(),

package/src/loader.ts

@@ -39,6 +39,8 @@ export interface JamwidgetsPostsLoaderOptions {
   siteKey: string;
   /** Base URL of your Jamwidgets instance (default: 'https://jamwidgets.com') */
   endpoint?: string;
+  /** Site origin sent for allowed-origin validation */
+  origin?: string;
   /** Filter posts by tag */
   tag?: string;
   /** Maximum number of posts to fetch (default: 500) */
@@ -63,6 +65,7 @@ interface ApiResponse {
 export function jamwidgetsPostsLoader(options: JamwidgetsPostsLoaderOptions): Loader {
   const {
     endpoint = DEFAULT_ENDPOINT,
+    origin,
     tag,
     limit = 500,
     onError = "throw",
@@ -89,10 +92,9 @@ export function jamwidgetsPostsLoader(options: JamwidgetsPostsLoaderOptions): Lo
         const response = await fetch(url.toString(), {
           headers: {
             "X-Jamwidgets-Key": siteKey,
-            // Legacy headers for backward compatibility
             "X-Seriph-Key": siteKey,
-            // User-Agent to avoid bot detection (Cloudflare, etc.)
             "User-Agent": "JamwidgetsAstroLoader/1.0",
+            ...(origin ? { Origin: origin } : {}),
           },
         });