@wix/astro 1.0.25 → 1.0.27

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "@wix/astro",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "devDependencies": {
     "@wix/dashboard": "^1.3.35",
     "@wix/essentials": "^0.1.23",
+    "@wix/headless-node": "^1.4.0",
+    "@wix/headless-site": "^1.0.0",
+    "@wix/headless-site-assets": "^1.0.2",
     "@wix/sdk": "^1.15.23",
     "@wix/sdk-context": "^0.0.1",
+    "@wix/sdk-types": "^1.13.32",
     "astro": "^5.10.1",
     "chalk": "^5.4.1",
     "chokidar": "^3.6.0",
@@ -45,5 +49,5 @@
       "artifactId": "wix-astro"
     }
   },
-  "falconPackageHash": "3da19a908e980407fdedf672c3eef63699108f51ec265ed13f707d46"
+  "falconPackageHash": "d63557661fd785b25ed8a39da82d8812517f4690bfd1c928ef0454ae"
 }

package/src/client-context/utils.ts

@@ -1,7 +1,7 @@
-import type { WixClient } from '@wix/sdk';
-import { createClient, TokenRole } from '@wix/sdk';
+import type { Tokens, WixClient } from '@wix/sdk';
+import { headlessSite } from '@wix/headless-site';
+import { createClient } from '@wix/sdk';
 import { SiteSessionAuth } from '@wix/sdk/auth/site-session';
-import * as z from 'zod/v4';
 
 export function getSessionClient(options: { clientId: string }): WixClient {
   return createClient({
@@ -9,19 +9,10 @@ export function getSessionClient(options: { clientId: string }): WixClient {
       tokens: getCookieAsJson('wixSession')?.tokens,
       ...options,
     }),
+    host: headlessSite.host(),
   });
 }
 
