@trendify/cli 0.1.39 → 0.1.40

package/dist/shared/services/cli-update.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-update.service.d.ts","sourceRoot":"","sources":["../../../src/shared/services/cli-update.service.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,oBAAoB,GAC5B;IACE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAC7B,GACD;IACE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B,GACD;IACE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;CAC5B,GACD;IACE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEN,MAAM,MAAM,sBAAsB,GAC9B;IACE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;CACnB,GACD;IACE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;CACpB,CAAC;AAEN,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC,CAAC;AA4CF,wBAAgB,uBAAuB,IAAI,wBAAwB,CAElE;AAwHD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CA6BvE;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAgBtH"}
+{"version":3,"file":"cli-update.service.d.ts","sourceRoot":"","sources":["../../../src/shared/services/cli-update.service.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,oBAAoB,GAC5B;IACE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAC7B,GACD;IACE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B,GACD;IACE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;CAC5B,GACD;IACE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEN,MAAM,MAAM,sBAAsB,GAC9B;IACE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;CACnB,GACD;IACE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;CACpB,CAAC;AAEN,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC,CAAC;AAkDF,wBAAgB,uBAAuB,IAAI,wBAAwB,CAElE;AA+KD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CA6BvE;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAgBtH"}

package/dist/shared/services/cli-update.service.js

@@ -111,7 +111,9 @@ async function fetchLatestPublishedVersion(packageName) {
             const packument = (await response.json());
             const latestVersion = packument['dist-tags']?.[DEFAULT_NPM_DIST_TAG];
             if (typeof latestVersion === 'string' && latestVersion.trim()) {
-                return latestVersion.trim();
+                const normalizedVersion = latestVersion.trim();
+                await fetchPublishedVersionManifest(packageName, normalizedVersion);
+                return normalizedVersion;
             }
             throw new Error(`O dist-tag "${DEFAULT_NPM_DIST_TAG}" nao foi encontrado no registry.`);
         }
@@ -125,6 +127,47 @@ async function fetchLatestPublishedVersion(packageName) {
     }
     throw new Error(`Nao foi possivel consultar o dist-tag "${DEFAULT_NPM_DIST_TAG}" no registry do npm. ${toErrorMessage(lastError)}`);
 }
