@blocofy/cli 0.2.2 → 0.2.4

package/README.md

@@ -53,6 +53,7 @@ A theme is a directory of files grouped by top-level folder:
 | `asset/` | CSS and static files (`theme.css`) |
 | `pages/<slug>.json` | Page content (`/` → `pages/index.json`) |
 | `config/settings.json` | Theme settings + color schemes |
+| `config/settings_schema.json` | Theme settings panel schema (synced with `pull`/`push`) |
 
 Liquid templates use the `.liquid` extension; files under `asset/` are served as-is.
 

package/bin/blocofy.mjs

@@ -9,6 +9,7 @@
  * livereload. No monorepo required.
  */
 import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
 import { resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 
@@ -17,13 +18,13 @@ import { pullContent, pushContent } from "../lib/content-sync.mjs";
 import { credentialsPath, loadCredentials, saveCredentials } from "../lib/credentials.mjs";
 import { startDevServer } from "../lib/dev-server.mjs";
 import { readLocalTemplates } from "../lib/local-theme.mjs";
-import { githubNote, statusLine, syncScopeNote } from "../lib/messages.mjs";
+import { githubNote, retryNotice, statusLine, syncScopeNote } from "../lib/messages.mjs";
 import { fetchDevSession, fetchSiteStatus, fetchWhoami, publishInstance, pullTheme, pushTheme } from "../lib/theme-sync.mjs";
 import { isAffirmative, livePushDecision } from "../lib/confirm.mjs";
 import { hyperlink, openUrl } from "../lib/term.mjs";
 import { isValidToken, isValidUrl, normalizeUrl } from "../lib/validate.mjs";
 
-const VERSION = "0.1.14";
+const VERSION = createRequire(import.meta.url)("../package.json").version;
 const args = process.argv.slice(2);
 
 /** Human label for a resolved site: "Name (slug)" or just the slug. */
@@ -239,7 +240,14 @@ async function themePush(rest) {
     }
   }
 
