@accelerated-agency/visual-editor 0.4.6 → 0.4.7

package/dist/vite.cjs

@@ -11,20 +11,6 @@ var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
 
 // src/visualEditorProxyPlugin.ts
-var SCRAPER_PROXY_HOST = process.env.SCRAPERAPI_PROXY_HOST || "proxy-server.scraperapi.com";
-var SCRAPER_PROXY_PORT = Number(process.env.SCRAPERAPI_PROXY_PORT || "8001");
-var SCRAPER_PROXY_USERNAME_BASE = process.env.SCRAPERAPI_PROXY_USERNAME_BASE || "scraperapi";
-var SCRAPER_PROXY_USERNAME_PARAMS = process.env.SCRAPERAPI_PROXY_USERNAME_PARAMS || "render=true.wait_for_selector=body.follow_redirect=false.keep_headers=true";
-var SCRAPER_PROXY_USERNAME = process.env.SCRAPERAPI_PROXY_USERNAME || [
-  SCRAPER_PROXY_USERNAME_BASE,
-  SCRAPER_PROXY_USERNAME_PARAMS
-].filter(Boolean).join(".");
-var SCRAPER_PROXY_PASSWORD = process.env.SCRAPERAPI_PROXY_PASSWORD || process.env.SCRAPERAPI_API_KEY;
-var SCRAPER_API_ENDPOINT = process.env.SCRAPERAPI_ENDPOINT || "https://api.scraperapi.com/";
-var SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED_RAW = process.env.SCRAPERAPI_REQUEST_TLS_REJECT_UNAUTHORIZED || "false";
-var SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED = !["0", "false", "no"].includes(
-  SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED_RAW.toLowerCase()
-);
 var DEFAULT_TRACKING_MARKERS = [
   "snowplow",
   "taboola",
@@ -122,30 +108,6 @@ function stripTrackingScriptsFromScrapedHtml(html, markers) {
   }
   return out;
 }
-var SCRAPER_BILLING_ERROR_RE = /exhausted the api credits|upgrade your subscription|enable overages|dashboard\.scraperapi\.com\/billing|insufficient credits|billing/i;
-var scraperProxyClientPromise = null;
-async function getScraperProxyClient() {
-  if (scraperProxyClientPromise) return scraperProxyClientPromise;
-  scraperProxyClientPromise = (async () => {
-    if (!SCRAPER_PROXY_PASSWORD) return null;
-    try {
-      const undici = await import('undici');
-      const proxyUrl = "http://" + encodeURIComponent(SCRAPER_PROXY_USERNAME) + ":" + encodeURIComponent(SCRAPER_PROXY_PASSWORD) + "@" + SCRAPER_PROXY_HOST + ":" + String(SCRAPER_PROXY_PORT);
-      return {
-        dispatcher: new undici.ProxyAgent({
-          uri: proxyUrl,
-          requestTls: {
-            rejectUnauthorized: SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED
-          }
-        }),
-        fetchFn: undici.fetch
-      };
-    } catch (_) {
-      return null;
-    }
-  })();
-  return scraperProxyClientPromise;
-}
 var iframeAlwaysShowCss = `<style id="__ce_force_show">
 
 </style>`;
@@ -3283,6 +3245,35 @@ function parseEditorUrlPayload(rawUrl) {
         password: nestedPassword || undefined,
       };
     }
