@tinycloud/cli 1.2.0-beta.9 → 1.2.1-beta.0

package/dist/courier-entry.js

@@ -929,6 +929,9 @@ async function courierNode(profile) {
   const key = loadKey();
   const grant = loadGrant();
   if (profile.status === "awaiting-space") {
+    if (profile.spacePending) {
+      throw new CourierError("no-space", `TinyCloud "${COURIER_SPACE}" space is still being set up by OpenKey; run \`${cmd("init --resume")}\`.`);
+    }
     throw new CourierError("no-space", `TinyCloud "${COURIER_SPACE}" space is missing; after hosting it, run \`${cmd("init --resume")}\`.`);
   }
   if (!grant || profile.status === "awaiting-grant") {
@@ -1289,6 +1292,27 @@ async function verifySpaceReady(node) {
     throw error;
   }
 }
+async function waitForSpaceReady(probe, options = {}) {
+  const timeoutMs = options.timeoutMs ?? 15e4;
+  const delaysMs = options.delaysMs ?? [2e3, 3e3, 5e3, 8e3, 13e3];
+  const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const now = options.now ?? Date.now;
+  const started = now();
+  const deadline = started + timeoutMs;
+  let attempt = 0;
+  for (; ; ) {
+    if (await probe())
+      return true;
+    const current = now();
+    if (current >= deadline)
+      return false;
+    options.onWait?.(current - started);
+    await sleep(Math.min(delaysMs[attempt++] ?? 15e3, deadline - current));
+  }
+}
+function pendingSpaceError(profile) {
+  return new CourierError("no-space", `OpenKey is still setting up your TinyCloud "${COURIER_SPACE}" space on ${profile.host}. This can take a few minutes. Run \`${cmd("init --resume")}\` shortly; no new approval is needed. If it still isn't ready after a few minutes, run \`${cmd("init")}\` to approve again, and OpenKey will retry the setup.`);
+}
 function noSpaceError(profile) {
   return new CourierError("no-space", `Your TinyCloud "${COURIER_SPACE}" space is not set up on ${profile.host}, so the approved grant can't be used yet. Courier will not create it. If OpenKey auto-sign didn't host it, sign in once at the Share view (https://share.tinycloud.xyz) or, from a wallet profile, run \`tc space host ${COURIER_SPACE}\`. Then run \`${cmd("init --resume")}\`. No new approval is needed.`);
 }
@@ -1335,11 +1359,21 @@ async function installGrant(profile, key, payload) {
   saveGrant(grant);
   applyGrantToProfile(profile, grant);
   if (!await verifySpaceReady(node)) {
+    const pending = payload.spacePending === true && payload.spaceReady === null;
     profile.status = "awaiting-space";
+    if (pending)
+      profile.spacePending = true;
+    else
+      delete profile.spacePending;
     saveProfile(profile);
-    throw noSpaceError(profile);
+    if (!pending)
+      throw noSpaceError(profile);
+    console.error(`OpenKey is setting up your TinyCloud "${COURIER_SPACE}" space; waiting up to 2.5 minutes\u2026`);
+    if (!await waitForSpaceReady(() => verifySpaceReady(node)))
+      throw pendingSpaceError(profile);
   }
   profile.status = "ready";
+  delete profile.spacePending;
   saveProfile(profile);
 }
 async function resumeGrant(profile, key) {
@@ -1354,12 +1388,14 @@ async function resumeGrant(profile, key) {
     throw new CourierError("bad-grant", `Saved grant space is not ${COURIER_SPACE}.`);
   }
   const { node } = await restoreVerifiedGrant(profile, key, payload);
-  if (!await verifySpaceReady(node)) {
+  const ready = profile.spacePending ? await waitForSpaceReady(() => verifySpaceReady(node), { timeoutMs: 6e4 }) : await verifySpaceReady(node);
+  if (!ready) {
     profile.status = "awaiting-space";
     saveProfile(profile);
-    throw noSpaceError(profile);
+    throw profile.spacePending ? pendingSpaceError(profile) : noSpaceError(profile);
   }
   profile.status = "ready";
+  delete profile.spacePending;
   applyGrantToProfile(profile, grant);
   saveProfile(profile);
 }