@zalkera/cli 0.25.0 → 0.27.0

package/dist/main.js

@@ -700,17 +700,25 @@ var ZalkeraApi = class _ZalkeraApi {
     return this.request("GET", `/api/partner/site-preset/presets/${encodeURIComponent(code2)}/source-url`);
   }
   /**
-   * 버전 이력(최신순). B2「현재 사이트 내려받기」와 롤백이 여기서 대상을 고른다.
+   * 버전 이력 **전량**(최신순). B2「현재 사이트 내려받기」와 롤백이 여기서 대상을 고른다.
    *
-   * @param limit **최근 몇 개만** 받을지. 없으면 전량이다.
+   * 🔴 **상한을 못 받는다.** 방향 판정(memo191)이 「이 내용이 원장에 처음 나타난 번호」를 세는데,
+   *    잘린 페이지로 세면 앞부분이 안 보여 그 번호가 **거짓**이 된다. 그리고 그 거짓은 화면에서
+   *    「서버가 더 최신」 같은 단정적인 낱말로 나온다. 상한이 필요한 자리는 [listRecentRevisions] 다 —
+   *    한 메서드에 선택 인자로 두면 잘린 목록이 원장 자리로 흘러들어도 타입이 안 막는다.
+   */
+  listRevisions() {
+    return this.request("GET", "/api/partner/site-upload/revisions");
+  }
+  /**
+   * **최근 [limit] 건만.** 목록을 보여 주는 자리용이다 — 원장 판정에 쓰면 안 된다([listRevisions]).
    *
    * ⚠ **판은 발행할 때마다 늘고 줄지 않는다.** 몇 개면 되는 소비자가 전량을 받으면 그 비용이 원장
    *   크기에 비례해 영원히 자란다 — 반영 확인 폴링이 그 자리다(판 1,000개 테넌트에서 매 폴마다
    *   전량). 구 서버는 이 파라미터를 **조용히 무시**하고 전량을 준다 — 동작은 종전과 같다.
    */