-const cookieSchema = z.object({
-  tokens: z.object({
-    accessToken: z.object({ expiresAt: z.number(), value: z.string() }),
-    refreshToken: z.object({
-      role: z.enum([TokenRole.MEMBER, TokenRole.NONE, TokenRole.VISITOR]),
-      value: z.string(),
-    }),
-  }),
-});
-
 function getCookieAsJson(name: string) {
   const cookies = document.cookie.split('; ');
   const cookie = cookies.find((row) => row.startsWith(`${name}=`));
@@ -32,9 +23,37 @@ function getCookieAsJson(name: string) {
 
   try {
     const jsonString = decodeURIComponent(cookie.split('=')[1] ?? '');
-    return cookieSchema.parse(JSON.parse(jsonString));
+    const cookieValue = JSON.parse(jsonString) as unknown;
+
+    if (isCookieValue(cookieValue)) {
+      return cookieValue;
+    }
+
+    throw new Error('Invalid cookie value');
   } catch (error) {
     console.error('Error parsing cookie JSON:', error);
     return null;
   }
 }
+
+function isCookieValue(value: unknown): value is { tokens: Tokens } {
+  if (value == null || typeof value !== 'object') {
+    return false;
+  }
+
+  if (!('tokens' in value)) {
+    return false;
+  }
+
+  const tokens = value.tokens;
+
+  if (tokens == null || typeof tokens !== 'object') {
+    return false;
+  }
+
+  if (!('accessToken' in tokens) || !('refreshToken' in tokens)) {
+    return false;
+  }
+
+  return true;
+}

package/src/context/elevated.ts

@@ -5,6 +5,7 @@ import {
   WIX_CLIENT_PUBLIC_KEY,
   WIX_CLIENT_SECRET,
 } from 'astro:env/server';
+import { createHostProxy } from './hostProxy.js';
 
 const elevatedContextClient = createClient({
   auth: AppStrategy({
@@ -13,6 +14,7 @@ const elevatedContextClient = createClient({
     instanceId: WIX_CLIENT_INSTANCE_ID,
     publicKey: WIX_CLIENT_PUBLIC_KEY,
   }),
+  host: createHostProxy(),
 });
 
 elevatedContextClient.enableContext('global', { elevated: true });

package/src/context/hostProxy.ts

@@ -0,0 +1,38 @@
+import type { Host } from '@wix/sdk-types';
+import { headlessNode } from '@wix/headless-node';
+import { authAsyncLocalStorage } from '../utils/authAsyncLocalStorage.js';
+
+const createHostWithCurrentRequest = () => {
+  const store = authAsyncLocalStorage.getStore();
+
+  return headlessNode.host({ req: store?.request });
+};
+
+export const createHostProxy = (): Host => {
+  return new Proxy<Host>(
+    {},
+    {
+      get(target, prop: keyof Host) {
+        // host might be created before async local storage was set
+        const host = createHostWithCurrentRequest();
+        const value = host[prop];
+
+        if (typeof value !== 'function') {
+          return value;
+        }
+
+        // for functions, create the host again when the function runs,
+        // so that the middleware has a chance to set the async local storage
+        // before we access the current request
+        return function (...args: unknown[]) {
+          const anotherHost = createHostWithCurrentRequest();
+
+          return (anotherHost[prop] as (...args: unknown[]) => unknown).apply(
+            anotherHost,
+            args
+          );
+        };
+      },
+    }
+  );
+};

package/src/context/nonElevated.ts

@@ -2,6 +2,7 @@ import type { IOAuthStrategy } from '@wix/sdk';
 import { createClient, OAuthStrategy } from '@wix/sdk';
 import { WIX_CLIENT_ID } from 'astro:env/client';
 import { authAsyncLocalStorage } from '../utils/authAsyncLocalStorage.js';
+import { createHostProxy } from './hostProxy.js';
 
 const authProxy = new Proxy(
   {},
@@ -35,6 +36,7 @@ const authProxy = new Proxy(
 
 const contextClient = createClient({
   auth: authProxy,
+  host: createHostProxy(),
 });
 
 contextClient.enableContext('global');

package/src/index.ts

@@ -31,11 +31,12 @@ const createIntegration = (
   return {
     hooks: {
       async 'astro:build:done'({ logger }) {
-        const model = await createProjectModel(logger);
+        const rootDir = fileURLToPath(_config.root);
+
+        const model = await createProjectModel({ logger, rootDir });
         const appManifest = generateAppManifest(model);
 
         const outDir = fileURLToPath(_config.outDir);
-        const rootDir = fileURLToPath(_config.root);
 
         const appManifestPath = join(outDir, '_wix/app-manifest.json');
 
@@ -67,7 +68,7 @@ const createIntegration = (
         const rootDir = fileURLToPath(config.root);
         const extensionsDir = join(codegenDir, 'extensions');
 
-        const model = await createProjectModel(logger);
+        const model = await createProjectModel({ logger, rootDir });
 
         // support client-side context calls
         injectScript(
@@ -219,7 +220,7 @@ const createIntegration = (
               useFsEvents: false,
             })
             .on('all', async () => {
-              const model = await createProjectModel(logger);
+              const model = await createProjectModel({ logger, rootDir });
 
               await removeUnusedCodegenFiles({ extensionsDir, model });
 
@@ -233,9 +234,11 @@ const createIntegration = (
         }
       },
       'astro:server:setup': ({ logger, server }) => {
+        const rootDir = fileURLToPath(_config.root);
+
         server.middlewares.use(async (req, res, next) => {
           if (req.url === '/_wix/app-manifest.json') {
-            const model = await createProjectModel(logger);
+            const model = await createProjectModel({ logger, rootDir });
             const appManifest = generateAppManifest(model);
             res.setHeader('Content-Type', 'application/json');
             res.end(JSON.stringify(appManifest));

package/src/middleware/auth.ts

@@ -9,6 +9,7 @@ export const onRequest: MiddlewareHandler = async (context, next) => {
   const usedTokens = existingTokens ?? (await generateVisitorTokens());
 
   const store = {
+    request: context.request,
     sessionTokens: usedTokens,
   };
 

package/src/middleware/html-embeds.ts

@@ -1,15 +1,10 @@
 import type { MiddlewareHandler } from 'astro';
-import { httpClient } from '@wix/essentials';
+import { scripts } from '@wix/headless-site-assets';
 import {
   injectAfterTransformStream,
   injectBeforeTransformStream,
 } from '../utils/transformStreamUtils.js';
 
-interface SiteScript {
-  html: string;
-  position: 'BODY_END' | 'BODY_START' | 'HEAD';
-}
-
 const bodyEndTransformStream = (htmlToInject: string) =>
   injectBeforeTransformStream('</body>', htmlToInject);
 
@@ -19,13 +14,6 @@ const headTransformStream = (htmlToInject: string) =>
 const bodyStartTransformStream = (htmlToInject: string) =>
   injectAfterTransformStream(/<body(?![^>]*\/>)[^>]*>/, htmlToInject);
 
-async function fetchScripts() {
-  return httpClient
-    .fetchWithAuth('https://edge.wixapis.com/assets/scripts/v1/site-scripts')
-    .then(async (res) => res.json() as Promise<{ siteScripts: SiteScript[] }>)
-    .then((data) => data.siteScripts);
-}
-
 export const onRequest: MiddlewareHandler = async (context, next) => {
   const response = await next();
   const contentType = response.headers.get('Content-Type');
@@ -38,19 +26,23 @@ export const onRequest: MiddlewareHandler = async (context, next) => {
     return response;
   }
 
-  const scripts = await fetchScripts();
+  const { siteScripts } = await scripts.listSiteScripts();
+
+  if (siteScripts == null) {
+    throw new Error('Could not fetch site scripts');
+  }
 
-  const headInjection = scripts
+  const headInjection = siteScripts
     .filter((x) => x.position === 'HEAD')
     .map((x) => x.html)
     .join('\n');
 
-  const bodyStartInjection = scripts
+  const bodyStartInjection = siteScripts
     .filter((x) => x.position === 'BODY_START')
     .map((x) => x.html)
     .join('\n');
 
-  const bodyEndInjection = scripts
+  const bodyEndInjection = siteScripts
     .filter((x) => x.position === 'BODY_END')
     .map((x) => x.html)
     .join('\n');

package/src/utils/authAsyncLocalStorage.ts

@@ -2,5 +2,6 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import type { Tokens } from '@wix/sdk';
 
 export const authAsyncLocalStorage = new AsyncLocalStorage<{
+  request: Request;
   sessionTokens: Tokens;
 }>();

package/src/utils/buildBackofficeComponent.ts

@@ -14,19 +14,17 @@ export async function buildBackofficeComponent({
   component,
   entryFileName,
   injectRoute,
-  rootDir,
 }: {
   codegenDir: string;
   component: BackofficeExtensionWidget | BackofficeModal | BackofficePage;
   entryFileName: string;
   injectRoute: (injectRoute: InjectedRoute) => void;
-  rootDir: string;
 }): Promise<void> {
   const directory = join(codegenDir, component.manifest.compId);
 
   await outputDir(directory);
 
-  const entryFilePath = join(rootDir, component.directory, entryFileName);
+  const entryFilePath = join(component.directory, entryFileName);
 
   const entrypoint = join(directory, `entry.astro`);
   const HocEntrypoint = join(directory, `wrapper.tsx`);

package/src/utils/buildComponents.ts

@@ -16,8 +16,6 @@ export async function buildComponents({
   isDev: boolean;
   model: Model;
 }): Promise<void> {
-  const { rootDir } = model;
-
   // during dev, a single dynamic route is injected so adding or removing
   // components doesn't require re-running the dev command
   const injectRoute = isDev ? () => null : originalInjectRoute;
@@ -46,7 +44,6 @@ export async function buildComponents({
           component,
           entryFileName: 'widget.tsx',
           injectRoute,
-          rootDir,
         });
 
         break;
@@ -61,7 +58,6 @@ export async function buildComponents({
           component,
           entryFileName: 'modal.tsx',
           injectRoute,
-          rootDir,
         });
 
         break;
@@ -76,7 +72,6 @@ export async function buildComponents({
           component,
           entryFileName: 'page.tsx',
           injectRoute,
-          rootDir,
         });
 
         break;
@@ -92,7 +87,6 @@ export async function buildComponents({
           codegenDir: servicePluginsCodegenDir,
           component,
           injectRoute,
-          rootDir,
         });
 
         break;
@@ -108,7 +102,6 @@ export async function buildComponents({
           codegenDir: servicePluginsCodegenDir,
           component,
           injectRoute,
-          rootDir,
         });
 
         break;
@@ -124,7 +117,6 @@ export async function buildComponents({
           codegenDir: servicePluginsCodegenDir,
           component,
           injectRoute,
-          rootDir,
         });
 
         break;
@@ -140,7 +132,6 @@ export async function buildComponents({
           codegenDir: servicePluginsCodegenDir,
           component,
           injectRoute,
-          rootDir,
         });
 
         break;
@@ -156,7 +147,6 @@ export async function buildComponents({
           codegenDir: servicePluginsCodegenDir,
           component,
           injectRoute,
-          rootDir,
         });
 
         break;
@@ -170,7 +160,6 @@ export async function buildComponents({
           codegenDir: servicePluginsCodegenDir,
           component,
           injectRoute,
-          rootDir,
         });
 
         break;
@@ -184,7 +173,6 @@ export async function buildComponents({
           codegenDir: webhooksCodegenDir,
           component,
           injectRoute,
-          rootDir,
         });
 
         break;

package/src/utils/buildServicePluginComponent.ts

@@ -16,7 +16,6 @@ export async function buildServicePluginComponent({
   codegenDir,
   component,
   injectRoute,
-  rootDir,
 }: {
   codegenDir: string;
   component:
@@ -27,14 +26,13 @@ export async function buildServicePluginComponent({
     | EcomShippingRates
     | EcomValidations;
   injectRoute: (injectRoute: InjectedRoute) => void;
-  rootDir: string;
 }): Promise<void> {
   const directory = join(codegenDir, component.manifest.compId);
 
   await outputDir(directory);
 
   const entrypoint = join(directory, `entry.ts`);
-  const entryFilePath = join(rootDir, component.directory, 'plugin.ts');
+  const entryFilePath = join(component.directory, 'plugin.ts');
 
   await writeFile(
     entrypoint,

package/src/utils/buildWebhookComponent.ts

@@ -9,19 +9,17 @@ export async function buildWebhookComponent({
   codegenDir,
   component,
   injectRoute,
-  rootDir,
 }: {
   codegenDir: string;
   component: Webhook;
   injectRoute: (injectRoute: InjectedRoute) => void;
-  rootDir: string;
 }): Promise<void> {
   const directory = join(codegenDir, component.manifest.compId);
 
   await outputDir(directory);
 
   const entrypoint = join(directory, `entry.ts`);
-  const entryFilePath = join(rootDir, component.directory, 'event.ts');
+  const entryFilePath = join(component.directory, 'event.ts');
 
   await writeFile(
     entrypoint,

package/src/utils/createProjectModel.ts

@@ -1,5 +1,4 @@
 import { join } from 'node:path';
-import { cwd } from 'node:process';
 import type { AstroIntegrationLogger } from 'astro';
 import { globby } from 'globby';
 import { outdent } from 'outdent';
@@ -14,11 +13,14 @@ import {
 import { pathExists, readJson } from './fs-utils.js';
 import { loadEnvVars } from './loadEnvVars.js';
 
-export async function createProjectModel(
-  logger: AstroIntegrationLogger
-): Promise<Model> {
-  const rootDir = cwd();
-  const { appId, env } = loadEnvVars(logger);
+export async function createProjectModel({
+  logger,
+  rootDir,
+}: {
+  logger: AstroIntegrationLogger;
+  rootDir: string;
+}): Promise<Model> {
+  const { appId, env } = loadEnvVars({ logger, rootDir });
 
   const componentsPaths = await globby(
     pathToGlobby(join(EXTENSIONS_DIR, '*')),
@@ -31,7 +33,9 @@ export async function createProjectModel(
   const components: Component[] = [];
   const unknownComponents: UnknownComponent[] = [];
 
-  for (const componentPath of componentsPaths) {
+  for (const componentRelativePath of componentsPaths) {
+    const componentPath = join(rootDir, componentRelativePath);
+
     const extensionManifest = await readExtensionManifest(componentPath);
     const knownManifest = parseKnownExtensionManifest(extensionManifest);
 

package/src/utils/loadEnvVars.ts

@@ -5,11 +5,17 @@ import { loadEnv } from 'vite';
 
 const wixClientIdEnvVar = 'WIX_CLIENT_ID';
 
-export function loadEnvVars(logger: AstroIntegrationLogger): {
+export function loadEnvVars({
+  logger,
+  rootDir,
+}: {
+  logger: AstroIntegrationLogger;
+  rootDir: string;
+}): {
   appId: string;
   env: Record<string, string>;
 } {
-  const env = loadEnv(process.env.NODE_ENV ?? 'development', process.cwd(), '');
+  const env = loadEnv(process.env.NODE_ENV ?? 'development', rootDir, '');
   const appId = env[wixClientIdEnvVar];
 
   if (appId == null) {

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src", "test"],
+  "include": ["src"],
   "compilerOptions": {
     "outDir": "build",
     "declaration": true,