-  const result = await pushTheme({ dir, url: creds.url, token: creds.token, draft, instance });
+  const result = await pushTheme({
+    dir,
+    url: creds.url,
+    token: creds.token,
+    draft,
+    instance,
+    onRetry: (info) => console.error(retryNotice(info)),
+  });
   if (result.instanceId) {
     console.log(`Pushed to theme ${result.instanceId} (${result.created} created, ${result.updated} updated).`);
     console.log(`Preview & publish it in the admin panel: Theme → Theme library → "Open in editor".`);
@@ -365,6 +373,7 @@ async function themeDev(rest) {
     token: creds.token,
     port,
     syncDraft: Boolean(session),
+    onRetry: (info) => console.error(`  ${retryNotice(info)}`),
     // Her kaydetmede ne olduğunu bas — "reloaded" = watch tetiklendi; "0 views"
     // = hiçbir tarayıcı sekmesi bağlı değil (yanlış görünüme bakıyorsun); sync
     // hatası = draft güncellenemedi (preview/editör eski kalır, local yine yenilenir).

package/lib/dev-server.mjs

@@ -20,7 +20,7 @@ import { pushTheme } from "./theme-sync.mjs";
  * separate request); direct `/asset/*` references are served from disk. Images/JS
  * are remote (Directus/CDN), so no local serving is needed for them.
  */
-export function startDevServer({ dir, url, token, port, syncDraft = false, onError, onReload }) {
+export function startDevServer({ dir, url, token, port, syncDraft = false, onError, onReload, onRetry }) {
   const base = url.replace(/\/+$/, "");
   const clients = new Set();
 
@@ -97,7 +97,7 @@ export function startDevServer({ dir, url, token, port, syncDraft = false, onErr
     let error = null;
     if (syncDraft) {
       try {
-        await pushTheme({ dir, url, token, draft: true });
+        await pushTheme({ dir, url, token, draft: true, onRetry });
       } catch (err) {
         error = err?.message ?? String(err); // senkron hatası reload'u engellemesin
       }
@@ -108,7 +108,7 @@ export function startDevServer({ dir, url, token, port, syncDraft = false, onErr
 
   // Açılışta taslağı bir kez doldur → uzak görünümler hemen güncel local'i gösterir.
   if (syncDraft) {
-    void pushTheme({ dir, url, token, draft: true }).catch(() => {});
+    void pushTheme({ dir, url, token, draft: true, onRetry }).catch(() => {});
   }
 
   server.listen(port);

package/lib/local-theme.mjs

@@ -31,7 +31,10 @@ export function readLocalTemplates(dir) {
       }
       const rel = relative(dir, full).split(sep).join("/");
       const top = rel.split("/")[0] ?? "";
-      if (!THEME_DIRS.has(top)) continue;
+      // config/ dizininden YALNIZ settings_schema.json senkronlanır (tema-ayarları
+      // şeması); color_schemes.json/theme.json kendi sistemlerinde. Platform tarafıyla
+      // (github-sync mapRepoPath / theme-write themeWriteKind) simetrik tek-path istisnası.
+      if (rel !== "config/settings_schema.json" && !THEME_DIRS.has(top)) continue;
       out[rel.endsWith(".liquid") ? rel.slice(0, -7) : rel] = readFileSync(full, "utf8");
     }
   };

package/lib/messages.mjs

@@ -14,8 +14,8 @@ import { THEME_DIRS } from "./local-theme.mjs";
 export function syncScopeNote() {
   const synced = [...THEME_DIRS].sort().map((d) => `${d}/`).join(" ");
   return [
-    `Synced (theme code):  ${synced}`,
-    `Not synced (cloud):   config/ pages/ — edit these in the admin editor`,
+    `Synced (theme code):  ${synced} config/settings_schema.json`,
+    `Not synced (cloud):   pages/ (other config/ files) — edit these in the admin editor`,
   ];
 }
 
@@ -31,6 +31,16 @@ export function statusLine(session) {
   return `Local files → Draft theme ${draft}    ·    Live theme → ${live}`;
 }
 
+/**
+ * Geçici ağ hatasında yeniden-deneme bildirimi (saf → test edilebilir). `push`
+ * (ve `theme dev` taslak senkronu) sessizce retry ETMESİN; stderr'e kısa bir satır
+ * yazılır. `onRetry({ attempt, retries, reason })` payload'ından string üretir.
+ */
+export function retryNotice({ attempt, retries, reason }) {
+  const why = reason ? ` (${reason})` : "";
+  return `Network error${why} — retrying (${attempt}/${retries})…`;
+}
+
 /**
  * Dev oturumuna göre "düzlem" uyarısı döndürür (string), oturum yoksa null.
  * - GitHub bağlı → repo@branch + `git pull` ipucu.

package/lib/theme-sync.mjs

@@ -18,6 +18,49 @@ async function errorText(res) {
   }
 }
 
+/** Backoff delays (ms) between attempts — index 0 = after the first failure. */
+const RETRY_BACKOFF_MS = [300, 900];
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+/**
+ * fetch wrapper that retries ONLY on transient failures: a thrown fetch (network
+ * error / connection reset) or a 5xx / 429 response. Permanent 4xx (401/403/422 …)
+ * fail immediately — no retry. Max 2 retries with a short backoff (300ms, 900ms).
+ *
+ * Safe because every endpoint here is idempotent: theme push is a file upsert
+ * (create/update, no delete), pull/whoami/session/site are reads, publish sets a
+ * pointer. Re-sending the same request cannot double-apply anything.
+ *
+ * `onRetry({ attempt, retries, reason })` is called before each wait so callers can
+ * surface a "Network error, retrying…" line (not silent).
+ */
+export async function fetchWithRetry(input, init, { retries = 2, onRetry, backoff = RETRY_BACKOFF_MS } = {}) {
+  let lastErr;
+  for (let attempt = 0; attempt <= retries; attempt += 1) {
+    let res;
+    try {
+      res = await fetch(input, init);
+    } catch (err) {
+      // Thrown fetch = network-level failure (DNS, reset, "fetch failed"). Transient.
+      lastErr = err;
+      if (attempt === retries) throw err;
+      onRetry?.({ attempt: attempt + 1, retries, reason: err?.message ?? String(err) });
+      await sleep(backoff[attempt] ?? 0);
+      continue;
+    }
+    // 5xx / 429 = transient server-side; retry. Other statuses (incl. 4xx) return as-is.
+    if ((res.status >= 500 || res.status === 429) && attempt < retries) {
+      onRetry?.({ attempt: attempt + 1, retries, reason: `HTTP ${res.status}` });
+      await sleep(backoff[attempt] ?? 0);
+      continue;
+    }
+    return res;
+  }
+  // Unreachable (loop returns or throws), but keeps the type honest.
+  throw lastErr;
+}
+
 /**
  * Download a theme to disk. `{ path: content }` (stripped) → `.liquid` files.
  * With `draft`, pulls the "CLI Draft" instance (what `theme dev` syncs into)
@@ -74,15 +117,19 @@ export async function fetchDevSession({ url, token }) {
  * writes to a draft theme instance instead of the live theme — preview & publish
  * it from the admin panel without affecting the live site.
  */
-export async function pushTheme({ dir, url, token, draft = false, instance = null }) {
+export async function pushTheme({ dir, url, token, draft = false, instance = null, onRetry = null }) {
   const base = url.replace(/\/+$/, "");
   const files = readLocalTemplates(dir);
   const payload = instance ? { files, instance } : { files, draft };
-  const res = await fetch(`${base}/api/dev/theme`, {
-    method: "POST",
-    headers: { "content-type": "application/json", authorization: `Bearer ${token}` },
-    body: JSON.stringify(payload),
-  });
+  const res = await fetchWithRetry(
+    `${base}/api/dev/theme`,
+    {
+      method: "POST",
+      headers: { "content-type": "application/json", authorization: `Bearer ${token}` },
+      body: JSON.stringify(payload),
+    },
+    { onRetry },
+  );
   if (!res.ok) throw new Error(await errorText(res));
   return res.json();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocofy/cli",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Develop your Blocofy theme locally against live data with instant preview — login, theme dev, pull, push.",
   "type": "module",
   "license": "MIT",