extension 3.17.0 → 3.18.1

package/dist/322.cjs

@@ -7,11 +7,11 @@ exports.modules = {
         __webpack_require__.d(__webpack_exports__, {
             setupCdpAfterLaunch: ()=>setupCdpAfterLaunch
         });
+        var external_fs_ = __webpack_require__("fs");
+        var external_path_ = __webpack_require__("path");
         var messages = __webpack_require__("./browsers/browsers-lib/messages.ts");
         var shared_utils = __webpack_require__("./browsers/browsers-lib/shared-utils.ts");
         var banner = __webpack_require__("./browsers/browsers-lib/banner.ts");
-        var external_path_ = __webpack_require__("path");
-        var external_fs_ = __webpack_require__("fs");
         var content_script_targets = __webpack_require__("./browsers/browsers-lib/content-script-targets.ts");
         var content_script_contracts = __webpack_require__("./browsers/browsers-lib/content-script-contracts.ts");
         var external_ws_ = __webpack_require__("ws");
@@ -60,7 +60,6 @@ exports.modules = {
             }
         }
         const CONTENT_ROOT_SELECTOR = '#extension-root,[data-extension-root]:not([data-extension-root="extension-js-devtools"])';
-        const NON_DEVTOOLS_CONTENT_ROOT_SELECTOR = '#extension-root,[data-extension-root]:not([data-extension-root="extension-js-devtools"])';
         const EXTENSION_ROOT_META_EXPRESSION = `(() => {
           const readGeneration = (node) => {
             try {
@@ -149,7 +148,7 @@ exports.modules = {
           const generations = roots
             .concat(markers)
             .map((entry) => entry.generation)
-            .concat(typeof page.generation === 'number' ? [page.generation] : [])
+            .concat(page && typeof page.generation === 'number' ? [page.generation] : [])
             .concat(
               registries
                 .map((entry) => entry.generation)
@@ -321,7 +320,7 @@ exports.modules = {
             if ('off' === includeShadow) return mainHTML;
             const hasVisibleContentRoot = await evaluateWithContentContext(cdp, sessionId, `(() => {
       try {
-        return !!document.querySelector(${JSON.stringify(NON_DEVTOOLS_CONTENT_ROOT_SELECTOR)})
+        return !!document.querySelector(${JSON.stringify(CONTENT_ROOT_SELECTOR)})
       } catch {
         return false
       }
@@ -330,7 +329,7 @@ exports.modules = {
             try {
                 const mergedHtmlRaw = await evaluateWithContentContext(cdp, sessionId, `(() => { try { 
         var cloned = document.documentElement.cloneNode(true); 
-        var selector = ${JSON.stringify(NON_DEVTOOLS_CONTENT_ROOT_SELECTOR)};
+        var selector = ${JSON.stringify(CONTENT_ROOT_SELECTOR)};
         var s = new XMLSerializer(); 
         try { 
           var liveHosts = Array.from(document.querySelectorAll(selector));
@@ -488,6 +487,7 @@ exports.modules = {
                 ws.on('close', ()=>{
                     if (isDev) console.log(messages.hE8());
                     onRejectPending('CDP connection closed');
+                    reject(new Error('CDP WebSocket closed before the connection opened'));
                 });
             });
         }
@@ -771,6 +771,55 @@ exports.modules = {
             async getPageHTML(sessionId, includeShadow = 'open-only') {
                 return getPageHTML(this, sessionId, includeShadow);
             }
+            async getClosedShadowRoots(sessionId, maxBytes = 65536) {
+                await this.sendCommand('DOM.enable', {}, sessionId);
+                const doc = await this.sendCommand('DOM.getDocument', {
+                    depth: -1,
+                    pierce: true
+                }, sessionId);
+                const found = [];
+                const walk = (node, hostName)=>{
+                    if (!node || 'object' != typeof node) return;
+                    const name = node.localName || node.nodeName || hostName;
+                    if (Array.isArray(node.shadowRoots)) for (const sr of node.shadowRoots){
+                        if (sr && 'closed' === sr.shadowRootType && 'number' == typeof sr.nodeId) found.push({
+                            nodeId: sr.nodeId,
+                            host: String(name)
+                        });
+                        walk(sr, name);
+                    }
+                    if (Array.isArray(node.children)) for (const c of node.children)walk(c, name);
+                    if (node.contentDocument) walk(node.contentDocument, name);
+                };
+                walk(doc.root, 'html');
+                const out = [];
+                for (const f of found)try {
+                    const oh = await this.sendCommand('DOM.getOuterHTML', {
+                        nodeId: f.nodeId
+                    }, sessionId);
+                    let html = String(oh?.outerHTML ?? '');
+                    let truncated = false;
+                    if (maxBytes > 0 && html.length > maxBytes) {
+                        html = html.slice(0, maxBytes);
+                        truncated = true;
+                    }
+                    out.push({
+                        host: f.host,
+                        type: 'closed',
+                        html,
+                        ...truncated ? {
+                            truncated
+                        } : {}
+                    });
+                } catch  {
+                    out.push({
+                        host: f.host,
+                        type: 'closed',
+                        html: ''
+                    });
+                }
+                return out;
+            }
             async closeTarget(targetId) {
                 await this.sendCommand('Target.closeTarget', {
                     targetId
@@ -1127,6 +1176,23 @@ exports.modules = {
             else obj[key] = value;
             return obj;
         }
+        const __fileReadCache = new Map();
+        function readTextFileCached(filePath) {
+            try {
+                const stat = external_fs_.statSync(filePath);
+                const key = `${stat.mtimeMs}:${stat.size}`;
+                const cached = __fileReadCache.get(filePath);
+                if (cached && cached.key === key) return cached.text;
+                const text = external_fs_.readFileSync(filePath, 'utf-8');
+                __fileReadCache.set(filePath, {
+                    key,
+                    text
+                });
+                return text;
+            } catch  {
+                return external_fs_.readFileSync(filePath, 'utf-8');
+            }
+        }
         class CDPExtensionController {
             async connect() {
                 if (this.cdp) return;
@@ -1155,7 +1221,7 @@ exports.modules = {
                         info = await this.cdp.getExtensionInfo(this.extensionId);
                     } catch  {}
                     if (!info) {
-                        const manifest = JSON.parse(external_fs_.readFileSync(external_path_.join(this.outPath, 'manifest.json'), 'utf-8'));
+                        const manifest = JSON.parse(readTextFileCached(external_path_.join(this.outPath, 'manifest.json')));
                         return {
                             extensionId: this.extensionId,
                             name: manifest.name,
@@ -1402,7 +1468,7 @@ exports.modules = {
                 for (const rule of matchingRules){
                     const bundlePath = (0, content_script_targets.nG)(this.outPath, rule.index, 'js');
                     if (!bundlePath || !external_fs_.existsSync(bundlePath)) continue;
-                    const source = this.patchReinjectSourceForInvalidatedRuntime(external_fs_.readFileSync(bundlePath, 'utf-8'));
+                    const source = this.patchReinjectSourceForInvalidatedRuntime(readTextFileCached(bundlePath));
                     if (!source.trim()) continue;
                     const bundleId = (0, content_script_contracts.Y)(rule.index);
                     const expression = this.buildReinjectExpression(bundleId, source, true);
@@ -1441,7 +1507,7 @@ exports.modules = {
                     if (!jsPath || !external_fs_.existsSync(jsPath)) return null;
                     const jsFile = external_path_.relative(this.outPath, jsPath).replace(/\\/g, '/');
                     const cssFile = cssPath && external_fs_.existsSync(cssPath) ? external_path_.relative(this.outPath, cssPath).replace(/\\/g, '/') : null;
-                    const jsSource = external_fs_.readFileSync(jsPath, 'utf-8');
+                    const jsSource = readTextFileCached(jsPath);
                     const buildTokenMatch = jsSource.match(/__EXTENSIONJS_REINJECT_BUILD_TOKEN\s*=\s*"([^"]+)"/);
                     const proofMatch = jsSource.match(/extjs-chromium-live-content-css-modules:script-primary-\d+/) || jsSource.match(/Live Update Proof [A-Za-z0-9_-]+/);
                     return {
@@ -1778,7 +1844,7 @@ exports.modules = {
                         version = info?.extensionInfo?.version;
                     } catch  {
                         try {
-                            const manifest = JSON.parse(external_fs_.readFileSync(external_path_.join(this.outPath, 'manifest.json'), 'utf-8'));
+                            const manifest = JSON.parse(readTextFileCached(external_path_.join(this.outPath, 'manifest.json')));
                             name = manifest?.name;
                             version = manifest?.version;
                         } catch  {}
@@ -1798,7 +1864,7 @@ exports.modules = {
                 const bundlePath = (0, content_script_targets.nG)(this.outPath, rule.index, 'js');
                 if (!bundlePath || !external_fs_.existsSync(bundlePath)) return false;
                 const sourceOverride = sourceOverridesByBundleId && 'object' == typeof sourceOverridesByBundleId ? sourceOverridesByBundleId[bundleId] : void 0;
-                const source = this.patchReinjectSourceForInvalidatedRuntime('string' == typeof sourceOverride ? sourceOverride : external_fs_.readFileSync(bundlePath, 'utf-8'));
+                const source = this.patchReinjectSourceForInvalidatedRuntime('string' == typeof sourceOverride ? sourceOverride : readTextFileCached(bundlePath));
                 const buildTokenMatch = source.match(/__EXTENSIONJS_REINJECT_BUILD_TOKEN\s*=\s*"([^"]+)"/);
                 const proofMatch = source.match(/extjs-chromium-live-content-css-modules:script-primary-\d+/) || source.match(/Live Update Proof [A-Za-z0-9_-]+/);
                 if (!source.trim()) return false;
@@ -2093,6 +2159,18 @@ exports.modules = {
             });
             await cdpExtensionController.connect();
             if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.M3V('127.0.0.1', chromeRemoteDebugPort));
+            try {
+                if (extensionOutputPath && Number.isFinite(chromeRemoteDebugPort)) {
+                    const readyPath = external_path_.join(external_path_.dirname(extensionOutputPath), 'extension-js', external_path_.basename(extensionOutputPath), 'ready.json');
+                    if (external_fs_.existsSync(readyPath)) {
+                        const ready = JSON.parse(external_fs_.readFileSync(readyPath, 'utf-8'));
+                        if (ready.cdpPort !== chromeRemoteDebugPort) {
+                            ready.cdpPort = chromeRemoteDebugPort;
+                            external_fs_.writeFileSync(readyPath, JSON.stringify(ready, null, 2));
+                        }
+                    }
+                }
+            } catch  {}
             const mode = compilation?.options?.mode || 'development';
             let earlyBannerPrinted = false;
             if ('development' === mode) try {