Merge pull request #137 from peelar/misc

peelar · web-flow · commit f673c05c08ea · 2026-02-04T21:05:57.000+01:00
misc
diff --git a/.changeset/fix-export-signed-urls.md b/.changeset/fix-export-signed-urls.md
@@ -0,0 +1,5 @@
+---
+"dopeshot-app": patch
+---
+
+Fix image export failures when layouts include signed logo URLs by avoiding cache-busting on signed assets.
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,7 @@ yarn-error.log*
 .env
 .env.test
 .env.local
+.env.prod
 .env.development.local
 .env.test.local
 .env.production.local
diff --git a/apps/app/src/app/brand/page.tsx b/apps/app/src/app/brand/page.tsx
@@ -2,6 +2,7 @@ import { redirect } from "next/navigation";
 import { PlaygroundPage } from "@/app/(playground)/_components/playground-page";
 import { verifySession } from "@/lib/auth/session";
 import { getUserDb } from "@/lib/data/dal";
+import { FORCE_ONBOARDING_DEV } from "@/lib/dev-flags";
 import { getUserTier } from "@/lib/tier";
 import { isBrandPersonality } from "@/lib/types/brand";
 
@@ -60,7 +61,7 @@ export default async function Page() {
       looksCompleteFromProfile(profile);
   }
 
