@keywaysh/cli 0.1.0 → 0.1.1

package/dist/auth-QLPQ24HZ.js

@@ -0,0 +1,12 @@
+import {
+  clearAuth,
+  getAuthFilePath,
+  getStoredAuth,
+  saveAuthToken
+} from "./chunk-F4C46224.js";
+export {
+  clearAuth,
+  getAuthFilePath,
+  getStoredAuth,
+  saveAuthToken
+};

package/dist/chunk-F4C46224.js

@@ -0,0 +1,102 @@
+// src/utils/auth.ts
+import Conf from "conf";
+import { createCipheriv, createDecipheriv, randomBytes } from "crypto";
+import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync } from "fs";
+import { join } from "path";
+import { homedir } from "os";
+var store = new Conf({
+  projectName: "keyway",
+  configName: "config",
+  fileMode: 384
+});
+var KEY_DIR = join(homedir(), ".keyway");
+var KEY_FILE = join(KEY_DIR, ".key");
+function getOrCreateEncryptionKey() {
+  if (!existsSync(KEY_DIR)) {
+    mkdirSync(KEY_DIR, { recursive: true, mode: 448 });
+  }
+  if (existsSync(KEY_FILE)) {
+    const keyHex2 = readFileSync(KEY_FILE, "utf-8").trim();
+    if (keyHex2.length === 64) {
+      return Buffer.from(keyHex2, "hex");
+    }
+  }
+  const key = randomBytes(32);
+  const keyHex = key.toString("hex");
+  writeFileSync(KEY_FILE, keyHex, { mode: 384 });
+  try {
+    chmodSync(KEY_FILE, 384);
+  } catch {
+  }
+  return key;
+}
+function encryptToken(token) {
+  const key = getOrCreateEncryptionKey();
+  const iv = randomBytes(16);
+  const cipher = createCipheriv("aes-256-gcm", key, iv);
+  const encrypted = Buffer.concat([cipher.update(token, "utf8"), cipher.final()]);
+  const authTag = cipher.getAuthTag();
+  return `${iv.toString("hex")}:${authTag.toString("hex")}:${encrypted.toString("hex")}`;
+}
+function decryptToken(encryptedData) {
+  const key = getOrCreateEncryptionKey();
+  const parts = encryptedData.split(":");
+  if (parts.length !== 3) {
+    throw new Error("Invalid encrypted token format");
+  }
+  const iv = Buffer.from(parts[0], "hex");
+  const authTag = Buffer.from(parts[1], "hex");
+  const encrypted = Buffer.from(parts[2], "hex");
+  const decipher = createDecipheriv("aes-256-gcm", key, iv);
+  decipher.setAuthTag(authTag);
+  const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]);
+  return decrypted.toString("utf8");
+}
+function isExpired(auth) {
+  if (!auth.expiresAt) return false;
+  const expires = Date.parse(auth.expiresAt);
+  if (Number.isNaN(expires)) return false;
+  return expires <= Date.now();
+}
+async function getStoredAuth() {
+  const encryptedData = store.get("auth");
+  if (!encryptedData) {
+    return null;
+  }
+  try {
+    const decrypted = decryptToken(encryptedData);
+    const auth = JSON.parse(decrypted);
+    if (isExpired(auth)) {
+      clearAuth();
+      return null;
+    }
+    return auth;
+  } catch {
+    console.error("Failed to decrypt stored auth, clearing...");
+    clearAuth();
+    return null;
+  }
+}
+async function saveAuthToken(token, meta) {
+  const auth = {
+    keywayToken: token,
+    githubLogin: meta?.githubLogin,
+    expiresAt: meta?.expiresAt,
+    createdAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  const encrypted = encryptToken(JSON.stringify(auth));
+  store.set("auth", encrypted);
+}
+function clearAuth() {
+  store.delete("auth");
+}
+function getAuthFilePath() {
+  return store.path;
+}
+
+export {
+  getStoredAuth,
+  saveAuthToken,
+  clearAuth,
+  getAuthFilePath
+};

package/dist/cli.js

@@ -1,4 +1,10 @@
 #!/usr/bin/env node
+import {
+  clearAuth,
+  getAuthFilePath,
+  getStoredAuth,
+  saveAuthToken
+} from "./chunk-F4C46224.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -70,7 +76,7 @@ var INTERNAL_POSTHOG_HOST = "https://eu.i.posthog.com";
 // package.json
 var package_default = {
   name: "@keywaysh/cli",
-  version: "0.1.0",
+  version: "0.1.1",
   description: "One link to all your secrets",
   type: "module",
   bin: {
@@ -701,104 +707,6 @@ import pc2 from "picocolors";
 import readline from "readline";
 import open from "open";
 import prompts2 from "prompts";
-
-// src/utils/auth.ts
-import Conf from "conf";
-import { createCipheriv, createDecipheriv, randomBytes } from "crypto";
-import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
-var store = new Conf({
-  projectName: "keyway",
-  configName: "config",
-  fileMode: 384
-});
-var KEY_DIR = join(homedir(), ".keyway");
-var KEY_FILE = join(KEY_DIR, ".key");
-function getOrCreateEncryptionKey() {
-  if (!existsSync(KEY_DIR)) {
-    mkdirSync(KEY_DIR, { recursive: true, mode: 448 });
-  }
-  if (existsSync(KEY_FILE)) {
-    const keyHex2 = readFileSync(KEY_FILE, "utf-8").trim();
-    if (keyHex2.length === 64) {
-      return Buffer.from(keyHex2, "hex");
-    }
-  }
-  const key = randomBytes(32);
-  const keyHex = key.toString("hex");
-  writeFileSync(KEY_FILE, keyHex, { mode: 384 });
-  try {
-    chmodSync(KEY_FILE, 384);
-  } catch {
-  }
-  return key;
-}
-function encryptToken(token) {
-  const key = getOrCreateEncryptionKey();
-  const iv = randomBytes(16);
-  const cipher = createCipheriv("aes-256-gcm", key, iv);
-  const encrypted = Buffer.concat([cipher.update(token, "utf8"), cipher.final()]);
-  const authTag = cipher.getAuthTag();
-  return `${iv.toString("hex")}:${authTag.toString("hex")}:${encrypted.toString("hex")}`;
-}
-function decryptToken(encryptedData) {
-  const key = getOrCreateEncryptionKey();
-  const parts = encryptedData.split(":");
-  if (parts.length !== 3) {
-    throw new Error("Invalid encrypted token format");
-  }
-  const iv = Buffer.from(parts[0], "hex");
-  const authTag = Buffer.from(parts[1], "hex");
-  const encrypted = Buffer.from(parts[2], "hex");
-  const decipher = createDecipheriv("aes-256-gcm", key, iv);
-  decipher.setAuthTag(authTag);
-  const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]);
-  return decrypted.toString("utf8");
-}
-function isExpired(auth) {
-  if (!auth.expiresAt) return false;
-  const expires = Date.parse(auth.expiresAt);
-  if (Number.isNaN(expires)) return false;
-  return expires <= Date.now();
-}
-async function getStoredAuth() {
-  const encryptedData = store.get("auth");
-  if (!encryptedData) {
-    return null;
-  }
-  try {
-    const decrypted = decryptToken(encryptedData);
-    const auth = JSON.parse(decrypted);
-    if (isExpired(auth)) {
-      clearAuth();
-      return null;
-    }
-    return auth;
-  } catch {
-    console.error("Failed to decrypt stored auth, clearing...");
-    clearAuth();
-    return null;
-  }
-}
-async function saveAuthToken(token, meta) {
-  const auth = {
-    keywayToken: token,
-    githubLogin: meta?.githubLogin,
-    expiresAt: meta?.expiresAt,
-    createdAt: (/* @__PURE__ */ new Date()).toISOString()
-  };
-  const encrypted = encryptToken(JSON.stringify(auth));
-  store.set("auth", encrypted);
-}
-function clearAuth() {
-  store.delete("auth");
-}
-function getAuthFilePath() {
-  return store.path;
-}
-
-// src/cmds/login.ts
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -1213,11 +1121,18 @@ async function ensureLoginAndGitHubApp(repoFullName, options = {}) {
   const [repoOwner, repoName] = repoFullName.split("/");
   const envToken = process.env.KEYWAY_TOKEN;
   if (envToken) {
-    return ensureGitHubAppInstalledOnly(repoFullName, envToken);
+    const result = await ensureGitHubAppInstalledOnly(repoFullName, envToken);
+    if (result === null) {
+      throw new Error("KEYWAY_TOKEN is invalid or expired. Please update the token.");
+    }
+    return result;
   }
   const stored = await getStoredAuth();
   if (stored?.keywayToken) {
-    return ensureGitHubAppInstalledOnly(repoFullName, stored.keywayToken);
+    const result = await ensureGitHubAppInstalledOnly(repoFullName, stored.keywayToken);
+    if (result !== null) {
+      return result;
+    }
   }
   const allowPrompt = options.allowPrompt !== false;
   if (!allowPrompt || !isInteractive2()) {
@@ -1285,7 +1200,18 @@ async function ensureLoginAndGitHubApp(repoFullName, options = {}) {
 }
 async function ensureGitHubAppInstalledOnly(repoFullName, accessToken) {
   const [repoOwner, repoName] = repoFullName.split("/");
-  const status = await checkGitHubAppInstallation(repoOwner, repoName, accessToken);
+  let status;
+  try {
+    status = await checkGitHubAppInstallation(repoOwner, repoName, accessToken);
+  } catch (error) {
+    if (error instanceof APIError && error.statusCode === 401) {
+      console.log(pc4.yellow("\n\u26A0 Session expired or invalid. Clearing credentials..."));
+      const { clearAuth: clearAuth2 } = await import("./auth-QLPQ24HZ.js");
+      clearAuth2();
+      return null;
+    }
+    throw error;
+  }
   if (status.installed) {
     return accessToken;
   }
@@ -1500,9 +1426,9 @@ import pc6 from "picocolors";
 
 // src/core/doctor.ts
 import { execSync as execSync2 } from "child_process";
-import { writeFileSync as writeFileSync2, unlinkSync, readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
+import { writeFileSync, unlinkSync, readFileSync, existsSync } from "fs";
 import { tmpdir } from "os";
-import { join as join2 } from "path";
+import { join } from "path";
 var API_HEALTH_URL = `${process.env.KEYWAY_API_URL || INTERNAL_API_URL}/v1/health`;
 async function checkNode() {
   const nodeVersion = process.versions.node;
@@ -1619,9 +1545,9 @@ async function checkNetwork() {
   }
 }
 async function checkFileSystem() {
-  const testFile = join2(tmpdir(), `.keyway-test-${Date.now()}.tmp`);
+  const testFile = join(tmpdir(), `.keyway-test-${Date.now()}.tmp`);
   try {
-    writeFileSync2(testFile, "test");
+    writeFileSync(testFile, "test");
     unlinkSync(testFile);
     return {
       id: "filesystem",
@@ -1640,7 +1566,7 @@ async function checkFileSystem() {
 }
 async function checkGitignore() {
   try {
-    if (!existsSync2(".gitignore")) {
+    if (!existsSync(".gitignore")) {
       return {
         id: "gitignore",
         name: ".gitignore configuration",
@@ -1648,7 +1574,7 @@ async function checkGitignore() {
         detail: "No .gitignore file found"
       };
     }
-    const gitignoreContent = readFileSync2(".gitignore", "utf-8");
+    const gitignoreContent = readFileSync(".gitignore", "utf-8");
     const hasEnvPattern = gitignoreContent.includes("*.env") || gitignoreContent.includes(".env*");
     const hasDotEnv = gitignoreContent.includes(".env");
     if (hasEnvPattern || hasDotEnv) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keywaysh/cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "One link to all your secrets",
   "type": "module",
   "bin": {