ymmv-cli 0.1.3 → 0.1.5

package/dist/cli.js

@@ -11,13 +11,22 @@ async function mintYmmvToken(accessToken) {
   const res = await fetch(`${BASE}/api/v1/auth/token`, {
     method: "POST",
     headers: { "content-type": "application/json" },
-    body: JSON.stringify({ access_token: accessToken })
+    body: JSON.stringify({ access_token: accessToken }),
+    // Never follow a redirect: a 30x must fail (the existing `!res.ok` guard rejects the resulting
+    // opaqueredirect), not re-POST the GitHub access_token to the redirect target or read a
+    // redirected 200 as a successful mint. Mirrors publish/delete in api.ts.
+    redirect: "manual"
   });
   if (!res.ok) {
     const body = await res.json().catch(() => ({}));
     if (res.status === 503) {
       throw new Error(body.message ?? "GitHub is unavailable \u2014 run `ymmv login` again shortly.");
     }
+    if (res.status === 429) {
+      const retry = res.headers.get("retry-after");
+      const msg = body.message ?? "too many login attempts \u2014 slow down and try again shortly";
+      throw new Error(retry ? `${msg} (retry in ${retry}s)` : msg);
+    }
     throw new Error(`login failed: ${res.status} ${body.error ?? ""}`.trim());
   }
   return await res.json();
@@ -25,7 +34,10 @@ async function mintYmmvToken(accessToken) {
 async function revokeYmmvToken(token) {
   const res = await fetch(`${BASE}/api/v1/auth/logout`, {
     method: "POST",
-    headers: { authorization: `Bearer ${token}` }
+    headers: { authorization: `Bearer ${token}` },
+    // Never follow a redirect: a 30x→200 must not read as a successful revoke (which would delete the
+    // local file while the server token stays live). Same guard as mint + publish/delete.
+    redirect: "manual"
   });
   if (!res.ok) throw new Error(`logout failed: ${res.status}`);
   const body = await res.json().catch(() => ({}));
@@ -104,6 +116,77 @@ function diff(mine, theirs) {
   };
 }
 
+// ../shared/dist/github.js
+var GITHUB_CLIENT_ID = "Ov23liMoD29eizQcN1KZ";
+
+// ../shared/dist/types.js
+var SCHEMA_VERSION = 1;
+
+// ../shared/dist/parse.js
+var MAX_PARSE_ENTRIES = 256;
+var MAX_PARSE_EXTRAS = 256;
+var MAX_PARSE_VALUE = 4096;
+var MAX_PARSE_LABEL = 4096;
+var ProfileParseError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ProfileParseError";
+  }
+};
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function parseProfile(raw) {
+  if (!isRecord(raw))
+    throw new ProfileParseError("profile is not an object");
+  if (raw.schema_version !== SCHEMA_VERSION) {
+    throw new ProfileParseError(`unsupported schema_version: ${String(raw.schema_version)}`);
+  }
+  if (typeof raw.handle !== "string")
+    throw new ProfileParseError("handle is not a string");
+  if (typeof raw.updated_at !== "string")
+    throw new ProfileParseError("updated_at is not a string");
+  if (!Array.isArray(raw.entries))
+    throw new ProfileParseError("entries is not an array");
+  if (raw.entries.length > MAX_PARSE_ENTRIES) {
+    throw new ProfileParseError(`too many entries (>${MAX_PARSE_ENTRIES})`);
+  }
+  const entries = [];
+  for (let i = 0; i < raw.entries.length; i++) {
+    const entry = raw.entries[i];
+    if (!isRecord(entry) || typeof entry.key !== "string" || typeof entry.value !== "string") {
+      throw new ProfileParseError(`entry ${i} is not {key,value} strings`);
+    }
+    if (entry.value.length > MAX_PARSE_VALUE) {
+      throw new ProfileParseError(`entry ${i} value exceeds ${MAX_PARSE_VALUE} chars`);
+    }
+    entries.push({ key: entry.key, value: entry.value });
+  }
+  if (!Array.isArray(raw.extras))
+    throw new ProfileParseError("extras is not an array");
+  if (raw.extras.length > MAX_PARSE_EXTRAS) {
+    throw new ProfileParseError(`too many extras (>${MAX_PARSE_EXTRAS})`);
+  }
+  const extras = [];
+  for (let i = 0; i < raw.extras.length; i++) {
+    const extra = raw.extras[i];
+    if (!isRecord(extra) || typeof extra.label !== "string" || typeof extra.value !== "string") {
+      throw new ProfileParseError(`extra ${i} is not {label,value} strings`);
+    }
+    if (extra.label.length > MAX_PARSE_LABEL || extra.value.length > MAX_PARSE_VALUE) {
+      throw new ProfileParseError(`extra ${i} exceeds the length ceiling`);
+    }
+    extras.push({ label: extra.label, value: extra.value });
+  }
+  return {
+    schema_version: SCHEMA_VERSION,
+    handle: raw.handle,
+    entries,
+    extras,
+    updated_at: raw.updated_at
+  };
+}
+
 // ../shared/dist/reserved.js
 var RESERVED_ROUTES = ["api", "login", "logout"];
 var CLI_VERBS = ["login", "logout", "set", "delete", "view", "help"];
