extension-develop 3.5.0 → 3.6.0

package/README.md

@@ -101,20 +101,31 @@ Options accepted by each command. Values shown are typical types or enumerations
 
 ### dev
 
-| Option        | Type / Values                       | Description                                                                       |
-| ------------- | ----------------------------------- | --------------------------------------------------------------------------------- |
-| mode          | development, production, none       | Build mode                                                                        |
-| polyfill      | boolean                             | Include `webextension-polyfill` when possible                                     |
-| port          | number or string                    | Dev server port                                                                   |
-| source        | string                              | Inspect a source directory                                                        |
-| watchSource   | boolean                             | Watch the source directory                                                        |
-| logs          | off,error,warn,info,debug,trace,all | Unified logger verbosity (all shows everything)                                   |
-| logContext    | list or `all`                       | Comma-separated contexts (background,content,page,sidebar,popup,options,devtools) |
-| logFormat     | pretty,json                         | Pretty text or JSON output                                                        |
-| logTimestamps | boolean                             | Include timestamps in pretty output                                               |
-| logColor      | boolean                             | Colorize pretty output                                                            |
-| logUrl        | string or /regex/flags              | Filter by URL substring or JS-style regex literal                                 |
-| logTab        | number                              | Filter by tabId                                                                   |
+| Option              | Type / Values                       | Description                                                                       |
+| ------------------- | ----------------------------------- | --------------------------------------------------------------------------------- |
+| mode                | development, production, none       | Build mode                                                                        |
+| polyfill            | boolean                             | Include `webextension-polyfill` when possible                                     |
+| port                | number or string                    | Dev server port                                                                   |
+| source              | string                              | Inspect a source directory                                                        |
+| watchSource         | boolean                             | Watch the source directory                                                        |
+| sourceFormat        | pretty,json,ndjson                  | Output format for source HTML                                                     |
+| sourceSummary       | boolean                             | Output a compact summary instead of full HTML                                     |
+| sourceMeta          | boolean                             | Output page metadata (readyState, viewport, frames)                               |
+| sourceProbe         | string[]                            | CSS selectors to probe for quick validation                                       |
+| sourceTree          | off,root-only                       | Output a compact extension root tree                                              |
+| sourceConsole       | boolean                             | Output console summary (best-effort)                                              |
+| sourceDom           | boolean                             | Output DOM snapshots and diffs                                                    |
+| sourceMaxBytes      | number                              | Limit HTML output size in bytes (0 disables truncation)                           |
+| sourceRedact        | off,safe,strict                     | Redact sensitive content in HTML output                                           |
+| sourceIncludeShadow | off,open-only,all                   | Control Shadow DOM inclusion                                                      |
+| sourceDiff          | boolean                             | Include diff metadata on watch updates                                            |
+| logs                | off,error,warn,info,debug,trace,all | Unified logger verbosity (all shows everything)                                   |
+| logContext          | list or `all`                       | Comma-separated contexts (background,content,page,sidebar,popup,options,devtools) |
+| logFormat           | pretty,json,ndjson                  | Pretty text or JSON/NDJSON output                                                 |
+| logTimestamps       | boolean                             | Include timestamps in pretty output                                               |
+| logColor            | boolean                             | Colorize pretty output                                                            |
+| logUrl              | string or /regex/flags              | Filter by URL substring or JS-style regex literal                                 |
+| logTab              | number                              | Filter by tabId                                                                   |
 
 ### build
 
@@ -161,7 +172,7 @@ Options accepted by each command. Values shown are typical types or enumerations
 - Supported sections:
   - config(config: Configuration): mutate the assembled Rspack config. Supports a function or a plain object. When an object is provided, it is deep‑merged on top of the assembled config.
   - commands.dev | .build | .start | .preview: per‑command options (browser, profile, binaries, flags, preferences, unified logger defaults, packaging). These defaults are applied for all respective commands.
