@zalkera/cli 0.31.0 → 0.32.0

package/README.md

@@ -31,7 +31,7 @@ zalkera publish                # 올린 것을 새 버전으로 만든다(그래
 zalkera rollback <판번호>        # 라이브를 그 버전으로 되돌린다
 zalkera discard                # 사이트 쪽에서 편집 중인 것을 버린다(판은 안 옮긴다)
 zalkera baseline               # 기준 기록만 다시 세운다(파일은 안 건드린다)
-zalkera logout
+zalkera logout                 # 로그인 정보를 지우고 이 컴퓨터의 서버 쪽 로그인도 끊는다
 ```
 
 `--site` 는 **폴더가 소속을 모를 때만** 필요하다. 한 번 받으면 폴더가 그것을 기억한다.

package/dist/main.js

@@ -552,6 +552,7 @@ function escapeHtml(value) {
 // ../core/dist/auth/oauth.js
 init_errors();
 var REFRESH_SKEW_MS = 2e4;
+var REVOKE_TIMEOUT_MS = 5e3;
 async function login(config, store, options) {
   const pkce = createPkce();
   const state = createState();
@@ -633,7 +634,30 @@ async function refreshToken(config, store) {
 }
 async function logout(store) {
   logoutEpoch.set(store, epochOf(store) + 1);
+  const current = await store.read().catch(() => null);
   await store.clear();
+  const serverEnded = current?.clientId ? revokeRefreshToken(current, current.clientId) : Promise.resolve(false);
+  return { serverEnded };
+}
+async function revokeRefreshToken(tokens, clientId) {
+  const issuer = httpUrl(tokens.issuer);
+  if (!issuer)
+    return false;
+  try {
+    const response = await fetch(`${trimSlash(issuer.href)}/protocol/openid-connect/revoke`, {
+      method: "POST",
+      headers: { "content-type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        client_id: clientId,
+        token: tokens.refreshToken,
+        token_type_hint: "refresh_token"
+      }),
+      signal: AbortSignal.timeout(REVOKE_TIMEOUT_MS)
+    });
+    return response.ok;
+  } catch {
+    return false;
+  }
 }
 async function exchange(config, params) {
   const body = new URLSearchParams({ client_id: config.clientId, ...params });
@@ -654,7 +678,8 @@ async function exchange(config, params) {
     accessToken: token.access_token,
     refreshToken: token.refresh_token,
     expiresAt: Date.now() + token.expires_in * 1e3,
-    issuer: config.issuer
+    issuer: config.issuer,
+    clientId: config.clientId
   };
 }
 async function safeText(response) {
@@ -2431,6 +2456,32 @@ async function startDevServerWithEnv(options, storefrontKey, envName) {
 
 // ../core/dist/fetchSource.js
 import { createHash as createHash6 } from "node:crypto";
+
+// ../core/dist/emptyDir.js
+import { basename as basename2, dirname as dirname2, join as join13 } from "node:path";
+var OS_JUNK = /* @__PURE__ */ new Set([
+  ".DS_Store",
+  // macOS
+  "Thumbs.db",
+  // Windows
+  "desktop.ini"
+  // Windows
+]);
+var IGNORED = /* @__PURE__ */ new Set([
+  ".vscode",
+  // 편집기·확장이 만든다(우리가 만드는 쪽이다)
+  ...OS_JUNK
+]);
+var OWN_STATE_FILES = [SOURCE_MARK_PATH, SYNC_LEDGER_PATH];
+var OWN_STATE_DIR = (() => {
+  const dirs = new Set(OWN_STATE_FILES.map((p) => dirname2(p)));
+  if (dirs.size !== 1)
+    throw new Error(`\uC790\uAE30 \uC0C1\uD0DC \uD30C\uC77C\uC774 \uD55C \uD3F4\uB354\uC5D0 \uC788\uC9C0 \uC54A\uB2E4: ${[...dirs].join(", ")}`);
+  return [...dirs][0];
+})();
+var OWN_STATE_NAMES = new Set(OWN_STATE_FILES.map((p) => basename2(p)));
+
+// ../core/dist/fetchSource.js
 init_errors();
 
 // ../core/dist/fetchTarget.js
@@ -2540,7 +2591,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 join13, normalize as normalize3, sep as sep5 } from "node:path";
+import { delimiter as delimiter2, isAbsolute as isAbsolute2, join as join14, normalize as normalize3, sep as sep5 } from "node:path";
 var MIN_SYSTEM_NPM_MAJOR = 9;
 function majorOf(version2) {
   const m = /^(\d+)\./.exec((version2 ?? "").trim());
@@ -2603,7 +2654,7 @@ function npmArgvOf(choice, nodePath) {
       return null;
   }
 }
-var PATH_OPS = { join: join13, isAbsolute: isAbsolute2, normalize: normalize3, sep: sep5 };
+var PATH_OPS = { join: join14, 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)) {
@@ -2682,12 +2733,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 join14, resolve as resolve5, sep as sep6 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join15, resolve as resolve5, sep as sep6 } from "node:path";
 function tokenPath(env = process.env, home = homedir2()) {
-  const fallback = join14(home, ".config");
+  const fallback = join15(home, ".config");
   const base = env.XDG_CONFIG_HOME;
   const inside = base !== void 0 && isAbsolute3(base) && (resolve5(base) === resolve5(home) || resolve5(base).startsWith(resolve5(home) + sep6));
-  return join14(inside ? resolve5(base) : fallback, "zalkera", "auth.json");
+  return join15(inside ? resolve5(base) : fallback, "zalkera", "auth.json");
 }
 
 // ../core/dist/index.js
@@ -2809,7 +2860,7 @@ function trimPaths(paths, cap = PATH_LIST_CAP, all = false) {
 // ../core/dist/pull.js
 import { lstat as lstat5, mkdir as mkdir5, readFile as readFile6, realpath as realpath2, rename as rename2, rmdir, unlink } from "node:fs/promises";
 init_errors();
-import { basename as basename2, dirname as dirname2, join as join15, relative as relative4, resolve as resolve6, sep as sep7 } from "node:path";
+import { basename as basename3, dirname as dirname3, join as join16, relative as relative4, resolve as resolve6, sep as sep7 } from "node:path";
 var SAVED_SUFFIX = ".zalkera-saved";
 async function pullSiteSource(options) {
   const report = options.onProgress ?? (() => {
@@ -2841,7 +2892,7 @@ async function pullSiteSource(options) {
     const aside = await setAside(root, plan);
     savedTo = aside.folder;
     movedAway = aside.moved;
-    report(`\uACE0\uCE5C \uB0B4\uC6A9\uC744 ${basename2(savedTo)} \uC5D0 \uC62E\uACA8 \uB450\uC5C8\uC2B5\uB2C8\uB2E4.`);
+    report(`\uACE0\uCE5C \uB0B4\uC6A9\uC744 ${basename3(savedTo)} \uC5D0 \uC62E\uACA8 \uB450\uC5C8\uC2B5\uB2C8\uB2E4.`);
   }
   const todo = savedTo ? applyAfterDiscard(plan, incoming) : { writes: plan.writes, deletes: plan.deletes };
   await requireNoLinkedTargets(root, todo.writes);
@@ -2908,7 +2959,7 @@ async function requireNoLinkedTargets(root, paths) {
     const segments = path.split("/").filter((s) => s !== "");
     let current = root;
     for (const part of segments) {
-      current = join15(current, part);
+      current = join16(current, part);
       if (checked.has(current))
         continue;
       checked.add(current);
@@ -2931,13 +2982,13 @@ function withoutExcluded(declared) {
   return { incoming, dropped: dropped.sort() };
 }
 async function readLedger(root) {
-  const text = await readFile6(join15(root, SYNC_LEDGER_PATH), "utf8").catch(() => null);
+  const text = await readFile6(join16(root, SYNC_LEDGER_PATH), "utf8").catch(() => null);
   return text === null ? null : parseSyncLedger(text);
 }
 async function writeLedger(root, ledger) {
   try {
     const dir = await ensureOwnDir(root, ...SYNC_LEDGER_PATH.split("/").slice(0, -1));
-    await writeOwnFile(join15(dir, basename2(SYNC_LEDGER_PATH)), serializeSyncLedger(ledger));
+    await writeOwnFile(join16(dir, basename3(SYNC_LEDGER_PATH)), serializeSyncLedger(ledger));
   } catch {
     return false;
   }
@@ -2961,10 +3012,10 @@ async function applyDeletes(root, paths) {
     await unlink(target).catch(() => {
     });
     count2 += 1;
-    let dir = dirname2(target);
+    let dir = dirname3(target);
     while (dir.length > root.length && dir.startsWith(root)) {
       parents.add(dir);
-      dir = dirname2(dir);
+      dir = dirname3(dir);
     }
   }
   for (const dir of [...parents].sort((a, b) => b.length - a.length)) {
@@ -2976,14 +3027,14 @@ async function applyDeletes(root, paths) {
 async function setAside(root, plan) {
   const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
   const real = await realpath2(root).catch(() => root);
-  const saved = join15(dirname2(real), `${basename2(real)}${SAVED_SUFFIX}`, stamp);
+  const saved = join16(dirname3(real), `${basename3(real)}${SAVED_SUFFIX}`, stamp);
   const moved = [];
   for (const conflict of plan.conflicts) {
     const from = await resolveExisting(root, conflict.path);
     if (!from)
       continue;
-    const to = join15(saved, conflict.path);
-    await mkdir5(dirname2(to), { recursive: true });
+    const to = join16(saved, conflict.path);
+    await mkdir5(dirname3(to), { recursive: true });
     await rename2(from, to);
     moved.push(conflict.path);
   }
@@ -3005,12 +3056,12 @@ ${list}`,
 // ../core/dist/baseline.js
 init_errors();
 import { readFile as readFile7 } from "node:fs/promises";
