smoonb 0.0.100 → 0.0.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smoonb",
-  "version": "0.0.100",
+  "version": "0.0.101",
   "description": "Complete Supabase backup and migration tool - EXPERIMENTAL VERSION - USE AT YOUR OWN RISK",
   "preferGlobal": false,
   "preventGlobalInstall": true,

package/src/commands/backup/steps/00-license.js

@@ -10,9 +10,11 @@ const {
   maskSecret,
   safeStringifyHeaders,
   truncateBody,
+  sanitizeResponseParsedForBundle,
   classifyRequestError,
   buildSupportBundle,
-  formatBundleForTerminal
+  formatBundleForTerminal,
+  BODY_TRUNCATE_BYTES_BUNDLE
 } = require('../../../utils/supportDiagnostics');
 
 const LICENSE_KEY_ENV = 'SMOONB_LICENSE_KEY';
@@ -119,7 +121,7 @@ function printLicenseValidationError(getT, appUrl, opts) {
     bundleParams.httpStatus = httpStatus;
     bundleParams.httpStatusText = httpStatusText || '';
     bundleParams.responseHeaders = responseHeaders;
-    bundleParams.responseBodyTruncated = responseBodyTruncated;
+    bundleParams.responseBodyRaw = responseBodyTruncated || undefined;
   }
   if (err) {
     bundleParams.errorName = err.name;
@@ -165,6 +167,63 @@ function printLicenseValidationError(getT, appUrl, opts) {
   ui.hint(`   ${getT('license.error.messageSuggestion')}\n`);
 }
 
+/**
+ * Exibe falha quando servidor retorna allow === false (reason literal + CTA + bundle).
+ */
+function printLicenseDeniedByServer(getT, appUrl, opts) {
+  const {
+    correlationId,
+    correlationIdEchoed,
+    reason,
+    fullUrl,
+    rawBody,
+    resBody,
+    licenseMasked,
+    version,
+    command
+  } = opts;
+  const displayId = correlationIdEchoed || correlationId;
+  const responseBodyRaw = rawBody ? truncateBody(rawBody, BODY_TRUNCATE_BYTES_BUNDLE) : '';
+  const responseParsed = sanitizeResponseParsedForBundle(resBody);
+
+  ui.errorBold(`\n❌ ${getT('license.denied.title')}\n`);
+  ui.info(`   ${getT('license.denied.reason', { reason: reason || 'No reason provided' })}`);
+  ui.info(`   ${getT('license.denied.correlationId', { id: displayId })}\n`);
+  ui.link(`   ${getT('license.error.howToHelp')}`);
+  ui.info(`   ${getT('license.error.supportStep1', { url: appUrl })}`);
+  ui.info(`   ${getT('license.error.supportStep2')}`);
+  ui.info(`   ${getT('license.error.supportStep3')}`);
+  ui.info(`   ${getT('license.error.supportStep4')}`);
+  ui.info(`   ${getT('license.error.supportStep5')}\n`);
+
+  const bundleParams = {
+    correlationId: displayId,
+    product: 'smoonb CLI',
+    version,
+    timestamp: new Date().toISOString(),
+    os: process.platform,
+    arch: process.arch,
+    nodeVersion: process.version,
+    command: `smoonb ${command || 'backup'}`,
+    licenseMasked: licenseMasked || '***',
+    apiBaseUrl: fullUrl ? fullUrl.replace(/\/[^/]*$/, '') : APP_CONFIG.apiBaseUrl,
+    endpoint: ENDPOINT_PATH,
+    timeoutMs: REQUEST_TIMEOUT_MS,
+    telemetryEnabled: (process.env.SMOONB_TELEMETRY_ENABLED !== 'false').toString(),
+    httpStatus: 200,
+    httpStatusText: 'OK',
+    responseBodyRaw: responseBodyRaw || undefined,
+    responseParsed: responseParsed !== '(none)' ? responseParsed : undefined,
+    correlationIdEchoed: correlationIdEchoed && correlationIdEchoed !== correlationId ? correlationIdEchoed : undefined
+  };
+  const bundleText = buildSupportBundle(bundleParams);
+  ui.block(formatBundleForTerminal(bundleText));
+  ui.info('');
+  ui.link(`   ${getT('license.error.visit', { url: appUrl })}\n`);
+  ui.hint(`   ${getT('license.error.subjectSuggestion', { id: displayId })}`);
+  ui.hint(`   ${getT('license.error.messageSuggestion')}\n`);
+}
+
 /**
  * Step 00: Validação de licença via backend.
  * Roda antes de todos os outros steps.
@@ -276,7 +335,7 @@ module.exports = async (options) => {
   if (statusCode !== 200) {
     const displayCorrelationId = resBody.correlationId || correlationId;
     const responseHeadersStr = safeStringifyHeaders(headers);
-    const responseBodyTruncated = rawBody ? truncateBody(rawBody) : '';
+    const responseBodyRaw = rawBody ? truncateBody(rawBody, BODY_TRUNCATE_BYTES_BUNDLE) : '';
     printLicenseValidationError(getT, appUrl, {
       correlationId: displayCorrelationId,
       kind: 'http',
@@ -289,35 +348,47 @@ module.exports = async (options) => {
       version: cliVersion,
       command,
       responseHeaders: responseHeadersStr,
-      responseBodyTruncated
+      responseBodyTruncated: responseBodyRaw
     });
     process.exit(1);
   }
 
-  const valid = resBody.valid === true;
-  const status = resBody.status || '';
+  // allow como boolean robusto: true ou "true" -> true; resto -> false
+  const allowRaw = resBody.allow;
+  const allow = allowRaw === true || (typeof allowRaw === 'string' && allowRaw.toLowerCase() === 'true');
 
-  if (!valid || ['expired', 'canceled'].includes(status)) {
-    ui.error(`❌ ${getT('license.invalidOrInactive')}`);
-    ui.info(`   ${getT('license.openDesktopApp')}`);
-    ui.link(`   ${appUrl}`);
-    process.exit(1);
-  }
-
-  if (status === 'trial') {
-    ui.warn(`   ⚠️ ${getT('license.trialNotice')}`);
+  if (allow === true) {
+    // Nunca negar quando allow === true
+    const status = resBody.status || '';
+    if (status === 'trial') {
+      ui.warn(`   ⚠️ ${getT('license.trialNotice')}`);
+    }
+    const license = {
+      status: resBody.status,
+      plan: resBody.plan,
+      expiresAt: resBody.expiresAt,
+      accountId: resBody.accountId,
+      workspaceId: resBody.workspaceId
+    };
+    const smoonbToken = resBody.token || '';
+    return { license, smoonbToken };
   }
 
-  const license = {
-    status: resBody.status,
-    plan: resBody.plan,
-    expiresAt: resBody.expiresAt,
-    accountId: resBody.accountId,
-    workspaceId: resBody.workspaceId
-  };
-  const smoonbToken = resBody.token || '';
-
-  return { license, smoonbToken };
+  // allow === false: exibir reason do servidor literalmente + CTA + bundle
+  const serverReason = resBody.reason != null ? String(resBody.reason) : 'No reason provided';
+  const correlationIdEchoed = resBody.correlationId || null;
+  printLicenseDeniedByServer(getT, appUrl, {
+    correlationId,
+    correlationIdEchoed,
+    reason: serverReason,
+    fullUrl,
+    rawBody,
+    resBody,
+    licenseMasked: maskSecret(licenseKey),
+    version: cliVersion,
+    command
+  });
+  process.exit(1);
 };
 
 module.exports.maskLicense = maskLicense;

package/src/i18n/locales/en.json

@@ -273,6 +273,9 @@
   "license.checkConnection": "Check your connection and try again.",
   "license.invalidOrInactive": "Your license is invalid or your subscription is not active.",
   "license.openDesktopApp": "Open the desktop app, check your subscription and generate a new license.",
+  "license.denied.title": "License validation denied by server.",
+  "license.denied.reason": "Reason: {reason}",
+  "license.denied.correlationId": "Correlation ID: {id}",
   "license.trialNotice": "You are using a trial license.",
   "license.error.title": "License validation failed.",
   "license.error.whatHappened": "What happened:",

package/src/i18n/locales/pt-BR.json

@@ -273,6 +273,9 @@
   "license.checkConnection": "Verifique sua conexão e tente novamente.",
   "license.invalidOrInactive": "Sua licença é inválida ou sua assinatura não está ativa.",
   "license.openDesktopApp": "Abra o app desktop, verifique sua assinatura e gere uma nova licença.",
+  "license.denied.title": "Validação de licença negada pelo servidor.",
+  "license.denied.reason": "Motivo: {reason}",
+  "license.denied.correlationId": "Correlation ID: {id}",
   "license.trialNotice": "Você está usando uma licença trial.",
   "license.error.title": "Falha na validação da licença.",
   "license.error.whatHappened": "O que aconteceu:",

package/src/utils/supportDiagnostics.js

@@ -6,6 +6,7 @@ const crypto = require('crypto');
 
 const ALLOWLIST_HEADERS = ['content-type', 'server', 'cf-ray', 'x-request-id'];
 const BODY_TRUNCATE_BYTES = 2048;
+const BODY_TRUNCATE_BYTES_BUNDLE = 4096;
 
 function createCorrelationId() {
   if (crypto.randomUUID) {
@@ -65,6 +66,30 @@ function truncateBody(input, maxBytes = BODY_TRUNCATE_BYTES) {
   return buf.slice(0, maxBytes).toString('utf8') + '\n...[truncated]';
 }
 
+/** Campos permitidos no ResponseParsed do bundle (sem tokens/sensíveis). */
+const RESPONSE_PARSED_KEYS = ['allow', 'reason', 'periodEnd', 'trialEndsAt', 'remainingThisMonth', 'correlationId'];
+
+/**
+ * Extrai objeto sanitizado da resposta para o bundle (allow, reason, periodEnd, trialEndsAt, remainingThisMonth, correlationId).
+ * @param {object} parsed - resBody
+ * @returns {string} JSON string ou "(none)"
+ */
+function sanitizeResponseParsedForBundle(parsed) {
+  if (!parsed || typeof parsed !== 'object') return '(none)';
+  const out = {};
+  for (const key of RESPONSE_PARSED_KEYS) {
+    if (Object.prototype.hasOwnProperty.call(parsed, key)) {
+      out[key] = parsed[key];
+    }
+  }
+  if (Object.keys(out).length === 0) return '(none)';
+  try {
+    return JSON.stringify(out);
+  } catch {
+    return '(none)';
+  }
+}
+
 /**
  * Classifica erro de request (rede/TLS/timeout).
  * @param {Error} err
@@ -169,14 +194,22 @@ function buildSupportBundle(params) {
   ];
 
   if (p.httpStatus != null) {
-    lines.push(`HTTP: ${p.httpStatus} ${p.httpStatusText || ''}`.trim());
+    lines.push(`HttpStatus: ${p.httpStatus} ${(p.httpStatusText || '').trim()}`);
+  }
+  if (p.correlationIdEchoed != null && p.correlationIdEchoed !== p.correlationId) {
+    lines.push(`CorrelationIdEchoed: ${p.correlationIdEchoed}`);
   }
   if (p.responseHeaders) {
     lines.push('ResponseHeaders:', p.responseHeaders);
   }
-  if (p.responseBodyTruncated) {
+  if (p.responseBodyRaw != null) {
+    lines.push('ResponseBodyRaw:', p.responseBodyRaw);
+  } else if (p.responseBodyTruncated) {
     lines.push('ResponseBody(Truncated):', p.responseBodyTruncated);
   }
+  if (p.responseParsed != null) {
+    lines.push('ResponseParsed:', p.responseParsed);
+  }
   if (p.errorName || p.errorMessage) {
     lines.push(`Error: name: ${p.errorName || ''} message: ${p.errorMessage || ''}`);
   }
@@ -209,8 +242,10 @@ module.exports = {
   maskSecret,
   safeStringifyHeaders,
   truncateBody,
+  sanitizeResponseParsedForBundle,
   classifyRequestError,
   buildSupportBundle,
   formatBundleForTerminal,
-  BODY_TRUNCATE_BYTES
+  BODY_TRUNCATE_BYTES,
+  BODY_TRUNCATE_BYTES_BUNDLE
 };