-  - browser.chrome | .firefox | .edge | .chromium-based | .gecko-based: start flags, excluded flags, preferences, binaries, and profile reuse (persistProfile).
+- browser.chrome | .firefox | .edge | .chromium-based | .gecko-based: start flags, excluded flags, preferences, binaries, profile reuse (persistProfile), and per-browser `extensions`.
   - extensions: load-only companion extensions (unpacked dirs) loaded alongside your extension in dev/preview/start.
     - Example: { dir: "./extensions" } loads every "./extensions/\*" folder that contains a manifest.json.
 - Precedence when composing options: browser._ → commands._ → CLI flags. CLI flags always win over config defaults.
@@ -180,9 +191,13 @@ Use this when you have other unpacked extensions you want loaded alongside your
 - **How they’re loaded**: they’re appended into the browser runner’s `--load-extension` list (Chromium) / addon install list (Firefox) **before** your extension. Your extension is always loaded last for precedence.
 - **Discovery**:
   - `extensions.dir`: scans one level deep (e.g. `./extensions/*/manifest.json`)
+    - When `dir` points to `./extensions`, browser folders like `./extensions/chrome/*` and `./extensions/firefox/*` are also scanned.
   - `extensions.paths`: explicit directories (absolute or relative to the project root)
 - **Overrides**: top-level `extensions` applies to all commands, but `commands.<cmd>.extensions` overrides it for that command.
 - **Invalid entries**: ignored. In author mode (`EXTENSION_AUTHOR_MODE=true`) we print a warning if `extensions` is configured but nothing resolves.
+- **Store URLs**: entries pointing to Chrome Web Store, Edge Addons, or AMO are downloaded on-demand into `./extensions/<browser>/<id-or-slug>`.
+- **Local paths**: only paths under `./extensions/` are accepted for companion extensions.
+- **CLI**: use `--extensions <csv>` to provide a comma-separated list of paths or store URLs.
 
 Example:
 

package/dist/215.cjs

@@ -74,7 +74,7 @@ exports.modules = {
                 return mainHTML;
             }
         }