-  listRevisions(limit) {
-    const path = "/api/partner/site-upload/revisions";
-    return this.request("GET", limit == null ? path : `${path}?limit=${limit}`);
+  listRecentRevisions(limit) {
+    return this.request("GET", `/api/partner/site-upload/revisions?limit=${limit}`);
   }
   /** 소스 tar.gz 다운로드 URL **+ sha256**(TENANT_ADMIN+). 소스 소유의 실물이고, 해시가 그 약속의 검산이다. */
   sourceUrl(revisionNo) {
@@ -1911,6 +1919,14 @@ function serializeSyncLedger(ledger) {
 
 // ../core/dist/localMark.js
 import { join as join9 } from "node:path";
+
+// ../core/dist/sourceVersion.js
+var VERSION_DIGEST_PATTERN = /^[0-9a-f]{64}$/;
+function isVersionDigest(value) {
+  return typeof value === "string" && VERSION_DIGEST_PATTERN.test(value);
+}
+
+// ../core/dist/localMark.js
 var SOURCE_MARK_PATH = ".zalkera/source.json";
 var TENANT_CODE = /^[a-z0-9][a-z0-9-]{0,62}$/;
 var MAX_REVISION_NO = 2147483647;
@@ -1943,7 +1959,14 @@ function parseSourceMark(text) {
       return null;
     if (typeof o.fetchedAt !== "string")
       return null;
-    return { format: 1, tenant: o.tenant, revisionNo: o.revisionNo, sha256: o.sha256, fetchedAt: o.fetchedAt };
+    return {
+      format: 1,
+      tenant: o.tenant,
+      revisionNo: o.revisionNo,
+      sha256: o.sha256,
+      fetchedAt: o.fetchedAt,
+      ...baselineFields(o)
+    };
   }
   if (o.format === 2 && o.origin === "published") {
     if (typeof o.revisionNo !== "number" || !Number.isInteger(o.revisionNo))
@@ -1955,7 +1978,8 @@ function parseSourceMark(text) {
       origin: "published",
       tenant: o.tenant,
       revisionNo: o.revisionNo,
-      publishedAt: o.publishedAt
+      publishedAt: o.publishedAt,
+      ...baselineFields(o)
     };
   }
   if (o.format === 2 && o.origin === "linked") {
@@ -1965,6 +1989,16 @@ function parseSourceMark(text) {
   }
   return null;
 }
+function baselineFields(o) {
+  const out = {};
+  if (isVersionDigest(o.folderVersion))
+    out.folderVersion = o.folderVersion;
+  if (isVersionDigest(o.serverVersion))
+    out.serverVersion = o.serverVersion;
+  if (typeof o.tool === "string" && o.tool.length > 0 && o.tool.length <= 64)
+    out.tool = o.tool;
+  return out;
+}
 async function writeSourceMarkTo(root, mark) {
   return writeMarkText(root, buildSourceMark(mark));
 }
@@ -2155,6 +2189,126 @@ var MAX_RAW_BYTES = 300 * 1024 * 1024;
 
 // ../core/dist/publish.js
 init_errors();
+
+// ../core/dist/serverNormalization.js
+var EXCLUDED_PREFIXES2 = [".git/", "node_modules/", ".github/workflows/"];
+var SECRET_FILE_NAMES = /* @__PURE__ */ new Set([
+  "authorized_keys",
+  "known_hosts",
+  "netrc",
+  "htpasswd",
+  "shadow",
+  "credentials",
+  "credentials.json",
+  "credentials.yml",
+  "credentials.yaml",
+  "secrets.json",
+  "secrets.yml",
+  "secrets.yaml",
+  "database.yml",
+  "database.yaml",
+  "wp-config.php"
+]);
+var SECRET_BASE_NAMES = /* @__PURE__ */ new Set([
+  "id_rsa",
+  "id_dsa",
+  "id_ecdsa",
+  "id_ed25519",
+  "id_ecdsa_sk",
+  "id_ed25519_sk"
+]);
+var SECRET_EXTENSIONS = /* @__PURE__ */ new Set([
+  "pem",
+  "key",
+  "p12",
+  "pfx",
+  "jks",
+  "keystore",
+  "kdbx",
+  "ppk",
+  "ovpn",
+  "env",
+  "tfstate",
+  "tfvars",
+  "gpg",
+  "pgp"
+]);
+var ENV_KEEP_SUFFIXES = [".example", ".sample", ".template"];
+var SERVER_NORMALIZATION_SETS = {
+  prefixes: EXCLUDED_PREFIXES2,
+  secretFileNames: [...SECRET_FILE_NAMES],
+  secretBaseNames: [...SECRET_BASE_NAMES],
+  secretExtensions: [...SECRET_EXTENSIONS],
+  envKeepSuffixes: ENV_KEEP_SUFFIXES
+};
+
+// ../core/dist/workdir.js
+init_errors();
+import { createReadStream as createReadStream2 } from "node:fs";
+import { createHash as createHash5 } from "node:crypto";
+import { lstat as lstat3, readdir as readdir3 } from "node:fs/promises";
+import { join as join11, sep as sep4 } from "node:path";
+async function hashWorkdir(root, options = {}) {
+  const manifest = {};
+  const cap = Math.min(options.maxEntries ?? MAX_ENTRIES, MAX_ENTRIES);
+  let seen = 0;
+  async function walk(dir, prefix) {
+    const entries = await readdir3(dir, { withFileTypes: true }).catch((error) => {
+      if (error?.code === "ENOENT")
+        return [];
+      throw error;
+    });
+    for (const item of entries) {
+      const relative5 = prefix === "" ? item.name : `${prefix}/${item.name}`;
+      if (isExcludedEntry(relative5))
+        continue;
+      if (item.isSymbolicLink())
+        continue;
+      if (item.isDirectory()) {
+        await walk(join11(dir, item.name), relative5);
+        continue;
+      }
+      if (!item.isFile())
+        continue;
+      seen += 1;
+      if (seen > cap) {
+        throw new DevtoolsError("LOCAL_TOO_LARGE", `\uC774 \uD3F4\uB354\uC758 \uD30C\uC77C\uC774 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4(${cap}\uAC1C \uCD08\uACFC).`, "\uC0AC\uC774\uD2B8 \uD3F4\uB354\uAC00 \uC544\uB2CC \uACF3\uC744 \uAC00\uB9AC\uD0A4\uACE0 \uC788\uC9C0 \uC54A\uC740\uC9C0 \uD655\uC778\uD574 \uC8FC\uC138\uC694.");
+      }
+      manifest[relative5] = { sha256: await hashFile(join11(dir, item.name)) };
+    }
+  }
+  await walk(root, "");
+  return manifest;
+}
+async function hashFile(path) {
+  const hash = createHash5("sha256");
+  for await (const chunk of createReadStream2(path))
+    hash.update(chunk);
+  return hash.digest("hex");
+}
+async function resolveExisting(root, path) {
+  if (path === "" || path.includes("\0"))
+    return null;
+  const segments = path.split("/").filter((s) => s !== "");
+  if (segments.length === 0)
+    return null;
+  if (segments.some((s) => s === "." || s === ".." || s.includes(sep4)))
+    return null;
+  let current = root;
+  for (const part of segments) {
+    const next = join11(current, part);
+    const info = await lstat3(next).catch(() => null);
+    if (!info || info.isSymbolicLink())
+      return null;
+    current = next;
+  }
+  return current;
+}
+
+// ../core/dist/folderVersion.js
+var TEMPLATE_SCAN_MAX_BYTES = 256 * 1024;
+
+// ../core/dist/publish.js
 var MAX_ARCHIVE_BYTES = 100 * 1024 * 1024;
 var TRANSFER_TIMEOUT_MS = 15 * 60 * 1e3;
 
@@ -2216,7 +2370,7 @@ async function startDevServerWithEnv(options, storefrontKey, envName) {
 }
 
 // ../core/dist/fetchSource.js
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 init_errors();
 
 // ../core/dist/fetchTarget.js
@@ -2297,11 +2451,11 @@ async function fetchVerifiedSourceTar(options) {
   if (!source.sha256) {
     throw new DevtoolsError("SERVER_REJECTED", "\uC11C\uBC84\uAC00 \uBB34\uACB0\uC131 \uD574\uC2DC\uB97C \uC8FC\uC9C0 \uC54A\uC544 \uC18C\uC2A4\uB97C \uAC80\uC99D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.", "\uC798\uCEE4\uB77C\uC5D0 \uBB38\uC758\uD574 \uC8FC\uC138\uC694. \uAC80\uC99D \uC5C6\uC774 \uC9C4\uD589\uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.");
   }
-  const actual = createHash5("sha256").update(buffer).digest("hex");
+  const actual = createHash6("sha256").update(buffer).digest("hex");
   if (actual !== source.sha256) {
     throw new DevtoolsError("SERVER_REJECTED", "\uBC1B\uC740 \uC18C\uC2A4\uAC00 \uC6D0\uBCF8\uACFC \uB2E4\uB985\uB2C8\uB2E4(\uBB34\uACB0\uC131 \uD655\uC778 \uC2E4\uD328).", "\uB124\uD2B8\uC6CC\uD06C \uBB38\uC81C\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uB2E4\uC2DC \uC2DC\uB3C4\uD574 \uC8FC\uC138\uC694.");
   }
-  return { revisionNo, buffer, sha256: source.sha256 };
+  return { revisionNo, buffer, sha256: source.sha256, versionDigest: source.versionDigest ?? null };
 }
 
 // ../core/dist/unzip.js
@@ -2323,7 +2477,7 @@ init_notice();
 // ../core/dist/npmChoice.js
 import { execFileSync } from "node:child_process";
 import { existsSync as existsSync7, realpathSync } from "node:fs";
-import { delimiter as delimiter2, isAbsolute as isAbsolute2, join as join11, normalize as normalize3, sep as sep4 } from "node:path";
+import { delimiter as delimiter2, isAbsolute as isAbsolute2, join as join12, normalize as normalize3, sep as sep5 } from "node:path";
 var MIN_SYSTEM_NPM_MAJOR = 9;
 function majorOf(version2) {
   const m = /^(\d+)\./.exec((version2 ?? "").trim());
@@ -2386,7 +2540,7 @@ function npmArgvOf(choice, nodePath) {
       return null;
   }
 }
-var PATH_OPS = { join: join11, isAbsolute: isAbsolute2, normalize: normalize3, sep: sep4 };
+var PATH_OPS = { join: join12, isAbsolute: isAbsolute2, normalize: normalize3, sep: sep5 };
 function probeSystemNpm(nodePath, excludeUnder = [], env = process.env) {
   const entries = (env.PATH ?? "").split(delimiter2);
   for (const step of systemNpmSearchSteps(entries, PATH_OPS, excludeUnder)) {
@@ -2465,12 +2619,12 @@ var UPGRADE_NOTICE_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 
 // ../core/dist/tokenPath.js
 import { homedir as homedir2 } from "node:os";
-import { isAbsolute as isAbsolute3, join as join12, resolve as resolve5, sep as sep5 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join13, resolve as resolve5, sep as sep6 } from "node:path";
 function tokenPath(env = process.env, home = homedir2()) {
-  const fallback = join12(home, ".config");
+  const fallback = join13(home, ".config");
   const base = env.XDG_CONFIG_HOME;
-  const inside = base !== void 0 && isAbsolute3(base) && (resolve5(base) === resolve5(home) || resolve5(base).startsWith(resolve5(home) + sep5));
-  return join12(inside ? resolve5(base) : fallback, "zalkera", "auth.json");
+  const inside = base !== void 0 && isAbsolute3(base) && (resolve5(base) === resolve5(home) || resolve5(base).startsWith(resolve5(home) + sep6));
+  return join13(inside ? resolve5(base) : fallback, "zalkera", "auth.json");
 }
 
 // ../core/dist/index.js
@@ -2593,71 +2747,6 @@ function trimPaths(paths, cap = PATH_LIST_CAP, all = false) {
 import { lstat as lstat4, mkdir as mkdir5, readFile as readFile5, realpath as realpath2, rename as rename2, rmdir, stat as stat3, unlink, writeFile as writeFile7 } from "node:fs/promises";
 init_errors();
 import { basename as basename2, dirname as dirname2, join as join14, relative as relative4, resolve as resolve6, sep as sep7 } from "node:path";
-
-// ../core/dist/workdir.js
-init_errors();
-import { createReadStream as createReadStream2 } from "node:fs";
-import { createHash as createHash6 } from "node:crypto";
-import { lstat as lstat3, readdir as readdir3 } from "node:fs/promises";
-import { join as join13, sep as sep6 } from "node:path";
-async function hashWorkdir(root, options = {}) {
-  const manifest = {};
-  const cap = Math.min(options.maxEntries ?? MAX_ENTRIES, MAX_ENTRIES);
-  let seen = 0;
-  async function walk(dir, prefix) {
-    const entries = await readdir3(dir, { withFileTypes: true }).catch((error) => {
-      if (error?.code === "ENOENT")
-        return [];
-      throw error;
-    });
-    for (const item of entries) {
-      const relative5 = prefix === "" ? item.name : `${prefix}/${item.name}`;
-      if (isExcludedEntry(relative5))
-        continue;
-      if (item.isSymbolicLink())
-        continue;
-      if (item.isDirectory()) {
-        await walk(join13(dir, item.name), relative5);
-        continue;
-      }
-      if (!item.isFile())
-        continue;
-      seen += 1;
-      if (seen > cap) {
-        throw new DevtoolsError("LOCAL_TOO_LARGE", `\uC774 \uD3F4\uB354\uC758 \uD30C\uC77C\uC774 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4(${cap}\uAC1C \uCD08\uACFC).`, "\uC0AC\uC774\uD2B8 \uD3F4\uB354\uAC00 \uC544\uB2CC \uACF3\uC744 \uAC00\uB9AC\uD0A4\uACE0 \uC788\uC9C0 \uC54A\uC740\uC9C0 \uD655\uC778\uD574 \uC8FC\uC138\uC694.");
-      }
-      manifest[relative5] = { sha256: await hashFile(join13(dir, item.name)) };
-    }
-  }
-  await walk(root, "");
-  return manifest;
-}
-async function hashFile(path) {
-  const hash = createHash6("sha256");
-  for await (const chunk of createReadStream2(path))
-    hash.update(chunk);
-  return hash.digest("hex");
-}
-async function resolveExisting(root, path) {
-  if (path === "" || path.includes("\0"))
-    return null;
-  const segments = path.split("/").filter((s) => s !== "");
-  if (segments.length === 0)
-    return null;
-  if (segments.some((s) => s === "." || s === ".." || s.includes(sep6)))
-    return null;
-  let current = root;
-  for (const part of segments) {
-    const next = join13(current, part);
-    const info = await lstat3(next).catch(() => null);
-    if (!info || info.isSymbolicLink())
-      return null;
-    current = next;
-  }
-  return current;
-}
-
-// ../core/dist/pull.js
 var SAVED_SUFFIX = ".zalkera-saved";
 async function pullSiteSource(options) {
   const report = options.onProgress ?? (() => {
@@ -3850,7 +3939,7 @@ async function main(argv) {
     case "status": {
       const context = await openContext(common);
       const draft = await context.api.draftFiles().catch(() => null);
-      const active = await context.api.listRevisions(20).then((rows) => rows.find((r) => r.isActive)?.revisionNo ?? null).catch(() => null);
+      const active = await context.api.listRecentRevisions(20).then((rows) => rows.find((r) => r.isActive)?.revisionNo ?? null).catch(() => null);
       const ledger = await readLedger(context.folder);
       const status = syncStatus({
         ledger,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zalkera/cli",
-    "version": "0.25.0",
+    "version": "0.27.0",
     "description": "잘커라 사이트 소스를 터미널에서 받고·올리고·발행합니다. 편집기 없이, 스크립트에서도.",
     "license": "MIT",
     "type": "module",