@within-7/jetr 0.3.0 → 0.4.0

package/README.md

@@ -17,29 +17,34 @@ npx @within-7/jetr deploy my-site ./dist
 ## Quick Start
 
 ```bash
-# 1. Login with your JWT token (from auth-gateway)
-jetr login <token>
-
-# 2. Create a site
-jetr create my-blog
+# 1. Login
+jetr login
+# Username: lib
+# Password: ****
+# ✔ Logged in as lib
+
+# 2. Deploy current directory
+jetr
+# Site name [my-blog]:
+# ✔ Deployed!
+#   URL:   https://my-blog.jetr.within-7.com
 
-# 3. Deploy
-jetr deploy my-blog ./dist
+# 3. Re-deploy (remembers site name)
+jetr
+# Using saved site: my-blog
 # ✔ Deployed!
-#   URL:       https://my-blog.jetr.within-7.com
-#   Uploaded:  12 files
-#   Size:      1.2 MB
 ```
 
 ## Commands
 
-### `jetr login <token>`
+### `jetr login [user] [password]`
 
-Save JWT token for authentication. Token is stored in `~/.jetr/config.json`.
+Login with username and password. Credentials are verified against auth-gateway, and the JWT token is saved locally.
 
 ```bash
-jetr login eyJhbGciOiJIUzI1NiJ9...
-jetr login <token> --api-url https://custom-api.example.com
+jetr login                    # interactive prompts
+jetr login lib mypassword     # non-interactive
+jetr login --token <jwt>      # direct token (for CI)
 ```
 
 ### `jetr create <name>`
@@ -52,16 +57,18 @@ jetr create preview-site --password secret123
 jetr create temp-demo --expires 86400    # expires in 24h
 ```
 
-### `jetr deploy <name> [directory]`
+### `jetr [directory] [name]`
 
-Deploy a directory to a site. Uses incremental upload — only changed files are uploaded.
+Deploy a directory. This is the default command — just run `jetr` in your project.
 
 ```bash