-        async function getPageHTML(cdp, sessionId) {
+        async function getPageHTML(cdp, sessionId, includeShadow = 'open-only') {
             try {
                 await cdp.evaluate(sessionId, 'document.title');
             } catch  {}
@@ -97,6 +97,7 @@ exports.modules = {
         }
       })()`);
             const mainHTML = 'string' == typeof mainHTMLRaw ? mainHTMLRaw : String(mainHTMLRaw || '');
+            if ('off' === includeShadow) return mainHTML;
             try {
                 const mergedHtmlRaw = await cdp.evaluate(sessionId, `(() => { try { 
         var cloned = document.documentElement.cloneNode(true); 
@@ -199,7 +200,7 @@ exports.modules = {
             while(Date.now() < deadline){
                 try {
                     const injected = await cdp.evaluate(sessionId, `(() => { try {
-          const hosts = Array.from(document.querySelectorAll('[data-extension-root="true"]'));
+          const hosts = Array.from(document.querySelectorAll('#extension-root,[data-extension-root="true"]'));
           if (!hosts.length) return false;
           const markers = ['iskilar_box','content_script','content_title','js-probe'];
           for (const h of hosts) {
@@ -244,7 +245,7 @@ exports.modules = {
                     try {
                         this.targetWebSocketUrl = await (0, discovery.N)(this.host, this.port, this.isDev());
                         this.ws = await establishBrowserConnection(this.targetWebSocketUrl, this.isDev(), (data)=>this.handleMessage(data), (reason)=>{
-                            this.pendingRequests.forEach(({ reject }, id)=>{
+                            this.pendingRequests.forEach(({ reject, timeout }, id)=>{
                                 try {
                                     reject(new Error(reason));
                                 } catch (error) {
@@ -253,6 +254,7 @@ exports.modules = {
                                         console.warn(messages.r0s(String(err.message || err)));
                                     }
                                 }
+                                if (timeout) clearTimeout(timeout);
                                 this.pendingRequests.delete(id);
                             });
                         });
@@ -281,6 +283,7 @@ exports.modules = {
                     if (message.id) {
                         const pending = this.pendingRequests.get(message.id);
                         if (pending) {
+                            if (pending.timeout) clearTimeout(pending.timeout);
                             this.pendingRequests.delete(message.id);
                             if (message.error) pending.reject(new Error(JSON.stringify(message.error)));
                             else pending.resolve(message.result);
@@ -299,7 +302,7 @@ exports.modules = {
                     }
                 }
             }
-            async sendCommand(method, params = {}, sessionId) {
+            async sendCommand(method, params = {}, sessionId, timeoutMs = 12000) {
                 return new Promise((resolve, reject)=>{
                     if (!this.ws || this.ws.readyState !== external_ws_default().OPEN) return reject(new Error('WebSocket is not open'));
                     const id = ++this.messageId;
@@ -310,12 +313,22 @@ exports.modules = {
                     };
                     if (sessionId) message.sessionId = sessionId;
                     try {
+                        const timeout = setTimeout(()=>{
+                            const pending = this.pendingRequests.get(id);
+                            if (!pending) return;
+                            this.pendingRequests.delete(id);
+                            pending.reject(new Error(`CDP command timed out (${timeoutMs}ms): ${String(pending.method || method)}`));
+                        }, timeoutMs);
                         this.pendingRequests.set(id, {
                             resolve,
-                            reject
+                            reject,
+                            timeout,
+                            method
                         });
                         this.ws.send(JSON.stringify(message));
                     } catch (error) {
+                        const pending = this.pendingRequests.get(id);
+                        if (pending?.timeout) clearTimeout(pending.timeout);
                         this.pendingRequests.delete(id);
                         reject(error);
                     }
@@ -376,8 +389,8 @@ exports.modules = {
                 }, sessionId);
                 return response.result?.value;
             }
-            async getPageHTML(sessionId) {
-                return getPageHTML(this, sessionId);
+            async getPageHTML(sessionId, includeShadow = 'open-only') {
+                return getPageHTML(this, sessionId, includeShadow);
             }
             async closeTarget(targetId) {
                 await this.sendCommand('Target.closeTarget', {
@@ -392,13 +405,14 @@ exports.modules = {
                     });
                     return true;
                 } catch (error) {
-                    const attempts = 3;
+                    const attempts = 8;
                     for(let i = 0; i < attempts; i++){
                         try {
                             const ok = await this.reloadExtensionViaTargetEval(extensionId);
                             if (ok) return true;
                         } catch  {}
-                        await new Promise((r)=>setTimeout(r, 150 * (i + 1)));
+                        const backoffMs = Math.min(1200, 150 * (i + 1));
+                        await new Promise((r)=>setTimeout(r, backoffMs));
                     }
                     console.warn(messages.ccn(extensionId, error.message || String(error)));
                     return false;
@@ -417,24 +431,28 @@ exports.modules = {
                     const preferredOrder = [
                         'service_worker',
                         'background_page',
-                        'worker'
+                        'worker',
+                        'page'
                     ];
                     for (const type of preferredOrder){
-                        const t = (targets || []).find((t)=>{
+                        const matchingTargets = (targets || []).filter((t)=>{
                             const url = String(t?.url || '');
                             const tt = String(t?.type || '');
-                            return tt === type && url.startsWith(`chrome-extension://${extensionId}/`);
+                            const inExtensionScope = url.startsWith(`chrome-extension://${extensionId}/`);
+                            return tt === type && inExtensionScope;
                         });
-                        if (!t) continue;
-                        const targetId = t?.targetId;
-                        if (targetId) try {
-                            const sessionId = await this.attachToTarget(targetId);
-                            await this.sendCommand('Runtime.enable', {}, sessionId);
-                            await this.sendCommand('Runtime.evaluate', {
-                                expression: 'chrome && chrome.runtime && chrome.runtime.reload && chrome.runtime.reload()'
-                            }, sessionId);
-                            return true;
-                        } catch  {}
+                        for (const target of matchingTargets){
+                            const targetId = target?.targetId;
+                            if (targetId) try {
+                                const sessionId = await this.attachToTarget(targetId);
+                                await this.sendCommand('Runtime.enable', {}, sessionId);
+                                await this.sendCommand('Runtime.evaluate', {
+                                    expression: '(function(){ try { if (!chrome || !chrome.runtime || !chrome.runtime.reload) return false; chrome.runtime.reload(); return true; } catch (error) { return false; } })()',
+                                    returnByValue: true
+                                }, sessionId);
+                                return true;
+                            } catch  {}
+                        }
                     }
                     return false;
                 } catch  {

package/dist/323.cjs

@@ -12,11 +12,98 @@ exports.modules = {
         var banner = __webpack_require__("./webpack/plugin-browsers/browsers-lib/banner.ts");
         var external_path_ = __webpack_require__("path");
         var external_fs_ = __webpack_require__("fs");
-        async function deriveExtensionIdFromTargetsHelper(cdp, outPath, maxRetries = 6, backoffMs = 150) {
+        async function deriveExtensionIdFromTargetsHelper(cdp, outPath, maxRetries = 6, backoffMs = 150, profilePath, extensionPaths) {
+            let expectedName;
+            let expectedVersion;
+            let expectedManifestVersion;
+            let expectedNameIsMsg = false;
+            try {
+                const manifest = JSON.parse(external_fs_.readFileSync(external_path_.join(outPath, 'manifest.json'), 'utf-8'));
+                expectedName = manifest?.name;
+                expectedVersion = manifest?.version;
+                expectedManifestVersion = manifest?.manifest_version;
+                expectedNameIsMsg = 'string' == typeof expectedName && /__MSG_/i.test(expectedName);
+                if (expectedNameIsMsg) {
+                    const defaultLocale = String(manifest?.default_locale || '').trim();
+                    const msgKeyMatch = String(expectedName || '').match(/__MSG_(.+)__/i);
+                    const msgKey = msgKeyMatch ? msgKeyMatch[1] : '';
+                    if (defaultLocale && msgKey) {
+                        const messagesPath = external_path_.join(outPath, '_locales', defaultLocale, 'messages.json');
+                        if (external_fs_.existsSync(messagesPath)) {
+                            const messagesJson = JSON.parse(external_fs_.readFileSync(messagesPath, 'utf-8'));
+                            const resolved = String(messagesJson?.[msgKey]?.message || '').trim();
+                            if (resolved) {
+                                expectedName = resolved;
+                                expectedNameIsMsg = false;
+                            }
+                        }
+                    }
+                }
+            } catch  {}
+            const trimTrailingSep = (p)=>p.replace(/[\\\/]+$/g, '');
+            const normalizePath = (p)=>{
+                try {
+                    const resolved = external_path_.resolve(p);
+                    if (external_fs_.existsSync(resolved)) return trimTrailingSep(external_fs_.realpathSync(resolved));
+                    return trimTrailingSep(resolved);
+                } catch  {
+                    return trimTrailingSep(external_path_.resolve(p));
+                }
+            };
+            const resolvedOutPath = normalizePath(outPath);
+            const normalizedCandidates = Array.isArray(extensionPaths) ? extensionPaths.map((p)=>p ? normalizePath(p) : '').filter(Boolean) : [];
+            const resolvedCandidates = normalizedCandidates.length ? normalizedCandidates : [
+                resolvedOutPath
+            ];
+            const platformIsCaseInsensitive = 'win32' === process.platform || 'darwin' === process.platform;
+            const normalizeForCompare = (p)=>platformIsCaseInsensitive ? p.toLowerCase() : p;
+            const matchesAnyCandidate = (p)=>{
+                const n = normalizeForCompare(p);
+                return resolvedCandidates.some((candidate)=>n === normalizeForCompare(candidate));
+            };
+            const deriveFromProfile = ()=>{
+                if (!profilePath) return null;
+                const candidates = [];
+                const pushPrefIfExists = (dir)=>{
+                    const prefPath = external_path_.join(dir, 'Preferences');
+                    if (external_fs_.existsSync(prefPath)) candidates.push(prefPath);
+                };
+                try {
+                    pushPrefIfExists(profilePath);
+                    pushPrefIfExists(external_path_.join(profilePath, 'Default'));
+                    const entries = external_fs_.readdirSync(profilePath);
+                    for (const entry of entries)if (/^Profile\s+\d+$/i.test(entry)) pushPrefIfExists(external_path_.join(profilePath, entry));
+                } catch  {}
+                for (const prefPath of candidates)try {
+                    if (!external_fs_.existsSync(prefPath)) continue;
+                    const prefs = JSON.parse(external_fs_.readFileSync(prefPath, 'utf-8'));
+                    const settings = prefs?.extensions?.settings;
+                    if (!settings || 'object' != typeof settings) continue;
+                    const entries = Object.entries(settings);
+                    let fallbackId = null;
+                    for (const [id, info] of entries){
+                        const storedPath = String(info?.path || '');
+                        if (!storedPath) continue;
+                        const normalized = normalizePath(storedPath);
+                        if (!matchesAnyCandidate(normalized)) continue;
+                        const manifestName = String(info?.manifest?.name || '');
+                        const manifestVersion = String(info?.manifest?.version || '');
+                        if (expectedName && manifestName === expectedName) return id;
+                        if (expectedVersion && manifestVersion === expectedVersion) return id;
+                        fallbackId = id;
+                    }
+                    if (fallbackId) return fallbackId;
+                } catch  {}
+                return null;
+            };
             let retries = 0;
             while(retries <= maxRetries){
                 try {
                     const targets = await cdp.getTargets();
+                    const profileCandidateId = deriveFromProfile();
+                    let firstEvalId = null;
+                    let evalIdCount = 0;
+                    let urlDerivedId = null;
                     for (const t of targets || []){
                         const url = String(t?.url || '');
                         const type = String(t?.type || '');
@@ -26,6 +113,8 @@ exports.modules = {
                             'worker'
                         ].includes(type);
                         if (!typeOk) continue;
+                        const urlMatch = url.match(/^chrome-extension:\/\/([^\/]+)/);
+                        if (!urlDerivedId && urlMatch?.[1]) urlDerivedId = String(urlMatch[1]);
                         if (url && !url.startsWith('chrome-extension://')) continue;
                         const targetId = t?.targetId;
                         if (targetId) try {
@@ -35,9 +124,22 @@ exports.modules = {
                             const info = await cdp.evaluate(sessionId, '(()=>{try{const m=chrome.runtime.getManifest?.();return {id:chrome.runtime?.id||"",name:m?.name||"",version:m?.version||"",manifestVersion:m?.manifest_version||0}}catch(_){return null}})()');
                             const id = String(info?.id || '').trim();
                             if (!id) continue;
-                            return id;
+                            evalIdCount += 1;
+                            if (!firstEvalId) firstEvalId = id;
+                            if (profileCandidateId && id === profileCandidateId) return id;
+                            const gotName = String(info?.name || '');
+                            const gotVersion = String(info?.version || '');
+                            const gotManifestVersion = Number(info?.manifestVersion || 0);
+                            const nameMatches = expectedName && !expectedNameIsMsg ? gotName === expectedName : false;
+                            const versionMatches = expectedVersion ? gotVersion === expectedVersion : false;
+                            const manifestVersionMatches = expectedManifestVersion ? gotManifestVersion === expectedManifestVersion : false;
+                            if (nameMatches && (!profileCandidateId || id === profileCandidateId)) return id;
+                            if (expectedVersion && versionMatches && (expectedManifestVersion ? manifestVersionMatches : true) && (!profileCandidateId || id === profileCandidateId)) return id;
                         } catch  {}
                     }
+                    if (1 === evalIdCount && firstEvalId) return firstEvalId;
+                    if (profileCandidateId) return profileCandidateId;
+                    if (urlDerivedId) return urlDerivedId;
                 } catch  {}
                 await new Promise((r)=>setTimeout(r, backoffMs));
                 retries++;
@@ -214,7 +316,7 @@ exports.modules = {
             }
             async deriveExtensionIdFromTargets(maxRetries = 20, backoffMs = 200) {
                 if (!this.cdp) return null;
-                return await deriveExtensionIdFromTargetsHelper(this.cdp, this.outPath, maxRetries, backoffMs);
+                return await deriveExtensionIdFromTargetsHelper(this.cdp, this.outPath, maxRetries, backoffMs, this.profilePath, this.extensionPaths);
             }
             async hardReload() {
                 if (!this.cdp || !this.extensionId) return false;
@@ -322,17 +424,25 @@ exports.modules = {
                 _define_property(this, "outPath", void 0);
                 _define_property(this, "browser", void 0);
                 _define_property(this, "cdpPort", void 0);
+                _define_property(this, "profilePath", void 0);
+                _define_property(this, "extensionPaths", void 0);
                 _define_property(this, "cdp", null);
                 _define_property(this, "extensionId", null);
                 this.outPath = args.outPath;
                 this.browser = args.browser;
                 this.cdpPort = args.cdpPort;
+                this.profilePath = args.profilePath;
+                this.extensionPaths = args.extensionPaths;
             }
         }
         var extension_output_path = __webpack_require__("./webpack/plugin-browsers/run-chromium/chromium-launch/extension-output-path.ts");
         async function setupCdpAfterLaunch(compilation, plugin, chromiumArgs) {
             const loadExtensionFlag = chromiumArgs.find((flag)=>flag.startsWith('--load-extension='));
             const extensionOutputPath = (0, extension_output_path.W)(compilation, loadExtensionFlag);
+            const extensionPaths = loadExtensionFlag ? loadExtensionFlag.replace('--load-extension=', '').split(',').map((s)=>s.trim()).filter(Boolean) : [];
+            const selectedExtensionPaths = extensionOutputPath && extensionOutputPath.length > 0 ? [
+                extensionOutputPath
+            ] : extensionPaths;
             const remoteDebugPortFlag = chromiumArgs.find((flag)=>flag.startsWith('--remote-debugging-port='));
             const chromeRemoteDebugPort = remoteDebugPortFlag ? parseInt(remoteDebugPortFlag.split('=')[1], 10) : (0, shared_utils.jl)(plugin.port, plugin.instanceId);
             const userDataDirFlag = chromiumArgs.find((flag)=>flag.startsWith('--user-data-dir='));
@@ -344,7 +454,9 @@ exports.modules = {
             const cdpExtensionController = new CDPExtensionController({
                 outPath: extensionOutputPath,
                 browser: 'chromium-based' === plugin.browser ? 'chrome' : plugin.browser,
-                cdpPort: chromeRemoteDebugPort
+                cdpPort: chromeRemoteDebugPort,
+                profilePath: userDataDir || void 0,
+                extensionPaths: selectedExtensionPaths
             });
             const retryAsync = async (operation, attempts = 5, initialDelayMs = 150)=>{
                 let lastError;
@@ -361,7 +473,13 @@ exports.modules = {
             if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.M3V('127.0.0.1', chromeRemoteDebugPort));
             let extensionControllerInfo = null;
             try {
-                extensionControllerInfo = await cdpExtensionController.ensureLoaded();
+                const ensureLoadedTimeoutMs = 10000;
+                extensionControllerInfo = await Promise.race([
+                    cdpExtensionController.ensureLoaded(),
+                    new Promise((_, reject)=>{
+                        setTimeout(()=>reject(new Error(`ensureLoaded timeout (${ensureLoadedTimeoutMs}ms)`)), ensureLoadedTimeoutMs);
+                    })
+                ]);
             } catch (error) {
                 if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.warn(`[CDP] ensureLoaded failed: ${String(error?.message || error)}`);
             }