@farmslot/adapter-web 0.4.1 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farmslot/adapter-web",
-  "version": "0.4.1",
+  "version": "0.6.0",
   "description": "Web platform adapter for Farmslot recipes: resolve and launch an isolated Chromium, own its CDP port, load unpacked extensions, and keep macOS focus.",
   "type": "commonjs",
   "exports": {
@@ -64,30 +64,35 @@
     "./validation-process-ownership": {
       "types": "./dist/validation-process-ownership.d.cts",
       "default": "./src/validation-process-ownership.cjs"
+    },
+    "./web-dapp": {
+      "types": "./dist/web-dapp/index.d.mts",
+      "default": "./src/web-dapp/index.mjs"
     }
   },
   "scripts": {
-    "typecheck": "tsc --noEmit --project tsconfig.json && yarn build && tsc --project tsconfig.consumer.json",
-    "test": "node --test \"test/*.test.cjs\"",
+    "typecheck": "yarn workspace @farmslot/adapter-sdk build && tsc --noEmit --project tsconfig.json && yarn build && tsc --project tsconfig.consumer.json",
+    "test": "node --test \"test/*.test.cjs\" \"test/*.test.mjs\"",
     "format": "prettier --write --ignore-path ../../.prettierignore .",
     "format:check": "prettier --check --ignore-path ../../.prettierignore .",
-    "lint": "eslint \"src/**/*.cjs\" \"test/**/*.cjs\" \"test/**/*.ts\"",
-    "lint:fix": "eslint \"src/**/*.cjs\" \"test/**/*.cjs\" \"test/**/*.ts\" --fix",
-    "quality": "prettier --check --ignore-path ../../.prettierignore . && eslint \"src/**/*.cjs\" \"test/**/*.cjs\" \"test/**/*.ts\" && yarn typecheck && yarn test",
+    "lint": "eslint \"src/**/*.cjs\" \"src/**/*.mjs\" \"test/**/*.cjs\" \"test/**/*.mjs\" \"test/**/*.ts\"",
+    "lint:fix": "eslint \"src/**/*.cjs\" \"src/**/*.mjs\" \"test/**/*.cjs\" \"test/**/*.mjs\" \"test/**/*.ts\" --fix",
+    "quality": "prettier --check --ignore-path ../../.prettierignore . && eslint \"src/**/*.cjs\" \"src/**/*.mjs\" \"test/**/*.cjs\" \"test/**/*.mjs\" \"test/**/*.ts\" && yarn typecheck && yarn test",
     "build": "yarn workspace @farmslot/adapter-sdk build && rm -rf dist && tsc --project tsconfig.build.json",
     "prepack": "cd ../.. && node scripts/quality/check-farmslot-package-readiness.mjs --require-changelog --packages @farmslot/adapter-web && yarn workspace @farmslot/adapter-web build",
     "prepublishOnly": "node ../../scripts/quality/check-farmslot-package-readiness.mjs --publish --packages @farmslot/adapter-web"
   },
   "dependencies": {
-    "@farmslot/adapter-sdk": "0.6.0",
-    "@farmslot/recipe-runner": "0.26.0",
+    "@farmslot/adapter-sdk": "0.7.1",
+    "@farmslot/recipe-runner": "0.27.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
     "eslint": "^10.3.0",
     "prettier": "^3.8.3",
-    "typescript": "^5.6.0"
+    "typescript": "^5.6.0",
+    "viem": "^2.54.3"
   },
   "repository": {
     "type": "git",
@@ -115,7 +120,9 @@
     "LICENSE",
     "CHANGELOG.md",
     "src/**/*.cjs",
-    "dist/**/*.d.cts"
+    "src/**/*.mjs",
+    "dist/**/*.d.cts",
+    "dist/**/*.d.mts"
   ],
   "publishConfig": {
     "access": "public"

package/src/launch-browser.cjs

@@ -78,6 +78,8 @@ const BROWSER_RESOLVER_CLI = require.resolve('./browser-resolver.cjs');
  * @property {string} [rerunCommand] Command named in "Next:" hints.
  * @property {number} [focusSettleMs] macOS: wait before the one focus check (default 1000).
  * @property {(line: string) => void} [log] Progress lines (default stderr).
+ * @property {(progress: { message?: string, waitingFor?: string, current?: number, total?: number, unit?: string }) => void} [progress]
+ *   What the launch is waiting for, for a caller's stage handle (`stage.progress`).
  */
 
 /**
@@ -117,6 +119,7 @@ function normalizeOptions(options) {
     if (!opts[key]) throw new Error(`Missing --${flag}`);
   }
   opts.log = opts.log ?? ((line) => process.stderr.write(`${line}\n`));
+  opts.progress = opts.progress ?? (() => {});
   return opts;
 }
 
@@ -254,12 +257,13 @@ function runLaunch(opts, acquireLock) {
   try {
     try {
       beginDetachedLaunch(cdpPort, profile, activeValidationLease);
+      opts.progress({ message: 'starting the browser' });
       if (application) {
         execFileSync('open', macBackgroundOpenArgs(application, chromeArgs), {
           env: sanitizedChildEnv(),
           stdio: ['ignore', logFd, logFd],
         });
-        browserPid = waitForOwnedCdpPid(cdpPort, ownedBrowser);
+        browserPid = waitForOwnedCdpPid(cdpPort, ownedBrowser, opts.progress);
         if (browserPid === null) {
           stopProfileProcessesSync(profile, { waitForAppearanceMs: 400 });
           throw ownedListenerMissing();
@@ -271,7 +275,7 @@ function runLaunch(opts, acquireLock) {
           stdio: ['ignore', logFd, logFd],
         });
         child.unref();
-        browserPid = waitForOwnedCdpPid(cdpPort, ownedBrowser);
+        browserPid = waitForOwnedCdpPid(cdpPort, ownedBrowser, opts.progress);
         if (browserPid === null) {
           stopProfileProcessesSync(profile, { extraPids: child.pid ? [child.pid] : [] });
           throw ownedListenerMissing();
@@ -342,6 +346,7 @@ function runLaunch(opts, acquireLock) {
 // Without it the slot has no window at all, so a failure fails the launch:
 // the owned browser is stopped (its markers kept if it cannot be).
 function openBackgroundWindow(opts, pid, url, clearLaunchMarkers) {
+  opts.progress({ message: 'opening the start window' });
   const result = spawnSync(
     process.execPath,
     [BROWSER_RESOLVER_CLI, 'open-window', '--port', String(opts.cdpPort), '--url', url],
@@ -399,6 +404,7 @@ function writeBrowserResolution(runtime, resolution) {
 }
 
 function loadExtensionOverCdp(opts, pid, initialUrl, clearLaunchMarkers) {
+  opts.progress({ message: 'loading the extension over CDP' });
   const result = spawnSync(
     process.execPath,
     [
@@ -495,10 +501,20 @@ function macApplicationForExecutable(executable) {
   return null;
 }
 
-function waitForOwnedCdpPid(port, ownedBrowser) {
-  for (let i = 0; i < 300; i += 1) {
+function waitForOwnedCdpPid(port, ownedBrowser, progress) {
+  const attempts = 300;
+  for (let i = 0; i < attempts; i += 1) {
     const pid = cdpListenerPids(port).find(ownedBrowser);
     if (pid !== undefined) return pid;
+    // Every 50 attempts (about 5 s): enough to show the wait is moving.
+    if (i > 0 && i % 50 === 0) {
+      progress({
+        waitingFor: `an owned CDP listener on 127.0.0.1:${port}`,
+        current: i,
+        total: attempts,
+        unit: 'attempts',
+      });
+    }
     spawnSync('sleep', ['0.1']);
   }
   return null;

package/src/web-dapp/cleanup.mjs

@@ -0,0 +1,74 @@
+#!/usr/bin/env node
+// cleanup.mjs — `mm-harness cleanup --adapter <web-dapp adapter>`: stop the slot
+// browser and wallet host, then remove the slot's runtime state and the installed
+// wallet fixture. Browser profiles are kept unless --reset-profile.
+//
+// Inputs: --target <checkout> [--cdp-port <port>] [--reset-profile]
+// Outputs: JSON summary on stdout. Exit 0 cleaned; 1 the CDP port stayed busy.
+// Never touches: product source files, the Next.js dev server.
+
+import { existsSync, readdirSync, rmSync } from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import { recipeHarnessPath, walletFixturePath } from './lib/paths.mjs';
+import { stopConsoleCollector, stopWebDappBrowser } from './lib/processes.mjs';
+import { webDappPolicy, webDappRuntimeDir } from './lib/runtime.mjs';
+
+const usage = 'Usage: cleanup.mjs --target <checkout> [--cdp-port <port>] [--reset-profile]';
+
+export async function cleanupWebDappRuntime({ target, cdpPort, resetProfile = false }) {
+  const root = path.resolve(target);
+  const stop = await stopWebDappBrowser(root, { cdpPort });
+  await stopConsoleCollector(root);
+  const runtime = webDappRuntimeDir(root);
+  const removed = [];
+  if (existsSync(runtime)) {
+    for (const entry of readdirSync(runtime)) {
+      if (entry.startsWith('profile-') && !resetProfile) continue;
+      rmSync(path.join(runtime, entry), { recursive: true, force: true });
+      removed.push(entry);
+    }
+  }
+  const overlay = recipeHarnessPath(root, webDappPolicy().adapterId);
+  if (existsSync(overlay)) {
+    rmSync(overlay, { recursive: true, force: true });
+    removed.push(path.relative(root, overlay));
+  }
+  const fixture = walletFixturePath(root);
+  if (existsSync(fixture)) {
+    rmSync(fixture, { force: true });
+    removed.push(path.relative(root, fixture));
+  }
+  return {
+    status: 'pass',
+    target: root,
+    stopped: stop.stopped,
+    cdpPortFree: stop.cdpPortFree,
+    removed,
+  };
+}
+
+if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
+  const argv = process.argv.slice(2);
+  if (argv.includes('--help') || argv.includes('-h')) {
+    process.stdout.write(`${usage}\n`);
+    process.exit(0);
+  }
+  const value = (flag) => {
+    const index = argv.indexOf(flag);
+    return index >= 0 ? argv[index + 1] : undefined;
+  };
+  const rawPort = value('--cdp-port') ?? process.env.RECIPE_CDP_PORT ?? process.env.CDP_PORT;
+  try {
+    const result = await cleanupWebDappRuntime({
+      target: value('--target') ?? process.cwd(),
+      cdpPort: rawPort ? Number(rawPort) : undefined,
+      resetProfile: argv.includes('--reset-profile'),
+    });
+    process.stdout.write(`${JSON.stringify(result)}\n`);
+  } catch (error) {
+    process.stdout.write(`${JSON.stringify({ status: 'fail', error: error.message })}\n`);
+    process.exit(1);
+  }
+}