+async function fetchPublishedVersionManifest(packageName, version) {
+    const versionUrl = new URL(`${DEFAULT_NPM_REGISTRY_URL}/${encodeURIComponent(packageName)}/${encodeURIComponent(version)}`);
+    versionUrl.searchParams.set('ts', Date.now().toString());
+    let lastError = null;
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+        const controller = new AbortController();
+        const timeout = setTimeout(() => {
+            controller.abort();
+        }, REGISTRY_REQUEST_TIMEOUT_MS);
+        try {
+            const response = await fetch(versionUrl, {
+                method: 'GET',
+                headers: {
+                    accept: 'application/json',
+                    'cache-control': 'no-cache',
+                    pragma: 'no-cache',
+                },
+                cache: 'no-store',
+                signal: controller.signal,
+            });
+            clearTimeout(timeout);
+            if (!response.ok) {
+                throw new Error(`Registry respondeu com status ${response.status} para a versao ${version}.`);
+            }
+            const manifest = (await response.json());
+            const tarballUrl = manifest.dist?.tarball;
+            if (typeof tarballUrl === 'string' && tarballUrl.trim()) {
+                return manifest;
+            }
+            throw new Error(`A versao ${version} foi encontrada, mas nao informou um tarball valido.`);
+        }
+        catch (error) {
+            clearTimeout(timeout);
+            lastError = error;
+            if (attempt < 1) {
+                await wait(750);
+            }
+        }
+    }
+    throw new Error(`A versao ${version} ainda nao esta pronta para instalacao. ${toErrorMessage(lastError)}`);
+}
 export async function checkForCliUpdate() {
     const { packageName, packageVersion } = readInstalledPackageMetadata();
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trendify/cli",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "description": "CLI do Trendify para descoberta de temas e fluxos de conta.",
   "type": "module",
   "main": "dist/cli.entry.js",

package/scripts/update-runner.ps1

@@ -61,6 +61,120 @@ function Write-StateFile {
   Move-Item -Path $tempFilePath -Destination $Path -Force
 }
 
+function Get-TargetTarballUrl {
+  param(
+    [string]$NodeCommand,
+    [string]$PackageName,
+    [string]$TargetVersion
+  )
+
+  $env:PACKAGE_NAME_FOR_FETCH = $PackageName
+  $env:TARGET_VERSION_FOR_FETCH = $TargetVersion
+
+  try {
+    $tarballUrl = & $NodeCommand -e @'
+const packageName = process.env.PACKAGE_NAME_FOR_FETCH;
+const targetVersion = process.env.TARGET_VERSION_FOR_FETCH;
+
+if (!packageName || !targetVersion) {
+  process.exit(1);
+}
+
+const versionUrl = new URL(`https://registry.npmjs.org/${encodeURIComponent(packageName)}/${encodeURIComponent(targetVersion)}`);
+versionUrl.searchParams.set('ts', Date.now().toString());
+
+fetch(versionUrl, {
+  method: 'GET',
+  headers: {
+    accept: 'application/json',
+    'cache-control': 'no-cache',
+    pragma: 'no-cache',
+  },
+  cache: 'no-store',
+})
+  .then(async (response) => {
+    if (!response.ok) {
+      throw new Error(`Registry respondeu com status ${response.status}.`);
+    }
+
+    const manifest = await response.json();
+    const tarballUrl = manifest?.dist?.tarball;
+
+    if (typeof tarballUrl !== 'string' || tarballUrl.trim().length === 0) {
+      throw new Error('Tarball nao encontrado.');
+    }
+
+    process.stdout.write(tarballUrl.trim());
+  })
+  .catch(() => {
+    process.exit(1);
+  });
+'@ 2> $null
+
+    if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($tarballUrl)) {
+      return $null
+    }
+
+    return $tarballUrl.Trim()
+  } finally {
+    Remove-Item Env:\PACKAGE_NAME_FOR_FETCH -ErrorAction SilentlyContinue
+    Remove-Item Env:\TARGET_VERSION_FOR_FETCH -ErrorAction SilentlyContinue
+  }
+}
+
+function Wait-ForTargetVersion {
+  param(
+    [string]$NodeCommand,
+    [string]$NpmCommand,
+    [string]$PackageName,
+    [string]$TargetVersion,
+    [int]$RetryAttempts,
+    [int]$RetryDelaySeconds
+  )
+
+  for ($attempt = 1; $attempt -le $RetryAttempts; $attempt += 1) {
+    $tarballUrl = Get-TargetTarballUrl -NodeCommand $NodeCommand -PackageName $PackageName -TargetVersion $TargetVersion
+
+    if (-not [string]::IsNullOrWhiteSpace($tarballUrl)) {
+      return $tarballUrl
+    }
+
+    if ($attempt -lt $RetryAttempts) {
+      Write-Host "A versao publicada ainda nao esta disponivel para instalacao no npm. Nova tentativa em ${RetryDelaySeconds}s..."
+      Start-Sleep -Seconds $RetryDelaySeconds
+    }
+  }
+
+  return $null
+}
+
+function Install-TargetVersion {
+  param(
+    [string]$NpmCommand,
+    [string]$TarballUrl,
+    [string]$CachePath,
+    [int]$RetryAttempts,
+    [int]$RetryDelaySeconds
+  )
+
+  for ($attempt = 1; $attempt -le $RetryAttempts; $attempt += 1) {
+    & $NpmCommand install --global --cache $CachePath --prefer-online $TarballUrl
+
+    if ($LASTEXITCODE -eq 0) {
+      return $true
+    }
+
+    if ($attempt -lt $RetryAttempts) {
+      Write-Host ''
+      Write-Host "A instalacao nao foi concluida. Nova tentativa em ${RetryDelaySeconds}s..."
+      Write-Host ''
+      Start-Sleep -Seconds $RetryDelaySeconds
+    }
+  }
+
+  return $false
+}
+
 if (-not (Test-Path -LiteralPath $stateFilePath)) {
   exit 0
 }
