@iola_adm/iola-cli 0.2.18 → 0.2.20

package/bin/postinstall.js

@@ -32,25 +32,27 @@ const steps = [
 ];
 
 const canAnimate = process.stdout.isTTY && process.env.CI !== "true";
+const setupStarted = process.hrtime.bigint();
 
 console.log("");
-console.log("IOLA CLI: настройка после установки");
+console.log("IOLA CLI: настройка после установки npm-пакета");
+console.log("Время ниже считает только настройку CLI, без скачивания и распаковки npm-пакета.");
 
 for (let index = 0; index < steps.length; index += 1) {
   const step = steps[index];
   await runStep(step, index + 1, steps.length);
 }
 
-console.log("IOLA CLI готова. Запуск: iola");
+console.log(`IOLA CLI готова за ${formatDuration(elapsedMs(setupStarted))}. Запуск: iola`);
 
 async function runStep(step, current, total) {
-  const started = Date.now();
+  const started = process.hrtime.bigint();
   let frame = 0;
   let lastOutput = "";
   const prefix = `[${current}/${total}] ${step.title}`;
   const render = () => {
     if (!canAnimate) return;
-    const seconds = Math.max(1, Math.round((Date.now() - started) / 1000));
+    const seconds = Math.max(1, Math.floor(elapsedMs(started) / 1000));
     process.stdout.write(`\r${frames[frame]} ${prefix}... ${seconds}s`);
     frame = (frame + 1) % frames.length;
   };
@@ -75,9 +77,9 @@ async function runStep(step, current, total) {
   }
 
   if (canAnimate) {
-    process.stdout.write(`\r✓ ${prefix} готово за ${formatDuration(Date.now() - started)}\n`);
+    process.stdout.write(`\r✓ ${prefix} готово за ${formatDuration(elapsedMs(started))}\n`);
   } else {
-    console.log(`✓ ${prefix} готово за ${formatDuration(Date.now() - started)}`);
+    console.log(`✓ ${prefix} готово за ${formatDuration(elapsedMs(started))}`);
   }
 }
 
@@ -114,9 +116,15 @@ function run(command, args, onOutput) {
   });
 }
 