-  const initialOnboardingOpen = tier === "brand" && !onboardingComplete;
+  const initialOnboardingOpen = FORCE_ONBOARDING_DEV || (tier === "brand" && !onboardingComplete);
 
   return (
     <PlaygroundPage
diff --git a/apps/app/src/app/m/[itemId]/page.tsx b/apps/app/src/app/m/[itemId]/page.tsx
@@ -2,6 +2,7 @@ import { redirect } from "next/navigation";
 import { PlaygroundPage } from "@/app/(playground)/_components/playground-page";
 import { verifySession } from "@/lib/auth/session";
 import { getUserDb } from "@/lib/data/dal";
+import { FORCE_ONBOARDING_DEV } from "@/lib/dev-flags";
 import { getUserTier } from "@/lib/tier";
 import { isBrandPersonality } from "@/lib/types/brand";
 
@@ -82,7 +83,7 @@ export default async function Page({ params }: PageProps) {
       looksCompleteFromProfile(profile);
   }
 
-  const initialOnboardingOpen = tier === "brand" && !onboardingComplete;
+  const initialOnboardingOpen = FORCE_ONBOARDING_DEV || (tier === "brand" && !onboardingComplete);
 
   return (
     <PlaygroundPage
diff --git a/apps/app/src/app/page.tsx b/apps/app/src/app/page.tsx
@@ -1,6 +1,7 @@
 import { PlaygroundPage } from "@/app/(playground)/_components/playground-page";
 import { verifySession } from "@/lib/auth/session";
 import { getUserDb } from "@/lib/data/dal";
+import { FORCE_ONBOARDING_DEV } from "@/lib/dev-flags";
 import { getUserTier } from "@/lib/tier";
 import { isBrandPersonality } from "@/lib/types/brand";
 
@@ -57,7 +58,7 @@ export default async function Page() {
         looksCompleteFromProfile(profile);
     }
 
-    const initialOnboardingOpen = tier === "brand" && !onboardingComplete;
+    const initialOnboardingOpen = FORCE_ONBOARDING_DEV || (tier === "brand" && !onboardingComplete);
 
     return (
       <PlaygroundPage
diff --git a/apps/app/src/domain/layout/export.ts b/apps/app/src/domain/layout/export.ts
@@ -42,6 +42,22 @@ type ExportSizeOptions = {
   maxImageScale?: number;
 };
 
+function isSignedUrl(url: string): boolean {
+  if (!url) return false;
+  return (
+    url.includes("token=") ||
+    url.includes("X-Amz-Signature=") ||
+    url.includes("X-Amz-Algorithm=") ||
+    url.includes("X-Amz-Credential=") ||
+    url.includes("X-Amz-Date=")
+  );
+}
+
+function elementHasSignedUrlImages(element: HTMLElement): boolean {
+  const images = Array.from(element.querySelectorAll("img"));
+  return images.some((img) => isSignedUrl(img.currentSrc || img.src));
+}
+
 /**
  * Calculate the pixel ratio for export, clamped to [1, 3].
  * Defaults to device pixel ratio or 2 (whichever is higher).
@@ -100,14 +116,16 @@ export async function exportLayoutAsPngWithBlob(
   try {
     await waitForRender();
 
+    const hasSignedUrlImages = elementHasSignedUrlImages(element);
     const resolvedPixelRatio = calculatePixelRatio({
       desiredPixelRatio: pixelRatio,
       maxImageScale,
       devicePixelRatio: window.devicePixelRatio,
     });
 
     const dataUrl = await toPng(element, {
-      cacheBust: true,
+      // Signed URLs become invalid if we append cache-busting query params.
+      cacheBust: !hasSignedUrlImages,
       pixelRatio: resolvedPixelRatio,
       width,
       height,
@@ -201,10 +219,11 @@ export async function generateThumbnail(elementId: string): Promise<string> {
   try {
     await waitForRender();
 
+    const hasSignedUrlImages = elementHasSignedUrlImages(element);
     // Capture full element at low resolution for thumbnail
     // CSS handles display sizing - we just need a lightweight capture
     const dataUrl = await toPng(element, {
-      cacheBust: true,
+      cacheBust: !hasSignedUrlImages,
       pixelRatio: 0.5, // Half resolution for smaller file size
       style: {
         visibility: "visible",
diff --git a/apps/app/src/hooks/use-onboarding-status.ts b/apps/app/src/hooks/use-onboarding-status.ts
@@ -3,15 +3,13 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { useSession } from "@/lib/auth/auth-client";
+import { FORCE_ONBOARDING_DEV } from "@/lib/dev-flags";
 
 type OnboardingStatusPayload = {
   tier: "free" | "brand";
   onboardingComplete: boolean;
 };
 
-const FORCE_ONBOARDING_DEV =
-  process.env.NODE_ENV === "development" && process.env.NEXT_PUBLIC_FORCE_ONBOARDING === "true";
-
 export function useOnboardingStatus(options?: { enabled?: boolean }) {
   const { data: session, isPending } = useSession();
   const enabled = options?.enabled ?? true;
diff --git a/apps/app/src/lib/dev-flags.ts b/apps/app/src/lib/dev-flags.ts
@@ -0,0 +1,4 @@
+const isDevelopment = process.env.NODE_ENV === "development";
+
+export const FORCE_ONBOARDING_DEV =
+  isDevelopment && process.env.NEXT_PUBLIC_FORCE_ONBOARDING === "true";
diff --git a/scripts/sql/run.sh b/scripts/sql/run.sh
@@ -93,6 +93,17 @@ strip_quotes() {
   echo "$s"
 }
 
+set_sql_url() {
+  local value="$1"
+  local label="$2"
+  local cleaned
+  cleaned="$(strip_quotes "$value")"
+  if [[ -z "$SQL_URL" && -n "$cleaned" ]]; then
+    SQL_URL="$cleaned"
+    SQL_URL_SOURCE="$label"
+  fi
+}
+
 read_env_value() {
   local key="$1"
   local file="$2"
@@ -102,10 +113,13 @@ read_env_value() {
 }
 
 SQL_URL=""
+SQL_URL_SOURCE=""
 ENV_FILE=""
+ENVIRONMENT_UPPER="$(echo "${ENVIRONMENT:-}" | tr '[:lower:]' '[:upper:]')"
 
 if [[ -n "$URL_OVERRIDE" ]]; then
   SQL_URL="$(strip_quotes "$URL_OVERRIDE")"
+  SQL_URL_SOURCE="--url"
   ENV_FILE="(override: --url)"
 else
   if [[ "$ENVIRONMENT" != "staging" && "$ENVIRONMENT" != "prod" && "$ENVIRONMENT" != "local" ]]; then
@@ -115,37 +129,96 @@ else
 
   if [[ "$ENVIRONMENT" == "staging" ]]; then
     ENV_FILE="${STAGING_ENV_FILE:-${ENV_FILE:-$APP_DIR/.env.local}}"
+    ENV_DIRECT_FROM_FILE="$(read_env_value "STAGING_DIRECT_DATABASE_URL" "$ENV_FILE")"
     DIRECT_FROM_FILE="$(read_env_value "DIRECT_DATABASE_URL" "$ENV_FILE")"
     DIRECT_ALT_FROM_FILE="$(read_env_value "DIRECT_URL" "$ENV_FILE")"
-    SQL_URL="${STAGING_DIRECT_DATABASE_URL:-${DIRECT_DATABASE_URL:-${DIRECT_URL:-${DIRECT_FROM_FILE:-$DIRECT_ALT_FROM_FILE}}}}"
+    set_sql_url "${STAGING_DIRECT_DATABASE_URL:-}" "STAGING_DIRECT_DATABASE_URL (env)"
+    set_sql_url "${DIRECT_DATABASE_URL:-}" "DIRECT_DATABASE_URL (env)"
+    set_sql_url "${DIRECT_URL:-}" "DIRECT_URL (env)"
+    set_sql_url "${ENV_DIRECT_FROM_FILE:-}" "STAGING_DIRECT_DATABASE_URL ($ENV_FILE)"
+    set_sql_url "${DIRECT_FROM_FILE:-}" "DIRECT_DATABASE_URL ($ENV_FILE)"
+    set_sql_url "${DIRECT_ALT_FROM_FILE:-}" "DIRECT_URL ($ENV_FILE)"
   elif [[ "$ENVIRONMENT" == "prod" ]]; then
     ENV_FILE="${PROD_ENV_FILE:-$APP_DIR/.env.prod}"
+    if [[ ! -f "$ENV_FILE" && -z "${PROD_DIRECT_DATABASE_URL:-}" && -z "${DIRECT_DATABASE_URL:-}" && -z "${DIRECT_URL:-}" ]]; then
+      cat <<EOF
+Error: prod env file not found: $ENV_FILE
+
+Set one of the following:
+  - Create $ENV_FILE (recommended)
+  - Set PROD_ENV_FILE=/path/to/env
+  - Export PROD_DIRECT_DATABASE_URL in your shell
+  - Use --url 'postgresql://...'
+EOF
+      exit 1
+    fi
+    ALLOW_PROD_URL=0
+    if [[ "${PROD_SQL_CONFIRMED:-}" == "yes" || "${npm_lifecycle_event:-}" == "sql:prod" ]]; then
+      ALLOW_PROD_URL=1
+    fi
+    if [[ "$ALLOW_PROD_URL" -eq 1 ]]; then
+      ENV_DIRECT_FROM_FILE="$(read_env_value "PROD_DIRECT_DATABASE_URL" "$ENV_FILE")"
+      PROD_DIRECT_FROM_ENV="${PROD_DIRECT_DATABASE_URL:-}"
+    else
+      ENV_DIRECT_FROM_FILE=""
+      PROD_DIRECT_FROM_ENV=""
+    fi
     DIRECT_FROM_FILE="$(read_env_value "DIRECT_DATABASE_URL" "$ENV_FILE")"
     DIRECT_ALT_FROM_FILE="$(read_env_value "DIRECT_URL" "$ENV_FILE")"
-    SQL_URL="${PROD_DIRECT_DATABASE_URL:-${DIRECT_DATABASE_URL:-${DIRECT_URL:-${DIRECT_FROM_FILE:-$DIRECT_ALT_FROM_FILE}}}}"
+    set_sql_url "${PROD_DIRECT_FROM_ENV:-}" "PROD_DIRECT_DATABASE_URL (env)"
+    set_sql_url "${DIRECT_DATABASE_URL:-}" "DIRECT_DATABASE_URL (env)"
+    set_sql_url "${DIRECT_URL:-}" "DIRECT_URL (env)"
+    set_sql_url "${ENV_DIRECT_FROM_FILE:-}" "PROD_DIRECT_DATABASE_URL ($ENV_FILE)"
+    set_sql_url "${DIRECT_FROM_FILE:-}" "DIRECT_DATABASE_URL ($ENV_FILE)"
+    set_sql_url "${DIRECT_ALT_FROM_FILE:-}" "DIRECT_URL ($ENV_FILE)"
   else
     ENV_FILE="${LOCAL_ENV_FILE:-${ENV_FILE:-$APP_DIR/.env.local}}"
     DIRECT_FROM_FILE="$(read_env_value "DIRECT_DATABASE_URL" "$ENV_FILE")"
     DIRECT_ALT_FROM_FILE="$(read_env_value "DIRECT_URL" "$ENV_FILE")"
-    SQL_URL="${DIRECT_DATABASE_URL:-${DIRECT_URL:-${DIRECT_FROM_FILE:-$DIRECT_ALT_FROM_FILE}}}"
+    set_sql_url "${DIRECT_DATABASE_URL:-}" "DIRECT_DATABASE_URL (env)"
+    set_sql_url "${DIRECT_URL:-}" "DIRECT_URL (env)"
+    set_sql_url "${DIRECT_FROM_FILE:-}" "DIRECT_DATABASE_URL ($ENV_FILE)"
+    set_sql_url "${DIRECT_ALT_FROM_FILE:-}" "DIRECT_URL ($ENV_FILE)"
   fi
-
-  SQL_URL="$(strip_quotes "${SQL_URL:-}")"
 fi
 
 if [[ -z "$SQL_URL" ]]; then
   cat <<EOF
 No database URL found.
 
 Set one of the following:
+  - ${ENVIRONMENT_UPPER}_DIRECT_DATABASE_URL in $ENV_FILE
   - DIRECT_DATABASE_URL in $ENV_FILE
   - DIRECT_URL in $ENV_FILE
-  - ${ENVIRONMENT^^}_DIRECT_DATABASE_URL in your shell
+  - ${ENVIRONMENT_UPPER}_DIRECT_DATABASE_URL in your shell
   - Use --url 'postgresql://...'
 EOF
+  if [[ "$ENVIRONMENT" == "prod" && "${ALLOW_PROD_URL:-0}" -eq 0 ]]; then
+    echo
+    echo "Note: PROD_DIRECT_DATABASE_URL is only read when running via 'pnpm sql:prod' (or with PROD_SQL_CONFIRMED=yes)."
+  fi
+  exit 1
+fi
+
+if [[ "$SQL_URL" == =* ]]; then
+  echo "Error: invalid database URL (starts with '='). Check for a double '=' in your env file."
   exit 1
 fi
 
+if [[ "$SQL_URL" =~ [[:space:]] ]]; then
+  echo "Error: invalid database URL (contains whitespace)."
+  exit 1
+fi
+
+case "$SQL_URL" in
+  postgres://*|postgresql://*)
+    ;;
+  *)
+    echo "Error: invalid database URL (expected postgres:// or postgresql://)."
+    exit 1
+    ;;
+esac
+
 if [[ "$ENVIRONMENT" == "prod" && "$DRY_RUN" -eq 0 ]]; then
   if [[ "${PROD_SQL_CONFIRMED:-}" != "yes" ]]; then
     cat <<'EOF'
@@ -193,6 +266,11 @@ if [[ "$DRY_RUN" -eq 1 ]]; then
   echo "  Environment: $ENVIRONMENT"
   echo "  Script: $SCRIPT_PATH"
   echo "  Env file: $ENV_FILE"
+  if [[ -n "$SQL_URL_SOURCE" ]]; then
+    echo "  URL source: $SQL_URL_SOURCE"
+  else
+    echo "  URL source: (unknown)"
+  fi
   if [[ "${VAR_KEYS[*]-}" != "" ]]; then
     echo "  Vars: ${VAR_KEYS[*]}"
   else

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"dopeshot-app": patch
 +---
++
 +Fix image export failures when layouts include signed logo URLs by avoiding cache-busting on signed assets.