@youkno/edge-cli 1.21.54 → 1.21.55

package/dist/commands/login.js

@@ -3,16 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerLogin = registerLogin;
 const auth_1 = require("../lib/auth");
 const config_1 = require("../lib/config");
+const shell_1 = require("./shell");
 function registerLogin(program) {
     program
         .command("login")
         .description("Authenticate via browser and store JWT tokens")
+        .option("--shell", "start interactive shell after login")
         .action(async function loginAction() {
         const parent = this.parent;
         const opts = (parent?.opts() ?? {});
         const cfg = await (0, config_1.resolveEffectiveConfig)(opts);
         const email = await (0, auth_1.login)(cfg);
         process.stdout.write(`Successfully authenticated as ${email}\n`);
+        if (this.opts().shell) {
+            await (0, shell_1.repl)(cfg, {});
+        }
     });
     program
         .command("login:list")

package/dist/commands/shell.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.repl = repl;
 exports.registerShell = registerShell;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -101,7 +102,7 @@ async function shellScript(cfg, authHeader, scriptText, options, scriptName = "i
     }
     process.stdout.write(body.endsWith("\n") ? body : `${body}\n`);
 }
-async function repl(cfg, authHeader, options) {
+async function repl(cfg, options) {
     const rl = node_readline_1.default.createInterface({
         input: process.stdin,
         output: process.stdout,
@@ -117,6 +118,7 @@ async function repl(cfg, authHeader, options) {
             return;
         }
         try {
+            const authHeader = await (0, auth_1.resolveAuthHeaderFast)(cfg);
             await shellCmd(cfg, authHeader, cmd, Boolean(options.json));
         }
         catch (err) {
@@ -156,7 +158,7 @@ function registerShell(program) {
         const options = this.opts();
         const authHeader = await (0, auth_1.resolveAuthHeader)(cfg);
         if (!target && (!inlineScript || inlineScript.length === 0)) {
-            await repl(cfg, authHeader, options);
+            await repl(cfg, options);
             return;
         }
         if (target?.endsWith(".esh")) {

package/dist/lib/auth.js

@@ -9,6 +9,7 @@ exports.logout = logout;
 exports.login = login;
 exports.resolveAccessToken = resolveAccessToken;
 exports.resolveAuthHeader = resolveAuthHeader;
+exports.resolveAuthHeaderFast = resolveAuthHeaderFast;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -391,7 +392,7 @@ async function refreshDefaultToken(cfg) {
     storeTokens(cfg, email, merged);
     return merged.accessToken;
 }
-async function resolveAccessToken(cfg, forceRefresh = false) {
+async function resolveAccessToken(cfg, forceRefresh = false, skipValidate = false) {
     const db = readDb();
     const scope = getScope(db, cfg);
     const email = scope.default;
@@ -422,7 +423,7 @@ async function resolveAccessToken(cfg, forceRefresh = false) {
             // continue with existing token
         }
     }
-    if (!(await validateAccessToken(cfg, accessToken)) && account.refreshToken) {
+    if (!skipValidate && !(await validateAccessToken(cfg, accessToken)) && account.refreshToken) {
         const refreshed = await refreshDefaultToken(cfg);
         if (refreshed) {
             accessToken = refreshed;
@@ -434,3 +435,7 @@ async function resolveAuthHeader(cfg) {
     const accessToken = await resolveAccessToken(cfg);
     return `Bearer ${accessToken}`;
 }
+async function resolveAuthHeaderFast(cfg) {
+    const accessToken = await resolveAccessToken(cfg, false, true);
+    return `Bearer ${accessToken}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youkno/edge-cli",
-  "version": "1.21.54",
+  "version": "1.21.55",
   "description": "Cross-platform Edge CLI",
   "bin": "dist/index.js",
   "publishConfig": {

package/src/commands/login.ts

@@ -2,18 +2,23 @@ import { Command } from "commander";
 
 import { login, listLogins, logout, setDefaultLogin } from "../lib/auth";
 import { resolveEffectiveConfig } from "../lib/config";
+import { repl } from "./shell";
 import { CliOptions } from "../lib/types";
 
 export function registerLogin(program: Command): void {
     program
         .command("login")
         .description("Authenticate via browser and store JWT tokens")
+        .option("--shell", "start interactive shell after login")
         .action(async function loginAction(this: Command) {
             const parent = this.parent;
             const opts = (parent?.opts() ?? {}) as CliOptions;
             const cfg = await resolveEffectiveConfig(opts);
             const email = await login(cfg);
             process.stdout.write(`Successfully authenticated as ${email}\n`);
+            if (this.opts<{ shell?: boolean }>().shell) {
+                await repl(cfg, {});
+            }
         });
 
     program

package/src/commands/shell.ts

@@ -4,7 +4,7 @@ import readline from "node:readline";
 
 import { Command } from "commander";
 
-import { resolveAuthHeader } from "../lib/auth";
+import { resolveAuthHeader, resolveAuthHeaderFast } from "../lib/auth";
 import { resolveEffectiveConfig } from "../lib/config";
 import { baseHeaders, checkedText } from "../lib/request";
 import { CliOptions, EffectiveConfig } from "../lib/types";
@@ -126,7 +126,7 @@ async function shellScript(
     process.stdout.write(body.endsWith("\n") ? body : `${body}\n`);
 }
 
-async function repl(cfg: EffectiveConfig, authHeader: string, options: ShellOptions) {
+export async function repl(cfg: EffectiveConfig, options: ShellOptions) {
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
@@ -144,6 +144,7 @@ async function repl(cfg: EffectiveConfig, authHeader: string, options: ShellOpti
             return;
         }
         try {
+            const authHeader = await resolveAuthHeaderFast(cfg);
             await shellCmd(cfg, authHeader, cmd, Boolean(options.json));
         } catch (err) {
             process.stderr.write(`ERROR: ${err instanceof Error ? err.message : String(err)}\n`);
@@ -185,7 +186,7 @@ export function registerShell(program: Command): void {
             const authHeader = await resolveAuthHeader(cfg);
 
             if (!target && (!inlineScript || inlineScript.length === 0)) {
-                await repl(cfg, authHeader, options);
+                await repl(cfg, options);
                 return;
             }
 

package/src/lib/auth.ts

@@ -459,7 +459,7 @@ async function refreshDefaultToken(cfg: EffectiveConfig): Promise<string | undef
     return merged.accessToken;
 }
 
-export async function resolveAccessToken(cfg: EffectiveConfig, forceRefresh = false): Promise<string> {
+export async function resolveAccessToken(cfg: EffectiveConfig, forceRefresh = false, skipValidate = false): Promise<string> {
     const db = readDb();
     const scope = getScope(db, cfg);
     const email = scope.default;
@@ -493,7 +493,7 @@ export async function resolveAccessToken(cfg: EffectiveConfig, forceRefresh = fa
         }
     }
 
-    if (!(await validateAccessToken(cfg, accessToken)) && account.refreshToken) {
+    if (!skipValidate && !(await validateAccessToken(cfg, accessToken)) && account.refreshToken) {
         const refreshed = await refreshDefaultToken(cfg);
         if (refreshed) {
             accessToken = refreshed;
@@ -507,3 +507,8 @@ export async function resolveAuthHeader(cfg: EffectiveConfig): Promise<string> {
     const accessToken = await resolveAccessToken(cfg);
     return `Bearer ${accessToken}`;
 }
+
+export async function resolveAuthHeaderFast(cfg: EffectiveConfig): Promise<string> {
+    const accessToken = await resolveAccessToken(cfg, false, true);
+    return `Bearer ${accessToken}`;
+}