+function elapsedMs(started) {
+  return Number(process.hrtime.bigint() - started) / 1_000_000;
+}
+
 function formatDuration(ms) {
-  const seconds = Math.max(1, Math.round(ms / 1000));
-  if (seconds < 60) return `${seconds}s`;
+  if (ms < 1000) return `${Math.max(1, Math.round(ms))}ms`;
+  const totalSeconds = ms / 1000;
+  if (totalSeconds < 60) return `${totalSeconds.toFixed(1)}s`;
+  const seconds = Math.floor(totalSeconds);
   const minutes = Math.floor(seconds / 60);
   const rest = seconds % 60;
   return `${minutes}m ${rest}s`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iola_adm/iola-cli",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "description": "CLI и AI-агент городского округа Йошкар-Ола.",
   "license": "MIT",
   "homepage": "https://github.com/adm-iola/iola-cli#readme",

package/src/cli.js

@@ -3315,8 +3315,13 @@ async function setupYandexConnector(args = []) {
   console.log("Выбрать активные функции можно командой /yandex или iola yandex menu.");
   if (clientId || oauthApps.length) {
     if (process.stdin.isTTY && !options["print-url"]) {
+      const secrets = await loadSecrets();
       console.log("Открываю браузер для входа в Яндекс. После авторизации токен сохранится автоматически.");
       for (const app of oauthApps.length ? oauthApps : [{ id: "custom", title: "Yandex Connector", clientId, services: authorizedServices }]) {
+        if (!options.force && hasYandexOAuthAppToken(secrets, app.id)) {
+          console.log(`Авторизация: ${app.title} уже подключена, пропускаю.`);
+          continue;
+        }
         console.log(`Авторизация: ${app.title}`);
         await runYandexBrowserOAuth({ appId: app.id, clientId: app.clientId, services: app.services, redirectUrl });
       }
@@ -3483,11 +3488,16 @@ function waitForYandexOAuthToken({ clientId, services, redirectUrl }) {
   return new Promise((resolvePromise, reject) => {
     let settled = false;
     const timeoutMs = 180000;
+    const debug = process.env.IOLA_YANDEX_OAUTH_DEBUG === "1";
+    const logDebug = (message) => {
+      if (debug) console.log(`[yandex-oauth] ${message}`);
+    };
     const finish = (token) => {
       if (!token) throw new Error("Yandex OAuth token не получен.");
       if (!settled) {
         settled = true;
         clearTimeout(timer);
+        logDebug("token received");
         resolvePromise(String(token));
       }
     };
@@ -3495,6 +3505,7 @@ function waitForYandexOAuthToken({ clientId, services, redirectUrl }) {
       try {
         const url = new URL(req.url || "/", redirectUrl);
         if (url.pathname === YANDEX_CONNECTOR_REDIRECT_PATH && req.method === "GET") {
+          logDebug(`GET ${url.pathname}${url.search || ""}`);
           const tokenFromQuery = url.searchParams.get("access_token") || url.searchParams.get("token");
           const errorFromQuery = url.searchParams.get("error") || "";
           if (errorFromQuery) throw new Error(`Yandex OAuth error: ${errorFromQuery}`);
@@ -3536,6 +3547,7 @@ function waitForYandexOAuthToken({ clientId, services, redirectUrl }) {
           return;
         }
         if (url.pathname === "/yandex/oauth/token" && req.method === "GET") {
+          logDebug(`GET ${url.pathname}${url.search || ""}`);
           const token = url.searchParams.get("token") || url.searchParams.get("access_token");
           const error = url.searchParams.get("error") || "";
           if (error) throw new Error(`Yandex OAuth error: ${error}`);
@@ -3549,11 +3561,18 @@ function waitForYandexOAuthToken({ clientId, services, redirectUrl }) {
           const chunks = [];
           for await (const chunk of req) chunks.push(chunk);
           const payload = JSON.parse(Buffer.concat(chunks).toString("utf8") || "{}");
+          logDebug(`POST ${url.pathname}; token=${payload.token ? "yes" : "no"} error=${payload.error ? "yes" : "no"}`);
           if (payload.error) throw new Error(`Yandex OAuth error: ${payload.error}`);
-          finish(payload.token);
           res.writeHead(200, { "content-type": "application/json" });
           res.end(JSON.stringify({ ok: true }));
-          server.close();
+          res.on("finish", () => {
+            try {
+              finish(payload.token);
+            } catch (error) {
+              if (!settled) reject(error);
+            }
+            server.close();
+          });
           return;
         }
         res.writeHead(404);
@@ -3586,6 +3605,7 @@ function waitForYandexOAuthToken({ clientId, services, redirectUrl }) {
     server.listen(YANDEX_CONNECTOR_REDIRECT_PORT, YANDEX_CONNECTOR_REDIRECT_HOST, async () => {
       const authUrl = buildYandexOAuthUrl({ clientId, services, redirectUrl });
       console.log(`Если браузер не открылся, откройте ссылку вручную: ${authUrl}`);
+      console.log("Ожидаю возврат токена из браузера...");
       try {
         await openUrl(authUrl);
       } catch (error) {
@@ -3628,6 +3648,13 @@ function getYandexConnectorConnectedAppIds(secrets = {}) {
   return apps;
 }
 
+function hasYandexOAuthAppToken(secrets = {}, appId = "core") {
+  if (process.env.YANDEX_OAUTH_TOKEN) return true;
+  if (secrets.yandex?.oauthApps?.[appId]?.token) return true;
+  if (appId === "core" && (secrets.yandex?.oauthToken || secrets.cloud?.["yandex-disk"]?.token)) return true;
+  return false;
+}
+
 function isYandexConnectorFullyConnected(secrets = {}) {
   if (process.env.YANDEX_OAUTH_TOKEN) return true;
   const connected = getYandexConnectorConnectedAppIds(secrets);
@@ -11510,7 +11537,7 @@ function parseOptions(args) {
 
   for (let index = 0; index < args.length; index += 1) {
     const arg = args[index];
-    if (arg === "--json" || arg === "--yes" || arg === "--silent" || arg === "--events" || arg === "--stream-json" || arg === "--stdio" || arg === "--system" || arg === "--headed" || arg === "--headless" || arg === "--no-history" || arg === "--summary" || arg === "--all" || arg === "--full" || arg === "--unread" || arg === "--once" || arg === "--local" || arg === "--cache" || arg === "--tools" || arg === "--files" || arg === "--plan" || arg === "--trace" || arg === "--diff" || arg === "--stage" || arg === "--fts" || arg === "--bare" || arg === "--quiet" || arg === "--optional" || arg === "--project" || arg === "--dry-run" || arg === "--no-color" || arg === "--fail-on-empty" || arg === "--debug" || arg === "--fix" || arg === "--append" || arg === "--preserve-active" || arg === "--open" || arg === "--print-url") {
+    if (arg === "--json" || arg === "--yes" || arg === "--silent" || arg === "--events" || arg === "--stream-json" || arg === "--stdio" || arg === "--system" || arg === "--headed" || arg === "--headless" || arg === "--no-history" || arg === "--summary" || arg === "--all" || arg === "--full" || arg === "--unread" || arg === "--once" || arg === "--local" || arg === "--cache" || arg === "--tools" || arg === "--files" || arg === "--plan" || arg === "--trace" || arg === "--diff" || arg === "--stage" || arg === "--fts" || arg === "--bare" || arg === "--quiet" || arg === "--optional" || arg === "--project" || arg === "--dry-run" || arg === "--no-color" || arg === "--fail-on-empty" || arg === "--debug" || arg === "--fix" || arg === "--force" || arg === "--append" || arg === "--preserve-active" || arg === "--open" || arg === "--print-url") {
       result[arg.slice(2)] = true;
     } else if (arg === "--check" || arg === "--upgrade-node") {
       result.check = true;

package/test/smoke-test.js

@@ -7,6 +7,7 @@ const rootDir = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 const binPath = resolve(rootDir, "bin", "iola.js");
 const packageJson = JSON.parse(await readFile(resolve(rootDir, "package.json"), "utf8"));
 const cliSource = await readFile(resolve(rootDir, "src", "cli.js"), "utf8");
+const postinstallSource = await readFile(resolve(rootDir, "bin", "postinstall.js"), "utf8");
 
 function runCli(args) {
   return new Promise((resolvePromise, reject) => {
@@ -69,13 +70,19 @@ assertIncludes(cliSource, "IOLA_YANDEX_OAUTH_CLIENT_ID", "Yandex setup should us
 assertIncludes(cliSource, "IOLA_YANDEX_ORGANIZER_OAUTH_CLIENT_ID", "Yandex setup should support the organizer OAuth app group");
 assertIncludes(cliSource, "addressbook:all", "Yandex contacts should use the addressbook OAuth scope");
 assertIncludes(cliSource, "Автоматический прием OAuth-токена не сработал", "Yandex OAuth should provide manual token fallback");
+assertIncludes(cliSource, "уже подключена, пропускаю", "Yandex setup should skip already connected OAuth app groups");
+assertIncludes(cliSource, "IOLA_YANDEX_OAUTH_DEBUG", "Yandex OAuth callback should have debug logging");
 assertIncludes(cliSource, "partial (", "Yandex connector status should report partial connections");
+assertIncludes(cliSource, "hasYandexOAuthAppToken", "Yandex setup should detect tokens per OAuth app");
 assertIncludes(cliSource, "isYandexConnectorFullyConnected", "Yandex master status should require all OAuth app tokens");
 assertIncludes(cliSource, "--app", "Yandex token command should persist tokens by OAuth app group");
 assertNotIncludes(cliSource, "Сервисы через запятую [identity,disk]", "Yandex setup should not ask for services during connector setup");
 if (!packageJson.files.includes("docs/assets/iola-oauth-icon.png")) {
   throw new Error("package files should include the Yandex OAuth icon");
 }
+assertIncludes(postinstallSource, "process.hrtime.bigint()", "postinstall should use a monotonic timer");
+assertIncludes(postinstallSource, "без скачивания и распаковки npm-пакета", "postinstall timing should not imply full npm install time");
+assertIncludes(postinstallSource, "IOLA CLI готова за", "postinstall should print total setup duration");
 
 const commands = await runCli(["commands"]);
 assertIncludes(commands, "iola browser status|install|open|text|html|screenshot|pdf|click|type|eval", "commands");