-jetr deploy my-blog ./dist
-jetr deploy my-blog .          # deploy current directory
-jetr deploy my-blog            # defaults to current directory
+jetr                           # deploy current dir, name from .jetrrc or prompt
+jetr ./dist                    # deploy ./dist
+jetr ./dist my-blog            # deploy ./dist as my-blog
 ```
 
+Site is auto-created if it doesn't exist. Name is saved to `.jetrrc` for next time. Uses incremental upload (10x concurrent) — only changed files are uploaded.
+
 ### `jetr list`
 
 List your sites.

package/dist/cli.js

@@ -14,6 +14,7 @@ import { homedir } from "os";
 var CONFIG_DIR = join(homedir(), ".jetr");
 var CONFIG_FILE = join(CONFIG_DIR, "config.json");
 var DEFAULT_CONFIG = {
+  authUrl: "https://api.within-7.com",
   apiUrl: "https://jetr-api.lixilei.workers.dev"
 };
 function loadConfig() {
@@ -39,6 +40,20 @@ function getToken() {
   }
   return config.token;
 }
+async function login(user, password) {
+  const config = loadConfig();
+  const res = await fetch(`${config.authUrl}/user/login`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ user, password })
+  });
+  const body = await res.json();
+  if (!res.ok || !body.token) {
+    throw new Error(body.error || `Login failed: ${res.status}`);
+  }
+  saveConfig({ user: body.user || user, token: body.token });
+  return { user: body.user || user, token: body.token };
+}
 
 // src/api.ts
 async function request(path, options = {}) {
@@ -54,6 +69,9 @@ async function request(path, options = {}) {
 async function json(path, options = {}) {
   const res = await request(path, options);
   const body = await res.json();
+  if (res.status === 401) {
+    throw new Error("Token expired or invalid. Run: jetr login");
+  }
   if (!res.ok) {
     throw new Error(body.error || `API error: ${res.status}`);
   }
@@ -279,12 +297,19 @@ async function deploy(siteName, directory, onProgress) {
     `Upload: ${diff.upload.length}, Delete: ${diff.delete.length}, Unchanged: ${diff.unchanged.length}`
   );
   if (diff.upload.length > 0) {
-    for (let i = 0; i < diff.upload.length; i++) {
-      const fp = diff.upload[i];
+    const CONCURRENCY = 10;
+    let completed = 0;
+    const total = diff.upload.length;
+    const uploadOne = async (fp) => {
       const absPath = join3(absDir, fp);
       const content = readFileSync3(absPath);
-      onProgress?.(`Uploading (${i + 1}/${diff.upload.length}) ${fp}`);
       await api.uploadFile(siteName, fp, content, diff.deploy_id, manifest[fp].hash);
+      completed++;
+      onProgress?.(`Uploading (${completed}/${total}) ${fp}`);
+    };
+    for (let i = 0; i < total; i += CONCURRENCY) {
+      const batch = diff.upload.slice(i, i + CONCURRENCY);
+      await Promise.all(batch.map(uploadOne));
     }
   }
   onProgress?.("Finalizing...");
@@ -397,10 +422,7 @@ program.argument("[directory]", "Directory to deploy (default: current directory
   const config = loadConfig();
   if (!config.token) {
     console.error(chalk2.red("Not logged in."));
-    console.error(`Run: ${chalk2.cyan("jetr login <token>")}`);
-    console.error(
-      chalk2.dim("Get your token from auth-gateway: POST /user/login")
-    );
+    console.error(`Run: ${chalk2.cyan("jetr login")}`);
     process.exit(1);
   }
   let siteName = await resolveSiteName(dir, name);
@@ -454,18 +476,53 @@ program.argument("[directory]", "Directory to deploy (default: current directory
     process.exit(1);
   }
 });
-program.command("login").description("Save JWT token for authentication").argument("<token>", "JWT token from auth-gateway login").option("--api-url <url>", "API base URL").action((token, opts) => {
-  saveConfig({ token, ...opts.apiUrl ? { apiUrl: opts.apiUrl } : {} });
-  console.log(chalk2.green("\u2713 Token saved to ~/.jetr/config.json"));
+program.command("login").description("Login with username and password").argument("[user]", "Username").argument("[password]", "Password").option("--token <token>", "Login directly with a JWT token").action(async (user, password, opts) => {
+  if (opts?.token) {
+    saveConfig({ token: opts.token });
+    console.log(chalk2.green("\u2713 Token saved"));
+    return;
+  }
+  const { createInterface: createInterface2 } = await import("readline");
+  if (!user) {
+    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    user = await new Promise((res) => {
+      rl.question("Username: ", (a) => {
+        rl.close();
+        res(a.trim());
+      });
+    });
+  }
+  if (!password) {
+    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    password = await new Promise((res) => {
+      rl.question("Password: ", (a) => {
+        rl.close();
+        res(a.trim());
+      });
+    });
+  }
+  if (!user || !password) {
+    console.error(chalk2.red("Username and password required"));
+    process.exit(1);
+  }
+  const spinner = ora("Logging in...").start();
+  try {
+    const result = await login(user, password);
+    spinner.succeed(`Logged in as ${chalk2.bold(result.user)}`);
+  } catch (e) {
+    spinner.fail(e.message);
+    process.exit(1);
+  }
 });
-program.command("whoami").description("Show current config").action(() => {
+program.command("whoami").description("Show current login status").action(() => {
   const config = loadConfig();
-  console.log(
-    `API:   ${config.apiUrl}`
-  );
-  console.log(
-    `Token: ${config.token ? config.token.slice(0, 20) + "..." : chalk2.red("not set")}`
-  );
+  if (!config.token) {
+    console.log(chalk2.red("Not logged in."));
+    console.log(`Run: ${chalk2.cyan("jetr login")}`);
+    return;
+  }
+  console.log(`User:  ${chalk2.bold(config.user || "unknown")}`);
+  console.log(`Token: ${config.token.slice(0, 20)}...`);
 });
 program.command("init").description("Create .jetrignore with default patterns").argument("[directory]", "Target directory", ".").action(async (directory) => {
   const created = createJetrignore(resolve2(directory));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@within-7/jetr",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "CLI for Jetr static site hosting",
   "type": "module",
   "bin": {