Skip to content

Commit 6b6a040

Browse files
committed
try fix
1 parent 8795a2c commit 6b6a040

2 files changed

Lines changed: 56 additions & 2 deletions

File tree

commands/playwright.js

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,18 @@ module.exports = {
5858
return activeTabName;
5959
},
6060
async metamaskExtensionId() {
61-
const metamaskExtensionData = (await module.exports.getExtensionsData())
62-
.metamask;
61+
const allExtensionsData = await module.exports.getExtensionsData();
62+
const metamaskExtensionData = allExtensionsData.metamask;
63+
64+
// #region agent log
65+
if (!metamaskExtensionData) {
66+
log('[metamaskExtensionId] ERROR: metamask extension not found! Available extensions:', Object.keys(allExtensionsData));
67+
throw new Error(
68+
`[metamaskExtensionId] MetaMask extension not found in chrome://extensions. Available extensions: ${JSON.stringify(Object.keys(allExtensionsData))}. Full data: ${JSON.stringify(allExtensionsData)}`
69+
);
70+
}
71+
// #endregion
72+
6373
return metamaskExtensionData.id;
6474
},
6575
async setExpectInstance(expect) {
@@ -469,6 +479,10 @@ module.exports = {
469479
await devModeButton.click();
470480

471481
const extensionDataItems = await page.locator('extensions-item').all();
482+
// #region agent log
483+
log('[getExtensionsData] Found extensions-item count:', extensionDataItems.length);
484+
// #endregion
485+
472486
for (const extensionData of extensionDataItems) {
473487
const extensionName = (
474488
await extensionData
@@ -488,11 +502,31 @@ module.exports = {
488502
await extensionData.locator('#extension-id').textContent()
489503
).split(': ')[1];
490504

505+
// #region agent log
506+
log('[getExtensionsData] Found extension:', extensionName, 'version:', extensionVersion, 'id:', extensionId);
507+
// #endregion
508+
491509
extensionsData[extensionName] = {
492510
version: extensionVersion,
493511
id: extensionId,
494512
};
513+
514+
// Also add "metamask" key if extension name contains "metamask"
515+
if (extensionName.includes('metamask') && !extensionsData.metamask) {
516+
extensionsData.metamask = {
517+
version: extensionVersion,
518+
id: extensionId,
519+
};
520+
// #region agent log
521+
log('[getExtensionsData] Added metamask alias for:', extensionName);
522+
// #endregion
523+
}
495524
}
525+
526+
// #region agent log
527+
log('[getExtensionsData] Final extensionsData keys:', Object.keys(extensionsData));
528+
// #endregion
529+
496530
await page.close();
497531

498532
return extensionsData;

helpers.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,13 @@ module.exports = {
208208
extract: true,
209209
});
210210
}
211+
// #region agent log
212+
log(`[download] Successfully downloaded and extracted to: ${destination}`);
213+
// #endregion
211214
} catch (e) {
215+
// #region agent log
216+
log(`[download] FAILED to download from: ${url}, error: ${e.message}`);
217+
// #endregion
212218
throw new Error(
213219
`[download] Unable to download metamask release from: ${url} to: ${destination} with following error:\n${e}`,
214220
);
@@ -224,6 +230,10 @@ module.exports = {
224230
downloadsDirectory = path.resolve(__dirname, 'downloads');
225231
}
226232

233+
// #region agent log
234+
log(`[prepareMetamask] Platform: ${os.platform()}, downloadsDirectory: ${downloadsDirectory}`);
235+
// #endregion
236+
227237
await module.exports.createDirIfNotExist(downloadsDirectory);
228238
const metamaskDirectory = path.join(downloadsDirectory, release.tagName);
229239
const metamaskDirectoryExists =
@@ -236,11 +246,21 @@ module.exports = {
236246
const metamaskManifestFileExists = await module.exports.checkDirOrFileExist(
237247
metamaskManifestFilePath,
238248
);
249+
250+
// #region agent log
251+
log(`[prepareMetamask] metamaskDirectory: ${metamaskDirectory}, exists: ${metamaskDirectoryExists}, manifestExists: ${metamaskManifestFileExists}`);
252+
// #endregion
253+
239254
if (!metamaskDirectoryExists && !metamaskManifestFileExists) {
240255
await module.exports.download(release.downloadUrl, metamaskDirectory);
241256
} else {
242257
log('Metamask is already downloaded');
243258
}
259+
260+
// #region agent log
261+
log(`[prepareMetamask] Returning metamaskDirectory: ${metamaskDirectory}`);
262+
// #endregion
263+
244264
return metamaskDirectory;
245265
},
246266
};

0 commit comments

Comments
 (0)