pdlab-cli 0.1.0 → 0.1.2

package/README.md

@@ -17,7 +17,13 @@ npm install -g pdlab-cli
 ## 快速开始
 
 ```bash
-# 首次使用需要告诉它服务器地址，之后会记住
+pdlab login
+```
+
+默认连官方部署 `https://1836.online`，装完直接就能用。
+自建实例才需要指定地址，指定过一次之后会记在配置文件里：
+
+```bash
 pdlab login --api-url https://your-1836-instance.example.com
 ```
 
@@ -71,7 +77,14 @@ pdlab post list --project-id <项目 id>
 { "apiUrl": "https://your-1836-instance.example.com", "token": "pdlab_…" }
 ```
 
-API 地址的解析顺序：`--api-url` 参数 > `PDLAB_API_URL` 环境变量 > 配置文件。
+API 地址的解析顺序：`--api-url` 参数 > `PDLAB_API_URL` 环境变量 > 配置文件 > 默认地址
+（`https://1836.online`）。所有命令都支持 `--api-url`，
+包括 `project` / `post` 这些资源命令。`pdlab config get` 会同时打出配置文件里写了什么、
+以及这次实际会用哪个地址。
+
+读命令（`project list` / `get`、`post list` / `get`）会在**已登录时带上凭证**，
+可见范围因此按你的身份走：有审核权限才能 `post list --status pending`，
+作者也才能 `post get` 到自己那篇还没过审的稿子。没登录则匿名读公开内容，照常可用。
 在 CI 里可以只给环境变量，不落配置文件。
 
 ## 凭证与安全

package/dist/index.js

@@ -35,8 +35,9 @@ var import_open = __toESM(require("open"));
 var import_fs = require("fs");
 var import_os = require("os");
 var import_path = require("path");
-var CONFIG_DIR = (0, import_path.join)((0, import_os.homedir)(), ".pdlab");
+var CONFIG_DIR = process.env.PDLAB_CONFIG_DIR ?? (0, import_path.join)((0, import_os.homedir)(), ".pdlab");
 var CONFIG_FILE = (0, import_path.join)(CONFIG_DIR, "config.json");