+    var path = parsed.pathname || '';
+    var isProxyPath =
+      path === '/api/conversion-proxy' ||
+      path.indexOf('/api/conversion-proxy/') === 0 ||
+      path.indexOf('api/conversion-proxy') !== -1;
+    if (isProxyPath) {
+      var fallbackUrl = (experimentData && experimentData.pageUrl) ? String(experimentData.pageUrl) : '';
+      if (fallbackUrl) {
+        var recovered = new URL(fallbackUrl, window.location.href);
+        var qp = new URLSearchParams(parsed.search || '');
+        qp.delete('url');
+        qp.delete('password');
+        qp.delete('conversionProxyBaseUrl');
+        qp.delete('trackingMarkers');
+        qp.delete('strictObserverFreeze');
+        qp.delete('proxy');
+        qp.delete('raw');
+        recovered.search = '';
+        qp.forEach(function(v, k) { recovered.searchParams.set(k, v); });
+        recovered.hash = parsed.hash || '';
+        return {
+          url: recovered.toString(),
+          password:
+            (experimentData && experimentData.editorPassword)
+              ? String(experimentData.editorPassword)
+              : undefined,
+        };
+      }
+    }
     return {
       url: parsed.toString(),
       password:
@@ -3301,6 +3292,12 @@ function emitEditorUrlChangedPayload(payload) {
   var key = String(payload.url || '') + '|' + String(payload.password || '');
   if (key === lastEditorUrlPayloadKey) return;
   lastEditorUrlPayloadKey = key;
+  try {
+    console.info('[V2 iframe-url]', {
+      url: payload.url || '',
+      passwordPresent: !!payload.password,
+    });
+  } catch(_) {}
   send('editor-url-changed', payload);
 }
 function emitEditorUrlChanged(rawUrl) {
@@ -5073,6 +5070,67 @@ function stripDataVveInstanceSubtree(root) {
   }
 }
 
+function cssEscapeIdent(raw) {
+  var s = raw == null ? '' : String(raw);
+  if (!s) return '';
+  try {
+    if (typeof CSS !== 'undefined' && CSS && typeof CSS.escape === 'function') {
+      return CSS.escape(s);
+    }
+  } catch(_) {}
+  // Fallback escape for identifiers when CSS.escape is unavailable.
+  return s.replace(/[^a-zA-Z0-9_-]/g, function(ch) { return '\\\\' + ch; });
+}
+
+function unescapeCssToken(token) {
+  if (!token) return '';
+  var s = String(token);
+  var out = '';
+  for (var i = 0; i < s.length; i++) {
+    var ch = s.charAt(i);
+    if (ch === '\\\\' && i + 1 < s.length) {
+      out += s.charAt(i + 1);
+      i += 1;
+      continue;
+    }
+    out += ch;
+  }
+  return out;
+}
+
+function isGeneratedClassToken(token) {
+  var t = token == null ? '' : String(token).trim();
+  if (!t) return true;
+  if (t.indexOf('vve-') === 0) return true;
+  // Tailwind arbitrary values / variant-heavy utilities are often unstable in selectors.
+  if (
+    t.indexOf('[') !== -1 ||
+    t.indexOf(']') !== -1 ||
+    t.indexOf('(') !== -1 ||
+    t.indexOf(')') !== -1 ||
+    t.indexOf('{') !== -1 ||
+    t.indexOf('}') !== -1 ||
+    t.indexOf(':') !== -1
+  ) return true;
+  // CSS-in-JS / runtime hash prefixes.
+  if (/^(css|jsx|sc|emotion|styled|chakra|mantine|mui|ant)-/i.test(t)) return true;
+  // Classnames with long hashy suffixes (framework/runtime generated).
+  if (/[a-f0-9]{8,}/i.test(t)) return true;
+  if (/^[a-zA-Z_-]+[0-9]{4,}[a-zA-Z0-9_-]*$/.test(t)) return true;
+  if (/^[a-zA-Z0-9_-]{36,}$/.test(t)) return true;
+  return false;
+}
+
+function escapeSelectorClassTokens(sel) {
+  if (!sel || typeof sel !== 'string') return '';
+  return sel.replace(/.((?:\\.|[^s>+~:#.])+)/g, function(_m, cls) {
+    if (!cls) return _m;
+    // Already escaped token; keep it as-is.
+    if (cls.indexOf('\\\\') >= 0) return '.' + cls;
+    return '.' + cssEscapeIdent(cls);
+  });
+}
+
 function buildSelector(el) {
   if (!el) return '';
   var doc = el.ownerDocument || document;
@@ -5084,16 +5142,16 @@ function buildSelector(el) {
       if (doc.querySelectorAll(attrSel).length === 1) return attrSel;
     } catch(_) {}
   }
-  if (el.id) return '#' + el.id;
+  if (el.id) return '#' + cssEscapeIdent(el.id);
   var parts = [], node = el, depth = 0;
   while (node && node.nodeType === 1 && depth < 5) {
-    if (node.id) { parts.unshift('#' + node.id); break; }
+    if (node.id) { parts.unshift('#' + cssEscapeIdent(node.id)); break; }
     var p = node.tagName.toLowerCase();
     if (node.classList && node.classList.length) {
       var clsArr = Array.from(node.classList).filter(function(c) {
-        return c.indexOf('vve-') !== 0;
+        return c.indexOf('vve-') !== 0 && !isGeneratedClassToken(c);
       });
-      if (clsArr.length) p += '.' + clsArr.slice(0, 2).join('.');
+      if (clsArr.length) p += '.' + clsArr.slice(0, 2).map(function(c) { return cssEscapeIdent(c); }).join('.');
     }
     var idx = 1, sib = node.previousElementSibling;
     while (sib) { if (sib.tagName === node.tagName) idx++; sib = sib.previousElementSibling; }
@@ -5105,17 +5163,32 @@ function buildSelector(el) {
   return parts.join(' > ');
 }
 
+function stripGeneratedSelectorClassTokens(sel) {
+  if (!sel || typeof sel !== 'string') return '';
+  var s = sel.replace(/.((?:\\.|[^s>+~:#.])+)/g, function(_m, cls) {
+    var raw = unescapeCssToken(cls);
+    if (isGeneratedClassToken(raw)) return '';
+    return '.' + cssEscapeIdent(raw);
+  });
+  return s
+    .replace(/.{2,}/g, '.')
+    .replace(/s{2,}/g, ' ')
+    .replace(/s*>s*>/g, ' > ')
+    .trim();
+}
+
 /**
  * Strip editor-only .vve-* class tokens from a selector string (fixes DB rows saved while an element was selected).
  */
 function sanitizeSelectorForMatch(sel) {
   if (!sel || typeof sel !== 'string') return '';
   var s0 = sel.replace(/.vve-[a-zA-Z0-9_-]+/gi, '');
+  s0 = stripGeneratedSelectorClassTokens(s0);
   var parts = s0.split(/s*>s*/).map(function(seg) {
     var t = seg.replace(/.+/g, '.').replace(/.$/, '');
     return t.trim();
   });
-  return parts.filter(Boolean).join(' > ');
+  return escapeSelectorClassTokens(parts.filter(Boolean).join(' > '));
 }
 
 /** Drop the rightmost :nth-of-type(n) (hydration / layout often shifts sibling indices). */
@@ -5159,11 +5232,12 @@ function querySelectorResolved(iframeDoc, selector) {
     return null;
   }
   var alt = sanitizeSelectorForMatch(selector);
+  var escaped = escapeSelectorClassTokens(alt || selector);
   // Prefer sanitized + nth relax FIRST: raw selectors often still contain .vve-* from
   // save-time selection; those only match after clicking (we re-add vve-selected).
-  var el = walkRelax(alt || selector);
+  var el = walkRelax(escaped || alt || selector);
   if (el) return el;
-  if (alt !== selector) {
+  if (alt !== selector || escaped !== selector) {
     el = walkRelax(selector);
     if (el) return el;
   }
@@ -5830,6 +5904,12 @@ window.addEventListener('load', function() {
       if (!d || d.channel !== 'vvveb-proxy-url' || d.type !== 'editor-url-changed') return;
       if (!iframe || !iframe.contentWindow || ev.source !== iframe.contentWindow) return;
       var payload = d.payload || {};
+      try {
+        console.info('[V2 iframe-url bridge]', {
+          url: payload.url || '',
+          passwordPresent: !!payload.password,
+        });
+      } catch(_) {}
       emitEditorUrlChangedPayload({
         url: payload.url || undefined,
         password: payload.password || undefined,
@@ -6119,8 +6199,6 @@ function createVisualEditorMiddleware(options) {
           extraTrackingMarkersForRequest
         );
         const strictFreezeParam = (url.searchParams.get("strictObserverFreeze") || "").toLowerCase();
-        const proxyParam = (url.searchParams.get("proxy") || "").toLowerCase();
-        const useScraperProxy = proxyParam === "1" || proxyParam === "true" || proxyParam === "yes";
         const strictObserverFreezeForRequest = strictFreezeParam === "1" || strictFreezeParam === "true" || strictFreezeParam === "yes" ? true : strictFreezeParam === "0" || strictFreezeParam === "false" || strictFreezeParam === "no" ? false : strictObserverFreeze;
         if (!targetUrl) {
           res.statusCode = 400;
@@ -6130,40 +6208,7 @@ function createVisualEditorMiddleware(options) {
         const parsed = new URL(targetUrl);
         const origin = parsed.origin;
         const method = (req.method || "GET").toUpperCase();
-        const scraperProxyClient = useScraperProxy ? await getScraperProxyClient() : null;
-        if (useScraperProxy && !scraperProxyClient) {
-          res.statusCode = 500;
-          res.setHeader("Content-Type", "application/json");
-          res.end(
-            JSON.stringify({
-              error: "ScraperAPI proxy is not configured. Set SCRAPERAPI_PROXY_PASSWORD or SCRAPERAPI_API_KEY."
-            })
-          );
-          return;
-        }
         const directFetch = (input, init = {}) => fetch(input, init);
-        const scraperFetch = (input, init = {}) => {
-          if (!SCRAPER_PROXY_PASSWORD) return directFetch(input, init);
-          if (!useScraperProxy || !scraperProxyClient) {
-            const scraperUrl = new URL(SCRAPER_API_ENDPOINT);
-            scraperUrl.searchParams.set("api_key", SCRAPER_PROXY_PASSWORD);
-            scraperUrl.searchParams.set("url", input);
-            return fetch(scraperUrl.toString(), init);
-          }
-          return scraperProxyClient.fetchFn(input, {
-            ...init,
-            dispatcher: scraperProxyClient.dispatcher
-          });
-        };
-        const shouldFallbackFromScraper = async (resp) => {
-          try {
-            if (resp.ok) return false;
-            const text = await resp.clone().text();
-            return SCRAPER_BILLING_ERROR_RE.test(String(text || ""));
-          } catch (_) {
-            return false;
-          }
-        };
         const workerRawFetch = (input, init = {}) => {
           const workerUrl = new URL("/api/conversion-proxy", conversionProxyBaseUrlForRequest);
           workerUrl.searchParams.set("url", input);
@@ -6196,17 +6241,6 @@ function createVisualEditorMiddleware(options) {
             }
             return workerRawFetch(input, init);
           }
-          const primary = await scraperFetch(input, init);
-          if (!await shouldFallbackFromScraper(primary)) {
-            return primary;
-          }
-          try {
-            console.warn("[conversion-proxy] ScraperAPI billing/quota detected; falling back to direct fetch", {
-              url: input,
-              mode: useScraperProxy ? "proxy" : "simple"
-            });
-          } catch (_) {
-          }
           return directFetch(input, init);
         };
         const headers = {
@@ -6278,16 +6312,8 @@ function createVisualEditorMiddleware(options) {
           res.end(
             JSON.stringify({
               error: aborted ? `Upstream request timed out after ${upstreamTimeoutMs / 1e3}s` : fetchErr?.message || "Upstream fetch failed",
-              phase: useScraperProxy ? "scraperapi-proxy-fetch" : "scraperapi-simple-fetch",
-              fetchMode: useScraperProxy ? "proxy" : "simple",
-              scraperapi: {
-                host: SCRAPER_PROXY_HOST,
-                port: SCRAPER_PROXY_PORT,
-                username: SCRAPER_PROXY_USERNAME,
-                endpoint: SCRAPER_API_ENDPOINT,
-                hasProxyPassword: Boolean(SCRAPER_PROXY_PASSWORD),
-                requestTlsRejectUnauthorized: SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED
-              },
+              phase: conversionProxyBaseUrlForRequest ? "worker-raw-fetch" : "direct-upstream-fetch",
+              fetchMode: conversionProxyBaseUrlForRequest ? "worker" : "direct",
               cause: fetchCause && typeof fetchCause === "object" ? {
                 name: fetchCause.name,
                 code: fetchCause.code,
@@ -6473,8 +6499,51 @@ try{
     }
   }
 }catch(_){}
-function getEditorUrlPayload(){try{var u=new URL(window.location.href);var nested=u.searchParams.get("url");return{url:nested||u.toString(),password:u.searchParams.get("password")||undefined};}catch(_){return null;}}
-function notifyEditorUrlChanged(){try{var payload=getEditorUrlPayload();if(!payload)return;if(window.parent){window.parent.postMessage({channel:PARENT_URL_CHANNEL,type:"editor-url-changed",payload:payload},"*");}}catch(_){}}
+function getEditorUrlPayload(){
+  try{
+    var u=new URL(window.location.href);
+    var nested=u.searchParams.get("url");
+    if(nested){
+      return {url:nested,password:u.searchParams.get("password")||undefined};
+    }
+    var p=u.pathname||"";
+    var isProxyPath=p==="/api/conversion-proxy"||p.indexOf("/api/conversion-proxy/")===0||p.indexOf("api/conversion-proxy")!==-1;
+    if(isProxyPath){
+      var recoveredBase=new URL(TARGET_PAGE_URL,window.location.href);
+      var qp=new URLSearchParams(u.search||"");
+      qp.delete("url");
+      qp.delete("password");
+      qp.delete("conversionProxyBaseUrl");
+      qp.delete("trackingMarkers");
+      qp.delete("strictObserverFreeze");
+      qp.delete("proxy");
+      qp.delete("raw");
+      recoveredBase.search="";
+      qp.forEach(function(v,k){recoveredBase.searchParams.set(k,v);});
+      recoveredBase.hash=u.hash||"";
+      return {url:recoveredBase.toString(),password:u.searchParams.get("password")||undefined};
+    }
+    return {url:u.toString(),password:u.searchParams.get("password")||undefined};
+  }catch(_){
+    return null;
+  }
+}
+function notifyEditorUrlChanged(){
+  try{
+    var payload=getEditorUrlPayload();
+    if(!payload) return;
+    try{
+      console.info("[conversion-proxy] iframe url rendered",{
+        current:window.location.href,
+        target:payload.url||"",
+        passwordPresent:!!payload.password
+      });
+    }catch(_){}
+    if(window.parent){
+      window.parent.postMessage({channel:PARENT_URL_CHANNEL,type:"editor-url-changed",payload:payload},"*");
+    }
+  }catch(_){}
+}
 try{notifyEditorUrlChanged();}catch(_){}
 try{if(window.history&&typeof window.history.pushState==="function"){var nativePushState=window.history.pushState;window.history.pushState=function(){var ret=nativePushState.apply(window.history,arguments);setTimeout(notifyEditorUrlChanged,0);return ret;};}}catch(_){}
 try{if(window.history&&typeof window.history.replaceState==="function"){var nativeReplaceState=window.history.replaceState;window.history.replaceState=function(){var ret=nativeReplaceState.apply(window.history,arguments);setTimeout(notifyEditorUrlChanged,0);return ret;};}}catch(_){}
@@ -6482,7 +6551,29 @@ try{window.addEventListener("popstate",notifyEditorUrlChanged,true);}catch(_){}
 try{window.addEventListener("hashchange",notifyEditorUrlChanged,true);}catch(_){}
 function isSkippable(raw){if(!raw||typeof raw!=="string")return true;return raw.startsWith("data:")||raw.startsWith("blob:")||raw.startsWith("javascript:")||raw.startsWith("#");}
 function toAbsolute(raw){if(isSkippable(raw))return raw;try{var base=raw.startsWith("/")||raw.startsWith("//")?TARGET_ORIGIN:TARGET_PAGE_URL;return new URL(raw,base).toString();}catch(_){return raw;}}
-function toProxy(raw){if(isSkippable(raw))return null;var abs=toAbsolute(raw);if(!abs||typeof abs!=="string")return null;try{var parsed=new URL(abs);if(parsed.origin!==TARGET_ORIGIN)return null;var root="/api/conversion-proxy";return root+"?password="+encodeURIComponent(PROXY_PASSWORD||"")+"&url="+encodeURIComponent(parsed.toString());}catch(_){return null;}}
+function toProxy(raw){
+  if(isSkippable(raw))return null;
+  var abs=toAbsolute(raw);
+  if(!abs||typeof abs!=="string")return null;
+  try{
+    var parsed=new URL(abs);
+    // If input is already a proxy URL, unwrap to its target url first
+    // to avoid nested /api/conversion-proxy?url=/api/conversion-proxy?... chains.
+    var p=(parsed.pathname||"");
+    var isProxyPath=p==="/api/conversion-proxy"||p.indexOf("/api/conversion-proxy/")===0||p.indexOf("api/conversion-proxy")!==-1;
+    if(isProxyPath){
+      var nested=parsed.searchParams.get("url")||"";
+      if(nested){
+        try{parsed=new URL(nested);}catch(_){}
+      }
+    }
+    if(parsed.origin!==TARGET_ORIGIN)return null;
+    var root="/api/conversion-proxy";
+    return root+"?password="+encodeURIComponent(PROXY_PASSWORD||"")+"&url="+encodeURIComponent(parsed.toString());
+  }catch(_){
+    return null;
+  }
+}
 var nativeAssign=window.location.assign?window.location.assign.bind(window.location):null;
 var nativeReplace=window.location.replace?window.location.replace.bind(window.location):null;
 function safeNavigate(raw,mode){var abs=toAbsolute(raw);var prox=toProxy(raw);if(!prox){try{console.warn("[conversion-proxy] redirect blocked",{mode:mode,requested:raw,resolved:abs,origin:TARGET_ORIGIN});}catch(_){}return false;}try{console.info("[conversion-proxy] redirect intercepted",{mode:mode,requested:raw,resolved:abs,proxied:prox});if(mode==="replace"&&nativeReplace){nativeReplace(prox);return true;}if(nativeAssign){nativeAssign(prox);return true;}window.location.href=prox;return true;}catch(err){try{console.warn("[conversion-proxy] redirect interception failed",{mode:mode,requested:raw,resolved:abs,proxied:prox,error:err&&err.message?err.message:String(err)});}catch(_){}return false;}}
@@ -6556,6 +6647,15 @@ function toProxyNetworkUrl(raw){
   try{
     var base=raw.startsWith("/")?TARGET_ORIGIN:TARGET_PAGE_URL;
     var abs=new URL(raw,base);
+    // Unwrap already-proxied URLs first to avoid nested proxy urls.
+    var p0=abs.pathname||"";
+    var isProxyPath0=p0==="/api/conversion-proxy"||p0.indexOf("/api/conversion-proxy/")===0||p0.indexOf("api/conversion-proxy")!==-1;
+    if(isProxyPath0){
+      var nested0=abs.searchParams.get("url")||"";
+      if(nested0){
+        try{abs=new URL(nested0);}catch(_){}
+      }
+    }
     // Some embedded scripts build absolute requests against editor origin
     // (e.g. https://localhost:4001/api/unstable/graphql.json). Remap those
     // paths to target origin first, then proxy as usual.

package/dist/vite.js

@@ -3,20 +3,6 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 
 // src/visualEditorProxyPlugin.ts
-var SCRAPER_PROXY_HOST = process.env.SCRAPERAPI_PROXY_HOST || "proxy-server.scraperapi.com";
-var SCRAPER_PROXY_PORT = Number(process.env.SCRAPERAPI_PROXY_PORT || "8001");
-var SCRAPER_PROXY_USERNAME_BASE = process.env.SCRAPERAPI_PROXY_USERNAME_BASE || "scraperapi";
-var SCRAPER_PROXY_USERNAME_PARAMS = process.env.SCRAPERAPI_PROXY_USERNAME_PARAMS || "render=true.wait_for_selector=body.follow_redirect=false.keep_headers=true";
-var SCRAPER_PROXY_USERNAME = process.env.SCRAPERAPI_PROXY_USERNAME || [
-  SCRAPER_PROXY_USERNAME_BASE,
-  SCRAPER_PROXY_USERNAME_PARAMS
-].filter(Boolean).join(".");
-var SCRAPER_PROXY_PASSWORD = process.env.SCRAPERAPI_PROXY_PASSWORD || process.env.SCRAPERAPI_API_KEY;
-var SCRAPER_API_ENDPOINT = process.env.SCRAPERAPI_ENDPOINT || "https://api.scraperapi.com/";
-var SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED_RAW = process.env.SCRAPERAPI_REQUEST_TLS_REJECT_UNAUTHORIZED || "false";
-var SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED = !["0", "false", "no"].includes(
-  SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED_RAW.toLowerCase()
-);
 var DEFAULT_TRACKING_MARKERS = [
   "snowplow",
   "taboola",
@@ -114,30 +100,6 @@ function stripTrackingScriptsFromScrapedHtml(html, markers) {
   }
   return out;
 }
-var SCRAPER_BILLING_ERROR_RE = /exhausted the api credits|upgrade your subscription|enable overages|dashboard\.scraperapi\.com\/billing|insufficient credits|billing/i;
-var scraperProxyClientPromise = null;
-async function getScraperProxyClient() {
-  if (scraperProxyClientPromise) return scraperProxyClientPromise;
-  scraperProxyClientPromise = (async () => {
-    if (!SCRAPER_PROXY_PASSWORD) return null;
-    try {
-      const undici = await import('undici');
-      const proxyUrl = "http://" + encodeURIComponent(SCRAPER_PROXY_USERNAME) + ":" + encodeURIComponent(SCRAPER_PROXY_PASSWORD) + "@" + SCRAPER_PROXY_HOST + ":" + String(SCRAPER_PROXY_PORT);
-      return {
-        dispatcher: new undici.ProxyAgent({
-          uri: proxyUrl,
-          requestTls: {
-            rejectUnauthorized: SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED
-          }
-        }),
-        fetchFn: undici.fetch
-      };
-    } catch (_) {
-      return null;
-    }
-  })();
-  return scraperProxyClientPromise;
-}
 var iframeAlwaysShowCss = `<style id="__ce_force_show">
 
 </style>`;
@@ -3275,6 +3237,35 @@ function parseEditorUrlPayload(rawUrl) {
         password: nestedPassword || undefined,
       };
     }
+    var path = parsed.pathname || '';
+    var isProxyPath =
+      path === '/api/conversion-proxy' ||
+      path.indexOf('/api/conversion-proxy/') === 0 ||
+      path.indexOf('api/conversion-proxy') !== -1;
+    if (isProxyPath) {
+      var fallbackUrl = (experimentData && experimentData.pageUrl) ? String(experimentData.pageUrl) : '';
+      if (fallbackUrl) {
+        var recovered = new URL(fallbackUrl, window.location.href);
+        var qp = new URLSearchParams(parsed.search || '');
+        qp.delete('url');
+        qp.delete('password');
+        qp.delete('conversionProxyBaseUrl');
+        qp.delete('trackingMarkers');
+        qp.delete('strictObserverFreeze');
+        qp.delete('proxy');
+        qp.delete('raw');
+        recovered.search = '';
+        qp.forEach(function(v, k) { recovered.searchParams.set(k, v); });
+        recovered.hash = parsed.hash || '';
+        return {
+          url: recovered.toString(),
+          password:
+            (experimentData && experimentData.editorPassword)
+              ? String(experimentData.editorPassword)
+              : undefined,
+        };
+      }
+    }
     return {
       url: parsed.toString(),
       password:
@@ -3293,6 +3284,12 @@ function emitEditorUrlChangedPayload(payload) {
   var key = String(payload.url || '') + '|' + String(payload.password || '');
   if (key === lastEditorUrlPayloadKey) return;
   lastEditorUrlPayloadKey = key;
+  try {
+    console.info('[V2 iframe-url]', {
+      url: payload.url || '',
+      passwordPresent: !!payload.password,
+    });
+  } catch(_) {}
   send('editor-url-changed', payload);
 }
 function emitEditorUrlChanged(rawUrl) {
@@ -5065,6 +5062,67 @@ function stripDataVveInstanceSubtree(root) {
   }
 }
 
+function cssEscapeIdent(raw) {
+  var s = raw == null ? '' : String(raw);
+  if (!s) return '';
+  try {
+    if (typeof CSS !== 'undefined' && CSS && typeof CSS.escape === 'function') {
+      return CSS.escape(s);
+    }
+  } catch(_) {}
+  // Fallback escape for identifiers when CSS.escape is unavailable.
+  return s.replace(/[^a-zA-Z0-9_-]/g, function(ch) { return '\\\\' + ch; });
+}
+
+function unescapeCssToken(token) {
+  if (!token) return '';
+  var s = String(token);
+  var out = '';
+  for (var i = 0; i < s.length; i++) {
+    var ch = s.charAt(i);
+    if (ch === '\\\\' && i + 1 < s.length) {
+      out += s.charAt(i + 1);
+      i += 1;
+      continue;
+    }
+    out += ch;
+  }
+  return out;
+}
+
+function isGeneratedClassToken(token) {
+  var t = token == null ? '' : String(token).trim();
+  if (!t) return true;
+  if (t.indexOf('vve-') === 0) return true;
+  // Tailwind arbitrary values / variant-heavy utilities are often unstable in selectors.
+  if (
+    t.indexOf('[') !== -1 ||
+    t.indexOf(']') !== -1 ||
+    t.indexOf('(') !== -1 ||
+    t.indexOf(')') !== -1 ||
+    t.indexOf('{') !== -1 ||
+    t.indexOf('}') !== -1 ||
+    t.indexOf(':') !== -1
+  ) return true;
+  // CSS-in-JS / runtime hash prefixes.
+  if (/^(css|jsx|sc|emotion|styled|chakra|mantine|mui|ant)-/i.test(t)) return true;
+  // Classnames with long hashy suffixes (framework/runtime generated).
+  if (/[a-f0-9]{8,}/i.test(t)) return true;
+  if (/^[a-zA-Z_-]+[0-9]{4,}[a-zA-Z0-9_-]*$/.test(t)) return true;
+  if (/^[a-zA-Z0-9_-]{36,}$/.test(t)) return true;
+  return false;
+}
+
+function escapeSelectorClassTokens(sel) {
+  if (!sel || typeof sel !== 'string') return '';
+  return sel.replace(/.((?:\\.|[^s>+~:#.])+)/g, function(_m, cls) {
+    if (!cls) return _m;
+    // Already escaped token; keep it as-is.
+    if (cls.indexOf('\\\\') >= 0) return '.' + cls;
+    return '.' + cssEscapeIdent(cls);
+  });
+}
+
 function buildSelector(el) {
   if (!el) return '';
   var doc = el.ownerDocument || document;
@@ -5076,16 +5134,16 @@ function buildSelector(el) {
       if (doc.querySelectorAll(attrSel).length === 1) return attrSel;
     } catch(_) {}
   }
-  if (el.id) return '#' + el.id;
+  if (el.id) return '#' + cssEscapeIdent(el.id);
   var parts = [], node = el, depth = 0;
   while (node && node.nodeType === 1 && depth < 5) {
-    if (node.id) { parts.unshift('#' + node.id); break; }
+    if (node.id) { parts.unshift('#' + cssEscapeIdent(node.id)); break; }
     var p = node.tagName.toLowerCase();
     if (node.classList && node.classList.length) {
       var clsArr = Array.from(node.classList).filter(function(c) {
-        return c.indexOf('vve-') !== 0;
+        return c.indexOf('vve-') !== 0 && !isGeneratedClassToken(c);
       });
-      if (clsArr.length) p += '.' + clsArr.slice(0, 2).join('.');
+      if (clsArr.length) p += '.' + clsArr.slice(0, 2).map(function(c) { return cssEscapeIdent(c); }).join('.');
     }
     var idx = 1, sib = node.previousElementSibling;
     while (sib) { if (sib.tagName === node.tagName) idx++; sib = sib.previousElementSibling; }
@@ -5097,17 +5155,32 @@ function buildSelector(el) {
   return parts.join(' > ');
 }
 
+function stripGeneratedSelectorClassTokens(sel) {
+  if (!sel || typeof sel !== 'string') return '';
+  var s = sel.replace(/.((?:\\.|[^s>+~:#.])+)/g, function(_m, cls) {
+    var raw = unescapeCssToken(cls);
+    if (isGeneratedClassToken(raw)) return '';
+    return '.' + cssEscapeIdent(raw);
+  });
+  return s
+    .replace(/.{2,}/g, '.')
+    .replace(/s{2,}/g, ' ')
+    .replace(/s*>s*>/g, ' > ')
+    .trim();
+}
+
 /**
  * Strip editor-only .vve-* class tokens from a selector string (fixes DB rows saved while an element was selected).
  */
 function sanitizeSelectorForMatch(sel) {
   if (!sel || typeof sel !== 'string') return '';
   var s0 = sel.replace(/.vve-[a-zA-Z0-9_-]+/gi, '');
+  s0 = stripGeneratedSelectorClassTokens(s0);
   var parts = s0.split(/s*>s*/).map(function(seg) {
     var t = seg.replace(/.+/g, '.').replace(/.$/, '');
     return t.trim();
   });
-  return parts.filter(Boolean).join(' > ');
+  return escapeSelectorClassTokens(parts.filter(Boolean).join(' > '));
 }
 
 /** Drop the rightmost :nth-of-type(n) (hydration / layout often shifts sibling indices). */
@@ -5151,11 +5224,12 @@ function querySelectorResolved(iframeDoc, selector) {
     return null;
   }
   var alt = sanitizeSelectorForMatch(selector);
+  var escaped = escapeSelectorClassTokens(alt || selector);
   // Prefer sanitized + nth relax FIRST: raw selectors often still contain .vve-* from
   // save-time selection; those only match after clicking (we re-add vve-selected).
-  var el = walkRelax(alt || selector);
+  var el = walkRelax(escaped || alt || selector);
   if (el) return el;
-  if (alt !== selector) {
+  if (alt !== selector || escaped !== selector) {
     el = walkRelax(selector);
     if (el) return el;
   }
@@ -5822,6 +5896,12 @@ window.addEventListener('load', function() {
       if (!d || d.channel !== 'vvveb-proxy-url' || d.type !== 'editor-url-changed') return;
       if (!iframe || !iframe.contentWindow || ev.source !== iframe.contentWindow) return;
       var payload = d.payload || {};
+      try {
+        console.info('[V2 iframe-url bridge]', {
+          url: payload.url || '',
+          passwordPresent: !!payload.password,
+        });
+      } catch(_) {}
       emitEditorUrlChangedPayload({
         url: payload.url || undefined,
         password: payload.password || undefined,
@@ -6111,8 +6191,6 @@ function createVisualEditorMiddleware(options) {
           extraTrackingMarkersForRequest
         );
         const strictFreezeParam = (url.searchParams.get("strictObserverFreeze") || "").toLowerCase();
-        const proxyParam = (url.searchParams.get("proxy") || "").toLowerCase();
-        const useScraperProxy = proxyParam === "1" || proxyParam === "true" || proxyParam === "yes";
         const strictObserverFreezeForRequest = strictFreezeParam === "1" || strictFreezeParam === "true" || strictFreezeParam === "yes" ? true : strictFreezeParam === "0" || strictFreezeParam === "false" || strictFreezeParam === "no" ? false : strictObserverFreeze;
         if (!targetUrl) {
           res.statusCode = 400;
@@ -6122,40 +6200,7 @@ function createVisualEditorMiddleware(options) {
         const parsed = new URL(targetUrl);
         const origin = parsed.origin;
         const method = (req.method || "GET").toUpperCase();
-        const scraperProxyClient = useScraperProxy ? await getScraperProxyClient() : null;
-        if (useScraperProxy && !scraperProxyClient) {
-          res.statusCode = 500;
-          res.setHeader("Content-Type", "application/json");
-          res.end(
-            JSON.stringify({
-              error: "ScraperAPI proxy is not configured. Set SCRAPERAPI_PROXY_PASSWORD or SCRAPERAPI_API_KEY."
-            })
-          );
-          return;
-        }
         const directFetch = (input, init = {}) => fetch(input, init);
-        const scraperFetch = (input, init = {}) => {
-          if (!SCRAPER_PROXY_PASSWORD) return directFetch(input, init);
-          if (!useScraperProxy || !scraperProxyClient) {
-            const scraperUrl = new URL(SCRAPER_API_ENDPOINT);
-            scraperUrl.searchParams.set("api_key", SCRAPER_PROXY_PASSWORD);
-            scraperUrl.searchParams.set("url", input);
-            return fetch(scraperUrl.toString(), init);
-          }
-          return scraperProxyClient.fetchFn(input, {
-            ...init,
-            dispatcher: scraperProxyClient.dispatcher
-          });
-        };
-        const shouldFallbackFromScraper = async (resp) => {
-          try {
-            if (resp.ok) return false;
-            const text = await resp.clone().text();
-            return SCRAPER_BILLING_ERROR_RE.test(String(text || ""));
-          } catch (_) {
-            return false;
-          }
-        };
         const workerRawFetch = (input, init = {}) => {
           const workerUrl = new URL("/api/conversion-proxy", conversionProxyBaseUrlForRequest);
           workerUrl.searchParams.set("url", input);
@@ -6188,17 +6233,6 @@ function createVisualEditorMiddleware(options) {
             }
             return workerRawFetch(input, init);
           }
-          const primary = await scraperFetch(input, init);
-          if (!await shouldFallbackFromScraper(primary)) {
-            return primary;
-          }
-          try {
-            console.warn("[conversion-proxy] ScraperAPI billing/quota detected; falling back to direct fetch", {
-              url: input,
-              mode: useScraperProxy ? "proxy" : "simple"
-            });
-          } catch (_) {
-          }
           return directFetch(input, init);
         };
         const headers = {
@@ -6270,16 +6304,8 @@ function createVisualEditorMiddleware(options) {
           res.end(
             JSON.stringify({
               error: aborted ? `Upstream request timed out after ${upstreamTimeoutMs / 1e3}s` : fetchErr?.message || "Upstream fetch failed",
-              phase: useScraperProxy ? "scraperapi-proxy-fetch" : "scraperapi-simple-fetch",
-              fetchMode: useScraperProxy ? "proxy" : "simple",
-              scraperapi: {
-                host: SCRAPER_PROXY_HOST,
-                port: SCRAPER_PROXY_PORT,
-                username: SCRAPER_PROXY_USERNAME,
-                endpoint: SCRAPER_API_ENDPOINT,
-                hasProxyPassword: Boolean(SCRAPER_PROXY_PASSWORD),
-                requestTlsRejectUnauthorized: SCRAPER_REQUEST_TLS_REJECT_UNAUTHORIZED
-              },
+              phase: conversionProxyBaseUrlForRequest ? "worker-raw-fetch" : "direct-upstream-fetch",
+              fetchMode: conversionProxyBaseUrlForRequest ? "worker" : "direct",
               cause: fetchCause && typeof fetchCause === "object" ? {
                 name: fetchCause.name,
                 code: fetchCause.code,
@@ -6465,8 +6491,51 @@ try{
     }
   }
 }catch(_){}
-function getEditorUrlPayload(){try{var u=new URL(window.location.href);var nested=u.searchParams.get("url");return{url:nested||u.toString(),password:u.searchParams.get("password")||undefined};}catch(_){return null;}}
-function notifyEditorUrlChanged(){try{var payload=getEditorUrlPayload();if(!payload)return;if(window.parent){window.parent.postMessage({channel:PARENT_URL_CHANNEL,type:"editor-url-changed",payload:payload},"*");}}catch(_){}}
+function getEditorUrlPayload(){
+  try{
+    var u=new URL(window.location.href);
+    var nested=u.searchParams.get("url");
+    if(nested){
+      return {url:nested,password:u.searchParams.get("password")||undefined};
+    }
+    var p=u.pathname||"";
+    var isProxyPath=p==="/api/conversion-proxy"||p.indexOf("/api/conversion-proxy/")===0||p.indexOf("api/conversion-proxy")!==-1;
+    if(isProxyPath){
+      var recoveredBase=new URL(TARGET_PAGE_URL,window.location.href);
+      var qp=new URLSearchParams(u.search||"");
+      qp.delete("url");
+      qp.delete("password");
+      qp.delete("conversionProxyBaseUrl");
+      qp.delete("trackingMarkers");
+      qp.delete("strictObserverFreeze");
+      qp.delete("proxy");
+      qp.delete("raw");
+      recoveredBase.search="";
+      qp.forEach(function(v,k){recoveredBase.searchParams.set(k,v);});
+      recoveredBase.hash=u.hash||"";
+      return {url:recoveredBase.toString(),password:u.searchParams.get("password")||undefined};
+    }
+    return {url:u.toString(),password:u.searchParams.get("password")||undefined};
+  }catch(_){
+    return null;
+  }
+}
+function notifyEditorUrlChanged(){
+  try{
+    var payload=getEditorUrlPayload();
+    if(!payload) return;
+    try{
+      console.info("[conversion-proxy] iframe url rendered",{
+        current:window.location.href,
+        target:payload.url||"",
+        passwordPresent:!!payload.password
+      });
+    }catch(_){}
+    if(window.parent){
+      window.parent.postMessage({channel:PARENT_URL_CHANNEL,type:"editor-url-changed",payload:payload},"*");
+    }
+  }catch(_){}
+}
 try{notifyEditorUrlChanged();}catch(_){}
 try{if(window.history&&typeof window.history.pushState==="function"){var nativePushState=window.history.pushState;window.history.pushState=function(){var ret=nativePushState.apply(window.history,arguments);setTimeout(notifyEditorUrlChanged,0);return ret;};}}catch(_){}
 try{if(window.history&&typeof window.history.replaceState==="function"){var nativeReplaceState=window.history.replaceState;window.history.replaceState=function(){var ret=nativeReplaceState.apply(window.history,arguments);setTimeout(notifyEditorUrlChanged,0);return ret;};}}catch(_){}
@@ -6474,7 +6543,29 @@ try{window.addEventListener("popstate",notifyEditorUrlChanged,true);}catch(_){}
 try{window.addEventListener("hashchange",notifyEditorUrlChanged,true);}catch(_){}
 function isSkippable(raw){if(!raw||typeof raw!=="string")return true;return raw.startsWith("data:")||raw.startsWith("blob:")||raw.startsWith("javascript:")||raw.startsWith("#");}
 function toAbsolute(raw){if(isSkippable(raw))return raw;try{var base=raw.startsWith("/")||raw.startsWith("//")?TARGET_ORIGIN:TARGET_PAGE_URL;return new URL(raw,base).toString();}catch(_){return raw;}}
-function toProxy(raw){if(isSkippable(raw))return null;var abs=toAbsolute(raw);if(!abs||typeof abs!=="string")return null;try{var parsed=new URL(abs);if(parsed.origin!==TARGET_ORIGIN)return null;var root="/api/conversion-proxy";return root+"?password="+encodeURIComponent(PROXY_PASSWORD||"")+"&url="+encodeURIComponent(parsed.toString());}catch(_){return null;}}
+function toProxy(raw){
+  if(isSkippable(raw))return null;
+  var abs=toAbsolute(raw);
+  if(!abs||typeof abs!=="string")return null;
+  try{
+    var parsed=new URL(abs);
+    // If input is already a proxy URL, unwrap to its target url first
+    // to avoid nested /api/conversion-proxy?url=/api/conversion-proxy?... chains.
+    var p=(parsed.pathname||"");
+    var isProxyPath=p==="/api/conversion-proxy"||p.indexOf("/api/conversion-proxy/")===0||p.indexOf("api/conversion-proxy")!==-1;
+    if(isProxyPath){
+      var nested=parsed.searchParams.get("url")||"";
+      if(nested){
+        try{parsed=new URL(nested);}catch(_){}
+      }
+    }
+    if(parsed.origin!==TARGET_ORIGIN)return null;
+    var root="/api/conversion-proxy";
+    return root+"?password="+encodeURIComponent(PROXY_PASSWORD||"")+"&url="+encodeURIComponent(parsed.toString());
+  }catch(_){
+    return null;
+  }
+}
 var nativeAssign=window.location.assign?window.location.assign.bind(window.location):null;
 var nativeReplace=window.location.replace?window.location.replace.bind(window.location):null;
 function safeNavigate(raw,mode){var abs=toAbsolute(raw);var prox=toProxy(raw);if(!prox){try{console.warn("[conversion-proxy] redirect blocked",{mode:mode,requested:raw,resolved:abs,origin:TARGET_ORIGIN});}catch(_){}return false;}try{console.info("[conversion-proxy] redirect intercepted",{mode:mode,requested:raw,resolved:abs,proxied:prox});if(mode==="replace"&&nativeReplace){nativeReplace(prox);return true;}if(nativeAssign){nativeAssign(prox);return true;}window.location.href=prox;return true;}catch(err){try{console.warn("[conversion-proxy] redirect interception failed",{mode:mode,requested:raw,resolved:abs,proxied:prox,error:err&&err.message?err.message:String(err)});}catch(_){}return false;}}
@@ -6548,6 +6639,15 @@ function toProxyNetworkUrl(raw){
   try{
     var base=raw.startsWith("/")?TARGET_ORIGIN:TARGET_PAGE_URL;
     var abs=new URL(raw,base);
+    // Unwrap already-proxied URLs first to avoid nested proxy urls.
+    var p0=abs.pathname||"";
+    var isProxyPath0=p0==="/api/conversion-proxy"||p0.indexOf("/api/conversion-proxy/")===0||p0.indexOf("api/conversion-proxy")!==-1;
+    if(isProxyPath0){
+      var nested0=abs.searchParams.get("url")||"";
+      if(nested0){
+        try{abs=new URL(nested0);}catch(_){}
+      }
+    }
     // Some embedded scripts build absolute requests against editor origin
     // (e.g. https://localhost:4001/api/unstable/graphql.json). Remap those
     // paths to target origin first, then proxy as usual.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accelerated-agency/visual-editor",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "private": false,
   "description": "Conversion visual editor as a reusable React package",
   "type": "module",