@@ -75,6 +189,11 @@ $packageName = if ($state['PACKAGE_NAME']) { $state['PACKAGE_NAME'] } else { '@t
 $currentVersion = if ($state['CURRENT_VERSION']) { $state['CURRENT_VERSION'] } else { 'desconhecida' }
 $targetVersion = if ($state['TARGET_VERSION']) { $state['TARGET_VERSION'] } else { 'latest' }
 $npmCommand = if (Get-Command 'npm.cmd' -ErrorAction SilentlyContinue) { 'npm.cmd' } else { 'npm' }
+$updateRetryAttempts = 3
+$updateRetryDelaySeconds = 3
+$npmCachePath = Join-Path ([System.IO.Path]::GetTempPath()) ("trendify-cli-updater-npm-cache-" + [System.Guid]::NewGuid().ToString('N'))
+
+New-Item -ItemType Directory -Path $npmCachePath -Force | Out-Null
 
 Reset-Terminal
 Write-Host 'Trendify CLI'
@@ -85,15 +204,29 @@ Write-Host ''
 Write-StateFile -Path $stateFilePath -Values $state -Status 'updating'
 
 try {
-  & $npmCommand install --global "$packageName@$targetVersion"
-  if ($LASTEXITCODE -ne 0) {
+  $targetTarballUrl = Wait-ForTargetVersion -NodeCommand $nodeCommand -NpmCommand $npmCommand -PackageName $packageName -TargetVersion $targetVersion -RetryAttempts $updateRetryAttempts -RetryDelaySeconds $updateRetryDelaySeconds
+
+  if ([string]::IsNullOrWhiteSpace($targetTarballUrl)) {
+    throw "target-version-unavailable"
+  }
+
+  if (-not (Install-TargetVersion -NpmCommand $npmCommand -TarballUrl $targetTarballUrl -CachePath $npmCachePath -RetryAttempts $updateRetryAttempts -RetryDelaySeconds $updateRetryDelaySeconds)) {
     throw "npm install finalizou com codigo $LASTEXITCODE."
   }
 } catch {
   Write-StateFile -Path $stateFilePath -Values $state -Status 'failed'
-  Write-Error 'Falha ao atualizar automaticamente o CLI.'
-  Write-Host "Execute manualmente: npm install -g $packageName@$targetVersion"
+  if ($_.Exception.Message -eq 'target-version-unavailable') {
+    Write-Error "A versao $targetVersion do CLI ainda nao esta disponivel para instalacao no npm."
+    Write-Host 'Isso costuma acontecer por alguns instantes logo apos a publicacao.'
+    Write-Host 'Tente novamente em alguns segundos.'
+  } else {
+    Write-Error 'Falha ao atualizar automaticamente o CLI.'
+    Write-Host 'Se o erro foi ETARGET, aguarde alguns instantes e tente novamente.'
+    Write-Host "Comando manual: npm install -g $packageName@$targetVersion"
+  }
   exit 1
+} finally {
+  Remove-Item -LiteralPath $npmCachePath -Recurse -Force -ErrorAction SilentlyContinue
 }
 
 Remove-Item -LiteralPath $stateFilePath -Force -ErrorAction SilentlyContinue

package/scripts/update-runner.sh

@@ -13,7 +13,7 @@ cleanup() {
   fi
 
   if [ -n "${TRENDIFY_TEMP_UPDATER_DIR:-}" ]; then
-    rmdir "$TRENDIFY_TEMP_UPDATER_DIR" >/dev/null 2>&1 || true
+    rm -rf "$TRENDIFY_TEMP_UPDATER_DIR" >/dev/null 2>&1 || true
   fi
 }
 
@@ -59,6 +59,85 @@ create_temp_updater_dir() {
   exit 1
 }
 
+resolve_target_tarball_url() {
+  PACKAGE_NAME_FOR_FETCH=$PACKAGE_NAME TARGET_VERSION_FOR_FETCH=$TARGET_VERSION "$NODE_COMMAND" -e '
+const packageName = process.env.PACKAGE_NAME_FOR_FETCH;
+const targetVersion = process.env.TARGET_VERSION_FOR_FETCH;
+
+if (!packageName || !targetVersion) {
+  process.exit(1);
+}
+
+const versionUrl = new URL(`https://registry.npmjs.org/${encodeURIComponent(packageName)}/${encodeURIComponent(targetVersion)}`);
+versionUrl.searchParams.set("ts", Date.now().toString());
+
+fetch(versionUrl, {
+  method: "GET",
+  headers: {
+    accept: "application/json",
+    "cache-control": "no-cache",
+    pragma: "no-cache",
+  },
+  cache: "no-store",
+})
+  .then(async (response) => {
+    if (!response.ok) {
+      throw new Error(`Registry respondeu com status ${response.status}.`);
+    }
+
+    const manifest = await response.json();
+    const tarballUrl = manifest?.dist?.tarball;
+
+    if (typeof tarballUrl !== "string" || tarballUrl.trim().length === 0) {
+      throw new Error("Tarball nao encontrado.");
+    }
+
+    process.stdout.write(tarballUrl.trim());
+  })
+  .catch(() => {
+    process.exit(1);
+  });
+'
+}
+
+wait_for_target_tarball_url() {
+  ATTEMPT=1
+
+  while [ "$ATTEMPT" -le "$UPDATE_RETRY_ATTEMPTS" ]; do
+    if TARGET_TARBALL_URL=$(resolve_target_tarball_url 2>/dev/null); then
+      return 0
+    fi
+
+    if [ "$ATTEMPT" -lt "$UPDATE_RETRY_ATTEMPTS" ]; then
+      printf 'A versao publicada ainda nao esta disponivel para instalacao no npm. Nova tentativa em %ss...\n' "$UPDATE_RETRY_DELAY_SECONDS"
+      sleep "$UPDATE_RETRY_DELAY_SECONDS"
+    fi
+
+    ATTEMPT=$((ATTEMPT + 1))
+  done
+
+  return 1
+}
+
+install_target_version() {
+  ATTEMPT=1
+
+  while [ "$ATTEMPT" -le "$UPDATE_RETRY_ATTEMPTS" ]; do
+    if npm install --global --cache "$NPM_CACHE_DIR" --prefer-online "$TARGET_TARBALL_URL"; then
+      return 0
+    fi
+
+    if [ "$ATTEMPT" -lt "$UPDATE_RETRY_ATTEMPTS" ]; then
+      printf '\nA instalacao nao foi concluida. Nova tentativa em %ss...\n\n' "$UPDATE_RETRY_DELAY_SECONDS"
+      sleep "$UPDATE_RETRY_DELAY_SECONDS"
+    fi
+
+    ATTEMPT=$((ATTEMPT + 1))
+  done
+
+  return 1
+}
+
 if [ "${TRENDIFY_UPDATER_STAGE:-launcher}" != "temp" ]; then
   TEMP_UPDATER_DIR=$(create_temp_updater_dir)
   TEMP_UPDATER_PATH="$TEMP_UPDATER_DIR/update-runner.sh"
@@ -83,6 +162,12 @@ PACKAGE_NAME=${PACKAGE_NAME:-@trendify/cli}
 CURRENT_VERSION=${CURRENT_VERSION:-desconhecida}
 TARGET_VERSION=${TARGET_VERSION:-latest}
 REQUESTED_AT=${REQUESTED_AT:-unknown}
+UPDATE_RETRY_ATTEMPTS=${UPDATE_RETRY_ATTEMPTS:-3}
+UPDATE_RETRY_DELAY_SECONDS=${UPDATE_RETRY_DELAY_SECONDS:-3}
+NPM_CACHE_DIR="${TRENDIFY_TEMP_UPDATER_DIR}/npm-cache"
+TARGET_TARBALL_URL=
+
+mkdir -p "$NPM_CACHE_DIR"
 
 reset_terminal
 printf 'Trendify CLI\n'
@@ -91,10 +176,19 @@ printf '[2/4] Atualizando %s de v%s para v%s...\n\n' "$PACKAGE_NAME" "$CURRENT_V
 
 write_state_file "updating"
 
-if ! npm install --global "${PACKAGE_NAME}@${TARGET_VERSION}"; then
+if ! wait_for_target_tarball_url; then
+  write_state_file "failed"
+  printf '\nA versao %s do CLI ainda nao esta disponivel para instalacao no npm.\n' "$TARGET_VERSION" >&2
+  printf 'Isso costuma acontecer por alguns instantes logo apos a publicacao.\n' >&2
+  printf 'Tente novamente em alguns segundos.\n' >&2
+  exit 1
+fi
+
+if ! install_target_version; then
   write_state_file "failed"
   printf '\nFalha ao atualizar automaticamente o CLI.\n' >&2
-  printf 'Execute manualmente: npm install -g %s@%s\n' "$PACKAGE_NAME" "$TARGET_VERSION" >&2
+  printf 'Se o erro foi ETARGET, aguarde alguns instantes e tente novamente.\n' >&2
+  printf 'Comando manual: npm install -g %s@%s\n' "$PACKAGE_NAME" "$TARGET_VERSION" >&2
   exit 1
 fi