astro-tractstack 2.0.38 → 2.0.40

package/dist/index.js

@@ -10,7 +10,7 @@ function b(t) {
 }
 function g(t, e) {
   e.info("TractStack configuration applied"), t.enableMultiTenant && e.info("Multi-tenant mode enabled"), t.includeExamples && e.info("Example components will be included");
-  const c = process.env.PUBLIC_GO_BACKEND, o = process.env.PUBLIC_TENANTID;
+  const c = process.env.PUBLIC_GO_BACKEND, r = process.env.PUBLIC_TENANTID;
   if (!c)
     e.warn("PUBLIC_GO_BACKEND not set - this will be required at runtime");
   else
@@ -19,11 +19,11 @@ function g(t, e) {
     } catch {
       e.error(`PUBLIC_GO_BACKEND is not a valid URL: ${c}`);
     }
-  return o ? /^[a-zA-Z0-9_-]+$/.test(o) ? e.info(`Tenant ID validated: ${o}`) : e.error(`PUBLIC_TENANTID contains invalid characters: ${o}`) : e.warn("PUBLIC_TENANTID not set - this will be required at runtime"), t;
+  return r ? /^[a-zA-Z0-9_-]+$/.test(r) ? e.info(`Tenant ID validated: ${r}`) : e.error(`PUBLIC_TENANTID contains invalid characters: ${r}`) : e.warn("PUBLIC_TENANTID not set - this will be required at runtime"), t;
 }
 async function w(t, e, c) {
   e.info("TractStack: Injecting template files");
-  const o = [
+  const r = [
     // Core Configuration
     {
       src: t("../templates/env.example"),
@@ -751,6 +751,10 @@ async function w(t, e, c) {
       src: t("../templates/src/utils/api.ts"),
       dest: "src/utils/api.ts"
     },
+    {
+      src: t("../templates/src/utils/tenantResolver.ts"),
+      dest: "src/utils/tenantResolver.ts"
+    },
     {
       src: t("../templates/src/utils/api/brandConfig.ts"),
       dest: "src/utils/api/brandConfig.ts"
@@ -2144,12 +2148,12 @@ async function w(t, e, c) {
       }
     ] : []
   ];
-  for (const s of o)
+  for (const s of r)
     try {
       const p = i(s.dest);
       n(p) || x(p, { recursive: !0 });
-      const r = !s.protected && (s.dest === "tailwind.config.cjs" || s.dest.startsWith("src/components/codehooks/") || s.dest.startsWith("src/components/widgets/") || s.dest.startsWith("src/") || s.dest.startsWith("public/client/") || s.dest === ".gitignore");
-      if (!n(s.dest) || r)
+      const o = !s.protected && (s.dest === "tailwind.config.cjs" || s.dest.startsWith("src/components/codehooks/") || s.dest.startsWith("src/components/widgets/") || s.dest.startsWith("src/") || s.dest.startsWith("public/client/") || s.dest === ".gitignore");
+      if (!n(s.dest) || o)
         if (n(s.src))
           k(s.src, s.dest), e.info(`Updated ${s.dest}`);
         else {
@@ -2158,8 +2162,8 @@ async function w(t, e, c) {
         }
       else s.protected ? e.info(`Protected: ${s.dest} (skipped overwrite)`) : e.info(`Skipped existing ${s.dest}`);
     } catch (p) {
-      const r = p instanceof Error ? p.message : String(p);
-      e.error(`Failed to create ${s.dest}: ${r}`);
+      const o = p instanceof Error ? p.message : String(p);
+      e.error(`Failed to create ${s.dest}: ${o}`);
     }
 }
 function _(t) {
@@ -2178,7 +2182,7 @@ function C(t = {}) {
   return {
     name: "astro-tractstack",
     hooks: {
-      "astro:config:setup": async ({ config: c, updateConfig: o, logger: s }) => {
+      "astro:config:setup": async ({ config: c, updateConfig: r, logger: s }) => {
         g(t, s);
         const p = t.enableMultiTenant || !1;
         if (s.info(
@@ -2198,7 +2202,7 @@ function C(t = {}) {
           ), new Error(
             "TractStack requires an SSR adapter. Please add @astrojs/node adapter to your astro.config.mjs"
           );
-        o({
+        r({
           vite: {
             define: {
               __TRACTSTACK_VERSION__: JSON.stringify("2.0.0-alpha.1"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-tractstack",
-  "version": "2.0.38",
+  "version": "2.0.40",
   "description": "Astro integration for TractStack - redeeming the web from boring experiences",
   "type": "module",
   "main": "dist/index.js",

package/templates/src/components/edit/pane/AddPanePanel_new.tsx

@@ -24,6 +24,7 @@ import { DirectInjectStep } from './steps/DirectInjectStep';
 import BooleanToggle from '@/components/form/BooleanToggle';
 import EnumSelect from '@/components/form/EnumSelect';
 import type { StoryFragmentNode } from '@/types/compositorTypes';
+import { TractStackAPI } from '@/utils/api'; // <--- IMPORT ADDED
 
 type Step =
   | 'initial'
@@ -51,9 +52,10 @@ const callAskLemurAPI = async (
   expectJson: boolean,
   isSandboxMode: boolean
 ): Promise<string> => {
-  const goBackend =
-    import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
-  const tenantId = import.meta.env.PUBLIC_TENANTID || 'default';
+  // FIX: Use the centralized API class to ensure correct Tenant ID resolution
+  const api = new TractStackAPI();
+  const tenantId = api.getTenantId(); // Gets correct ID from window config
+
   const requestBody = {
     prompt,
     input_text: context,
@@ -62,43 +64,47 @@ const callAskLemurAPI = async (
     max_tokens: 2000,
   };
 
-  let response: Response;
+  let resultData: any;
+
   if (isSandboxMode) {
-    response = await fetch(`/api/sandbox`, {
+    // Sandbox mode still uses local fetch, but we pass the correct tenant ID
+    const response = await fetch(`/api/sandbox`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json', 'X-Tenant-ID': tenantId },
       credentials: 'include',
       body: JSON.stringify({ action: 'askLemur', payload: requestBody }),
     });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Sandbox API failed: ${response.status} ${errorText}`);
+    }
+
+    const json = await response.json();
+    if (!json.success) {
+      throw new Error(json.error || 'Sandbox generation failed');
+    }
+    resultData = json.data; // { response: ... }
   } else {
-    response = await fetch(`${goBackend}/api/v1/aai/askLemur`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'X-Tenant-ID': tenantId },
-      credentials: 'include',
-      body: JSON.stringify(requestBody),
-    });
-  }
+    // Production mode: Use the robust API class
+    const response = await api.post('/api/v1/aai/askLemur', requestBody);
 
-  if (!response.ok) {
-    const errorText = await response.text();
-    let backendError = `API call failed: ${response.status} ${response.statusText}`;
-    try {
-      const errorJson = JSON.parse(errorText);
-      if (errorJson?.error) backendError = errorJson.error;
-    } catch (e) {
-      /* ignore */
+    if (!response.success) {
+      throw new Error(
+        response.error || 'Generation failed to return valid response.'
+      );
     }
-    throw new Error(backendError);
+
+    // TractStackAPI unwraps the 'data' field automatically
+    resultData = response.data; // { response: ... }
   }
 
-  const result = (await response.json()) as GenerationResponse;
-  if (!result.success || !result.data?.response) {
-    throw new Error(
-      result.error || 'Generation failed to return valid response.'
-    );
+  if (!resultData?.response) {
+    throw new Error('Generation failed to return a response object.');
   }
 
-  let rawResponseData = result.data.response;
+  let rawResponseData = resultData.response;
+
   if (expectJson && typeof rawResponseData === 'object') {
     return JSON.stringify(rawResponseData);
   }

package/templates/src/components/edit/pane/AddPanePanel_reuse.tsx

@@ -10,6 +10,7 @@ import {
 } from '@/components/compositor/preview/PaneSnapshotGenerator';
 import { PaneAddMode, type StoryFragmentNode } from '@/types/compositorTypes';
 import type { FullContentMapItem } from '@/types/tractstack';
+import { TractStackAPI } from '@/utils/api';
 
 interface AddPaneReUsePanelProps {
   nodeId: string;
@@ -127,23 +128,15 @@ const AddPaneReUsePanel = ({
     const fetchFragments = async () => {
       try {
         const paneIds = visiblePreviews.map((preview) => preview.pane.id);
+        const api = new TractStackAPI();
 
-        const goBackend =
-          import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
-        const response = await fetch(`${goBackend}/api/v1/fragments/panes`, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'X-Tenant-ID': import.meta.env.PUBLIC_TENANTID || 'default',
-          },
-          body: JSON.stringify({ paneIds }),
-        });
+        const response = await api.post('/api/v1/fragments/panes', { paneIds });
 
-        if (!response.ok) {
-          throw new Error(`Fragment API failed: ${response.status}`);
+        if (!response.success) {
+          throw new Error(response.error || `Fragment API failed`);
         }
 
-        const data = await response.json();
+        const data = response.data;
 
         setPreviews((prevPreviews) => {
           const updated = [...prevPreviews];
@@ -206,22 +199,16 @@ const AddPaneReUsePanel = ({
     if (!selectedPaneId) return;
 
     try {
-      const goBackend =
-        import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
-      const response = await fetch(
-        `${goBackend}/api/v1/nodes/panes/${selectedPaneId}/template`,
-        {
-          headers: {
-            'X-Tenant-ID': import.meta.env.PUBLIC_TENANTID || 'default',
-          },
-        }
+      const api = new TractStackAPI();
+      const response = await api.get(
+        `/api/v1/nodes/panes/${selectedPaneId}/template`
       );
 
-      if (!response.ok) {
-        throw new Error(`Template API failed: ${response.status}`);
+      if (!response.success) {
+        throw new Error(response.error || `Template API failed`);
       }
 
-      const templateData = await response.json();
+      const templateData = response.data;
       const ctx = getCtx();
 
       // Find storyfragment

package/templates/src/layouts/Layout.astro

@@ -7,6 +7,7 @@ import { getBrandConfig } from '@/utils/api/brandConfig';
 import { freshInstallStore } from '@/stores/backend';
 import type { MenuNode } from '@/types/tractstack';
 import type { ImpressionNode } from '@/types/compositorTypes';
+import { resolveTenantId } from '@/utils/tenantResolver';
 export interface Props {
   title: string;
   slug?: string;
@@ -49,8 +50,17 @@ const {
 
 const isInitialized = !freshInstallStore.get().needsSetup;
 const goBackend = import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
-const tenantId =
-  Astro.locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
+// Resolve tenant explicitly "Above the Fences" to guarantee the client gets the truth
+const resolution = await resolveTenantId(Astro.request);
+const tenantId = resolution.id;
+if (!Astro.locals.tenant) {
+  Astro.locals.tenant = {
+    id: tenantId,
+    domain: Astro.url.hostname,
+    isMultiTenant: true,
+    isLocalhost: false,
+  };
+}
 const brandConfig = propBrandConfig || (await getBrandConfig(tenantId));
 const cssBasePath = isInitialized ? '/media/css' : '/styles';
 const fontBasePath = isInitialized ? '/media/fonts' : '/fonts';

package/templates/src/middleware.ts

@@ -1,4 +1,5 @@
 import type { APIContext, MiddlewareNext } from '@/types/astro';
+import { resolveTenantId } from '@/utils/tenantResolver';
 
 interface Locals {
   tenant?: {
@@ -9,14 +10,6 @@ interface Locals {
   };
 }
 
-interface CacheEntry {
-  tenantId: string;
-  timestamp: number;
-}
-
-const domainCache = new Map<string, CacheEntry>();
-const CACHE_TTL = 5 * 60 * 1000; // 5 minutes
-
 export async function onRequest(
   context: APIContext & { locals: Locals },
   next: MiddlewareNext
@@ -25,74 +18,22 @@ export async function onRequest(
     import.meta.env.PUBLIC_ENABLE_MULTI_TENANT === 'true';
 
   if (isMultiTenantEnabled && !import.meta.env.DEV) {
-    const hostname =
-      context.request.headers.get('x-forwarded-host') ||
-      context.request.headers.get('host');
-
-    if (hostname) {
-      let tenantId: string | null = null;
-
-      // Strategy 1: Regex Pattern (Fastest)
-      const parts = hostname.split('.');
-      if (
-        parts.length === 3 &&
-        ['freewebpress', 'tractstack'].includes(parts[1]) &&
-        parts[2] === 'com'
-      ) {
-        tenantId = parts[0];
-      } else if (
-        parts.length >= 4 &&
-        parts[1] === 'sandbox' &&
-        ['freewebpress', 'tractstack'].includes(parts[2]) &&
-        parts[3] === 'com'
-      ) {
-        tenantId = parts[0];
-      }
-
-      // Strategy 2: Cache Lookup (Fast)
-      if (!tenantId) {
-        const cached = domainCache.get(hostname);
-        if (cached) {
-          if (Date.now() - cached.timestamp < CACHE_TTL) {
-            tenantId = cached.tenantId;
-          } else {
-            domainCache.delete(hostname);
-          }
-        }
-      }
-
-      // Strategy 3: Backend Lookup (Fallback)
-      if (!tenantId) {
-        try {
-          // We assume the backend is always reachable on localhost:8080 in this architecture
-          const response = await fetch(
-            `http://127.0.0.1:8080/api/v1/resolve-domain?host=${encodeURIComponent(hostname)}`
-          );
-          if (response.ok) {
-            const data = await response.json();
-            if (data.tenantId) {
-              tenantId = data.tenantId;
-              domainCache.set(hostname, {
-                tenantId: data.tenantId,
-                timestamp: Date.now(),
-              });
-            }
-          }
-        } catch (error) {
-          console.error(`Failed to resolve domain ${hostname}:`, error);
-        }
-      }
-
-      if (tenantId) {
-        context.locals.tenant = {
-          id: tenantId,
-          domain: hostname,
-          isMultiTenant: true,
-          isLocalhost: false,
-        };
-
-        context.request.headers.set('X-Tenant-ID', tenantId);
-      }
+    // Use the shared utility to resolve the tenant ID
+    const resolution = await resolveTenantId(context.request);
+
+    if (resolution.id && resolution.id !== 'default') {
+      const hostname =
+        context.request.headers.get('x-forwarded-host') ||
+        context.request.headers.get('host');
+
+      context.locals.tenant = {
+        id: resolution.id,
+        domain: hostname,
+        isMultiTenant: true,
+        isLocalhost: false,
+      };
+
+      context.request.headers.set('X-Tenant-ID', resolution.id);
     }
   }
 

package/templates/src/utils/api.ts

@@ -20,7 +20,6 @@ export interface TractStackEvent {
 }
 
 function getConfig() {
-  // Server-side safety check
   if (typeof window === 'undefined') {
     return {
       goBackend: import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080',
@@ -40,47 +39,26 @@ function getConfig() {
   };
 }
 
-//function getTenantFromDomain(): string {
-//  if (typeof window === 'undefined') return 'default';
-//
-//  const hostname = window.location.hostname;
-//
-//  //if (hostname === 'localhost' || hostname === '127.0.0.1') {
-//  //  return 'default';
-//  //}
-//
-//  const parts = hostname.split('.');
-//  if (
-//    parts.length >= 4 &&
-//    parts[1] === 'sandbox' &&
-//    ['tractstack', 'freewebpress'].includes(parts[2]) &&
-//    parts[3] === 'com'
-//  ) {
-//    return parts[0];
-//  }
-//
-//  return 'default';
-//}
-
 export class TractStackAPI {
-  private baseUrl: string;
-  private tenantId: string;
+  private explicitTenantId?: string;
 
   constructor(tenantId?: string) {
-    const config = getConfig();
-    this.baseUrl = config.goBackend;
-    this.tenantId = tenantId || config.tenantId;
+    this.explicitTenantId = tenantId;
   }
 
   async request<T = any>(
     endpoint: string,
     options: RequestInit = {}
   ): Promise<APIResponse<T>> {
-    const url = `${this.baseUrl}${endpoint.startsWith('/') ? endpoint : `/${endpoint}`}`;
+    const config = getConfig();
+    const effectiveTenantId = this.explicitTenantId || config.tenantId;
+    const baseUrl = config.goBackend;
+
+    const url = `${baseUrl}${endpoint.startsWith('/') ? endpoint : `/${endpoint}`}`;
 
     const defaultHeaders = {
       'Content-Type': 'application/json',
-      'X-Tenant-ID': this.tenantId,
+      'X-Tenant-ID': effectiveTenantId,
       ...(typeof window !== 'undefined' &&
         (window as any).TRACTSTACK_CONFIG?.sessionId && {
           'X-TractStack-Session-ID': (window as any).TRACTSTACK_CONFIG
@@ -170,11 +148,12 @@ export class TractStackAPI {
   }
 
   getTenantId(): string {
-    return this.tenantId;
+    const config = getConfig();
+    return this.explicitTenantId || config.tenantId;
   }
 
   setTenantId(tenantId: string): void {
-    this.tenantId = tenantId;
+    this.explicitTenantId = tenantId;
   }
 
   async getContentMapWithTimestamp(
@@ -185,11 +164,7 @@ export class TractStackAPI {
       endpoint += `?lastUpdated=${lastUpdated}`;
     }
 
-    // Use the raw request method to get the full response
     const response = await this.request(endpoint);
-
-    // For this endpoint, the backend returns {data: [...], lastUpdated: 123} directly
-    // So response.data IS the {data: [...], lastUpdated: 123} object
     return response as APIResponse<{ data: any[]; lastUpdated: number }>;
   }
 }

package/templates/src/utils/tenantResolver.ts

@@ -0,0 +1,113 @@
+const VERBOSE = true;
+
+interface TenantResolution {
+  id: string;
+  source: 'regex' | 'cache' | 'fetch' | 'default';
+}
+
+interface CacheEntry {
+  tenantId: string;
+  timestamp: number;
+}
+
+const domainCache = new Map<string, CacheEntry>();
+const CACHE_TTL = 5 * 60 * 1000; // 5 minutes
+
+export async function resolveTenantId(
+  request: Request
+): Promise<TenantResolution> {
+  const hostname =
+    request.headers.get('x-forwarded-host') || request.headers.get('host');
+
+  if (VERBOSE) console.log(`[TenantResolver] Resolving: ${hostname}`);
+
+  if (!hostname) return { id: 'default', source: 'default' };
+
+  // Strategy 1: Regex Pattern (Fastest - Zero Latency)
+  const parts = hostname.split('.');
+
+  // Standard Subdomain (e.g. pro.freewebpress.com or pro.freewebpress.com:443)
+  if (
+    parts.length === 3 &&
+    ['freewebpress', 'tractstack'].includes(parts[1]) &&
+    parts[2].startsWith('com')
+  ) {
+    if (VERBOSE) console.log(`[TenantResolver] Regex Match: ${parts[0]}`);
+    return { id: parts[0], source: 'regex' };
+  }
+
+  // Sandbox Subdomain (e.g. id.sandbox.freewebpress.com)
+  if (
+    parts.length >= 4 &&
+    parts[1] === 'sandbox' &&
+    ['freewebpress', 'tractstack'].includes(parts[2]) &&
+    parts[3].startsWith('com')
+  ) {
+    if (VERBOSE)
+      console.log(`[TenantResolver] Regex Sandbox Match: ${parts[0]}`);
+    return { id: parts[0], source: 'regex' };
+  }
+
+  // Strategy 2: Cache Lookup (Fast - In Memory)
+  const cached = domainCache.get(hostname);
+  if (cached) {
+    if (Date.now() - cached.timestamp < CACHE_TTL) {
+      if (VERBOSE)
+        console.log(`[TenantResolver] Cache Hit: ${cached.tenantId}`);
+      return { id: cached.tenantId, source: 'cache' };
+    } else {
+      domainCache.delete(hostname);
+      if (VERBOSE)
+        console.log(`[TenantResolver] Cache Expired for: ${hostname}`);
+    }
+  }
+
+  // Strategy 3: Backend Lookup (Fallback - Network Request)
+  try {
+    const backendUrl =
+      import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:10000';
+    const urlObj = new URL(backendUrl);
+    // Force localhost to avoid Hairpin NAT / Loopback firewall blocks
+    const localBackend = `${urlObj.protocol}//127.0.0.1:${urlObj.port}`;
+
+    if (VERBOSE) console.log(`[TenantResolver] Fetching from: ${localBackend}`);
+
+    // Temporarily disable TLS validation because 127.0.0.1 won't match the cert
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+
+    const response = await fetch(
+      `${localBackend}/api/v1/resolve-domain?host=${encodeURIComponent(hostname)}`
+    );
+
+    // Restore security immediately
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = '1';
+
+    if (response.ok) {
+      const data = await response.json();
+      if (data.tenantId) {
+        if (VERBOSE)
+          console.log(`[TenantResolver] Fetch Success: ${data.tenantId}`);
+
+        // Cache the result
+        domainCache.set(hostname, {
+          tenantId: data.tenantId,
+          timestamp: Date.now(),
+        });
+
+        return { id: data.tenantId, source: 'fetch' };
+      }
+    } else {
+      if (VERBOSE)
+        console.log(`[TenantResolver] Fetch Failed: ${response.status}`);
+    }
+  } catch (error) {
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = '1';
+    console.error(
+      `[TenantResolver] Error resolving domain ${hostname}:`,
+      error
+    );
+  }
+
+  if (VERBOSE) console.warn(`[TenantResolver] Failed to resolve. Defaulting.`);
+  return { id: 'default', source: 'default' };
+}

package/utils/inject-files.ts

@@ -758,6 +758,10 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/utils/api.ts'),
       dest: 'src/utils/api.ts',
     },
+    {
+      src: resolve('../templates/src/utils/tenantResolver.ts'),
+      dest: 'src/utils/tenantResolver.ts',
+    },
     {
       src: resolve('../templates/src/utils/api/brandConfig.ts'),
       dest: 'src/utils/api/brandConfig.ts',