-import { join as join16, resolve as resolve7 } from "node:path";
+import { join as join17, resolve as resolve7 } from "node:path";
 async function rebuildBaseline(options) {
   const report = options.onProgress ?? (() => {
   });
   const root = resolve7(options.folder);
-  const previousText = await readFile7(join16(root, SYNC_LEDGER_PATH), "utf8").catch(() => null);
+  const previousText = await readFile7(join17(root, SYNC_LEDGER_PATH), "utf8").catch(() => null);
   const previous = previousText === null ? null : parseSyncLedger(previousText);
   report("\uD310\uC758 \uD30C\uC77C \uBAA9\uB85D\uC744 \uB2E4\uC2DC \uC77D\uB294 \uC911\uC785\uB2C8\uB2E4\u2026");
   const tar = await fetchVerifiedSourceTar({
@@ -3111,7 +3162,7 @@ function ledgerCorrection(ledger, draft) {
 init_errors();
 init_notice();
 import { readFile as readFile8, stat as stat3 } from "node:fs/promises";
-import { basename as basename3, join as join17, resolve as resolve8 } from "node:path";
+import { basename as basename4, join as join18, resolve as resolve8 } from "node:path";
 
 // ../core/dist/pushPlan.js
 function effectiveSha(base, draft, path) {
@@ -3388,14 +3439,14 @@ async function bodyOf(root, edits) {
       body.push({ path: edit.path, remove: true, ...edit.baseSha256 === null ? {} : { baseSha256: edit.baseSha256 } });
       continue;
     }
-    const size = (await stat3(join17(root, edit.path))).size;
+    const size = (await stat3(join18(root, edit.path))).size;
     if (size > MAX_PUSH_FILE_BYTES) {
       throw new DevtoolsError("PUSH_TOO_LARGE", `\uD30C\uC77C \uD558\uB098\uAC00 \uB108\uBB34 \uD07D\uB2C8\uB2E4: ${edit.path} (${Math.round(size / 1024)}KB \xB7 \uC0C1\uD55C ${MAX_PUSH_FILE_BYTES / 1024}KB).`, "\uB3D9\uC601\uC0C1\xB7\uC6D0\uBCF8 \uC774\uBBF8\uC9C0\xB7\uBE4C\uB4DC \uC0B0\uCD9C\uBB3C\uC774 \uC18C\uC2A4 \uD3F4\uB354\uC5D0 \uB4E4\uC5B4 \uC788\uC9C0 \uC54A\uC740\uC9C0 \uD655\uC778\uD574 \uC8FC\uC138\uC694.");
     }
     if (total + size > MAX_PUSH_BYTES)
       throw tooLarge();
-    const raw = await readFile8(join17(root, edit.path));
-    const breach = templateBreach(basename3(edit.path), raw);
+    const raw = await readFile8(join18(root, edit.path));
+    const breach = templateBreach(basename4(edit.path), raw);
     if (breach !== null) {
       throw new DevtoolsError("PUSH_SECRET_TEMPLATE", `${edit.path} \uC5D0 \uC2E4\uC81C \uAC12\uC774 \uB4E4\uC5B4 \uC788\uC5B4 \uC62C\uB9AC\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4(${breach}).`, "`.env.example` \uAC19\uC740 \uC11C\uC2DD \uD30C\uC77C\uC740 \uAC12\uC744 \uBE44\uC6CC \uB450\uC5B4\uC57C \uC62C\uB77C\uAC11\uB2C8\uB2E4. \uC2E4\uC81C \uAC12\uC740 \uCF58\uC194\uC758 \uD658\uACBD\uBCC0\uC218 \uD654\uBA74\uC5D0\uC11C \uAD00\uB9AC\uD574 \uC8FC\uC138\uC694.");
     }
@@ -3663,11 +3714,11 @@ function flagValue(flags, name) {
 import { readFileSync } from "node:fs";
 import { readFile as readFile10 } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
-import { join as join19, resolve as resolve11 } from "node:path";
+import { join as join20, resolve as resolve11 } from "node:path";
 
 // src/tokenStore.ts
 import { chmod as chmod4, readFile as readFile9, rm as rm6 } from "node:fs/promises";
-import { basename as basename4, dirname as dirname3 } from "node:path";
+import { basename as basename5, dirname as dirname4 } from "node:path";
 var FileTokenStore = class {
   // ⚠ 매개변수 프로퍼티(`constructor(private path)`)를 안 쓴다 — Node 의 타입 제거 실행기가
   //   그 문법을 거절해 **시험이 아예 안 돈다.** 이 레포의 시험은 전부 그 실행기로 돈다.
@@ -3689,14 +3740,16 @@ var FileTokenStore = class {
         accessToken: t.accessToken,
         refreshToken: t.refreshToken,
         expiresAt: t.expiresAt,
-        issuer: t.issuer
+        issuer: t.issuer,
+        // 없으면 로그아웃이 서버 세션을 못 끊는다 — 옛 파일은 칸이 없어 로컬만 지운다.
+        ...typeof t.clientId === "string" ? { clientId: t.clientId } : {}
       };
     } catch {
       return null;
     }
   }
   async write(tokens) {
-    const dir = await ensureOwnDir(dirname3(dirname3(this.path)), basename4(dirname3(this.path)));
+    const dir = await ensureOwnDir(dirname4(dirname4(this.path)), basename5(dirname4(this.path)));
     await chmod4(dir, 448).catch(() => {
     });
     await writeOwnFile(this.path, JSON.stringify(tokens), 384);
@@ -3723,9 +3776,9 @@ function serverUrlOf(env = process.env) {
 }
 async function tenantOf(folder, explicit) {
   if (explicit) return TENANT_CODE.test(explicit) ? explicit : null;
-  const mark = parseSourceMark(await readFile10(join19(folder, SOURCE_MARK_PATH), "utf8").catch(() => null));
+  const mark = parseSourceMark(await readFile10(join20(folder, SOURCE_MARK_PATH), "utf8").catch(() => null));
   if (mark) return mark.tenant;
-  const text = await readFile10(join19(folder, SYNC_LEDGER_PATH), "utf8").catch(() => null);
+  const text = await readFile10(join20(folder, SYNC_LEDGER_PATH), "utf8").catch(() => null);
   return text === null ? null : parseSyncLedger(text)?.tenant ?? null;
 }
 async function openAuth(options = {}) {
@@ -3945,7 +3998,7 @@ function help() {
   return `\uC798\uCEE4\uB77C \u2014 \uC0AC\uC774\uD2B8 \uC18C\uC2A4\uB97C \uB85C\uCEEC\uC5D0\uC11C \uB2E4\uB8E8\uB294 \uB3C4\uAD6C (v${version()})
 
   zalkera login                 \uBE0C\uB77C\uC6B0\uC800\uB85C \uB85C\uADF8\uC778
-  zalkera logout                \uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6B4\uB2E4
+  zalkera logout                \uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6B0\uACE0 \uC774 \uCEF4\uD4E8\uD130\uC758 \uC11C\uBC84 \uCABD \uB85C\uADF8\uC778\uB3C4 \uB04A\uB294\uB2E4
   zalkera status                \uC774 \uD3F4\uB354\uC640 \uC0AC\uC774\uD2B8\uAC00 \uC5B4\uB5BB\uAC8C \uB2E4\uB978\uC9C0 \uBCF8\uB2E4
   zalkera pull                  \uC0AC\uC774\uD2B8\uC758 \uC9C0\uAE08 \uD310\uC744 \uC774 \uD3F4\uB354\uC5D0 \uBC1B\uB294\uB2E4
   zalkera push                  \uC774 \uD3F4\uB354\uC5D0\uC11C \uACE0\uCE5C \uAC83\uC744 \uC0AC\uC774\uD2B8 \uCABD\uC5D0 \uC62C\uB9B0\uB2E4(\uCF1C\uC9C0\uC9C0\uB294 \uC54A\uB294\uB2E4)
@@ -4000,8 +4053,12 @@ async function main(argv) {
       return 0;
     }
     case "logout": {
-      await logout(new FileTokenStore());
-      process.stdout.write("\uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6E0\uC2B5\uB2C8\uB2E4.\n");
+      const store = new FileTokenStore();
+      const hadLogin = await store.read() !== null;
+      const serverEnded = await (await logout(store)).serverEnded;
+      process.stdout.write(
+        !hadLogin ? "\uB85C\uADF8\uC778 \uC815\uBCF4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.\n" : serverEnded ? "\uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6B0\uACE0 \uC774 \uAE30\uAE30\uC758 \uC11C\uBC84 \uCABD \uB85C\uADF8\uC778\uB3C4 \uB05D\uB0C8\uC2B5\uB2C8\uB2E4.\n" : "\uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6E0\uC2B5\uB2C8\uB2E4. \uC11C\uBC84 \uCABD \uB85C\uADF8\uC778\uC740 \uB04A\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4(\uC5F0\uACB0 \uC5C6\uC74C\xB7\uC608\uC804 \uB85C\uADF8\uC778).\n"
+      );
       return 0;
     }
     case "status": {

package/package.json

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