@magicpixelart/cli 0.5.20 → 0.5.21

package/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.5.21] — 2026-09-14
+
+- `sync --watch` can no longer hang forever: every network request now has a
+  deadline (45s for manifest/JSON calls, 120s for sprite downloads and pushes),
+  and a stalled request is retried like any other network blip.
+- A slow tick prints a heartbeat with elapsed time instead of a frozen line, and
+  the first big pull reports its running sprite count page by page.
+- Timeout errors now end with a "check your internet connection" hint, matching
+  every other CLI error.
+- The heartbeat line no longer prints a stray ellipsis before the sprite count.
+
 ## 0.5.20
 
 - `sync` no longer deletes a PNG that was edited in your project when the sprite

package/dist/api.js

@@ -1,5 +1,5 @@
 import { resolveEndpoint, getApiKey, CLI_VERSION } from './config.js';
-import { etagForSha256, MAX_ASSET_BYTES, readBodyWithLimit, safeFetch, validateEndpointUrl, } from './util/security.js';
+import { ASSET_TIMEOUT_MS, etagForSha256, MAX_ASSET_BYTES, readBodyWithLimit, safeFetch, validateEndpointUrl, } from './util/security.js';
 import { authHeaders } from './util/authHeaders.js';
 import { cmd } from './util/invoke.js';
 /**
@@ -275,8 +275,13 @@ function compareSemver(a, b) {
     }
     return 0;
 }
-/** Full manifest walk, including the cloud's removal list. */
-export async function fetchManifestSnapshot(config, since) {
+/**
+ * Full manifest walk, including the cloud's removal list.
+ *
+ * `onProgress` fires after each page with the running entry count, so a big
+ * first pull shows movement instead of one frozen status line.
+ */
+export async function fetchManifestSnapshot(config, since, onProgress) {
     const out = [];
     const removed = new Set();
     let removalsTruncated = false;
@@ -292,6 +297,8 @@ export async function fetchManifestSnapshot(config, since) {
     for (let page = 0; page < MAX_PAGES; page++) {
         const res = await fetchManifestPage({ config, since, cursor, limit: 500, conditional });
         out.push(...res.items);
+        if (out.length > 0)
+            onProgress?.(out.length);
         if (Array.isArray(res.removed_keys)) {
             for (const k of res.removed_keys)
                 if (typeof k === 'string' && k)
@@ -328,7 +335,7 @@ export async function fetchAssetBytes(config, key, knownSha) {
     const conditional = knownSha ? { 'If-None-Match': etagForSha256(knownSha) } : undefined;
     return retryTransient(`download ${key}`, async () => {
         const { headers, requestId } = buildHeaders(conditional);
-        const res = await safeFetch(url.href, { headers });
+        const res = await safeFetch(url.href, { headers }, { timeoutMs: ASSET_TIMEOUT_MS });
         const serverRequestId = res.headers.get('x-request-id') ?? requestId;
         if (res.status === 304) {
             // Drain so undici can return the socket to the keep-alive pool.
@@ -372,11 +379,10 @@ export async function pushSprites(sprites, retryOpts) {
     const url = resolveIngestEndpoint();
     return retryTransient('push', async () => {
         const { headers, requestId } = buildHeaders({ 'Content-Type': 'application/json' });
-        const res = await safeFetch(url, {
-            method: 'POST',
-            headers,
-            body: JSON.stringify({ sprites }),
-        });
+        const res = await safeFetch(url, { method: 'POST', headers, body: JSON.stringify({ sprites }) }, 
+        // A push batch carries PNG bytes; give it the asset deadline, not the
+        // shorter JSON one.
+        { timeoutMs: ASSET_TIMEOUT_MS });
         const serverRequestId = res.headers.get('x-request-id') ?? requestId;
         if (res.ok) {
             const data = (await res.json());

package/dist/commands/sync.js

@@ -23,7 +23,7 @@ import { maxIsoTimestamp } from '../util/iso.js';
 import { formatBytes } from '../util/format.js';
 import { computePreviousKeyOrphans } from '../util/previousKeyOrphans.js';
 import { cmd } from '../util/invoke.js';
-import { formatWatchSpriteLine } from '../util/watchCopy.js';
+import { formatSlowTickLine, formatWatchSpriteLine, SLOW_TICK_HEARTBEAT_MS } from '../util/watchCopy.js';
 import { decidePull } from '../util/pullDecision.js';
 import { hasUnpushedLocalEdit } from '../util/localEdit.js';
 import { shouldReconcile } from '../util/reconcile.js';
@@ -177,14 +177,31 @@ async function watchLoop(opts) {
                 return;
             process.stdout.write(`\r\x1b[2K${kleur.dim(`${timestamp()} ${msg}`)}`);
         };
+        // Heartbeat: a tick that legitimately takes minutes (huge first pull, slow
+        // link) must not look like the silent hang a timeout-less fetch used to
+        // cause. Requests now have deadlines, so a live counter here means "slow",
+        // not "stuck".
+        const tickStartedAt = Date.now();
+        let lastStatus = '';
+        const wrappedStatus = (msg) => {
+            lastStatus = msg;
+            onStatus(msg);
+        };
+        const heartbeat = opts.quiet
+            ? null
+            : setInterval(() => {
+                const elapsedSec = Math.round((Date.now() - tickStartedAt) / 1000);
+                onStatus(formatSlowTickLine(elapsedSec, lastStatus));
+            }, SLOW_TICK_HEARTBEAT_MS);
+        heartbeat?.unref?.();
         try {
-            onStatus('Checking MagicPixel…');
+            wrappedStatus('Checking MagicPixel…');
             const reuseIndex = gameIndexCache && Date.now() - gameIndexAt < GAME_INDEX_TTL_MS
                 ? gameIndexCache
                 : undefined;
             const r = await runOnce({ ...opts, watch: false }, {
                 watchMode: true,
-                onStatus,
+                onStatus: wrappedStatus,
                 gameIndex: reuseIndex,
                 onGameIndex: (idx) => {
                     gameIndexCache = idx;
@@ -288,6 +305,8 @@ async function watchLoop(opts) {
             }
         }
         finally {
+            if (heartbeat)
+                clearInterval(heartbeat);
             inFlight = false;
         }
     };
@@ -440,8 +459,17 @@ async function runOnce(opts, runOpts = {}) {
     // Capture before the Unity filter drops rows — lastSync must not jump past
     // an editor save whose `unity` flag was omitted on this tick.
     let observedUpdatedAt = null;
+    // Page-by-page progress: a first pull of thousands of sprites walks several
+    // pages, and a single static status line reads as a hang.
+    const onManifestProgress = (n) => {
+        const count = n.toLocaleString('en-US');
+        if (spinner)
+            spinner.text = `Fetching manifest… (${count})`;
+        else
+            onStatus?.(`Fetching your sprites from MagicPixel… (${count})`);
+    };
     try {
-        let snapshot = await fetchManifestSnapshot(config, since);
+        let snapshot = await fetchManifestSnapshot(config, since, onManifestProgress);
         if (snapshot.removalsTruncated && since) {
             // The server couldn't list every removal in this window. Trusting the
             // partial list and advancing the cursor would strand the rest forever, so
@@ -450,7 +478,7 @@ async function runOnce(opts, runOpts = {}) {
                 console.log(kleur.dim('Many sprites were removed at once — re-reading the full manifest to stay in sync.'));
             }
             since = undefined;
-            snapshot = await fetchManifestSnapshot(config, undefined);
+            snapshot = await fetchManifestSnapshot(config, undefined, onManifestProgress);
         }
         manifest = snapshot.entries;
         removedRemoteKeys = snapshot.removedKeys;

package/dist/util/security.js

@@ -88,14 +88,46 @@ export function tmpPathFor(diskPath) {
     const suffix = randomBytes(8).toString('hex');
     return `${diskPath}.${process.pid}.${suffix}.tmp`;
 }
+/**
+ * Deadline for a single request (JSON APIs: manifest, push, whoami, key
+ * validation). Without a deadline a stalled socket — sleeping laptop, dropped
+ * Wi-Fi, dead keep-alive connection — makes `fetch` hang forever, so
+ * `sync --watch` sits silently on one tick and never retries.
+ */
+export const REQUEST_TIMEOUT_MS = 45_000;
+/** Deadline for a PNG body, which can legitimately take much longer. */
+export const ASSET_TIMEOUT_MS = 120_000;
+function isAbortError(err) {
+    const name = err?.name;
+    return name === 'AbortError' || name === 'TimeoutError';
+}
 /**
  * Follow redirects only within the same origin as the initial request (prevents API key leak).
+ *
+ * Each hop gets a fresh deadline. The signal stays armed after the response
+ * headers arrive, so a stalled *body* read aborts too — that abort surfaces
+ * raw here and is relabelled as a transient network failure by `retryTransient`
+ * one layer up; only the connection attempt gets the friendly "didn't respond
+ * in time" wording. Callers that pass their own `init.signal` own their timing
+ * (e.g. `doctor`'s 5s probe).
  */
-export async function safeFetch(url, init = {}) {
+export async function safeFetch(url, init = {}, opts = {}) {
     const origin = new URL(url).origin;
+    const timeoutMs = opts.timeoutMs ?? REQUEST_TIMEOUT_MS;
     let current = url;
     for (let hop = 0; hop < 5; hop++) {
-        const res = await fetch(current, { ...init, redirect: 'manual' });
+        const signal = init.signal ?? AbortSignal.timeout(timeoutMs);
+        let res;
+        try {
+            res = await fetch(current, { ...init, signal, redirect: 'manual' });
+        }
+        catch (e) {
+            if (!init.signal && isAbortError(e)) {
+                throw new Error(`timed out after ${Math.round(timeoutMs / 1000)}s — MagicPixel didn't respond in time.\n` +
+                    `  Fix: check your internet connection and that the MagicPixel API is reachable.`, { cause: e });
+            }
+            throw e;
+        }
         // 304 lives in the 3xx range but is a conditional-request answer, not a
         // redirect: it carries no Location and callers handle it directly.
         if (res.status < 300 || res.status >= 400 || res.status === 304)

package/dist/util/watchCopy.js

@@ -19,3 +19,23 @@ export function formatWatchSpriteLine(c) {
         return `   Sprites:  ${fmt(set)} in your game`;
     return `   Sprites:  ${fmt(pulled)}`;
 }
+/** How long a single watch tick may run before the heartbeat starts printing. */
+export const SLOW_TICK_HEARTBEAT_MS = 60_000;
+/**
+ * Heartbeat line for a tick that has outlived `SLOW_TICK_HEARTBEAT_MS`. Keeps
+ * the last status text so the user sees *what* is slow, not just that
+ * something is. Requests carry their own deadlines, so this always means slow.
+ */
+export function formatSlowTickLine(elapsedSec, lastStatus) {
+    const secs = Math.max(0, Math.round(elapsedSec));
+    const elapsed = secs >= 120 ? `${Math.round(secs / 60)}m` : `${secs}s`;
+    // "Fetching sprites… (1,200)" → "Fetching sprites (1,200)": the ellipsis and
+    // the heartbeat suffix would otherwise both claim the end of the line.
+    const what = lastStatus
+        ?.trim()
+        .replace(/[.…]+(\s*\([^()]*\))?$/, '$1')
+        .trim();
+    return what
+        ? `${what} — still working (${elapsed})`
+        : `Still working (${elapsed})`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicpixelart/cli",
-  "version": "0.5.20",
+  "version": "0.5.21",
   "description": "Sync MagicPixel pixel-art assets to your local project.",
   "type": "module",
   "bin": {