@asteby/storefront 0.11.0 → 0.11.1

package/README.md

@@ -415,8 +415,10 @@ npx @asteby/storefront connect --ops https://ops.example.com --env-file .env --t
 # Conectada ✓ · 7 alcances · sk_…a91f
 ```
 
-`connect` redeems the code (`POST {ops}/api/connect/v1/redeem`), writes the key ATOMICALLY (temp file + rename, mode
-`0600`; default `./storefront_token`) with its non-secret state beside it (`<file>.json`), leaves ONLY `OPS_URL` and
+`connect` redeems the code (`POST {ops}/api/connect/v1/redeem` with `{code, client:{name,version,runtime,hostname}}`; OPS
+answers `{success:true,data:{token, connection, scopes, rotation_days, api_base}}`, an invalid, expired or used code is one
+answer: `400 invalid_code`), writes the key ATOMICALLY (temp file + rename, mode `0600`; default `./storefront_token`)
+with its non-secret state beside it (`<file>.json`: connection, `api_base`, `rotation_days`, `rotate_after`), leaves ONLY `OPS_URL` and
 `STOREFRONT_TOKEN_FILE` in the env file (never the key), prints just the prefix and last four characters, and checks
 the key with `token.introspect()`. Exit code is `1` with an es-MX message for an expired or used code, an unreachable
 OPS or a non-TTY stdin.
@@ -434,7 +436,7 @@ const storefront = createStorefrontClient({
   token: storefrontTokenFromEnv()!,
 })
 void diagnose(storefront)                 // one warning if scopes are missing; never throws, never delays boot
-connectStore().keepFresh()                // heartbeat + rotation (POST /api/connect/v1/rotate) when rotate_after passes
+connectStore().keepFresh()                // heartbeat; rotates (POST /api/connect/v1/rotate) on rotate_now / next_rotation_at; honors Retry-After on 429
 ```
 
 `token` also accepts any `() => string`, called on every request. `diagnose` logs, at most once, which scopes are

package/dist/cli.js

