@trendify/cli 0.1.17 → 0.1.19

package/dist/cli.entry.js

@@ -71,8 +71,8 @@ function mountApp(feedback = null) {
             await unmountApp();
             resetTerminalScreen();
             process.stdout.write([
-                `Atualizando o CLI de v${update.currentVersion} para v${update.latestVersion}.`,
-                `Pacote npm: ${update.packageName}`,
+                `Preparando a atualizacao do CLI para v${update.latestVersion}.`,
+                'O atualizador externo vai assumir o processo em seguida.',
                 '',
             ].join('\n'));
             const result = await runCliSelfUpdate(update.packageName, update.latestVersion);

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":"AAOA,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,mBAAmB,GAC3B;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;AAgOD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CA6BvE;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwB/G"}
+{"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,mBAAmB,GAC3B;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;AAgSD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CA6BvE;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAY/G"}

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

@@ -1,5 +1,8 @@
-import { readFileSync } from 'node:fs';
+import { chmodSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
 import { spawn } from 'node:child_process';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { randomUUID } from 'node:crypto';
 const DEFAULT_PACKAGE_NAME = '@trendify/cli';
 const DEFAULT_PACKAGE_VERSION = '0.0.0';
 const VERSION_PATTERN = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/u;
@@ -128,90 +131,155 @@ async function fetchLatestPublishedVersion(packageName) {
     }
     throw new Error('Nao foi possivel interpretar a versao publicada retornada pelo npm.');
 }
-async function runCommandWithInheritedStdio(command, args) {
-    return new Promise((resolve, reject) => {
-        const child = spawn(command, [...args], {
-            env: process.env,
-            stdio: 'inherit',
-        });
-        child.on('error', (error) => {
-            reject(error);
-        });
-        child.on('close', (code) => {
-            resolve(code ?? 1);
-        });
-    });
+function getUpdaterScriptPath() {
+    return join(tmpdir(), `trendify-cli-updater-${randomUUID()}.cjs`);
 }
-async function restartCli() {
-    const entrypoint = process.argv[1];
-    if (!entrypoint) {
-        throw new Error('Nao foi possivel identificar o entrypoint atual da CLI para reiniciar o processo.');
-    }
-    const helperScript = `
+function buildUpdaterScriptFileContents() {
+    return `#!/usr/bin/env node
 const { spawn } = require('node:child_process');
+const { unlinkSync } = require('node:fs');
+
+const payload = JSON.parse(process.argv[2] ?? '{}');
+
+const wait = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
+
+const resetTerminalScreen = () => {
+  if (!process.stdout.isTTY) {
+    return;
+  }
 
-const parentPid = Number(process.argv[1]);
-const nodePath = process.argv[2];
-const execArgv = JSON.parse(process.argv[3]);
-const cliArgv = JSON.parse(process.argv[4]);
+  process.stdout.write('\\u001b[2J\\u001b[3J\\u001b[H');
+};
 
-const canSignalParent = Number.isInteger(parentPid) && parentPid > 0;
+const releaseRawMode = () => {
+  if (process.stdin.isTTY && typeof process.stdin.setRawMode === 'function') {
+    try {
+      process.stdin.setRawMode(false);
+    } catch {}
+  }
+};
 
 const isParentAlive = () => {
-  if (!canSignalParent) {
+  if (!Number.isInteger(payload.parentPid) || payload.parentPid <= 0) {
     return false;
   }
 
   try {
-    process.kill(parentPid, 0);
+    process.kill(payload.parentPid, 0);
     return true;
-  } catch (error) {
+  } catch {
     return false;
   }
 };
 
-const launchCli = () => {
-  const child = spawn(nodePath, [...execArgv, ...cliArgv], {
-    env: process.env,
-    stdio: 'inherit',
-  });
+const waitForParentExit = async () => {
+  while (isParentAlive()) {
+    await wait(100);
+  }
+};
+
+const runCommand = (command, args) =>
+  new Promise((resolve, reject) => {
+    const child = spawn(command, args, {
+      env: process.env,
+      stdio: 'inherit',
+    });
 
-  child.on('error', (error) => {
-    process.stderr.write(\`Falha ao reiniciar a CLI atualizada: \${error.message}\\n\`);
-    process.exit(1);
+    child.on('error', reject);
+    child.on('close', (code) => resolve(code ?? 1));
   });
 
-  child.on('spawn', () => {
-    process.exit(0);
+const launchUpdatedCli = async () =>
+  new Promise((resolve, reject) => {
+    const child = spawn(payload.nodePath, [...payload.execArgv, ...payload.cliArgv], {
+      env: process.env,
+      stdio: 'inherit',
+    });
+
+    child.on('error', reject);
+    child.on('spawn', () => resolve());
   });
-};
 
-const waitForParentToExit = () => {
-  if (!isParentAlive()) {
-    setTimeout(launchCli, 150);
+const cleanupTempScript = () => {
+  if (typeof payload.scriptPath !== 'string' || payload.scriptPath.length === 0) {
     return;
   }
 
-  setTimeout(waitForParentToExit, 100);
+  try {
+    unlinkSync(payload.scriptPath);
+  } catch {}
 };
 
-waitForParentToExit();
-`.trim();
-    const helperArgs = [
-        '-e',
-        helperScript,
-        String(process.pid),
-        process.execPath,
-        JSON.stringify(process.execArgv),
-        JSON.stringify([entrypoint, ...process.argv.slice(2)]),
-    ];
+const main = async () => {
+  await waitForParentExit();
+  releaseRawMode();
+  resetTerminalScreen();
+
+  process.stdout.write(
+    [
+      \`Atualizando o CLI de v\${payload.currentVersion} para v\${payload.latestVersion}.\`,
+      \`Pacote npm: \${payload.packageName}\`,
+      '',
+    ].join('\\n'),
+  );
+
+  const npmExitCode = await runCommand(payload.npmCommand, ['install', '--global', \`\${payload.packageName}@\${payload.latestVersion}\`]);
+
+  if (npmExitCode !== 0) {
+    process.stderr.write(\`\\nFalha ao atualizar automaticamente: o npm encerrou com codigo \${npmExitCode}.\\n\`);
+    cleanupTempScript();
+    process.exit(npmExitCode);
+  }
+
+  releaseRawMode();
+  resetTerminalScreen();
+  process.stdout.write(\`CLI atualizada com sucesso para v\${payload.latestVersion}.\\n\\n\`);
+  await wait(150);
+  await launchUpdatedCli();
+  cleanupTempScript();
+  process.exit(0);
+};
+
+main().catch((error) => {
+  process.stderr.write(\`\\nFalha ao concluir a atualizacao externa: \${error?.message ?? String(error)}\\n\`);
+  cleanupTempScript();
+  process.exit(1);
+});
+`;
+}
+async function spawnDetachedUpdaterProcess(packageName, currentVersion, latestVersion) {
+    const entrypoint = process.argv[1];
+    if (!entrypoint) {
+        throw new Error('Nao foi possivel identificar o entrypoint atual da CLI para reiniciar o processo.');
+    }
+    const scriptPath = getUpdaterScriptPath();
+    const scriptContents = buildUpdaterScriptFileContents();
+    writeFileSync(scriptPath, scriptContents, 'utf8');
+    if (process.platform !== 'win32') {
+        chmodSync(scriptPath, 0o700);
+    }
+    const payload = JSON.stringify({
+        parentPid: process.pid,
+        currentVersion,
+        latestVersion,
+        packageName,
+        npmCommand: getNpmCommand(),
+        nodePath: process.execPath,
+        execArgv: process.execArgv,
+        cliArgv: [entrypoint, ...process.argv.slice(2)],
+        scriptPath,
+    });
     await new Promise((resolve, reject) => {
-        const child = spawn(process.execPath, helperArgs, {
+        const child = spawn(process.execPath, [scriptPath, payload], {
             detached: true,
             env: process.env,
             stdio: 'inherit',
         });
         child.on('error', (error) => {
+            try {
+                unlinkSync(scriptPath);
+            }
+            catch { }
             reject(error);
         });
         child.on('spawn', () => {
@@ -250,18 +318,8 @@ export async function checkForCliUpdate() {
 }
 export async function runCliSelfUpdate(packageName, latestVersion) {
     try {
-        const exitCode = await runCommandWithInheritedStdio(getNpmCommand(), [
-            'install',
-            '--global',
-            `${packageName}@${latestVersion}`,
-        ]);
-        if (exitCode !== 0) {
-            return {
-                error: `O npm encerrou a atualizacao com codigo ${exitCode}.`,
-                ok: false,
-            };
-        }
-        await restartCli();
+        const { packageVersion } = readInstalledPackageMetadata();
+        await spawnDetachedUpdaterProcess(packageName, packageVersion, latestVersion);
         return { ok: true };
     }
     catch (error) {

package/package.json

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