diff --git a/dist/autofill-debug.js b/dist/autofill-debug.js
index 426f640fa..1924b9695 100644
--- a/dist/autofill-debug.js
+++ b/dist/autofill-debug.js
@@ -8650,6 +8650,11 @@ class InterfacePrototype {
}
postInit() {
const cleanup = this.scanner.init();
+ if (this.globalConfig.isExtension) {
+ this.deviceApi.notify(new _deviceApiCalls.AddDebugFlagCall({
+ flag: 'autofill'
+ }));
+ }
this.addLogoutListener(() => {
cleanup('Logged out');
if (this.globalConfig.isDDGDomain) {
@@ -9754,7 +9759,7 @@ class Form {
this.device = deviceInterface;
this.hasShadowTree = hasShadowTree;
- /** @type Record<'all' | SupportedMainTypes, Set> */
+ /** @type {Record<'all' | SupportedMainTypes, Set>} */
this.inputs = {
all: new Set(),
credentials: new Set(),
@@ -14190,7 +14195,6 @@ var _Form = require("./Form/Form.js");
var _constants = require("./constants.js");
var _matching = require("./Form/matching.js");
var _autofillUtils = require("./autofill-utils.js");
-var _deviceApiCalls = require("./deviceApiCalls/__generated__/deviceApiCalls.js");
const {
MAX_INPUTS_PER_PAGE,
MAX_FORMS_PER_PAGE,
@@ -14289,12 +14293,6 @@ class DefaultScanner {
*/
init() {
var _this = this;
- if (this.device.globalConfig.isExtension) {
- this.device.deviceApi.notify(new _deviceApiCalls.AddDebugFlagCall({
- flag: 'autofill'
- }));
- }
-
// Add the shadow DOM listener. Handlers in handleEvent
window.addEventListener('pointerdown', this, true);
// We don't listen for focus events on mobile, they can cause keyboard flashing
@@ -14627,7 +14625,7 @@ function createScanner(device, scannerOptions) {
});
}
-},{"./Form/Form.js":33,"./Form/matching.js":43,"./autofill-utils.js":62,"./constants.js":65,"./deviceApiCalls/__generated__/deviceApiCalls.js":66}],50:[function(require,module,exports){
+},{"./Form/Form.js":33,"./Form/matching.js":43,"./autofill-utils.js":62,"./constants.js":65}],50:[function(require,module,exports){
"use strict";
Object.defineProperty(exports, "__esModule", {
diff --git a/dist/autofill.js b/dist/autofill.js
index 0604e2738..a3c13b871 100644
--- a/dist/autofill.js
+++ b/dist/autofill.js
@@ -4484,6 +4484,11 @@ class InterfacePrototype {
}
postInit() {
const cleanup = this.scanner.init();
+ if (this.globalConfig.isExtension) {
+ this.deviceApi.notify(new _deviceApiCalls.AddDebugFlagCall({
+ flag: 'autofill'
+ }));
+ }
this.addLogoutListener(() => {
cleanup('Logged out');
if (this.globalConfig.isDDGDomain) {
@@ -5588,7 +5593,7 @@ class Form {
this.device = deviceInterface;
this.hasShadowTree = hasShadowTree;
- /** @type Record<'all' | SupportedMainTypes, Set> */
+ /** @type {Record<'all' | SupportedMainTypes, Set>} */
this.inputs = {
all: new Set(),
credentials: new Set(),
@@ -10024,7 +10029,6 @@ var _Form = require("./Form/Form.js");
var _constants = require("./constants.js");
var _matching = require("./Form/matching.js");
var _autofillUtils = require("./autofill-utils.js");
-var _deviceApiCalls = require("./deviceApiCalls/__generated__/deviceApiCalls.js");
const {
MAX_INPUTS_PER_PAGE,
MAX_FORMS_PER_PAGE,
@@ -10123,12 +10127,6 @@ class DefaultScanner {
*/
init() {
var _this = this;
- if (this.device.globalConfig.isExtension) {
- this.device.deviceApi.notify(new _deviceApiCalls.AddDebugFlagCall({
- flag: 'autofill'
- }));
- }
-
// Add the shadow DOM listener. Handlers in handleEvent
window.addEventListener('pointerdown', this, true);
// We don't listen for focus events on mobile, they can cause keyboard flashing
@@ -10461,7 +10459,7 @@ function createScanner(device, scannerOptions) {
});
}
-},{"./Form/Form.js":23,"./Form/matching.js":33,"./autofill-utils.js":52,"./constants.js":55,"./deviceApiCalls/__generated__/deviceApiCalls.js":56}],40:[function(require,module,exports){
+},{"./Form/Form.js":23,"./Form/matching.js":33,"./autofill-utils.js":52,"./constants.js":55}],40:[function(require,module,exports){
"use strict";
Object.defineProperty(exports, "__esModule", {
diff --git a/src/DeviceInterface/InterfacePrototype.js b/src/DeviceInterface/InterfacePrototype.js
index 003940986..e40e80117 100644
--- a/src/DeviceInterface/InterfacePrototype.js
+++ b/src/DeviceInterface/InterfacePrototype.js
@@ -19,7 +19,8 @@ import {DeviceApi} from '../../packages/device-api/index.js'
import {
GetAutofillCredentialsCall,
StoreFormDataCall,
- SendJSPixelCall
+ SendJSPixelCall,
+ AddDebugFlagCall
} from '../deviceApiCalls/__generated__/deviceApiCalls.js'
import {initFormSubmissionsApi} from './initFormSubmissionsApi.js'
import {EmailProtection} from '../EmailProtection.js'
@@ -313,6 +314,9 @@ class InterfacePrototype {
postInit () {
const cleanup = this.scanner.init()
+ if (this.globalConfig.isExtension) {
+ this.deviceApi.notify(new AddDebugFlagCall({ flag: 'autofill' }))
+ }
this.addLogoutListener(() => {
cleanup('Logged out')
if (this.globalConfig.isDDGDomain) {
diff --git a/src/Form/Form.js b/src/Form/Form.js
index 95f0c7516..962507543 100644
--- a/src/Form/Form.js
+++ b/src/Form/Form.js
@@ -61,7 +61,7 @@ class Form {
this.device = deviceInterface
this.hasShadowTree = hasShadowTree
- /** @type Record<'all' | SupportedMainTypes, Set> */
+ /** @type {Record<'all' | SupportedMainTypes, Set>} */
this.inputs = {
all: new Set(),
credentials: new Set(),
diff --git a/src/Scanner.debug.js b/src/Scanner.debug.js
index 1b861ab4f..04fef4459 100644
--- a/src/Scanner.debug.js
+++ b/src/Scanner.debug.js
@@ -1,7 +1,5 @@
import { createScanner } from './Scanner.js'
-sessionStorage.setItem('ddg-autofill-debug', 'true')
-
/**
* Scanner.debug.js
*
@@ -21,6 +19,12 @@ const mockInterface = {
inputType_credentials: true,
inputType_identities: true,
inputType_creditCards: true
+ },
+ populateDataIfNeeded: () => {
+ // console.log('populateDataIfNeeded');
+ },
+ canAutofillType: () => {
+ return true
}
},
globalConfig: {
@@ -34,12 +38,80 @@ const mockInterface = {
},
attachTooltip (...args) {
console.log('device.attachTooltip', args)
+ },
+ isTooltipActive: () => {
+ return false
+ },
+ get scanner() {
+ return state.scanner
}
}
-// @ts-ignore
-const scanner = createScanner(mockInterface, {
- initialDelay: 1 // allow debugging directly on macOS - if this was 0 then it would try to use requestIdleCallback, which is absent in WebKit
-})
+let state = {
+ /** @type {import('./Scanner.js').Scanner | undefined} */
+ scanner: undefined,
+ /** @type {HTMLSelectElement|null} */
+ list: document.querySelector('select[name="html-list"]'),
+}
+
+const url = new URL(window.location.href);
+const initial = url.searchParams.get('form');
+const log = url.searchParams.has('log');
-scanner.init()
+if (log) {
+ sessionStorage.setItem('ddg-autofill-debug', 'true')
+} else {
+ sessionStorage.setItem('ddg-autofill-debug', 'false')
+}
+
+loadList()
+ .then(() => {
+ if (initial) {
+ loadNewForm(initial).catch(console.error)
+ }
+ })
+
+
+async function loadList() {
+ const url = new URL(`/test-forms/index.json`, window.location.href);
+ fetch(url)
+ .then(response => response.json())
+ .then(x => {
+ x.forEach(item => {
+ const option = document.createElement('option');
+ option.value = item.html;
+ option.textContent = item.html;
+ state.list?.appendChild(option);
+ });
+ })
+}
+async function loadNewForm(filename) {
+ const url = new URL(`/test-forms/${filename}`, window.location.href);
+ fetch(url)
+ .then(response => response.text())
+ .then(html => {
+ let mainElement = document.querySelector('main');
+ if (mainElement) {
+ mainElement.innerHTML = html;
+ if (state.list) {
+ state.list.value = filename
+ }
+ state.scanner = createScanner(/** @type {any} */(mockInterface), {
+ initialDelay: 1 // allow debugging directly on macOS - if this was 0 then it would try to use requestIdleCallback, which is absent in WebKit
+ })
+ state.scanner?.init();
+ } else {
+ console.log("'main' element not found on the page.");
+ }
+ })
+ .catch(error => {
+ console.error('Error:', error);
+ });
+}
+
+document.querySelector('select[name="html-list"]')?.addEventListener('change', (e) => {
+ const elem = /** @type {HTMLSelectElement} */(e.target);
+ const next = new URL(window.location.href);
+ next.searchParams.set('form', elem.value);
+ window.location.href = next.href;
+})
diff --git a/src/Scanner.js b/src/Scanner.js
index 5a1fcd541..1e1df5ba8 100644
--- a/src/Scanner.js
+++ b/src/Scanner.js
@@ -7,7 +7,6 @@ import {
shouldLog, pierceShadowTree,
findEnclosedElements
} from './autofill-utils.js'
-import { AddDebugFlagCall } from './deviceApiCalls/__generated__/deviceApiCalls.js'
const {
MAX_INPUTS_PER_PAGE,
@@ -106,10 +105,6 @@ class DefaultScanner {
* @returns {(reason: string, ...rest) => void}
*/
init () {
- if (this.device.globalConfig.isExtension) {
- this.device.deviceApi.notify(new AddDebugFlagCall({ flag: 'autofill' }))
- }
-
// Add the shadow DOM listener. Handlers in handleEvent
window.addEventListener('pointerdown', this, true)
// We don't listen for focus events on mobile, they can cause keyboard flashing
diff --git a/src/scanner-debug.html b/src/scanner-debug.html
index 7d0e1f26c..105970b7a 100644
--- a/src/scanner-debug.html
+++ b/src/scanner-debug.html
@@ -6,15 +6,37 @@
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
Scanner Test
+
-
-
-
+
+
+