Fixed #2347 Guard against potentially resource intensive repeating actions like 99yt

Author: brookhong

README.md

@@ -571,7 +571,7 @@ Some functionalities are also available when you're using original pdf viewer, b
 | settings.defaultSearchEngine | "g" | The default search engine used in Omnibar. |
 | settings.blocklistPattern | undefined | A regex to match the sites that will have Surfingkeys disabled. |
 | settings.focusAfterClosed | "right" | Which tab will be focused after the current tab is closed. ["left", "right", "last"] |
-| settings.repeatThreshold | 99 | The maximum of actions to be repeated. |
+| settings.repeatThreshold | 9 | The maximum of actions to be repeated. |
 | settings.tabsMRUOrder | true | Whether to list opened tabs in order of most recently used beneath Omnibar. |
 | settings.historyMUOrder | true | Whether to list history in order of most used beneath Omnibar. |
 | settings.newTabPosition | 'default' | Where to new tab. ["left", "right", "first", "last", "default"] |

README_CN.md

@@ -555,7 +555,7 @@ Surfingkeys默认使用[这个markdown分析器](https://github.com/chjj/marked)
 | settings.defaultSearchEngine | "g" | 搜索栏里的默认搜索引擎。 |
 | settings.blocklistPattern | undefined | 如果当前访问的网站匹配设定的正则表达式，则禁用Surfingkeys。 |
 | settings.focusAfterClosed | "right" | 关掉当前标签页后，切换到哪一侧的标签页。["left", "right"] |
-| settings.repeatThreshold | 99 | 操作可重复最多次数。 |
+| settings.repeatThreshold | 9 | 操作可重复最多次数。 |
 | settings.tabsMRUOrder | true | 查找打开标签页时，是否按最近访问顺序列出所有标签页。 |
 | settings.historyMUOrder | true | 查找访问记录时，是否按最常访问顺序列出所有访问记录。 |
 | settings.newTabPosition | 'default' | 在哪个位置创建新标签页。["left", "right", "first", "default"] |

src/background/start.js

@@ -217,7 +217,6 @@ function start(browser) {
     var conf = {
         llm: { },
         focusAfterClosed: "right",
-        repeatThreshold: 99,
         tabsMRUOrder: true,
         newTabPosition: 'default',
         showTabIndices: false,
@@ -451,9 +450,6 @@ function start(browser) {
     }
     function handleMessage(_message, _sender, _sendResponse) {
         if (self.hasOwnProperty(_message.action)) {
-            if (_message.repeats > conf.repeatThreshold) {
-                _message.repeats = conf.repeatThreshold;
-            }
             var result = self[_message.action](_message, _sender, _sendResponse);
             if (_message.needResponse) {
                 if (result) {

src/content_scripts/common/mode.js

@@ -311,9 +311,18 @@ Mode.handleMapKey = function(event, onNoMatched) {
                     RUNTIME.repeats = parseInt(this.repeats) || 1;
                     event.sk_stopPropagation = (!this.map_node.meta.stopPropagation
                         || this.map_node.meta.stopPropagation(key));
-                    while(RUNTIME.repeats > 0) {
-                        code();
-                        RUNTIME.repeats--;
+                    if (RUNTIME.repeats > runtime.conf.repeatThreshold) {
+                        dispatchSKEvent("front", ['showDialog', `Do you really want to repeat this action (${this.map_node.meta.annotation}) ${RUNTIME.repeats} times?`, () => {
+                            while(RUNTIME.repeats > 0) {
+                                code();
+                                RUNTIME.repeats--;
+                            }
+                        }]);
+                    } else {
+                        while(RUNTIME.repeats > 0) {
+                            code();
+                            RUNTIME.repeats--;
+                        }
                     }
                     actionDone = Mode.finish(thisMode);
                 }

src/content_scripts/common/runtime.js

@@ -79,6 +79,7 @@ const runtime = (function() {
             omnibarTabsQuery: {},
             pageUrlRegex: [],
             prevLinkRegex: /(\b(prev|previous)\b)|上页|上一页|前页|上頁|上一頁|前頁|<<|«/i,
+            repeatThreshold: 9,
             richHintsForKeystroke: 1000,
             scrollStepSize: 70,
             showModeStatus: false,

src/content_scripts/front.js

@@ -439,12 +439,28 @@ function createFront(insert, normal, hints, visual, browser) {
         });
     };
 
+    let onDialogResponseOk = null;
+    _actions["dialogResponse"] = function (message) {
+        if (message.result === "Ok" && onDialogResponseOk) {
+            onDialogResponseOk();
+        } else {
+            onDialogResponseOk = null;
+        }
+    };
+
     skCallbacks = initSKFunctionListener("front", {
         showPopup: (content) => {
             self.command({
                 action: 'showPopup',
-                content: content
+                content
+            });
+        },
+        showDialog: (question, onOk) => {
+            self.command({
+                action: 'showDialog',
+                question
             });
+            onDialogResponseOk = onOk;
         },
         applySettingsFromSnippets: (us) => {
             applyUICommand({

src/content_scripts/ui/frontend.js

@@ -70,12 +70,13 @@ const Front = (function() {
     };
 
     var pressedHintKeys = "";
+    var _display;
     self.addEventListener('keydown', function(event) {
         if (Mode.isSpecialKeyOf("<Esc>", event.sk_keyName)) {
             self.hidePopup();
             event.sk_stopPropagation = true;
-        } else if (_tabs.style.display !== "none") {
-            const tabHints = _tabs.querySelectorAll('div>div.sk_tab_hint');
+        } else if (_display && _display.style.display !== "none") {
+            const tabHints = _display.querySelectorAll('div>div.sk_tab_hint');
             if (tabHints.length > 0) {
                 const key = event.sk_keyName;
                 const characters = hints.getCharacters().toLowerCase();
@@ -88,7 +89,7 @@ const Front = (function() {
                     pressedHintKeys = pressedHintKeys + key.toUpperCase();
                     const hintState = refreshHints(tabHints, pressedHintKeys);
                     if (hintState.matched) {
-                        _tabs.onHit(hintState.matched);
+                        _display.onHit(hintState.matched);
                         pressedHintKeys = "";
                         self.hidePopup();
                     } else if (hintState.candidates === 0) {
@@ -203,7 +204,6 @@ const Front = (function() {
     };
     var keystroke = document.getElementById('sk_keystroke');
 
-    var _display;
     self.startInputGuard = () => {
         if (getBrowserName().startsWith("Safari")) {
             var inputGuard = setInterval(() => {
@@ -487,6 +487,24 @@ const Front = (function() {
         showPopup(message.content);
     };
 
+    _actions['showDialog'] = function(message) {
+        showElement(_popup, () => {
+            const hintLabels = hints.genLabels(2);
+            setSanitizedContent(_popup, `<div>${message.question}</div><div><div class=sk_tab_hint>${hintLabels[0]}</div><span class=sk_tab_group_title>Ok</span><div class=sk_tab_hint>${hintLabels[1]}</div><span class=sk_tab_group_title>Cancel</span></div>`);
+            const tabHints = _popup.querySelectorAll("div.sk_tab_hint");
+            _popup.style.textAlign = "center";
+            tabHints[0].link = "Ok";
+            tabHints[0].label = hintLabels[0];
+            tabHints[1].link = "Cancel";
+            tabHints[1].label = hintLabels[1];
+        }, (matched) => {
+            self.contentCommand({
+                action: 'dialogResponse',
+                result: matched
+            });
+        });
+    };
+
     self.vimMappings = [];
     let _aceEditor = null;
     function renderAceEditor(message) {