@@ -271,7 +271,11 @@ function createStorefrontClient(config) {
        * What the token in use is and can do (`GET {baseUrl}/_token`, a gateway route, not a `/storefront` one).
        * Needs no scope, so it answers even when the token is under-provisioned: `missing_scopes` says what to repair.
        */
-      introspect: (options) => get("/_token", void 0, options)
+      introspect: async (options) => {
+        const body = await get("/_token", void 0, options);
+        const env = body;
+        return typeof env?.success === "boolean" && env.data ? env.data : body;
+      }
     },
     /** Returns a new client that sends the given buyer session token. */
     withCustomerToken(customerToken) {
@@ -460,7 +464,7 @@ function repairPath(connectionName) {
 import { chmodSync, closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeSync } from "fs";
 import { dirname, join, resolve } from "path";
 import { hostname } from "os";
-var SDK_VERSION = true ? "0.11.0" : "dev";
+var SDK_VERSION = true ? "0.11.1" : "dev";
 function writeFileAtomic(file, content, mode = 384) {
   const dir = dirname(file);
   mkdirSync(dir, { recursive: true });
@@ -489,17 +493,26 @@ function writeFileAtomic(file, content, mode = 384) {
     throw err;
   }
 }
+function connectClientInfo() {
+  return { name: "@asteby/storefront", version: SDK_VERSION, runtime: `node ${process.version}`, hostname: hostname() };
+}
 var ConnectError = class extends Error {
-  constructor(kind, message, status = 0) {
+  constructor(kind, message, status = 0, retryAfterSeconds) {
     super(message);
     this.kind = kind;
     this.status = status;
+    this.retryAfterSeconds = retryAfterSeconds;
   }
   kind;
   status;
+  retryAfterSeconds;
   name = "ConnectError";
 };
 var trimSlash = (u) => u.replace(/\/+$/, "");
+var isObj = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+function unwrapEnvelope(body) {
+  return isObj(body) && typeof body.success === "boolean" && "data" in body ? body.data : body;
+}
 async function post(fetchImpl, url, body, bearer) {
   let res;
   try {
@@ -513,48 +526,70 @@ async function post(fetchImpl, url, body, bearer) {
     throw new ConnectError("network", "No pudimos comunicarnos con OPS. Revisa la direcci\xF3n y tu conexi\xF3n a internet.");
   }
   const text = await res.text().catch(() => "");
-  if (!res.ok) {
-    if (res.status === 429) throw new ConnectError("rate_limited", "Demasiados intentos. Espera unos minutos e int\xE9ntalo de nuevo.", 429);
-    if (res.status === 401 || res.status === 403) throw new ConnectError("unauthorized", "OPS rechaz\xF3 la credencial de esta tienda.", res.status);
-    if (res.status >= 500) throw new ConnectError("server", "OPS no pudo atender la solicitud. Int\xE9ntalo de nuevo en un momento.", res.status);
-    throw new ConnectError("invalid_code", "El c\xF3digo no es v\xE1lido, ya se us\xF3 o venci\xF3. Genera uno nuevo en OPS \u2192 Conexiones y API.", res.status);
-  }
-  if (!text) return void 0;
+  let json;
   try {
-    return JSON.parse(text);
+    json = text ? JSON.parse(text) : void 0;
   } catch {
-    throw new ConnectError("invalid_response", "OPS respondi\xF3 algo que no entendimos.", res.status);
+    json = void 0;
   }
+  if (!res.ok) {
+    const o = isObj(json) ? json : {};
+    const e = isObj(o.error) ? o.error : void 0;
+    const code = typeof o.error === "string" ? o.error : typeof e?.code === "string" ? e.code : "";
+    const message = typeof o.message === "string" ? o.message : typeof e?.message === "string" ? e.message : "";
+    if (res.status === 429) {
+      const ra = Number(res.headers.get("Retry-After"));
+      throw new ConnectError("rate_limited", message || "Demasiados intentos. Espera un momento y vuelve a intentarlo.", 429, Number.isFinite(ra) && ra > 0 ? ra : void 0);
+    }
+    if (res.status === 401 || code === "invalid_token") throw new ConnectError("unauthorized", message || "Clave inv\xE1lida.", res.status);
+    if (code === "invalid_code") throw new ConnectError("invalid_code", message || "El c\xF3digo no es v\xE1lido o ya venci\xF3. Genera uno nuevo desde OPS.", res.status);
+    if (res.status >= 500) throw new ConnectError("server", message || "OPS no pudo atender la solicitud. Int\xE9ntalo de nuevo en un momento.", res.status);
+    throw new ConnectError("server", message || `OPS respondi\xF3 ${res.status}.`, res.status);
+  }
+  if (json === void 0) throw new ConnectError("invalid_response", "OPS respondi\xF3 algo que no entendimos.", res.status);
+  return unwrapEnvelope(json);
 }
-function assertRedeem(r) {
+function assertGrant(r) {
   const o = r;
-  if (!o || typeof o.secret_token !== "string" || !o.secret_token || typeof o.connection_id !== "string" || !Array.isArray(o.scopes)) {
+  if (!isObj(o) || typeof o.token !== "string" || !o.token || !isObj(o.connection) || typeof o.connection.id !== "string" || !Array.isArray(o.scopes)) {
     throw new ConnectError("invalid_response", "OPS respondi\xF3 algo que no entendimos.");
   }
 }
 async function redeemConnectionCode(opts) {
   const fetchImpl = opts.fetch ?? globalThis.fetch.bind(globalThis);
-  const client_info = { sdk_version: SDK_VERSION, hostname: hostname(), ...opts.siteUrl ? { site_url: opts.siteUrl } : {} };
-  const res = await post(fetchImpl, `${trimSlash(opts.opsUrl)}/api/connect/v1/redeem`, { code: opts.code.trim(), client_info });
-  assertRedeem(res);
+  const res = await post(fetchImpl, `${trimSlash(opts.opsUrl)}/api/connect/v1/redeem`, { code: opts.code.trim(), client: connectClientInfo() });
+  assertGrant(res);
   return res;
 }
 var stateFileFor = (tokenFile) => `${tokenFile}.json`;
-function saveConnection(tokenFile, r, opsUrl = r.ops_url) {
-  const state = { ops_url: trimSlash(r.ops_url || opsUrl), connection_id: r.connection_id, environment: r.environment, scopes: r.scopes, rotate_after: r.rotate_after };
+var DEFAULT_ROTATION_DAYS = 90;
+var DAY_MS = 864e5;
+function stateFromGrant(g, opsUrl, prev, now = Date.now()) {
+  const days = g.rotation_days && g.rotation_days > 0 ? g.rotation_days : prev?.rotation_days ?? DEFAULT_ROTATION_DAYS;
+  return {
+    ops_url: trimSlash(opsUrl),
+    api_base: g.api_base || prev?.api_base || `${trimSlash(opsUrl)}/api/gw`,
+    connection: g.connection,
+    scopes: g.scopes,
+    rotation_days: days,
+    rotate_after: new Date(now + days * DAY_MS).toISOString(),
+    ...g.grace_until ? { grace_until: g.grace_until } : {}
+  };
+}
+function saveConnection(tokenFile, g, state) {
   writeFileAtomic(stateFileFor(tokenFile), JSON.stringify(state, null, 2) + "\n");
-  writeFileAtomic(tokenFile, r.secret_token + "\n");
+  writeFileAtomic(tokenFile, g.token + "\n");
 }
 
 // src/cli.ts
-var HELP = `Uso: npx @asteby/storefront connect --ops <url> [--env-file <ruta>] [--token-file <ruta>] [--site <url>]
+var HELP = `Uso: npx @asteby/storefront connect --ops <url> [--env-file <ruta>] [--token-file <ruta>]
 
 Conecta esta tienda con OPS. El c\xF3digo de conexi\xF3n (K7QM-2XPA) se pide en la terminal; nunca va como argumento.
 
   --ops          Direcci\xF3n de OPS (https://ops.ejemplo.com). Tambi\xE9n OPS_URL.
   --token-file   D\xF3nde guardar la clave (por omisi\xF3n ./storefront_token). Modo 0600, escritura at\xF3mica.
   --env-file     Archivo .env donde dejar SOLO OPS_URL y STOREFRONT_TOKEN_FILE (nunca la clave).
-  --site         Direcci\xF3n p\xFAblica de la tienda (opcional, informativa).`;
+`;
 function parseArgs(argv) {
   const flags = {};
   const [cmd, ...rest] = argv;
@@ -562,7 +597,7 @@ function parseArgs(argv) {
     const a = rest[i];
     const eq = a.indexOf("=");
     const key = (eq > 0 ? a.slice(0, eq) : a).replace(/^--/, "");
-    if (!a.startsWith("--") || !["ops", "env-file", "token-file", "site", "code"].includes(key)) return { cmd, flags, bad: a };
+    if (!a.startsWith("--") || !["ops", "env-file", "token-file", "code"].includes(key)) return { cmd, flags, bad: a };
     if (key === "code") return { cmd, flags, bad: "--code (el c\xF3digo se pide en la terminal, no como argumento)" };
     const val = eq > 0 ? a.slice(eq + 1) : rest[++i];
     if (!val) return { cmd, flags, bad: a };
@@ -616,25 +651,25 @@ ${HELP}`);
     return 1;
   }
   try {
-    const r = await redeemConnectionCode({ opsUrl, code, ...flags.site ? { siteUrl: flags.site } : {}, ...io.fetch ? { fetch: io.fetch } : {} });
-    saveConnection(tokenFile, r, opsUrl);
+    const r = await redeemConnectionCode({ opsUrl, code, ...io.fetch ? { fetch: io.fetch } : {} });
+    saveConnection(tokenFile, r, stateFromGrant(r, opsUrl, null));
     if (envFile) {
       const current = existsSync2(envFile) ? readFileSync2(envFile, "utf8") : "";
       if (/^\s*(export\s+)?STOREFRONT_TOKEN\s*=/m.test(current)) {
         io.stderr("Aviso: tu .env a\xFAn tiene STOREFRONT_TOKEN con una clave anterior; b\xF3rrala, el archivo de clave tiene prioridad.");
       }
-      writeFileAtomic(envFile, upsertEnv(current, { OPS_URL: r.ops_url || opsUrl, STOREFRONT_TOKEN_FILE: tokenFile }), 384);
+      writeFileAtomic(envFile, upsertEnv(current, { OPS_URL: opsUrl, STOREFRONT_TOKEN_FILE: tokenFile }), 384);
     }
-    io.stdout(`Conectada \u2713 \xB7 ${r.scopes.length} alcances \xB7 ${maskToken(r.secret_token)}`);
+    io.stdout(`Conectada \u2713 \xB7 ${r.scopes.length} alcances \xB7 ${maskToken(r.token)}`);
     io.stdout(`Clave guardada en ${tokenFile} (modo 0600).${envFile ? ` Variables en ${envFile}.` : ` Usa STOREFRONT_TOKEN_FILE=${tokenFile}.`}`);
-    const base = `${(r.ops_url || opsUrl).replace(/\/+$/, "")}/api/gw`;
-    const sf = createStorefrontClient({ baseUrl: base, token: r.secret_token, ...io.fetch ? { fetch: io.fetch } : {}, timeoutMs: 1e4 });
+    const base = r.api_base || `${opsUrl}/api/gw`;
+    const sf = createStorefrontClient({ baseUrl: base, token: r.token, ...io.fetch ? { fetch: io.fetch } : {}, timeoutMs: 1e4 });
     try {
       const info = await sf.token.introspect();
       if (info.missing_scopes?.length) {
         io.stderr(`Aviso: a la clave le faltan permisos (${info.missing_scopes.join(", ")}). Rep\xE1ralo en ${repairPath()}.`);
       } else {
-        io.stdout(`Verificada con OPS \xB7 entorno ${info.environment}.`);
+        io.stdout(`Verificada con OPS \xB7 entorno ${info.environment ?? r.connection.environment}.`);
       }
     } catch {
       io.stderr("Aviso: la clave se guard\xF3 pero no pudimos verificarla con OPS todav\xEDa.");

package/dist/fiscal-document.d.cts

@@ -1,5 +1,5 @@
-import { U as FiscalDocumentSource, aR as RegionFiscalEntry, Z as IdentityDocumentSpec, T as FiscalDocumentEvidence, aS as RegionFiscalId, $ as IdentityRulesV1 } from './types-C-Ley-Mt.cjs';
-export { Y as IdentityCapture, _ as IdentityFieldRule, a0 as IdentityStrategy } from './types-C-Ley-Mt.cjs';
+import { U as FiscalDocumentSource, aR as RegionFiscalEntry, Z as IdentityDocumentSpec, T as FiscalDocumentEvidence, aS as RegionFiscalId, $ as IdentityRulesV1 } from './types-bsdlAumU.cjs';
+export { Y as IdentityCapture, _ as IdentityFieldRule, a0 as IdentityStrategy } from './types-bsdlAumU.cjs';
 import './geo.cjs';
 
 /** A value read from a document: text, or the codes of a catalog (`multiple` fields). */

package/dist/fiscal-document.d.ts

@@ -1,5 +1,5 @@
-import { U as FiscalDocumentSource, aR as RegionFiscalEntry, Z as IdentityDocumentSpec, T as FiscalDocumentEvidence, aS as RegionFiscalId, $ as IdentityRulesV1 } from './types-D7UJxrba.js';
-export { Y as IdentityCapture, _ as IdentityFieldRule, a0 as IdentityStrategy } from './types-D7UJxrba.js';
+import { U as FiscalDocumentSource, aR as RegionFiscalEntry, Z as IdentityDocumentSpec, T as FiscalDocumentEvidence, aS as RegionFiscalId, $ as IdentityRulesV1 } from './types-B1E3GySa.js';
+export { Y as IdentityCapture, _ as IdentityFieldRule, a0 as IdentityStrategy } from './types-B1E3GySa.js';
 import './geo.js';
 
 /** A value read from a document: text, or the codes of a catalog (`multiple` fields). */

package/dist/index.cjs

@@ -303,7 +303,11 @@ function createStorefrontClient(config) {
        * What the token in use is and can do (`GET {baseUrl}/_token`, a gateway route, not a `/storefront` one).
        * Needs no scope, so it answers even when the token is under-provisioned: `missing_scopes` says what to repair.
        */
-      introspect: (options) => get("/_token", void 0, options)
+      introspect: async (options) => {
+        const body = await get("/_token", void 0, options);
+        const env = body;
+        return typeof env?.success === "boolean" && env.data ? env.data : body;
+      }
     },
     /** Returns a new client that sends the given buyer session token. */
     withCustomerToken(customerToken) {