@rpascene/shared 0.30.14 → 0.30.15

package/dist/es/env/types.mjs

@@ -148,7 +148,8 @@ const YHT_STRING_ENV_KEYS = [
     'domain',
     'yht_access_token',
     'model',
-    'baseURL'
+    'baseURL',
+    'traceId'
 ];
 const YHT_NUMBER_ENV_KEYS = [
     'chatType',

package/dist/es/extractor/web-extractor.mjs

@@ -30,7 +30,7 @@ function collectElementInfo(node, currentWindow, currentDocument, baseZoom = 1,
         rect.left += basePoint.left;
         rect.top += basePoint.top;
     }
-    if (rect.height >= window.innerHeight && rect.width >= window.innerWidth) return null;
+    if (rect.height >= currentWindow.innerHeight && rect.width >= currentWindow.innerWidth) return null;
     if (isFormElement(node, currentWindow)) {
         const attributes = getNodeAttributes(node, currentWindow);
         let valueContent = attributes.value || attributes.placeholder || node.textContent || '';
@@ -65,6 +65,10 @@ function collectElementInfo(node, currentWindow, currentDocument, baseZoom = 1,
     if (isButtonElement(node, currentWindow)) {
         const rect = mergeElementAndChildrenRects(node, currentWindow, currentDocument, baseZoom);
         if (!rect) return null;
+        if (0 !== basePoint.left || 0 !== basePoint.top) {
+            rect.left += basePoint.left;
+            rect.top += basePoint.top;
+        }
         const attributes = getNodeAttributes(node, currentWindow);
         const pseudo = getPseudoElementContent(node, currentWindow);
         const content = node.innerText || pseudo.before || pseudo.after || '';
@@ -254,6 +258,20 @@ async function extractTreeNode(initNode, debugMode = false, basePoint = {
         }
         return nodeInfo;
     }
+    function getCssScale(ele) {
+        try {
+            const { width, height } = ele.getBoundingClientRect();
+            return {
+                cssScaleX: Number((width / ele.offsetWidth).toFixed(1)),
+                cssScaleY: Number((height / ele.offsetHeight).toFixed(1))
+            };
+        } catch (error) {
+            return {
+                cssScaleX: 1,
+                cssScaleY: 1
+            };
+        }
+    }
     const rootNodeInfo = dfs(startNode, window, document, baseZoom, basePoint);
     if (Array.isArray(rootNodeInfo)) topChildren.push(...rootNodeInfo);
     else if (rootNodeInfo) topChildren.push(rootNodeInfo);
@@ -262,6 +280,7 @@ async function extractTreeNode(initNode, debugMode = false, basePoint = {
         for(let i = 0; i < iframes.length; i++){
             const iframe = iframes[i];
             const iframeInfo = collectElementInfo(iframe, window, document, 1);
+            const baseZoom = getCssScale(iframe).cssScaleX;
             if (iframeInfo) {
                 const iframeChildren = await postWindowMessage(iframe.contentWindow, window, {
                     action: 'extractTreeNode',