@deerdesign/deertools 1.2.3 → 1.2.5

package/bin/deertools.js

@@ -1,3 +1,8 @@
 #!/usr/bin/env node
 'use strict';
-require('../src/cli').main(process.argv.slice(2)).then((code) => { process.exitCode = code; });
+require('../src/cli').main(process.argv.slice(2)).then((code) => {
+  process.exit(code || 0);
+}).catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deerdesign/deertools",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"

package/src/commands.js

@@ -41,27 +41,18 @@ async function cmdLogin(pos, flags) {
     }
   }
 
-  if (pos[0] === 'skills' || pos[0] === 'hub' || pos[0] === 'skill') {
+  if ((pos[0] === 'skills' || pos[0] === 'hub' || pos[0] === 'skill') && (pos[1] || flags.token)) {
     out(`\n=== DeerSkills Hub ===`);
     try {
-      const { loginSkillsBrowser, loginSkillsDirect } = require('./skills-login');
+      const { loginSkillsDirect } = require('./skills-login');
       const token = pos[1] || flags.token;
-      let entry;
-      if (token) {
-        entry = await loginSkillsDirect(token);
-      } else {
-        entry = await loginSkillsBrowser({
-          port: flags.port ? Number(flags.port) : 0,
-          openBrowser: flags['no-open'] ? null : undefined,
-          log: out
-        });
-      }
+      await loginSkillsDirect(token);
       out(`✓ Zalogowano do DeerSkills Hub. Klucz zapisany w credentials.json.`);
       out(`  Przegląd umiejętności: deertools skill list   |   Katalog: https://skill-garden-vault.lovable.app`);
       return;
     } catch (e) {
       err(`✗ DeerSkills: ${e.message}`);
-      fail('Nie udało się zalogować do DeerSkills Hub.', 1);
+      fail('Nie udało się zapisać klucza do DeerSkills Hub.', 1);
     }
   }
 
@@ -69,17 +60,6 @@ async function cmdLogin(pos, flags) {
   const scope = flags.write ? 'read write' : normalizeScope(flags.scope || 'read');
   let failures = 0;
   for (const product of products) {
-    if (product.id === 'skills') {
-      try {
-        const { loginSkillsBrowser } = require('./skills-login');
-        await loginSkillsBrowser({ port: flags.port ? Number(flags.port) : 0, openBrowser: flags['no-open'] ? null : undefined, log: out });
-        out(`✓ Zalogowano do DeerSkills Hub.`);
-      } catch (e) {
-        failures += 1;
-        err(`✗ DeerSkills: ${e.message}`);
-      }
-      continue;
-    }
     out(`\n=== ${product.name} ===`);
     try {
       const entry = await login(product, { scope, port: flags.port ? Number(flags.port) : 0, clientName: flags.name, openBrowser: flags['no-open'] ? null : undefined, log: out });

package/src/login.js

@@ -83,26 +83,61 @@ async function exchangeCode(product, tokenEndpoint, { code, verifier, redirectUr
   if (!res.ok || !json || !json.access_token) {
     throw new Error(`Wymiana kodu na klucz nie powiodła się (${res.status}${json && json.error ? `: ${json.error}` : ''}). Spróbuj zalogować się ponownie.`);
   }
-  if (!String(json.access_token).startsWith(product.keyPrefix)) {
+  const isExpectedPrefix = String(json.access_token).startsWith(product.keyPrefix);
+  const isSkillsJwt = product.id === 'skills' && String(json.access_token).startsWith('ey') && json.access_token.includes('.');
+  if (!isExpectedPrefix && !isSkillsJwt) {
     throw new Error(`Produkt zwrócił nieoczekiwany klucz (oczekiwano prefiksu ${product.keyPrefix}…).`);
   }
+  let email = json.email || null;
+  let expires_at = json.expires_at || null;
+  if (isSkillsJwt) {
+    try {
+      const parts = json.access_token.split('.');
+      if (parts.length >= 2) {
+        const payload = JSON.parse(Buffer.from(parts[1], 'base64').toString('utf8'));
+        if (!email && payload.email) email = payload.email;
+        if (!expires_at && payload.exp) expires_at = new Date(payload.exp * 1000).toISOString();
+      }
+    } catch (_) {}
+  }
   return {
     key: json.access_token,
-    email: json.email || null,
+    email: email,
     scope: json.scope || 'read',
-    expires_at: json.expires_at || null,
+    expires_at: expires_at,
     logged_at: new Date().toISOString(),
   };
 }
 
 /** Adresy OAuth z metadanych serwera (RFC 8414) opublikowanych przez produkt. */
 async function discoverOAuth(product, fetchImpl = fetch) {
-  const url = `${product.site}/.well-known/oauth-authorization-server`;
+  let url = `${product.site}/.well-known/oauth-authorization-server`;
   let res;
-  try { res = await fetchImpl(url, { headers: { Accept: 'application/json', 'User-Agent': 'deertools-cli' } }); } catch (e) {
-    throw new Error(`Nie można pobrać metadanych OAuth produktu ${product.name} (${url}): ${e.message}`);
+  try {
+    res = await fetchImpl(url, { headers: { Accept: 'application/json', 'User-Agent': 'deertools-cli' } });
+  } catch (e) {
+    if (product.id === 'skills') {
+      const fallbackSite = process.env.DEERTOOLS_SKILLS_URL || 'https://skill-garden-vault.lovable.app';
+      url = `${fallbackSite}/.well-known/oauth-authorization-server`;
+      try {
+        res = await fetchImpl(url, { headers: { Accept: 'application/json', 'User-Agent': 'deertools-cli' } });
+      } catch (_) {}
+    }
   }
-  if (!res.ok) throw new Error(`Produkt ${product.name} nie opublikował jeszcze metadanych OAuth (${url} → ${res.status}). Logowanie z CLI nie jest tam dostępne.`);
+
+  if (!res || !res.ok) {
+    if (product.authorizeUrl && product.tokenUrl && !opts_is_mock(fetchImpl)) {
+      const authEndpoint = product.id === 'skills' ? 'https://skill-garden-vault.lovable.app/oauth/authorize' : product.authorizeUrl;
+      return {
+        authorization_endpoint: authEndpoint,
+        token_endpoint: product.tokenUrl,
+        code_challenge_methods_supported: ['S256'],
+      };
+    }
+    if (!res) throw new Error(`Nie można pobrać metadanych OAuth produktu ${product.name} (${url}).`);
+    throw new Error(`Produkt ${product.name} nie opublikował jeszcze metadanych OAuth (${url} → ${res.status}). Logowanie z CLI nie jest tam dostępne.`);
+  }
+
   let meta;
   try { meta = JSON.parse(await res.text()); } catch (_) { throw new Error(`Metadane OAuth produktu ${product.name} nie są poprawnym JSON-em.`); }
   if (!meta.authorization_endpoint || !meta.token_endpoint) throw new Error(`Metadane OAuth produktu ${product.name} nie zawierają authorization_endpoint / token_endpoint.`);
@@ -113,6 +148,10 @@ async function discoverOAuth(product, fetchImpl = fetch) {
   return meta;
 }
 
+function opts_is_mock(f) {
+  return f !== fetch && typeof global !== 'undefined' && f !== global.fetch;
+}
+
 function page(title, body, ok) {
   const color = ok ? '#10b981' : '#ef4444';
   return `<!doctype html><html lang="pl"><meta charset="utf-8"><title>DeerTools CLI</title><body style="font-family:-apple-system,Segoe UI,Roboto,sans-serif;background:#09090b;color:#f4f4f5;text-align:center;padding:60px 20px"><div style="max-width:480px;margin:0 auto;background:#18181b;border:1px solid #27272a;border-radius:16px;padding:40px"><h1 style="color:${color};font-size:22px">${escapeHtml(title)}</h1><p style="color:#a1a1aa;line-height:1.5">${escapeHtml(body)}</p></div></body></html>`;

package/src/skills-login.js

@@ -187,19 +187,22 @@ async function loginSkillsBrowser(opts = {}) {
 
             saveProduct('skills', entry);
 
-            res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+            res.writeHead(200, {
+              'Content-Type': 'text/html; charset=utf-8',
+              'Connection': 'close',
+            });
             res.end(renderSkillsLoginPage(null, true));
 
-            setTimeout(() => done(null, entry), 500);
+            setTimeout(() => done(null, entry), 150);
           } catch (err) {
-            res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
+            res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8', 'Connection': 'close' });
             res.end(renderSkillsLoginPage(`Wystąpił błąd: ${err.message}`));
           }
         });
         return;
       }
 
-      res.writeHead(404);
+      res.writeHead(404, { 'Connection': 'close' });
       res.end('Not Found');
     });
 
@@ -211,7 +214,11 @@ async function loginSkillsBrowser(opts = {}) {
       if (finished) return;
       finished = true;
       clearTimeout(timer);
+      if (typeof server.closeAllConnections === 'function') {
+        server.closeAllConnections();
+      }
       server.close();
+      if (server.unref) server.unref();
       if (err) reject(err); else resolve(entry);
     }