@rpascene/shared 0.30.12 → 0.30.14

package/dist/es/constants/index.mjs

@@ -21,54 +21,100 @@ const DEFAULT_WAIT_FOR_NAVIGATION_TIMEOUT = 5000;
 const DEFAULT_WAIT_FOR_NETWORK_IDLE_TIMEOUT = 2000;
 const DEFAULT_WAIT_FOR_NETWORK_IDLE_TIME = 300;
 const DEFAULT_WAIT_FOR_NETWORK_IDLE_CONCURRENCY = 2;
+const rpasceneCommand = {
+    Tap: "Tap",
+    RightClick: "RightClick",
+    DoubleClick: "DoubleClick",
+    Hover: "Hover",
+    Input: "Input",
+    KeyboardPress: "KeyboardPress",
+    Scroll: "Scroll",
+    DragAndDrop: "DragAndDrop",
+    ClearInput: "ClearInput",
+    Sleep: "Sleep",
+    LongPress: "LongPress",
+    Swipe: "Swipe",
+    Reload: "Reload",
+    GoBack: "GoBack",
+    Navigate: 'Navigate'
+};
+const rpastudioCommand = {
+    SeleniumClickCommand: "SeleniumClickCommand",
+    SeleniumRightClickCommand: "SeleniumRightClickCommand",
+    SeleniumDoubleClickCommand: "SeleniumDoubleClickCommand",
+    SeleniumMouseHoverCommand: "SeleniumMouseHoverCommand",
+    SeleniumSetValueCommand: "SeleniumSetValueCommand",
+    SeleniumElementSendKeysCommand: "SeleniumElementSendKeysCommand",
+    SeleniumSendKeysCommand: "SeleniumSendKeysCommand",
+    SeleniumElementScrollCommand: 'SeleniumElementScrollCommand',
+    SeleniumWindowScrollCommand: 'SeleniumWindowScrollCommand',
+    SeleniumDragAndDropCommand: 'SeleniumDragAndDropCommand',
+    SeleniumClearValueCommand: "SeleniumClearValueCommand",
+    PauseCommand: "PauseCommand",
+    SeleniumBrowserRefreshCommand: "SeleniumBrowserRefreshCommand",
+    SeleniumBrowserNavigateBackCommand: 'SeleniumBrowserNavigateBackCommand',
+    SeleniumBrowserNavigateCommand: 'SeleniumBrowserNavigateCommand'
+};
 const commandMap = {
-    Tap: {
-        CommandName: "SeleniumClickCommand",
+    [rpasceneCommand.Tap]: {
+        CommandName: rpastudioCommand.SeleniumClickCommand,
         DisplayName: "\u5143\u7D20\u70B9\u51FB"
     },
-    RightClick: {
-        CommandName: "SeleniumRightClickCommand",
+    [rpasceneCommand.RightClick]: {
+        CommandName: rpastudioCommand.SeleniumRightClickCommand,
         DisplayName: "\u5143\u7D20\u53F3\u952E\u70B9\u51FB"
     },
-    DoubleClick: {
-        CommandName: "SeleniumDoubleClickCommand",
+    [rpasceneCommand.DoubleClick]: {
+        CommandName: rpastudioCommand.SeleniumDoubleClickCommand,
         DisplayName: "\u5143\u7D20\u53CC\u51FB"
     },
-    Hover: {
-        CommandName: "SeleniumMouseHoverCommand",
+    [rpasceneCommand.Hover]: {
+        CommandName: rpastudioCommand.SeleniumMouseHoverCommand,
         DisplayName: "\u9F20\u6807\u60AC\u505C"
     },
-    Input: {
-        CommandName: "SeleniumSetValueCommand",
+    [rpasceneCommand.Input]: {
+        CommandName: rpastudioCommand.SeleniumSetValueCommand,
         DisplayName: "\u8BBE\u7F6E\u6587\u672C"
     },
-    KeyboardPress: {
-        CommandName: "SeleniumSendKeysCommand",
+    [rpasceneCommand.KeyboardPress]: {
+        CommandName: rpastudioCommand.SeleniumElementSendKeysCommand,
         DisplayName: "\u6A21\u62DF\u6309\u952E"
     },
-    Scroll: {
-        CommandName: "SeleniumElementScrollCommand",
+    [rpasceneCommand.Scroll]: {
+        CommandName: rpastudioCommand.SeleniumElementScrollCommand,
         DisplayName: "\u5143\u7D20\u6EDA\u52A8"
     },
-    DragAndDrop: {
-        CommandName: "SeleniumDragDropCommand",
+    [rpasceneCommand.DragAndDrop]: {
+        CommandName: rpastudioCommand.SeleniumDragAndDropCommand,
         DisplayName: "\u5143\u7D20\u62D6\u62FD\uFF08\u81F3\u6307\u5B9A\u5143\u7D20\uFF09"
     },
-    ClearInput: {
-        CommandName: "SeleniumClearTextCommand",
+    [rpasceneCommand.ClearInput]: {
+        CommandName: rpastudioCommand.SeleniumClearValueCommand,
         DisplayName: "\u6E05\u7A7A\u6587\u672C"
     },
-    Sleep: {
-        CommandName: "SeleniumPauseCommand",
+    [rpasceneCommand.Sleep]: {
+        CommandName: rpastudioCommand.PauseCommand,
         DisplayName: "\u6682\u505C\u811A\u672C"
     },
-    LongPress: {
-        CommandName: "SeleniumSendKeysCommand",
-        DisplayName: "\u6A21\u62DF\u6309\u952E"
+    [rpasceneCommand.LongPress]: {
+        CommandName: "",
+        DisplayName: ""
     },
-    Swipe: {
-        CommandName: "SeleniumClickCommand",
-        DisplayName: "\u5143\u7D20\u70B9\u51FB"
+    [rpasceneCommand.Swipe]: {
+        CommandName: "",
+        DisplayName: ""
+    },
+    [rpasceneCommand.Reload]: {
+        CommandName: rpastudioCommand.SeleniumBrowserRefreshCommand,
+        DisplayName: "\u5237\u65B0"
+    },
+    [rpasceneCommand.GoBack]: {
+        CommandName: rpastudioCommand.SeleniumBrowserNavigateBackCommand,
+        DisplayName: "\u540E\u9000"
+    },
+    [rpasceneCommand.Navigate]: {
+        CommandName: rpastudioCommand.SeleniumBrowserNavigateCommand,
+        DisplayName: "\u6253\u5F00\u9875\u9762"
     }
 };
-export { CONTAINER_MINI_HEIGHT, CONTAINER_MINI_WIDTH, DEFAULT_WAIT_FOR_NAVIGATION_TIMEOUT, DEFAULT_WAIT_FOR_NETWORK_IDLE_CONCURRENCY, DEFAULT_WAIT_FOR_NETWORK_IDLE_TIME, DEFAULT_WAIT_FOR_NETWORK_IDLE_TIMEOUT, DEFAULT_WDA_PORT, constants_NodeType as NodeType, PLAYGROUND_SERVER_PORT, PLAYWRIGHT_EXAMPLE_CODE, SCRCPY_SERVER_PORT, TEXT_MAX_SIZE, TEXT_SIZE_THRESHOLD, WEBDRIVER_ELEMENT_ID_KEY, YAML_EXAMPLE_CODE, commandMap };
+export { CONTAINER_MINI_HEIGHT, CONTAINER_MINI_WIDTH, DEFAULT_WAIT_FOR_NAVIGATION_TIMEOUT, DEFAULT_WAIT_FOR_NETWORK_IDLE_CONCURRENCY, DEFAULT_WAIT_FOR_NETWORK_IDLE_TIME, DEFAULT_WAIT_FOR_NETWORK_IDLE_TIMEOUT, DEFAULT_WDA_PORT, constants_NodeType as NodeType, PLAYGROUND_SERVER_PORT, PLAYWRIGHT_EXAMPLE_CODE, SCRCPY_SERVER_PORT, TEXT_MAX_SIZE, TEXT_SIZE_THRESHOLD, WEBDRIVER_ELEMENT_ID_KEY, YAML_EXAMPLE_CODE, commandMap, rpasceneCommand, rpastudioCommand };

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

@@ -220,12 +220,9 @@ async function extractTreeNodeAsString(initNode, visibleOnly = false, debugMode
 async function extractTreeNode(initNode, debugMode = false, basePoint = {
     left: 0,
     top: 0
-}, baseZoom = 1, containerPaths = []) {
+}, baseZoom = 1) {
     setDebugMode(debugMode);
     indexId = 0;
-    let containerPathClone = [
-        ...containerPaths
-    ];
     const topDocument = getTopDocument();
     const startNode = initNode || topDocument;
     const topChildren = [];
@@ -236,11 +233,6 @@ async function extractTreeNode(initNode, debugMode = false, basePoint = {
         if (!node) return null;
         if (node.nodeType && 10 === node.nodeType) return null;
         const elementInfo = collectElementInfo(node, currentWindow, currentDocument, baseZoom, basePoint, false);
-        if (elementInfo) {
-            const allPaths = getLocators(node);
-            elementInfo.allPaths = allPaths;
-            elementInfo.containerPaths = containerPathClone;
-        }
         if (node instanceof currentWindow.HTMLIFrameElement) {
             if (node.contentWindow && node.contentWindow) return null;
         }
@@ -262,20 +254,6 @@ 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);
@@ -284,19 +262,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;
-            const containerPath = getContainerPath(iframe);
-            containerPathClone = containerPathClone.concat(containerPath);
-            if (iframeInfo) if (iframe.contentDocument && iframe.contentWindow) {
-                console.log("iframe\u540C\u57DF");
-                const iframeChildren = dfs(iframe.contentDocument.body, iframe.contentWindow, iframe.contentDocument, baseZoom, {
-                    left: iframeInfo.rect.left,
-                    top: iframeInfo.rect.top
-                });
-                if (Array.isArray(iframeChildren)) topChildren.push(...iframeChildren);
-                else if (iframeChildren) topChildren.push(iframeChildren);
-            } else {
-                console.log(iframeInfo, "iframe\u8DE8\u57DF\u4E86");
+            if (iframeInfo) {
                 const iframeChildren = await postWindowMessage(iframe.contentWindow, window, {
                     action: 'extractTreeNode',
                     data: {
@@ -304,8 +270,7 @@ async function extractTreeNode(initNode, debugMode = false, basePoint = {
                             left: iframeInfo.rect.left,
                             top: iframeInfo.rect.top
                         },
-                        baseZoom,
-                        containerPaths: containerPathClone
+                        baseZoom
                     }
                 });
                 if (Array.isArray(iframeChildren)) topChildren.push(...iframeChildren);
@@ -351,7 +316,7 @@ function mergeElementAndChildrenRects(node, currentWindow, currentDocument, base
 }
 if ('undefined' != typeof window) onWindowMessage(window, async ({ action, data }, { source })=>{
     if ('extractTreeNode' === action) try {
-        return await extractTreeNode(document.body, false, data.basePoint, data.baseZoom, data.containerPaths);
+        return await extractTreeNode(document.body, false, data.basePoint, data.baseZoom);
     } catch (error) {
         return {
             error: 'error message'