@siming-org/cli 0.5.1 → 0.5.2

package/dist/index.js

@@ -181,6 +181,7 @@ function resolveServerConfig(args = {}, env = process.env, paths) {
   const cliValues = {};
   if (args.port !== void 0) cliValues.port = args.port;
   if (args.mongoUri !== void 0) cliValues.mongoUri = args.mongoUri;
+  if (args.publicUrl !== void 0) cliValues.publicUrl = args.publicUrl;
   if (Object.keys(cliValues).length > 0) {
     layers.push({ layer: "cli", values: cliValues, detailOf: () => "CLI \u53C2\u6570" });
   }
@@ -202,7 +203,7 @@ function resolveServerConfig(args = {}, env = process.env, paths) {
     throw new ConfigValidationError("\u670D\u52A1\u914D\u7F6E\u6821\u9A8C\u5931\u8D25", issues);
   }
   for (const key of SIMING_CONFIG_KEYS) {
-    if (sources[key] === void 0) {
+    if (sources[key] === void 0 && result.data[key] !== void 0) {
       sources[key] = { layer: "default", detail: "\u5185\u7F6E\u9ED8\u8BA4\u503C" };
     }
   }
@@ -7940,7 +7941,7 @@ function displayUrl(host, port) {
 var MONGO_ERROR_PATTERN = /server selection|ECONNREFUSED|ENOTFOUND|EACCES|authentication/i;
 function createServerCommand() {
   const server = new Command17("server").description("\u7BA1\u7406 siming \u670D\u52A1\uFF08API \u4E0E Web UI \u540C\u8FDB\u7A0B\u540C\u7AEF\u53E3\uFF09");
-  server.command("start").description("\u542F\u52A8 siming \u670D\u52A1\uFF08\u9ED8\u8BA4\u5B88\u62A4\u6A21\u5F0F\uFF0C\u65E5\u5FD7\u5199\u5165 /tmp/siming/\uFF09").option("--port <port>", "\u76D1\u542C\u7AEF\u53E3\uFF08\u9ED8\u8BA4 7777\uFF1B\u4E5F\u53EF\u7ECF PORT \u73AF\u5883\u53D8\u91CF/\u914D\u7F6E\u6587\u4EF6\u914D\u7F6E\uFF09").option("--mongo-uri <uri>", "MongoDB \u8FDE\u63A5\u4E32\uFF08\u4E5F\u53EF\u7ECF SIMING_MONGO_URI/\u914D\u7F6E\u6587\u4EF6\u914D\u7F6E\uFF09").option("--foreground", "\u524D\u53F0\u8FD0\u884C\uFF08\u8C03\u8BD5/systemd \u573A\u666F\uFF09\uFF0CCtrl+C \u4F18\u96C5\u9000\u51FA\uFF1B\u4E0D\u5199 pidfile", false).action(async (opts) => {
+  server.command("start").description("\u542F\u52A8 siming \u670D\u52A1\uFF08\u9ED8\u8BA4\u5B88\u62A4\u6A21\u5F0F\uFF0C\u65E5\u5FD7\u5199\u5165 /tmp/siming/\uFF09").option("--port <port>", "\u76D1\u542C\u7AEF\u53E3\uFF08\u9ED8\u8BA4 7777\uFF1B\u4E5F\u53EF\u7ECF PORT \u73AF\u5883\u53D8\u91CF/\u914D\u7F6E\u6587\u4EF6\u914D\u7F6E\uFF09").option("--mongo-uri <uri>", "MongoDB \u8FDE\u63A5\u4E32\uFF08\u4E5F\u53EF\u7ECF SIMING_MONGO_URI/\u914D\u7F6E\u6587\u4EF6\u914D\u7F6E\uFF09").option("--public-url <url>", "\u5BF9\u5916\u53EF\u8FBE\u57FA\u7840\u5730\u5740\uFF08\u53CD\u4EE3\u90E8\u7F72\u65F6 whoami \u81EA\u62A5\u7528\uFF1B\u4E5F\u53EF\u7ECF SIMING_PUBLIC_URL/\u914D\u7F6E\u6587\u4EF6\u914D\u7F6E\uFF09").option("--foreground", "\u524D\u53F0\u8FD0\u884C\uFF08\u8C03\u8BD5/systemd \u573A\u666F\uFF09\uFF0CCtrl+C \u4F18\u96C5\u9000\u51FA\uFF1B\u4E0D\u5199 pidfile", false).action(async (opts) => {
     process.exitCode = await startAction(opts);
   });
   server.command("stop").description("\u505C\u6B62 siming \u670D\u52A1\uFF08SIGTERM \u5BBD\u9650 10s \u2192 SIGKILL \u515C\u5E95\uFF09").action(async () => {
@@ -7983,7 +7984,8 @@ async function startAction(opts) {
   try {
     resolved = resolveServerConfig({
       port: opts.port,
-      mongoUri: opts.mongoUri
+      mongoUri: opts.mongoUri,
+      publicUrl: opts.publicUrl
     });
   } catch (e) {
     if (e instanceof ConfigValidationError) {
@@ -8085,6 +8087,9 @@ function buildDaemonEnv(resolved) {
   env.SIMING_HOST = resolved.config.host;
   env.SIMING_LOG_LEVEL = resolved.config.logLevel;
   env.SIMING_AUTH_ENABLED = String(resolved.config.auth.enabled);
+  if (resolved.config.publicUrl !== void 0) {
+    env.SIMING_PUBLIC_URL = resolved.config.publicUrl;
+  }
   env.SIMING_CONFIG_SOURCES_JSON = JSON.stringify(resolved.sources);
   return env;
 }
@@ -8231,16 +8236,19 @@ function printStartSummary(pid, resolved) {
   }
 }
 function formatConfigSummary(resolved) {
-  return SIMING_CONFIG_KEYS2.map((key) => {
+  return SIMING_CONFIG_KEYS2.flatMap((key) => {
     const value = resolved.config[key];
+    if (value === void 0) return [];
     const display = key === "mongoUri" ? maskMongoUri(String(value)) : String(value);
-    return `    ${key}: ${display} \uFF08\u6765\u6E90: ${resolved.sources[key]?.detail ?? "\u5185\u7F6E\u9ED8\u8BA4\u503C"}\uFF09`;
+    return [`    ${key}: ${display} \uFF08\u6765\u6E90: ${resolved.sources[key]?.detail ?? "\u5185\u7F6E\u9ED8\u8BA4\u503C"}\uFF09`];
   });
 }
 function printRunHeader(config, sources) {
-  const summary = SIMING_CONFIG_KEYS2.map((key) => {
-    const value = key === "mongoUri" ? maskMongoUri(String(config[key])) : String(config[key]);
-    return `${key}=${value} (${sources[key]?.detail ?? "\u5185\u7F6E\u9ED8\u8BA4\u503C"})`;
+  const summary = SIMING_CONFIG_KEYS2.flatMap((key) => {
+    const value = config[key];
+    if (value === void 0) return [];
+    const display = key === "mongoUri" ? maskMongoUri(String(value)) : String(value);
+    return [`${key}=${display} (${sources[key]?.detail ?? "\u5185\u7F6E\u9ED8\u8BA4\u503C"})`];
   }).join(", ");
   console.log(`[${(/* @__PURE__ */ new Date()).toISOString()}] \u2500\u2500 siming server _run v${VERSION4} \u2500\u2500 pid=${process.pid}`);
   console.log(`[siming] config: ${summary}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@siming-org/cli",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "license": "MIT",
   "author": "Wuchao",
   "engines": {
@@ -27,8 +27,8 @@
     "picocolors": "^1.1.1",
     "yaml": "^2.6.0",
     "zod": "^4.4.3",
-    "@siming-org/core": "0.5.1",
-    "@siming-org/server": "0.5.1"
+    "@siming-org/core": "0.5.2",
+    "@siming-org/server": "0.5.2"
   },
   "devDependencies": {
     "tsup": "^8.3.5",