+var DEFAULT_API_URL = "https://1836.online";
 function readConfig() {
   if (!(0, import_fs.existsSync)(CONFIG_FILE)) return {};
   try {
@@ -55,13 +56,12 @@ function updateConfig(patch) {
   return next;
 }
 function resolveApiUrl(flagValue) {
-  const apiUrl = flagValue ?? process.env.PDLAB_API_URL ?? readConfig().apiUrl;
-  if (!apiUrl) {
-    console.error("\u672A\u914D\u7F6E API \u5730\u5740\u3002\u8BF7\u5148\u8FD0\u884C `pdlab login` / `pdlab register`\uFF0C\u6216\u8BBE\u7F6E PDLAB_API_URL \u73AF\u5883\u53D8\u91CF\u3002");
-    process.exit(1);
-  }
+  const apiUrl = flagValue ?? process.env.PDLAB_API_URL ?? readConfig().apiUrl ?? DEFAULT_API_URL;
   return apiUrl.replace(/\/+$/, "");
 }
+function optionalToken() {
+  return readConfig().token;
+}
 function requireToken() {
   const token = readConfig().token;
   if (!token) {
@@ -139,7 +139,7 @@ async function pollCliAuth(code, apiUrl) {
 
 // src/commands/login.ts
 function registerLoginCommand(program2) {
-  program2.command("login").description("\u5728\u6D4F\u89C8\u5668\u91CC\u5B8C\u6210\u4E00\u6B21\u6027\u6388\u6743\uFF0C\u767B\u5F55 pdlab CLI\uFF08token \u957F\u671F\u6709\u6548\uFF0C\u76F4\u5230\u88AB\u64A4\u9500\uFF09").option("--api-url <url>", "API \u670D\u52A1\u5668\u5730\u5740\uFF0C\u672A\u914D\u7F6E\u8FC7\u65F6\u5FC5\u987B\u63D0\u4F9B\u4E00\u6B21").action(async (opts) => {
+  program2.command("login").description("\u5728\u6D4F\u89C8\u5668\u91CC\u5B8C\u6210\u4E00\u6B21\u6027\u6388\u6743\uFF0C\u767B\u5F55 pdlab CLI\uFF08token \u957F\u671F\u6709\u6548\uFF0C\u76F4\u5230\u88AB\u64A4\u9500\uFF09").option("--api-url <url>", "API \u670D\u52A1\u5668\u5730\u5740\uFF0C\u9ED8\u8BA4\u662F\u5B98\u65B9\u90E8\u7F72\uFF0C\u81EA\u5EFA\u5B9E\u4F8B\u624D\u9700\u8981\u586B").action(async (opts) => {
     const apiUrl = resolveApiUrl(opts.apiUrl);
     const start = await apiRequest("/api/cli/auth/start", {
       method: "POST",
@@ -171,7 +171,7 @@ function registerLoginCommand(program2) {
 // src/commands/register.ts
 var import_open2 = __toESM(require("open"));
 function registerRegisterCommand(program2) {
-  program2.command("register").description("\u5728\u6D4F\u89C8\u5668\u91CC\u5B8C\u6210\u6CE8\u518C\u7533\u8BF7\uFF08\u6CE8\u518C\u540E\u9700\u7BA1\u7406\u5458\u5BA1\u6838\uFF0CCLI \u4E0D\u4F1A\u81EA\u52A8\u767B\u5F55\uFF09").option("--api-url <url>", "API \u670D\u52A1\u5668\u5730\u5740\uFF0C\u672A\u914D\u7F6E\u8FC7\u65F6\u5FC5\u987B\u63D0\u4F9B\u4E00\u6B21").action(async (opts) => {
+  program2.command("register").description("\u5728\u6D4F\u89C8\u5668\u91CC\u5B8C\u6210\u6CE8\u518C\u7533\u8BF7\uFF08\u6CE8\u518C\u540E\u9700\u7BA1\u7406\u5458\u5BA1\u6838\uFF0CCLI \u4E0D\u4F1A\u81EA\u52A8\u767B\u5F55\uFF09").option("--api-url <url>", "API \u670D\u52A1\u5668\u5730\u5740\uFF0C\u9ED8\u8BA4\u662F\u5B98\u65B9\u90E8\u7F72\uFF0C\u81EA\u5EFA\u5B9E\u4F8B\u624D\u9700\u8981\u586B").action(async (opts) => {
     const apiUrl = resolveApiUrl(opts.apiUrl);
     const start = await apiRequest("/api/cli/auth/start", {
       method: "POST",
@@ -224,8 +224,19 @@ function registerWhoamiCommand(program2) {
 function registerConfigCommand(program2) {
   const config = program2.command("config").description("\u67E5\u770B/\u4FEE\u6539\u672C\u5730\u914D\u7F6E\uFF08~/.pdlab/config.json\uFF09");
   config.command("get").description("\u6253\u5370\u5F53\u524D\u914D\u7F6E").action(() => {
-    const { token, ...rest } = readConfig();
-    console.log(JSON.stringify({ ...rest, token: token ? "***" : void 0 }, null, 2));
+    const { token, apiUrl } = readConfig();
+    console.log(
+      JSON.stringify(
+        {
+          apiUrl,
+          token: token ? "***" : void 0,
+          effectiveApiUrl: resolveApiUrl(),
+          defaultApiUrl: DEFAULT_API_URL
+        },
+        null,
+        2
+      )
+    );
   });
   config.command("set <key> <value>").description("\u8BBE\u7F6E\u4E00\u9879\u914D\u7F6E\uFF0C\u76EE\u524D\u652F\u6301\uFF1Aapi-url").action((key, value) => {
     if (key !== "api-url") {
@@ -330,6 +341,11 @@ function handleCommandError(error, examples) {
   process.exit(1);
 }
 
+// src/commands/options.ts
+function withApiUrl(cmd) {
+  return cmd.option("--api-url <url>", "API \u670D\u52A1\u5668\u5730\u5740\uFF0C\u8986\u76D6 PDLAB_API_URL\u3001\u914D\u7F6E\u6587\u4EF6\u4E0E\u9ED8\u8BA4\u5730\u5740");
+}
+
 // src/commands/project.ts
 var CREATE_EXAMPLES = [
   {
@@ -354,24 +370,30 @@ function toBody(opts) {
   return body;
 }
 function withProjectFlags(cmd) {
-  return cmd.option("--title <title>", "\u9879\u76EE\u6807\u9898").option("--description <description>", "\u9879\u76EE\u63CF\u8FF0").option("--cover-image <url>", "\u5C01\u9762\u56FE http/https \u94FE\u63A5").option("--commercial-type <type>", "\u5546\u4E1A\u5C5E\u6027").option("--status <status>", "planning | active | review | completed").option("--progress <percent>", "\u8FDB\u5EA6 0-100").option("--taxonomy-ids <ids>", "\u9017\u53F7\u5206\u9694\u7684\u5206\u7C7B\u6807\u7B7E id \u5217\u8868");
+  return withApiUrl(cmd).option("--title <title>", "\u9879\u76EE\u6807\u9898").option("--description <description>", "\u9879\u76EE\u63CF\u8FF0").option("--cover-image <url>", "\u5C01\u9762\u56FE http/https \u94FE\u63A5").option("--commercial-type <type>", "\u5546\u4E1A\u5C5E\u6027").option("--status <status>", "planning | active | review | completed").option("--progress <percent>", "\u8FDB\u5EA6 0-100").option("--taxonomy-ids <ids>", "\u9017\u53F7\u5206\u9694\u7684\u5206\u7C7B\u6807\u7B7E id \u5217\u8868");
 }
 function registerProjectCommand(program2) {
   const project = program2.command("project").description("\u9879\u76EE\u7684\u589E\u5220\u6539\u67E5");
-  project.command("list").description("\u5217\u51FA\u9879\u76EE").option("--status <status>", "\u6309\u72B6\u6001\u7B5B\u9009\uFF1Aplanning | active | review | completed").action(async (opts) => {
-    const data = await apiRequest("/api/projects", { query: { status: opts.status } });
-    console.log(JSON.stringify(data, null, 2));
-  });
-  project.command("get <id>").description("\u67E5\u770B\u9879\u76EE\u8BE6\u60C5").action(async (id) => {
-    const data = await apiRequest(`/api/projects/${id}`);
+  withApiUrl(project.command("list").description("\u5217\u51FA\u9879\u76EE")).option("--status <status>", "\u6309\u72B6\u6001\u7B5B\u9009\uFF1Aplanning | active | review | completed").action(async (opts) => {
+    const data = await apiRequest("/api/projects", {
+      query: { status: opts.status },
+      token: optionalToken(),
+      apiUrl: opts.apiUrl
+    });
     console.log(JSON.stringify(data, null, 2));
   });
+  withApiUrl(project.command("get <id>").description("\u67E5\u770B\u9879\u76EE\u8BE6\u60C5")).action(
+    async (id, opts) => {
+      const data = await apiRequest(`/api/projects/${id}`, { token: optionalToken(), apiUrl: opts.apiUrl });
+      console.log(JSON.stringify(data, null, 2));
+    }
+  );
   withProjectFlags(project.command("create").description("\u521B\u5EFA\u9879\u76EE\uFF08\u9700\u8981\u9879\u76EE\u521B\u5EFA\u6743\u9650\uFF09")).action(
     async (opts) => {
       const token = requireToken();
       try {
         const body = projectCreateSchema.parse(toBody(opts));
-        const data = await apiRequest("/api/projects", { method: "POST", body, token });
+        const data = await apiRequest("/api/projects", { method: "POST", body, token, apiUrl: opts.apiUrl });
         console.log(JSON.stringify(data, null, 2));
       } catch (error) {
         handleCommandError(error, CREATE_EXAMPLES);
@@ -383,16 +405,18 @@ function registerProjectCommand(program2) {
       const token = requireToken();
       try {
         const body = projectUpdateSchema.parse(toBody(opts));
-        const data = await apiRequest(`/api/projects/${id}`, { method: "PATCH", body, token });
+        const data = await apiRequest(`/api/projects/${id}`, { method: "PATCH", body, token, apiUrl: opts.apiUrl });
         console.log(JSON.stringify(data, null, 2));
       } catch (error) {
         handleCommandError(error, UPDATE_EXAMPLES);
       }
     }
   );
-  project.command("delete <id>").description("\u5220\u9664\u9879\u76EE\uFF08\u9700\u8981\u662F\u9879\u76EE\u53D1\u8D77\u4EBA\uFF0C\u4E14\u9879\u76EE\u4E0B\u6CA1\u6709\u5185\u5BB9/\u79EF\u5206\u8BB0\u5F55\uFF09").action(async (id) => {
+  withApiUrl(
+    project.command("delete <id>").description("\u5220\u9664\u9879\u76EE\uFF08\u9700\u8981\u662F\u9879\u76EE\u53D1\u8D77\u4EBA\uFF0C\u4E14\u9879\u76EE\u4E0B\u6CA1\u6709\u5185\u5BB9/\u79EF\u5206\u8BB0\u5F55\uFF09")
+  ).action(async (id, opts) => {
     const token = requireToken();
-    const data = await apiRequest(`/api/projects/${id}`, { method: "DELETE", token });
+    const data = await apiRequest(`/api/projects/${id}`, { method: "DELETE", token, apiUrl: opts.apiUrl });
     console.log(JSON.stringify(data, null, 2));
   });
 }
@@ -411,15 +435,21 @@ function toMediaLinks(value) {
 }
 function registerPostCommand(program2) {
   const post = program2.command("post").description("\u5185\u5BB9\uFF08\u5E16\u5B50\uFF09\u7684\u589E\u5220\u6539\u67E5");
-  post.command("list").description("\u5217\u51FA\u5185\u5BB9").option("--project-id <id>", "\u6309\u9879\u76EE\u7B5B\u9009").option("--status <status>", "pending | approved | rejected\uFF08\u67E5\u770B\u975E approved \u9700\u8981\u5BA1\u6838\u6743\u9650\uFF09").action(async (opts) => {
-    const data = await apiRequest("/api/posts", { query: { projectId: opts.projectId, status: opts.status } });
-    console.log(JSON.stringify(data, null, 2));
-  });
-  post.command("get <id>").description("\u67E5\u770B\u5185\u5BB9\u8BE6\u60C5").action(async (id) => {
-    const data = await apiRequest(`/api/posts/${id}`);
+  withApiUrl(post.command("list").description("\u5217\u51FA\u5185\u5BB9")).option("--project-id <id>", "\u6309\u9879\u76EE\u7B5B\u9009").option("--status <status>", "pending | approved | rejected\uFF08\u67E5\u770B\u975E approved \u9700\u8981\u5BA1\u6838\u6743\u9650\uFF09").action(async (opts) => {
+    const data = await apiRequest("/api/posts", {
+      query: { projectId: opts.projectId, status: opts.status },
+      token: optionalToken(),
+      apiUrl: opts.apiUrl
+    });
     console.log(JSON.stringify(data, null, 2));
   });
-  post.command("create").description("\u53D1\u5E03\u5185\u5BB9\uFF08\u9700\u8981\u5185\u5BB9\u521B\u5EFA\u6743\u9650\uFF0C\u4E14\u662F\u9879\u76EE\u53D1\u8D77\u4EBA\u6216\u5DF2\u62A5\u540D\u5171\u5EFA\uFF09").option("--title <title>", "\u5185\u5BB9\u6807\u9898").option("--body <body>", "\u5185\u5BB9\u6B63\u6587").option("--project-id <id>", "\u6240\u5C5E\u9879\u76EE id").option("--media-links <urls>", "\u9017\u53F7\u5206\u9694\u7684\u5A92\u4F53\u94FE\u63A5").action(async (opts) => {
+  withApiUrl(post.command("get <id>").description("\u67E5\u770B\u5185\u5BB9\u8BE6\u60C5")).action(
+    async (id, opts) => {
+      const data = await apiRequest(`/api/posts/${id}`, { token: optionalToken(), apiUrl: opts.apiUrl });
+      console.log(JSON.stringify(data, null, 2));
+    }
+  );
+  withApiUrl(post.command("create").description("\u53D1\u5E03\u5185\u5BB9\uFF08\u9700\u8981\u5185\u5BB9\u521B\u5EFA\u6743\u9650\uFF0C\u4E14\u662F\u9879\u76EE\u53D1\u8D77\u4EBA\u6216\u5DF2\u62A5\u540D\u5171\u5EFA\uFF09")).option("--title <title>", "\u5185\u5BB9\u6807\u9898").option("--body <body>", "\u5185\u5BB9\u6B63\u6587").option("--project-id <id>", "\u6240\u5C5E\u9879\u76EE id").option("--media-links <urls>", "\u9017\u53F7\u5206\u9694\u7684\u5A92\u4F53\u94FE\u63A5").action(async (opts) => {
     const token = requireToken();
     try {
       const body = postCreateSchema.parse({
@@ -428,13 +458,13 @@ function registerPostCommand(program2) {
         projectId: opts.projectId,
         mediaLinks: toMediaLinks(opts.mediaLinks)
       });
-      const data = await apiRequest("/api/posts", { method: "POST", body, token });
+      const data = await apiRequest("/api/posts", { method: "POST", body, token, apiUrl: opts.apiUrl });
       console.log(JSON.stringify(data, null, 2));
     } catch (error) {
       handleCommandError(error, CREATE_EXAMPLES2);
     }
   });
-  post.command("update <id>").description("\u7F16\u8F91\u5185\u5BB9\uFF08\u4F5C\u8005\u672C\u4EBA\uFF0C\u6216\u6709\u7F16\u8F91\u4EFB\u610F\u5185\u5BB9\u7684\u6743\u9650\uFF09").option("--title <title>", "\u5185\u5BB9\u6807\u9898").option("--body <body>", "\u5185\u5BB9\u6B63\u6587").option("--media-links <urls>", "\u9017\u53F7\u5206\u9694\u7684\u5A92\u4F53\u94FE\u63A5").action(async (id, opts) => {
+  withApiUrl(post.command("update <id>").description("\u7F16\u8F91\u5185\u5BB9\uFF08\u4F5C\u8005\u672C\u4EBA\uFF0C\u6216\u6709\u7F16\u8F91\u4EFB\u610F\u5185\u5BB9\u7684\u6743\u9650\uFF09")).option("--title <title>", "\u5185\u5BB9\u6807\u9898").option("--body <body>", "\u5185\u5BB9\u6B63\u6587").option("--media-links <urls>", "\u9017\u53F7\u5206\u9694\u7684\u5A92\u4F53\u94FE\u63A5").action(async (id, opts) => {
     const token = requireToken();
     try {
       const body = postUpdateSchema.parse({
@@ -442,17 +472,19 @@ function registerPostCommand(program2) {
         body: opts.body,
         mediaLinks: toMediaLinks(opts.mediaLinks)
       });
-      const data = await apiRequest(`/api/posts/${id}`, { method: "PATCH", body, token });
+      const data = await apiRequest(`/api/posts/${id}`, { method: "PATCH", body, token, apiUrl: opts.apiUrl });
       console.log(JSON.stringify(data, null, 2));
     } catch (error) {
       handleCommandError(error, UPDATE_EXAMPLES2);
     }
   });
-  post.command("delete <id>").description("\u5220\u9664\u5185\u5BB9\uFF08\u4F5C\u8005\u672C\u4EBA\uFF0C\u6216\u6709\u5220\u9664\u4EFB\u610F\u5185\u5BB9\u7684\u6743\u9650\uFF09").action(async (id) => {
-    const token = requireToken();
-    const data = await apiRequest(`/api/posts/${id}`, { method: "DELETE", token });
-    console.log(JSON.stringify(data, null, 2));
-  });
+  withApiUrl(post.command("delete <id>").description("\u5220\u9664\u5185\u5BB9\uFF08\u4F5C\u8005\u672C\u4EBA\uFF0C\u6216\u6709\u5220\u9664\u4EFB\u610F\u5185\u5BB9\u7684\u6743\u9650\uFF09")).action(
+    async (id, opts) => {
+      const token = requireToken();
+      const data = await apiRequest(`/api/posts/${id}`, { method: "DELETE", token, apiUrl: opts.apiUrl });
+      console.log(JSON.stringify(data, null, 2));
+    }
+  );
 }
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdlab-cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": false,
   "description": "1836 开源共建平台（problem-driven-lab）的命令行工具：项目、内容的增删改查，浏览器授权登录",
   "keywords": [