@@ -114,9 +197,6 @@ function isValidHandle(handle) {
   return handle.length >= 1 && handle.length <= 39 && HANDLE_RE.test(handle);
 }
 
-// ../shared/dist/types.js
-var SCHEMA_VERSION = 1;
-
 // src/token-store.ts
 import { randomUUID } from "crypto";
 import { chmod, mkdir, readFile, rename, rm, writeFile } from "fs/promises";
@@ -127,7 +207,10 @@ function tokenFilePath() {
 }
 async function saveToken(data) {
   const path = tokenFilePath();
-  await mkdir(dirname(path), { recursive: true });
+  const dir = dirname(path);
+  await mkdir(dir, { recursive: true, mode: 448 });
+  if (process.platform !== "win32") await chmod(dir, 448).catch(() => {
+  });
   const tmp = `${path}.${randomUUID()}.tmp`;
   const stored = { base: BASE, token: data.token, handle: data.handle };
   try {
@@ -169,7 +252,6 @@ async function peekBase() {
 }
 
 // src/device-flow.ts
-var CLIENT_ID = "Ov23liMoD29eizQcN1KZ";
 var DEVICE_CODE_URL = "https://github.com/login/device/code";
 var TOKEN_URL = "https://github.com/login/oauth/access_token";
 var realSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -178,7 +260,7 @@ async function requestDeviceCode(deps = {}) {
   const res = await doFetch(DEVICE_CODE_URL, {
     method: "POST",
     headers: { accept: "application/json" },
-    body: new URLSearchParams({ client_id: CLIENT_ID })
+    body: new URLSearchParams({ client_id: GITHUB_CLIENT_ID })
   });
   if (!res.ok) {
     throw new Error(`device code request failed: ${res.status} ${await res.text()}`);
@@ -191,18 +273,36 @@ async function pollForToken(dc, deps = {}) {
   const now = deps.now ?? Date.now;
   let interval = dc.interval || 5;
   const deadline = now() + dc.expires_in * 1e3;
+  let transientFailures = 0;
+  const MAX_TRANSIENT_FAILURES = 5;
   while (now() < deadline) {
     await sleep(interval * 1e3);
     const res = await doFetch(TOKEN_URL, {
       method: "POST",
       headers: { accept: "application/json" },
       body: new URLSearchParams({
-        client_id: CLIENT_ID,
+        client_id: GITHUB_CLIENT_ID,
         device_code: dc.device_code,
         grant_type: "urn:ietf:params:oauth:grant-type:device_code"
       })
     });
-    const tok = await res.json();
+    let tok;
+    if (res.ok) {
+      try {
+        tok = await res.json();
+      } catch {
+        tok = void 0;
+      }
+    }
+    if (tok === void 0) {
+      if (++transientFailures >= MAX_TRANSIENT_FAILURES) {
+        throw new Error(
+          "GitHub isn't responding to the login poll \u2014 check your connection and run `ymmv login` again."
+        );
+      }
+      continue;
+    }
+    transientFailures = 0;
     if (tok.access_token) return tok.access_token;
     switch (tok.error) {
       case "authorization_pending":
@@ -301,7 +401,7 @@ async function fetchProfileJson(handle) {
   if (!res.ok) {
     throw new Error(`fetch failed: ${res.status} ${await res.text()}`);
   }
-  return await res.json();
+  return parseProfile(await res.json());
 }
 async function deleteProfile() {
   const cred = await ensureLogin();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ymmv-cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Publish and diff terminal-native developer tool-stack profiles at ymmv.fyi.",
   "type": "module",
   "bin": {