@streamapp/stream 0.0.3 → 0.0.5

package/resources/server.mjs

@@ -174283,6 +174283,8 @@ async function typeInto(driver, step, params, foreground, find2) {
   await driver.type(text3);
   return "keyboard";
 }
+var ForegroundRefused = class extends Error {
+};
 var WINDOW_POLL_MS = 500;
 async function waitForWindow(driver, match2, timeoutMs) {
   const titles = match2.titleAnyOf ?? (match2.title == null ? [] : [match2.title]);
@@ -174326,7 +174328,13 @@ async function runDesktopRecipeLocked(recipe, params, driver) {
   const stepFailed = (step, machine) => blocked("drift", step.label ? `${step.label}\uFF1A${machine}` : machine);
   if (recipe.steps[0]?.kind !== "window") await driver.scopeWindow(recipe.app);
   let scoped = recipe.app;
-  const foreground = () => driver.focusApp(scoped);
+  const foreground = async () => {
+    if (!await driver.focusApp(scoped)) {
+      throw new ForegroundRefused(
+        `\u6CA1\u80FD\u628A\u300C${scoped.title ?? scoped.process}\u300D\u62AC\u5230\u524D\u53F0\u2014\u2014\u5C4F\u5E55\u9501\u7740\u3001\u4F1A\u8BDD\u6CA1\u4EBA\u8FDE\u7740\u3001\u6216\u8005\u522B\u7684\u7A97\u53E3\u538B\u7740\u4E0D\u653E\u3002\u8FD9\u4E00\u6B65\u8981\u53D1\u7684\u662F\u952E\u76D8/\u9F20\u6807\u8F93\u5165\uFF0C\u6CA1\u6709\u524D\u53F0\u5C31\u6CA1\u6709\u6536\u4EF6\u4EBA\uFF0C\u6240\u4EE5\u505C\u624B\u3002`
+      );
+    }
+  };
   if (recipe.loginCheck) {
     if ((await find2(subQuery(recipe.loginCheck.wall, params))).length > 0) return blocked("needsLogin");
   }
@@ -174335,55 +174343,60 @@ async function runDesktopRecipeLocked(recipe, params, driver) {
   for (const [i, step] of recipe.steps.entries()) {
     probe2(`#${i} ${step.kind}${step.label ? ` (${step.label.slice(0, 24)}\u2026)` : ""}`);
     if (step.skipIf && (await find2(subQuery(step.skipIf, params))).length > 0) continue;
-    if (step.kind === "window") {
-      const win = await waitForWindow(driver, step.match, step.timeoutMs ?? 12e3);
-      if (!win && step.optional) continue;
-      if (!win) return stepFailed(step, `window not found: ${JSON.stringify(step.match)}`);
-      probe2(`#${i} window hit \u300C${win.title}\u300D (${win.process})`);
-      scoped = { process: win.process, title: win.title };
-      try {
-        await driver.scopeWindow(scoped);
-      } catch (e) {
-        if (step.optional) continue;
-        const now = (await driver.windows()).map((w) => w.title).join("\u3001");
-        return stepFailed(step, `\u7A97\u53E3\u300C${win.title}\u300D\u5728\u88AB scope \u4E4B\u524D\u5C31\u6D88\u5931\u4E86\uFF08${e.message}\uFF09\uFF1B\u6B64\u523B\u8FD8\u5728\u7684\u7A97\u53E3\uFF1A${now}`);
-      }
-      if (step.focus) await foreground();
-      if (step.waitFor) {
-        const q = subQuery(step.waitFor, params);
-        const rounds = Math.max(1, Math.ceil((step.timeoutMs ?? 12e3) / WINDOW_POLL_MS));
-        let seen2 = false;
-        for (let i2 = 0; i2 < rounds; i2++) {
-          if ((await find2(q)).length > 0) {
-            seen2 = true;
-            break;
-          }
-          await driver.sleep(WINDOW_POLL_MS);
-        }
-        if (!seen2 && !step.optional) return stepFailed(step, `window is up but its UI never appeared: ${JSON.stringify(q)}`);
-      }
-    } else if (step.kind === "focus") {
-      await foreground();
-    } else if (step.kind === "invoke") {
-      const q = subQuery(step.query, params);
-      const els = await find2(q);
-      if (els.length === 0 && step.optional) continue;
-      if (els.length === 0) return stepFailed(step, `invoke target not found: ${JSON.stringify(q)}`);
-      if (step.fallbackClick) {
+    try {
+      if (step.kind === "window") {
+        const win = await waitForWindow(driver, step.match, step.timeoutMs ?? 12e3);
+        if (!win && step.optional) continue;
+        if (!win) return stepFailed(step, `window not found: ${JSON.stringify(step.match)}`);
+        probe2(`#${i} window hit \u300C${win.title}\u300D (${win.process})`);
+        scoped = { process: win.process, title: win.title };
+        try {
+          await driver.scopeWindow(scoped);
+        } catch (e) {
+          if (step.optional) continue;
+          const now = (await driver.windows()).map((w) => w.title).join("\u3001");
+          return stepFailed(step, `\u7A97\u53E3\u300C${win.title}\u300D\u5728\u88AB scope \u4E4B\u524D\u5C31\u6D88\u5931\u4E86\uFF08${e.message}\uFF09\uFF1B\u6B64\u523B\u8FD8\u5728\u7684\u7A97\u53E3\uFF1A${now}`);
+        }
+        if (step.focus) await foreground();
+        if (step.waitFor) {
+          const q = subQuery(step.waitFor, params);
+          const rounds = Math.max(1, Math.ceil((step.timeoutMs ?? 12e3) / WINDOW_POLL_MS));
+          let seen2 = false;
+          for (let i2 = 0; i2 < rounds; i2++) {
+            if ((await find2(q)).length > 0) {
+              seen2 = true;
+              break;
+            }
+            await driver.sleep(WINDOW_POLL_MS);
+          }
+          if (!seen2 && !step.optional) return stepFailed(step, `window is up but its UI never appeared: ${JSON.stringify(q)}`);
+        }
+      } else if (step.kind === "focus") {
+        await foreground();
+      } else if (step.kind === "invoke") {
+        const q = subQuery(step.query, params);
+        const els = await find2(q);
+        if (els.length === 0 && step.optional) continue;
+        if (els.length === 0) return stepFailed(step, `invoke target not found: ${JSON.stringify(q)}`);
+        if (step.fallbackClick) {
+          await foreground();
+          await driver.click(els[0].rect);
+        } else await driver.invoke(els[0].ref);
+      } else if (step.kind === "type") {
+        const via = await typeInto(driver, step, params, foreground, find2);
+        if (via === "no-target") {
+          return stepFailed(step, `type target not found: ${JSON.stringify(subQuery(step.query, params))}`);
+        }
+        typedVia = via;
+      } else if (step.kind === "scroll") {
         await foreground();
-        await driver.click(els[0].rect);
-      } else await driver.invoke(els[0].ref);
-    } else if (step.kind === "type") {
-      const via = await typeInto(driver, step, params, foreground, find2);
-      if (via === "no-target") {
-        return stepFailed(step, `type target not found: ${JSON.stringify(subQuery(step.query, params))}`);
+        await driver.scroll(step.dir, step.amount);
+      } else if (step.kind === "wait") {
+        await driver.sleep(step.ms);
       }
-      typedVia = via;
-    } else if (step.kind === "scroll") {
-      await foreground();
-      await driver.scroll(step.dir, step.amount);
-    } else if (step.kind === "wait") {
-      await driver.sleep(step.ms);
+    } catch (e) {
+      if (e instanceof ForegroundRefused) return stepFailed(step, e.message);
+      throw e;
     }
   }
   if (!recipe.observer || !recipe.read) {
@@ -218711,9 +218724,15 @@ function envWithBundledNode(env = process.env, execPath = process.execPath, sep4
   const current = env.PATH ?? env.Path ?? "";
   return { ...env, PATH: current ? `${dir}${sep4}${current}` : dir };
 }
-function resolveNpmCommand(baseDir = dirname28(fileURLToPath2(import.meta.url)), exists = existsSync18, execPath = process.execPath) {
+function resolveNpmCommand(baseDir = dirname28(fileURLToPath2(import.meta.url)), exists = existsSync18, execPath = process.execPath, platform = process.platform) {
   const cli = join36(baseDir, "npm", "bin", "npm-cli.js");
   if (exists(cli)) return { cmd: execPath, prefixArgs: [cli], bundled: true };
+  if (platform === "win32") {
+    const cut = Math.max(execPath.lastIndexOf("/"), execPath.lastIndexOf("\\"));
+    const nodeDir = cut > 0 ? execPath.slice(0, cut) : dirname28(execPath);
+    const cli2 = join36(nodeDir, "node_modules", "npm", "bin", "npm-cli.js");
+    if (exists(cli2)) return { cmd: execPath, prefixArgs: [cli2], bundled: false };
+  }
   return { cmd: "npm", prefixArgs: [], bundled: false };
 }
 
@@ -219173,6 +219192,10 @@ var DshWorkbench = class {
       child.stdout?.on("data", (chunk) => {
         tail2 = `${tail2}${String(chunk)}`.slice(-4e3);
       });
+      child.on("error", (e) => {
+        const msg2 = e instanceof Error ? e.message : String(e);
+        reject2(new Error(`\u8D77\u4E0D\u6765 ${cmd}\uFF08${msg2}\uFF09\u2014\u2014\u8FD9\u53F0\u673A\u5668\u4E0A\u627E\u4E0D\u5230\u5B83\u3002${tail2.trim()}`));
+      });
       child.on("exit", (code) => {
         if (code === 0) resolve9();
         else reject2(new Error(`${cmd} ${args.join(" ")} exited with ${code}