@ecomiq/storefront 2.0.22 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecomiq/storefront",
-  "version": "2.0.22",
+  "version": "2.1.3",
   "description": "Micro framework SSR de Ecomiq para storefronts. Páginas, datos y deploy sin configurar nada.",
   "type": "module",
   "license": "MIT",
@@ -38,6 +38,8 @@
     "./internal/page": "./src/runtime/page.tsx",
     "./internal/context": "./src/runtime/context.ts",
     "./internal/server-config": "./src/server-config-store.ts",
+    "./internal/runtime": "./src/storefront-runtime.ts",
+    "./internal/definition-data": "./src/storefront-definition/data.ts",
     "./internal/health": "./src/health.ts",
     "./internal/head": "./src/runtime/head.ts",
     "./internal/default-layout": "./src/runtime/default-layout.tsx",
@@ -84,7 +86,7 @@
     "vite": "^8.1.0",
     "wrangler": "^4.100.0",
     "zod": "^3.25.0",
-    "@ecomiq/core": "^0.1.8",
+    "@ecomiq/core": "^0.1.9",
     "@ecomiq/storefront-definition": "^1.0.0"
   },
   "peerDependencies": {

package/src/cart-session.ts

@@ -1,6 +1,5 @@
 import {
   ApiError,
-  cartVariantIdFromProduct,
   type RemoveCartItemParams,
   type StorefrontCart,
   type StorefrontClient,
@@ -11,7 +10,7 @@ import { z } from 'zod'
 type CartClient = Pick<StorefrontClient, 'getCart' | 'createCart' | 'addCartItem'>
 
 export interface LoadActiveCartInput {
-  cartId: string
+  cartToken: string
 }
 
 export type ActiveCartLoadResult =
@@ -35,14 +34,14 @@ export type CartItemMutationResult =
     }
 
 export interface AddProductToCartInput {
-  cartId?: string
+  cartToken?: string
   currencyCode: string
   variantId: string
   quantity: number
 }
 
 export interface AddProductToCartResult {
-  cartId: string
+  cartToken: string
   cart: StorefrontCart
   created: boolean
 }
@@ -118,7 +117,7 @@ export async function loadActiveCart(
   input: LoadActiveCartInput,
 ): Promise<ActiveCartLoadResult> {
   try {
-    const cart = await client.getCart({ cartId: input.cartId })
+    const cart = await client.getCart({ cartToken: input.cartToken })
     return { ok: true as const, value: cartIsActive(cart) ? cart : null }
   } catch (error) {
     if (cartIsUnavailable(error)) return { ok: true as const, value: null }
@@ -165,13 +164,12 @@ export async function addProductToCart(
   client: CartClient,
   input: AddProductToCartInput,
 ): Promise<AddProductToCartResult> {
-  const variantId = cartVariantIdFromProduct(input.variantId)
   let current: StorefrontCart | undefined
   let created = false
 
-  if (input.cartId) {
+  if (input.cartToken) {
     try {
-      const persisted = await client.getCart({ cartId: input.cartId })
+      const persisted = await client.getCart({ cartToken: input.cartToken })
       if (cartIsActive(persisted)) current = persisted
     } catch (error) {
       if (!cartIsUnavailable(error)) throw error
@@ -183,20 +181,20 @@ export async function addProductToCart(
     created = true
   }
 
-  const add = (cartId: string) => client.addCartItem({
-    cartId,
-    variantId,
+  const add = (cartToken: string) => client.addCartItem({
+    cartToken,
+    variantId: input.variantId,
     quantity: input.quantity,
   })
 
   try {
-    const cart = await add(current.id)
-    return { cartId: cart.id, cart, created }
+    const cart = await add(current.token)
+    return { cartToken: cart.token, cart, created }
   } catch (error) {
     if (!cartIsUnavailable(error)) throw error
     const replacement = await client.createCart({ currencyCode: input.currencyCode })
-    const cart = await add(replacement.id)
-    return { cartId: cart.id, cart, created: true }
+    const cart = await add(replacement.token)
+    return { cartToken: cart.token, cart, created: true }
   }
 }
 

package/src/client.ts

@@ -2,7 +2,7 @@ import {
   createClient as createCoreClient,
   type CreateApiOptions,
   type StorefrontClient,
-} from '@ecomiq/core'
+} from '@ecomiq/core/client'
 import { getServerConfig } from './server-config-store'
 
 let sharedClient: StorefrontClient | null = null

package/src/cloud-runtime-client.ts

@@ -27,6 +27,8 @@ export const ActiveStorefrontRuntimeSchema = z
         sequence: z.number().int().nonnegative(),
         releaseSequence: z.number().int().nonnegative(),
         publishedAt: z.string().datetime({ offset: true }),
+        runtimeReleaseId: z.string().optional(),
+        artifactDigest: z.string().optional(),
       })
       .strict(),
     definition: StorefrontDefinitionSchema,
@@ -37,6 +39,32 @@ export type ActiveStorefrontRuntime = z.infer<
   typeof ActiveStorefrontRuntimeSchema
 >
 
+export const EnvironmentPointerSchema = z
+  .object({
+    schemaVersion: z.literal(1),
+    storeSlug: CloudRuntimeStoreSlugSchema,
+    projectId: z.string().min(1),
+    environmentId: z.string().min(1),
+    generation: z.number().int().nonnegative(),
+    releaseSequence: z.number().int().nonnegative(),
+    deploymentSequence: z.number().int().nonnegative(),
+    artifactDigest: z.string().min(1),
+    artifactKey: z.string().min(1),
+    manifestDigest: z.string().min(1),
+    manifestKey: z.string().min(1),
+    runtimeReleaseId: z.string().min(1),
+    publishedAt: z.string().datetime({ offset: true }),
+    cachePolicy: z
+      .object({
+        pointerMaxAgeSeconds: z.number().int().nonnegative(),
+        staleIfErrorSeconds: z.number().int().nonnegative(),
+      })
+      .strict(),
+  })
+  .strict()
+
+export type EnvironmentPointer = z.infer<typeof EnvironmentPointerSchema>
+
 export type CloudRuntimeFetch = (
   input: RequestInfo | URL,
   init?: RequestInit,
@@ -44,6 +72,7 @@ export type CloudRuntimeFetch = (
 
 export interface CloudRuntimeClientOptions {
   baseUrl: string
+  artifactBaseUrl?: string
   timeoutMs?: number
   cacheTtlMs?: number
   fetch?: CloudRuntimeFetch
@@ -70,14 +99,22 @@ const DEFAULT_TIMEOUT_MS = 3_000
 const DEFAULT_CACHE_TTL_MS = 15_000
 const MAX_CACHE_ENTRIES = 100
 
+interface LastKnownGood {
+  runtime: ActiveStorefrontRuntime
+  generation: number
+}
+
 export class CloudRuntimeClient {
   readonly baseUrl: string
+  readonly artifactBaseUrl: string | null
   readonly timeoutMs: number
   readonly cacheTtlMs: number
 
   private readonly fetchRuntime: CloudRuntimeFetch
   private readonly now: () => number
   private readonly cache = new Map<string, RuntimeCacheEntry>()
+  private readonly lastKnownGood = new Map<string, LastKnownGood>()
+  private readonly artifactCache = new Map<string, ActiveStorefrontRuntime>()
   private readonly inFlight = new Map<
     string,
     Promise<ActiveStorefrontRuntime | null>
@@ -85,6 +122,9 @@ export class CloudRuntimeClient {
 
   constructor(options: CloudRuntimeClientOptions) {
     this.baseUrl = new URL(options.baseUrl).toString().replace(/\/$/, '')
+    this.artifactBaseUrl = options.artifactBaseUrl
+      ? new URL(options.artifactBaseUrl).toString().replace(/\/$/, '')
+      : null
     this.timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS
     this.cacheTtlMs = options.cacheTtlMs ?? DEFAULT_CACHE_TTL_MS
     this.fetchRuntime = options.fetch ?? globalThis.fetch
@@ -103,20 +143,139 @@ export class CloudRuntimeClient {
     const activeRequest = this.inFlight.get(storeSlug)
     if (activeRequest) return activeRequest
 
-    const request = this.requestActiveStorefront(storeSlug, cached).finally(
-      () => {
-        this.inFlight.delete(storeSlug)
-      },
-    )
+    const request = (
+      this.artifactBaseUrl
+        ? this.requestFromArtifactStore(storeSlug)
+        : this.requestActiveStorefront(storeSlug, cached)
+    ).finally(() => {
+      this.inFlight.delete(storeSlug)
+    })
     this.inFlight.set(storeSlug, request)
     return request
   }
 
   clearCache(): void {
     this.cache.clear()
+    this.lastKnownGood.clear()
+    this.artifactCache.clear()
     this.inFlight.clear()
   }
 
+  private async requestFromArtifactStore(
+    storeSlug: string,
+  ): Promise<ActiveStorefrontRuntime | null> {
+    const survivor = this.lastKnownGood.get(storeSlug)
+    let pointer: EnvironmentPointer | null
+    try {
+      pointer = await this.fetchPointer(storeSlug)
+    } catch {
+      if (survivor) return survivor.runtime
+      throw new CloudRuntimeResponseError(503)
+    }
+
+    if (pointer === null) {
+      if (survivor) return survivor.runtime
+      this.setCache(storeSlug, {
+        value: null,
+        expiresAt: this.now() + this.cacheTtlMs,
+      })
+      return null
+    }
+
+    if (survivor && pointer.generation < survivor.generation) {
+      this.setCache(storeSlug, {
+        value: survivor.runtime,
+        expiresAt: this.now() + this.cacheTtlMs,
+      })
+      return survivor.runtime
+    }
+
+    let runtime: ActiveStorefrontRuntime
+    try {
+      runtime = await this.fetchArtifactRuntime(pointer)
+    } catch {
+      if (survivor) return survivor.runtime
+      throw new CloudRuntimeResponseError(503)
+    }
+
+    if (runtime.store.slug !== storeSlug) {
+      throw new Error(
+        `El pointer de ${storeSlug} apunta a un artifact de ${runtime.store.slug}`,
+      )
+    }
+
+    const ttlMs = pointer.cachePolicy.pointerMaxAgeSeconds * 1_000
+    this.setCache(storeSlug, {
+      value: runtime,
+      expiresAt: this.now() + (ttlMs > 0 ? ttlMs : this.cacheTtlMs),
+    })
+    this.lastKnownGood.set(storeSlug, {
+      runtime,
+      generation: pointer.generation,
+    })
+    return runtime
+  }
+
+  private async fetchPointer(
+    storeSlug: string,
+  ): Promise<EnvironmentPointer | null> {
+    const response = await this.fetchWithTimeout(
+      `${this.artifactBaseUrl}/stores/${encodeURIComponent(storeSlug)}/pointer.json`,
+    )
+    if (response.status === 404) return null
+    if (!response.ok) throw new CloudRuntimeResponseError(response.status)
+    return EnvironmentPointerSchema.parse(await response.json())
+  }
+
+  private async fetchArtifactRuntime(
+    pointer: EnvironmentPointer,
+  ): Promise<ActiveStorefrontRuntime> {
+    const cached = this.artifactCache.get(pointer.artifactKey)
+    const base =
+      cached ?? (await this.requestArtifactBody(pointer.artifactKey))
+    if (!cached) {
+      if (this.artifactCache.size >= MAX_CACHE_ENTRIES) {
+        const oldestKey = this.artifactCache.keys().next().value
+        if (oldestKey !== undefined) this.artifactCache.delete(oldestKey)
+      }
+      this.artifactCache.set(pointer.artifactKey, base)
+    }
+    return {
+      ...base,
+      publication: {
+        sequence: pointer.deploymentSequence,
+        releaseSequence: pointer.releaseSequence,
+        publishedAt: pointer.publishedAt,
+        runtimeReleaseId: pointer.runtimeReleaseId,
+        artifactDigest: pointer.artifactDigest,
+      },
+    }
+  }
+
+  private async requestArtifactBody(
+    artifactKey: string,
+  ): Promise<ActiveStorefrontRuntime> {
+    const response = await this.fetchWithTimeout(
+      `${this.artifactBaseUrl}/${artifactKey}`,
+    )
+    if (!response.ok) throw new CloudRuntimeResponseError(response.status)
+    return ActiveStorefrontRuntimeSchema.parse(await response.json())
+  }
+
+  private async fetchWithTimeout(url: string): Promise<Response> {
+    const controller = new AbortController()
+    const timeout = setTimeout(() => controller.abort(), this.timeoutMs)
+    try {
+      return await this.fetchRuntime(url, {
+        method: 'GET',
+        headers: { accept: 'application/json' },
+        signal: controller.signal,
+      })
+    } finally {
+      clearTimeout(timeout)
+    }
+  }
+
   private setCache(storeSlug: string, entry: RuntimeCacheEntry): void {
     if (!this.cache.has(storeSlug) && this.cache.size >= MAX_CACHE_ENTRIES) {
       const oldestKey = this.cache.keys().next().value
@@ -197,6 +356,7 @@ export function getCloudRuntimeClient(
 ): CloudRuntimeClient {
   const key = [
     new URL(options.baseUrl).toString(),
+    options.artifactBaseUrl ? new URL(options.artifactBaseUrl).toString() : '',
     options.timeoutMs ?? DEFAULT_TIMEOUT_MS,
     options.cacheTtlMs ?? DEFAULT_CACHE_TTL_MS,
   ].join('|')

package/src/codegen.mjs

@@ -545,7 +545,6 @@ function assertNoFrameworkPageOverrides(pageEntries) {
   )
   // Overrides / alias legados
   reserved.set('/checkout', 'checkout.tsx')
-  reserved.set('/checkout/$cartId', 'checkout.$cartId.tsx')
 
   for (const entry of pageEntries) {
     const routeId = fileToRouteId(entry.rel)

package/src/components/checkout/checkout-session-view.tsx

@@ -45,11 +45,11 @@ import { useCheckoutGeo } from './use-checkout-geo'
 import { useCheckoutCustomerPrefill } from './use-checkout-customer-prefill'
 import { useCheckoutSession } from './use-checkout-session'
 
-export function CheckoutSessionView({ cartId }: { cartId: string }) {
+export function CheckoutSessionView({ cartToken }: { cartToken: string }) {
   const { store } = useSettings()
   const { session } = useAuth()
   const isAuthenticated = Boolean(session?.user)
-  const checkout = useCheckoutSession(cartId)
+  const checkout = useCheckoutSession(cartToken)
   const [stepFlow, setStepFlow] = useState<CheckoutStepFlow>(() => createCheckoutStepFlow())
   const [fieldErrors, setFieldErrors] = useState<
     Partial<Record<CheckoutFieldId, string>>
@@ -72,7 +72,7 @@ export function CheckoutSessionView({ cartId }: { cartId: string }) {
 
   const customerPrefill = useCheckoutCustomerPrefill({
     enabled: isAuthenticated && checkout.loadStatus === 'ready',
-    cartId,
+    cartToken,
     currency: store.currency,
     contact: checkout.contact,
     setContact: checkout.setContact,
@@ -298,7 +298,7 @@ export function CheckoutSessionView({ cartId }: { cartId: string }) {
         return
       }
       window.location.assign(
-        thankYouUrl(cartId, result.payment?.transactionId ?? undefined),
+        thankYouUrl(cartToken, result.payment?.transactionId ?? undefined),
       )
     } catch {
       /* formError en sesión */

package/src/components/checkout/format.ts

@@ -2,8 +2,8 @@ import type { CartCheckoutResponse } from '@ecomiq/core'
 
 export { formatMoney } from '../../format-money'
 
-export function thankYouUrl(cartId: string, transactionId?: string) {
-  const q = new URLSearchParams({ cartId })
+export function thankYouUrl(cartToken: string, transactionId?: string) {
+  const q = new URLSearchParams({ cartToken })
   if (transactionId) q.set('transactionId', transactionId)
   return `/thank-you?${q.toString()}`
 }

package/src/components/checkout/use-checkout-customer-prefill.ts

@@ -42,7 +42,7 @@ type ShippingFlatItem = { key: string }
 
 type UseCheckoutCustomerPrefillArgs = {
   enabled: boolean
-  cartId: string
+  cartToken: string
   currency: string
   contact: CheckoutContactForm
   setContact: Dispatch<SetStateAction<CheckoutContactForm>>
@@ -66,7 +66,7 @@ type UseCheckoutCustomerPrefillArgs = {
 
 export function useCheckoutCustomerPrefill({
   enabled,
-  cartId,
+  cartToken,
   currency,
   contact,
   setContact,
@@ -111,7 +111,7 @@ export function useCheckoutCustomerPrefill({
     setProfile(null)
     setSavedAddresses([])
     setSelectedSavedAddressId(null)
-  }, [cartId])
+  }, [cartToken])
 
   useEffect(() => {
     if (!enabled) return
@@ -139,7 +139,7 @@ export function useCheckoutCustomerPrefill({
         setIsLoadingCustomer(false)
       }
     })()
-  }, [enabled, cartId])
+  }, [enabled, cartToken])
 
   // Prefill perfil (campos vacíos).
   useEffect(() => {