unoverse 0.1.33 → 0.1.35

package/lib/create.mjs

@@ -31,6 +31,17 @@ async function ask(rl, q) {
  * pre-encoded base64 `user:token` blob that docker config (and the starter's own
  * `docr` setting) uses. Wrapping the second shape in base64 AGAIN is how a valid
  * credential gets refused, so detect it and pass it through untouched. */
+/** The raw dop_v1 token, whichever shape was pasted. docker login needs the raw form,
+ * so the base64 user:token blob is decoded before anything downstream sees it. */
+function rawToken(token) {
+  if (/^[A-Za-z0-9+/]+=*$/.test(token) && !token.startsWith("dop_v1_")) {
+    const decoded = Buffer.from(token, "base64").toString("utf8");
+    const m = /^([\x20-\x7e]+):[\x20-\x7e]+$/.exec(decoded);
+    if (m) return m[1];
+  }
+  return token;
+}
+
 function registryAuth(token) {
   if (/^[A-Za-z0-9+/]+=*$/.test(token)) {
     const decoded = Buffer.from(token, "base64").toString("utf8");
@@ -280,7 +291,7 @@ export async function create(nameArg) {
       const r = spawnSync("bash", [operatorScript, "init"], {
         stdio: "inherit",
         cwd: name,
-        env: { ...process.env, UNOVERSE_DOCR_TOKEN: token },
+        env: { ...process.env, UNOVERSE_DOCR_TOKEN: rawToken(token) },
       });
       if (r.status !== 0) {
         fail(`setup did not finish. Run 'unoverse start'${name === "." ? "" : ` in ./${name}`} to pick it back up`);

package/operator/lib/init.sh

@@ -5,6 +5,49 @@
 # (`npm i -g unoverse`); symlinking a per-project bash script into /usr/local/bin was the
 # second CLI we set out to delete.
 
+# ── The image download, as an experience ─────────────────────────────────────
+#
+# The pull starts the moment the token is accepted, so the minute spent answering
+# questions is also the minute the images arrive. NOTHING writes to the terminal
+# asynchronously — a progress bar racing a readline prompt corrupts what the developer
+# is typing. The background half writes one line of STATE to a temp file; the wizard
+# prints a status line synchronously between question groups, where output composes
+# with input; the end of setup attaches with docker's own bars for whatever remains.
+PULL_STATE=""
+start_background_pull() {
+  PULL_STATE=$(mktemp)
+  (
+    imgs=$(docker compose -f "$ROOT/docker-compose.yml" config --images 2>/dev/null | sort -u)
+    total=$(printf '%s\n' "$imgs" | grep -c .)
+    n=0
+    for img in $imgs; do
+      short="${img##*/}"; short="${short%%:*}"
+      if docker image inspect "$img" >/dev/null 2>&1; then
+        n=$((n+1)); echo "$n $total ready $short" > "$PULL_STATE"; continue
+      fi
+      echo "$n $total pulling $short" > "$PULL_STATE"
+      docker pull "$img" >/dev/null 2>&1
+      n=$((n+1)); echo "$n $total pulled $short" > "$PULL_STATE"
+    done
+    echo "$total $total done -" > "$PULL_STATE"
+  ) &
+}
+
+# One dim line, printed only when the wizard is printing anyway. Never a redraw.
+pull_status_line() {
+  [ -n "$PULL_STATE" ] && [ -s "$PULL_STATE" ] || return 0
+  local n total verb what
+  read -r n total verb what < "$PULL_STATE" 2>/dev/null || return 0
+  if [ "$verb" = "done" ]; then
+    echo -e "  ${GREEN}⬇${NC} ${DIM}platform images: all $total downloaded${NC}"
+  elif [ "$verb" = "pulling" ]; then
+    echo -e "  ${CYAN}⬇${NC} ${DIM}platform images: $n of $total · pulling $what…${NC}"
+  else
+    echo -e "  ${CYAN}⬇${NC} ${DIM}platform images: $n of $total${NC}"
+  fi
+  echo ""
+}
+
 # First-run detection
 check_first_run() {
   if [ ! -f "$ROOT/.env" ]; then
@@ -115,6 +158,22 @@ cmd_init() {
     done
   fi
 
+  # THE DOWNLOAD STARTS NOW (see the block at the top of this file).
+  if [ "$DOCKER_OK" = "1" ]; then
+    local login_err
+    if login_err=$(echo "$DOCR_TOKEN" | docker login "$DOCR_REGISTRY" -u "$DOCR_TOKEN" --password-stdin 2>&1 >/dev/null); then
+      start_background_pull
+      echo ""
+      echo -e "  ${CYAN}⬇${NC} ${DIM}Platform images are downloading in the background while you configure${NC}"
+      echo ""
+    else
+      # The REASON, not just the fact: a swallowed docker error left "login failed"
+      # undiagnosable when create had just validated the same credential.
+      warn "Registry login failed. Images will not pull until it is fixed"
+      echo "$login_err" | grep -vi "warning" | head -3 | sed 's/^/      /'
+    fi
+  fi
+
   # A DEFAULT, because "from your admin" is meaningless when you are the admin. The
   # platform ships no database (docker-compose has no postgres), so this points at one
   # you run. Enter takes the conventional local one.
@@ -144,6 +203,7 @@ cmd_init() {
     fi
   fi
 
+  pull_status_line
   # Redis, current values as defaults
   local rd
   rd=$(_env_cur REDIS_HOST); rd="${rd:-host.docker.internal}"
@@ -174,7 +234,7 @@ cmd_init() {
   # a deployed universe ("there is no auth-off deployment"), and the platform enforces it
   # rather than trusting this wizard: authConfig.ts refuses to start with auth off when
   # NODE_ENV=production. So answering "no" here cannot produce an unprotected deployment.
-  echo ""
+  pull_status_line
   local cur_auth idp_prompt
   cur_auth=$(_env_cur AUTH_ENABLED)
   idp_prompt="[y/N]"
@@ -243,6 +303,7 @@ cmd_init() {
   ok "Redis namespace: ${BOLD}${REDIS_NAMESPACE}${NC}"
 
   # OpenAI (for Memory Server)
+  pull_status_line
   local cur_oai
   cur_oai=$(_env_cur OPENAI_API_KEY)
   # NOT just the memory server: compose hands this to the unoverse service itself —
@@ -297,21 +358,15 @@ ENVEOF
 
   ok ".env created"
 
-  # Registry login and the image pull both need a daemon. Without one the token is
-  # already written to .env, so `unoverse start` does this on its first run.
+  # Attach to the background pull started when the token was accepted: layers already
+  # down show as complete, the rest stream docker's progress bars. Without a daemon the
+  # token is in .env, and `unoverse start` pulls on its first run.
   if [ "$DOCKER_OK" = "1" ]; then
-    echo ""
-    echo -e "  Logging in to DigitalOcean Container Registry..."
-    if echo "$DOCR_TOKEN" | docker login "$DOCR_REGISTRY" -u "$DOCR_TOKEN" --password-stdin &>/dev/null; then
-      ok "Logged in to DOCR"
-    else
-      fail "DOCR login failed. Check your token"
-      exit 1
-    fi
     pull_missing_images
+    [ -n "$PULL_STATE" ] && rm -f "$PULL_STATE"
   else
     echo ""
-    info "Skipped the registry login and image pull. ${BOLD}unoverse start${NC} does both once Docker is up"
+    info "Skipped the image download. ${BOLD}unoverse start${NC} does it once Docker is up"
   fi
 
   # Install to PATH

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoverse",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "The Unoverse front door — create a Studio project, a universe, or a client app, and launch Studio.",
   "license": "SEE LICENSE IN README.md",
   "type": "module",