@frockbot/plugin-fly-sprite 0.3.3 → 0.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/plugin-fly-sprite",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "private": false,
   "type": "module",
   "exports": {
@@ -25,16 +25,16 @@
   },
   "dependencies": {
     "@cordisjs/plugin-webui": "0.8.2",
-    "@frockbot/computer-core": "0.3.3",
-    "@frockbot/computer-host-protocol": "0.3.3",
-    "@frockbot/computer-host-runtime": "0.3.3",
-    "@frockbot/kernel-contracts": "0.3.3",
-    "@frockbot/plugin-computer": "0.3.3",
+    "@frockbot/computer-core": "0.3.5",
+    "@frockbot/computer-host-protocol": "0.3.5",
+    "@frockbot/computer-host-runtime": "0.3.5",
+    "@frockbot/kernel-contracts": "0.3.5",
+    "@frockbot/plugin-computer": "0.3.5",
     "cordis": "4.0.0-rc.8"
   },
   "devDependencies": {
-    "@frockbot/plugin-testkit": "0.3.3",
-    "@frockbot/workspace-store": "0.3.3",
+    "@frockbot/plugin-testkit": "0.3.5",
+    "@frockbot/workspace-store": "0.3.5",
     "@types/bun": "1.4.0",
     "@types/node": "26.2.0",
     "typescript": "5.9.3"

package/src/computer.test.ts

@@ -2,6 +2,7 @@
 
 import { describe, expect, test } from "bun:test";
 import type { ComputerConnectionProgressV1 } from "@frockbot/computer-core";
+import { COMPUTER_UNCONFIGURED_MESSAGE_V1 } from "@frockbot/computer-core";
 import { verifyPluginPackage } from "@frockbot/plugin-testkit";
 import { DESKTOP_GUI_LEASE_KEY } from "@frockbot/computer-host-runtime";
 import manifest from "../frockbot.json" with { type: "json" };
@@ -316,8 +317,10 @@ describe("Fly Sprite computer", () => {
   test("an unconfigured Computer refuses rather than pretending", async () => {
     const computer = new FlySpriteComputer({ spriteName: "frockbot-test" });
     expect(computer.configured).toBe(false);
+    // The refusal is addressed to the User, not to whoever deploys the host:
+    // it names no environment variable and no settings screen.
     await expect(computer.bot("general").ensure()).rejects.toThrow(
-      "Set SPRITES_TOKEN",
+      COMPUTER_UNCONFIGURED_MESSAGE_V1,
     );
   });
 

package/src/computer.ts

@@ -1,5 +1,6 @@
 import { createHash, randomUUID } from "node:crypto";
 import {
+  COMPUTER_UNCONFIGURED_MESSAGE_V1,
   ComputerError,
   decodeComputerDoctorReportV1,
   type ComputerConnectionOptionsV1,
@@ -1181,7 +1182,7 @@ export class FlySpriteComputer {
     if (!this.host) {
       throw new ComputerError(
         "provider-unavailable",
-        "Set SPRITES_TOKEN to attach a Fly Sprite computer",
+        COMPUTER_UNCONFIGURED_MESSAGE_V1,
       );
     }
     let held = this.surfaces.get(layout.key);

package/src/host-client.test.ts

@@ -11,8 +11,10 @@ import {
   type ComputerHostOpenFrameV1,
   type ComputerHostProvisioningV1,
 } from "@frockbot/computer-host-protocol";
+import { COMPUTER_COLD_PROVISION_EXPECTATION_MS } from "@frockbot/plugin-computer/protocol";
 import {
   ComputerHostClient,
+  COMPUTER_HOST_OPEN_TIMEOUT_MS,
   type ComputerHostFetcherV1,
 } from "./host-client.ts";
 
@@ -566,6 +568,26 @@ describe("ComputerHostClient failures", () => {
     );
   });
 
+  test("open outlasts the cold provision the product advertises", async () => {
+    // A first-ever wake that takes exactly as long as the Computer card
+    // promises must not abort on our own clock: on the shared 120 s default it
+    // reached the User as `provider-unavailable`, which reads as a broken
+    // Computer rather than one that is still coming up.
+    expect(COMPUTER_HOST_OPEN_TIMEOUT_MS).toBeGreaterThan(
+      COMPUTER_COLD_PROVISION_EXPECTATION_MS,
+    );
+  });
+
+  test("a deadline the client set says the Computer may still be starting", async () => {
+    const error = await client(hanging())
+      .exec({ script: "sleep 600", timeoutMs: 5 }, { timeoutMs: 5 })
+      .catch((thrown: unknown) => thrown);
+    // Addressed to whoever reads it in the app, with the next move in it.
+    expect((error as ComputerError).message).toBe(
+      "The Computer did not answer in time. It may still be starting up; try again in a moment.",
+    );
+  }, 10_000);
+
   test("the client's own deadline expiring is provider-unavailable", async () => {
     const error = await client(hanging())
       .exec({ script: "sleep 600", timeoutMs: 5 }, { timeoutMs: 5 })

package/src/host-client.ts

@@ -83,6 +83,18 @@ export const COMPUTER_HOST_TIMEOUT_GRACE_MS = 5_000;
 /** The deadline for a call that declares none of its own. */
 export const COMPUTER_HOST_DEFAULT_TIMEOUT_MS = 120_000;
 
+/**
+ * The deadline for `open`, which is the one call that may provision.
+ *
+ * It has to outlast the slowest thing the product tells the User to expect:
+ * the Computer card advertises "This usually takes 2-3 minutes" for a cold
+ * provision. On the shared 120 s default a first-ever wake that took exactly
+ * as long as the UI promised aborted on our own clock and reached the User as
+ * `provider-unavailable` — "the Computer is broken" — rather than as a
+ * Computer that was still coming up.
+ */
+export const COMPUTER_HOST_OPEN_TIMEOUT_MS = 300_000;
+
 /** The deadline for a best-effort cancel, which must never outlive its caller. */
 const CANCEL_TIMEOUT_MS = 5_000;
 
@@ -336,15 +348,21 @@ export class ComputerHostClient {
   async open(
     options?: ComputerHostOpenOptionsV1,
   ): Promise<ComputerHostOpenResultV1> {
+    // A caller's own deadline still wins; absent one, `open` gets the cold
+    // provision's, not the shared default.
+    const openOptions: ComputerHostOpenOptionsV1 = {
+      ...options,
+      timeoutMs: options?.timeoutMs ?? COMPUTER_HOST_OPEN_TIMEOUT_MS,
+    };
     if (!options?.onProgress) {
       return this.json(
         { kind: "open" },
         decodeComputerHostOpenResultV1,
-        options,
+        openOptions,
       );
     }
-    const effectId = this.effectIdFor(options);
-    const lease = this.lease(COMPUTER_HOST_DEFAULT_TIMEOUT_MS, options);
+    const effectId = this.effectIdFor(openOptions);
+    const lease = this.lease(COMPUTER_HOST_OPEN_TIMEOUT_MS, openOptions);
     try {
       const response = await this.send(
         { kind: "open", stream: true },
@@ -379,7 +397,7 @@ export class ComputerHostClient {
       return await this.json(
         { kind: "open" },
         decodeComputerHostOpenResultV1,
-        options,
+        openOptions,
       );
     } finally {
       lease.release();
@@ -900,9 +918,12 @@ export class ComputerHostClient {
       );
     }
     if (lease.timedOut) {
+      // Written for whoever reads it in the app. A deadline this call set is
+      // not a broken Computer: most often the Computer is still starting, and
+      // "try again" is exactly the right next move.
       return new ComputerError(
         "provider-unavailable",
-        "The Computer host did not answer within the effect's deadline",
+        "The Computer did not answer in time. It may still be starting up; try again in a moment.",
         true,
         { cause: error },
       );

package/src/host.ts

@@ -1,5 +1,8 @@
 import type { Entry } from "@cordisjs/plugin-webui";
-import { ComputerError } from "@frockbot/computer-core";
+import {
+  COMPUTER_UNCONFIGURED_MESSAGE_V1,
+  ComputerError,
+} from "@frockbot/computer-core";
 import type { ComputerState } from "@frockbot/plugin-computer/shared";
 import { computerUpdateLabelV1 } from "@frockbot/plugin-computer/protocol";
 import {
@@ -50,7 +53,7 @@ class FlySpriteHostController {
       configured: computer.configured,
       message: computer.configured
         ? "Persistent Fly Sprite computer"
-        : "Set SPRITES_TOKEN to attach a computer",
+        : COMPUTER_UNCONFIGURED_MESSAGE_V1,
     });
     const data: ComputerState = {
       ...this.machine,