@infly/libs 2.0.38 → 2.0.42

package/build/docker/docker-build-push.test.js

@@ -0,0 +1,124 @@
+const assert = require("node:assert/strict");
+const path = require("node:path");
+const { spawnSync } = require("node:child_process");
+const test = require("node:test");
+
+const cliPath = path.resolve(__dirname, "../../bin/cli.js");
+
+function parseArgsInChildProcess(argv) {
+  const source = `
+    const { parseArgs } = require(${JSON.stringify(cliPath)});
+    process.stdout.write(JSON.stringify(parseArgs(${JSON.stringify(argv)})));
+  `;
+  return spawnSync(process.execPath, ["-e", source], {
+    encoding: "utf-8",
+  });
+}
+
+test("parseArgs keeps existing defaults and options", () => {
+  const result = parseArgsInChildProcess(["--local", "--env", "dev", "--dry-run"]);
+
+  assert.equal(result.status, 0, result.stderr);
+  assert.deepEqual(JSON.parse(result.stdout), {
+    env: "dev",
+    local: true,
+    dryRun: true,
+  });
+});
+
+test("parseArgs accepts spaced and equals cicd URL forms", () => {
+  const url = "https://cicd.sutpay.com/view/积分商城/";
+  const spaced = parseArgsInChildProcess(["--cicd-url", url]);
+  const equals = parseArgsInChildProcess([`--cicd-url=${url}`]);
+
+  assert.equal(spaced.status, 0, spaced.stderr);
+  assert.equal(equals.status, 0, equals.stderr);
+  assert.equal(JSON.parse(spaced.stdout).cicdUrl, url);
+  assert.equal(JSON.parse(equals.stdout).cicdUrl, url);
+});
+
+test("parseArgs accepts Docker Compose release options", () => {
+  const result = parseArgsInChildProcess([
+    "--project-dir",
+    "apps/deploy",
+    "--file=docker-compose.yaml",
+    "--bump",
+    "patch",
+    "--push",
+    "--config",
+    "docker.targets.js",
+    "--target=qdxy",
+    "--dry-run",
+  ]);
+
+  assert.equal(result.status, 0, result.stderr);
+  assert.deepEqual(JSON.parse(result.stdout), {
+    env: "prod",
+    local: false,
+    dryRun: true,
+    projectDir: "apps/deploy",
+    file: "docker-compose.yaml",
+    bump: "patch",
+    push: true,
+    config: "docker.targets.js",
+    target: "qdxy",
+  });
+});
+test("parseProjectArgs leaves environment unset for interactive selection", () => {
+  const source = `
+    const { parseProjectArgs } = require(${JSON.stringify(cliPath)});
+    process.stdout.write(JSON.stringify({
+      interactive: parseProjectArgs([]),
+      explicit: parseProjectArgs(["--env", "stage", "--target", "qdxy"]),
+    }));
+  `;
+  const result = spawnSync(process.execPath, ["-e", source], { encoding: "utf-8" });
+
+  assert.equal(result.status, 0, result.stderr);
+  assert.deepEqual(JSON.parse(result.stdout), {
+    interactive: { dryRun: false },
+    explicit: { dryRun: false, env: "stage", target: "qdxy" },
+  });
+});
+test("parseArgs rejects cicd URL without a value", () => {
+  const result = parseArgsInChildProcess(["--cicd-url"]);
+
+  assert.notEqual(result.status, 0);
+  assert.match(result.stderr, /--cicd-url/);
+});
+
+test("CLI keeps the existing unknown command output", () => {
+  const result = spawnSync(process.execPath, [cliPath, "unknown-command"], {
+    encoding: "utf-8",
+  });
+
+  assert.equal(result.status, 1);
+  assert.match(result.stderr, /未知命令: unknown-command/);
+  assert.match(result.stdout, /可用命令:/);
+});
+
+test("formatCicdLink returns no output when option is absent", () => {
+  const { formatCicdLink } = require("./docker-build-push");
+
+  assert.equal(formatCicdLink(), "");
+});
+
+test("formatCicdLink normalizes encoded Chinese URL and colors it blue", () => {
+  const { formatCicdLink } = require("./docker-build-push");
+  const result = formatCicdLink(
+    "https://cicd.sutpay.com/view/%E7%A7%AF%E5%88%86%E5%95%86%E5%9F%8E/"
+  );
+
+  assert.equal(
+    result,
+    "发布系统：\x1b[34mhttps://cicd.sutpay.com/view/积分商城/\x1b[0m"
+  );
+});
+
+test("formatCicdLink rejects unsafe URL values", () => {
+  const { formatCicdLink } = require("./docker-build-push");
+
+  assert.throws(() => formatCicdLink("ftp://cicd.sutpay.com/build"), /HTTP\/HTTPS/);
+  assert.throws(() => formatCicdLink("https://user:secret@cicd.sutpay.com/"), /凭据/);
+  assert.throws(() => formatCicdLink("https://cicd.sutpay.com/\nnext"), /控制字符/);
+});

package/module/Uts.js

@@ -5285,7 +5285,7 @@ true
   isDevMode() {
     if (
       window.location.href.indexOf("http://localhost") != 0 &&
-      window.location.href.indexOf("http://192.168.4") != 0 &&
+      window.location.href.indexOf("http://192.168") != 0 &&
       window.location.href.indexOf("dev=open") == -1
     ) {
       return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infly/libs",
-  "version": "2.0.38",
+  "version": "2.0.42",
   "description": "工具组件库",
   "main": "index.js",
   "scripts": {
@@ -20,7 +20,8 @@
     "./dataInit/*": "./dataInit/*",
     "./tools/*": "./tools/*",
     "./store/*": "./store/*",
-    "./build/*": "./build/*"
+    "./build/*": "./build/*",
+    "./script/build/*": "./script/build/*"
   },
   "repository": {
     "type": "git",
@@ -33,7 +34,10 @@
   ],
   "author": "Kahal",
   "license": "ISC",
-  "dependencies": {},
+  "dependencies": {
+    "enquirer": "^2.4.1",
+    "path-browserify": "^1.0.1"
+  },
   "devDependencies": {
     "@babel/core": "^7.23.3",
     "@babel/preset-env": "^7.23.3",
@@ -63,7 +67,7 @@
       "enablePreview": "[是否启用项目预览] eg: true",
       "enableClipboard": "[是否启用粘贴板粘贴git信息] eg: true",
       "openExplorer": "[是否自动打开资源管理器] eg: true",
-      "webhookUrl": "[消息推送机器人链接配置] eg: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=2417edd3-8f74-4c30-a7a8-5a72826d40d2",
+      "webhookUrl": "[消息推送机器人链接配置] eg: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=",
       "webhookAtUser": [
         "@人手机号"
       ],

package/script/build/deps.js

@@ -0,0 +1,63 @@
+const fs = require("fs");
+const path = require("path");
+
+/**
+ * 从项目的 webpack/vite 等构建配置中解析对兄弟 app 的依赖。
+ *
+ * 规则：如果 vue.config.js / next.config.* 的 alias 中存在指向 ../ 的路径，
+ * 则认为当前项目依赖该兄弟 app，构建前需要确保兄弟 app 源码是最新的。
+ *
+ * 示例（vue.config.js）：
+ *   alias: {
+ *     "@postal-benefits-platform": projectResolve("../postal-benefits-platform/src")
+ *   }
+ *
+ * @param {string} appDir - 当前 app 目录的绝对路径
+ * @returns {string[]} 兄弟 app 根目录（含 package.json）的绝对路径列表
+ */
+function resolveSiblingAppDeps(appDir) {
+  const siblings = [];
+  const configFiles = [
+    "vue.config.js",
+    "next.config.js",
+    "next.config.mjs",
+    "next.config.ts"
+  ];
+
+  for (const configFile of configFiles) {
+    const configPath = path.join(appDir, configFile);
+    if (!fs.existsSync(configPath)) continue;
+
+    const content = fs.readFileSync(configPath, "utf8");
+
+    // 匹配 alias 中指向 ../ 兄弟目录的值，兼容以下写法：
+    //   "@foo": projectResolve("../foo/src")
+    //   "@foo": resolve("../foo/src")
+    //   "@foo": path.resolve(__dirname, "../foo/src")
+    const aliasPattern = /["'](@[^"']+)["']\s*:\s*(?:projectResolve|resolve|path\.resolve\s*\(\s*__dirname\s*,)\s*\(\s*["'](\.\.\/[^"']+)["']/g;
+
+    let match;
+    while ((match = aliasPattern.exec(content)) !== null) {
+      const [, , relativePath] = match;
+      const resolved = path.resolve(appDir, relativePath);
+
+      // 向上查找含 package.json 的目录，即 app 根目录
+      let current = resolved;
+      for (let i = 0; i < 5; i++) {
+        if (fs.existsSync(path.join(current, "package.json"))) {
+          if (current !== appDir && !siblings.includes(current)) {
+            siblings.push(current);
+          }
+          break;
+        }
+        const parent = path.dirname(current);
+        if (parent === current) break;
+        current = parent;
+      }
+    }
+  }
+
+  return siblings;
+}
+
+module.exports = { resolveSiblingAppDeps };

package/script/git-automation/index.js

@@ -521,8 +521,8 @@ function checkAndUpdateRootPackages(packagesDir, targetBranch = "master") {
     stdio: "inherit"
   });
 
-  // 使用 merge-from-master.sh 脚本进行安全合并
-  const mergeScriptPath = path.join(rootDir, "script", "merge-from-master.sh");
+  // 只同步共享内容，保留当前分支配置和子模块集合
+  const mergeScriptPath = path.join(rootDir, "script", "sync-from-branch.sh");
   if (fs.existsSync(mergeScriptPath)) {
     execSync(`bash "${mergeScriptPath}" ${targetBranch}`, {
       cwd: rootDir,
@@ -699,42 +699,6 @@ async function checkAndUpdatePackages(outPackagesDir, targetBranch = "master") {
       console.log(global.logColor.warning, `\n⚠️  有 ${failedUpdates.length} 个模块更新失败，但可以继续执行`);
     }
 
-    // 4. 检查和更新 postal-benefits-platform（如果当前是 postal-benefits-platform-level）
-    const currentProjectName = require(path.resolve(process.cwd(), "package.json")).name;
-    if (currentProjectName === "postal-benefits-platform-level") {
-      // console.log(global.logColor.info, `\n🚀 开始检查和更新 postal-benefits-platform...`);
-
-      // 获取 postal-benefits-platform 的路径
-      const appsDir = path.resolve(packagesDir, "..", "apps");
-      const postalPlatformDir = path.join(appsDir, "postal-benefits-platform");
-
-      // 获取 postal-benefits-platform-level 当前分支
-      const currentLevelBranch = execSync("git rev-parse --abbrev-ref HEAD", {
-        cwd: process.cwd(),
-        encoding: "utf8"
-      }).trim();
-
-      // 检查 postal-benefits-platform 是否有未提交的更改
-      const platformCheckResult = checkSingleDirGitStatus(postalPlatformDir, "postal-benefits-platform");
-
-      if (platformCheckResult.hasUncommitted) {
-        console.log(global.logColor.error, `\n❌ postal-benefits-platform 存在未提交的更改`);
-        console.log(global.logColor.error, `\n请先提交或储藏这些更改后再继续执行！`);
-        process.exit(1);
-      }
-
-      // 切换到与 postal-benefits-platform-level 相同的分支并拉取最新代码
-      const platformUpdateResult = pullSingleDirFromBranch(
-        postalPlatformDir,
-        "postal-benefits-platform",
-        currentLevelBranch
-      );
-
-      if (!platformUpdateResult.success) {
-        console.log(global.logColor.warning, `\n⚠️  postal-benefits-platform 更新失败，但可以继续执行`);
-      }
-    }
-
     // console.log(global.logColor.success, `\n🎉 packages 检查和更新流程完成！`);
     return updateResults;
   } catch (error) {

package/script/webhook/webhook.js

@@ -68,7 +68,7 @@ function postVersionFileAndMsg(publishText, extraParams = {}) {
   const { branch, commitMsg, author } = gitInfo || {};
   const webhookMessage = getWebhookMessage();
   const GITPATH = `https://gitee.com/gdinfly_1/${projectName}/blob/${branch}/${newFileName}`;
-  const UPLOADURL = `https://qyapi.weixin.qq.com/cgi-bin/webhook/upload_media?key=08ea37af-c6f5-47dc-8fab-0833707c70b8&type=file`;
+  const UPLOADURL = `https://qyapi.weixin.qq.com/cgi-bin/webhook/upload_media?key=&type=file`;
   /* const data = {
         msgtype: "markdown",
         markdown: {

package/tools/project-command.js

@@ -0,0 +1,194 @@
+const { execFileSync } = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
+
+const {
+  EXIT_SELECTION,
+  selectOption: defaultSelectOption,
+} = require("./select-option");
+
+function loadConfig(cwd = process.cwd()) {
+  const packagePath = path.resolve(cwd, "package.json");
+  if (!fs.existsSync(packagePath)) {
+    throw new Error(`Project package not found: ${packagePath}.`);
+  }
+  delete require.cache[require.resolve(packagePath)];
+  const inflyConfig = require(packagePath).infly;
+  if (!inflyConfig?.dev && !inflyConfig?.build) {
+    throw new Error(`Project config is missing in ${packagePath}. Add infly.dev or infly.build.`);
+  }
+  return {
+    config: {
+      targets: inflyConfig.targets,
+      dev: inflyConfig.dev,
+      build: inflyConfig.build,
+    },
+    configDir: path.dirname(packagePath),
+  };
+}
+
+function normalizeTargets(targets) {
+  if (Array.isArray(targets)) {
+    return Object.fromEntries(targets.map((target) => [target, {}]));
+  }
+  if (targets && typeof targets === "object") return targets;
+  throw new Error("Project targets must be a non-empty array or object.");
+}
+
+function normalizeEnvironments(environments) {
+  if (Array.isArray(environments)) {
+    return Object.fromEntries(environments.map((entry) => {
+      const separatorIndex = entry.indexOf(":");
+      const environment = separatorIndex < 0 ? entry : entry.slice(0, separatorIndex);
+      const mode = separatorIndex < 0 ? entry : entry.slice(separatorIndex + 1);
+      if (!environment || !mode) {
+        throw new Error(`Invalid build environment mapping: ${entry}`);
+      }
+      return [environment, { mode, args: ["--mode", mode] }];
+    }));
+  }
+  if (environments && typeof environments === "object") return environments;
+  throw new Error("Build environments must be an array or object.");
+}
+
+function resolveBuildPlatforms(targets, buildConfig, targetName) {
+  const normalizedTargets = normalizeTargets(targets);
+  if (normalizedTargets[targetName]) return [targetName];
+
+  const preset = buildConfig.presets?.[targetName];
+  if (!preset) throw new Error(`Unknown build target: ${targetName}`);
+
+  return preset.targets.map((name) => {
+    if (!normalizedTargets[name]) {
+      throw new Error(`Unknown build target in preset ${targetName}: ${name}`);
+    }
+    return name;
+  });
+}
+
+function commandParts(command) {
+  const parts = typeof command === "string"
+    ? command.trim().split(/\s+/)
+    : command;
+  if (!Array.isArray(parts) || parts.length === 0 || !parts[0]) {
+    throw new Error("Command configuration must be a non-empty string or array.");
+  }
+  return { command: parts[0], args: parts.slice(1) };
+}
+
+function defaultRunCommand(command, args, options) {
+  execFileSync(command, args, {
+    cwd: options.cwd,
+    env: options.env,
+    stdio: "inherit",
+  });
+}
+
+function printDryRun(command, args, env) {
+  const platform = env.VUE_APP_PLATFORM ? `VUE_APP_PLATFORM=${env.VUE_APP_PLATFORM} ` : "";
+  console.log(`[dry-run] ${platform}${command} ${args.join(" ")}`.trim());
+}
+
+async function choose(selectOption, message, entries) {
+  return selectOption(
+    message,
+    entries.map(([value, item]) => ({ value, label: item.label || value })),
+  );
+}
+
+async function runProjectCommand(options = {}, dependencies = {}) {
+  if (typeof options.config === "string") {
+    throw new Error("--config is not supported for project commands; use package.json infly config.");
+  }
+
+  const configObject = options.configObject
+    || (options.config && typeof options.config === "object" ? options.config : undefined);
+  const loaded = configObject
+    ? { config: configObject, configDir: options.configDir }
+    : loadConfig(options.cwd || process.cwd());
+  const config = loaded.config;
+  const configDir = options.configDir || loaded.configDir || process.cwd();
+  if (!config) throw new Error("Project command config is required.");
+  const targets = normalizeTargets(config.targets);
+
+  const selectOption = dependencies.selectOption || defaultSelectOption;
+  const runCommand = dependencies.runCommand || defaultRunCommand;
+  const log = dependencies.log || console.log;
+  const exitIfSelected = (selection) => {
+    if (selection !== EXIT_SELECTION) return false;
+    log("已退出，未执行任何操作。");
+    return true;
+  };
+  const action = options.action || await selectOption("请选择操作", [
+    { value: "dev", label: "启动开发环境" },
+    { value: "build", label: "构建项目" },
+  ]);
+  if (exitIfSelected(action)) return { cancelled: true };
+
+  if (action === "dev") {
+    const devConfig = config.dev;
+    if (!devConfig) throw new Error("Dev configuration is missing.");
+    const targetName = options.target || await choose(
+      selectOption,
+      "请选择目标平台",
+      Object.entries(targets),
+    );
+    if (exitIfSelected(targetName)) return { cancelled: true };
+    const target = targets[targetName];
+    if (!target) throw new Error(`Unknown dev target: ${targetName}`);
+    const parts = commandParts(devConfig.command);
+    const env = { ...process.env, VUE_APP_PLATFORM: targetName };
+    if (options.dryRun) printDryRun(parts.command, parts.args, env);
+    else runCommand(parts.command, parts.args, { cwd: configDir, env });
+    return { action, target: targetName };
+  }
+
+  if (action !== "build") throw new Error(`Unknown project action: ${action}`);
+  const buildConfig = config.build;
+  if (!buildConfig) throw new Error("Build configuration is missing.");
+  const environments = normalizeEnvironments(buildConfig.environments);
+  const environment = options.env || await choose(
+    selectOption,
+    "请选择构建环境",
+    Object.entries(environments),
+  );
+  if (exitIfSelected(environment)) return { cancelled: true };
+  const environmentConfig = environments[environment];
+  if (!environmentConfig) throw new Error(`Unknown build environment: ${environment}`);
+  const targetEntries = [
+    ...Object.entries(targets),
+    ...Object.entries(buildConfig.presets || {}),
+  ];
+  const targetName = options.target || await choose(
+    selectOption,
+    "请选择目标平台",
+    targetEntries,
+  );
+  if (exitIfSelected(targetName)) return { cancelled: true };
+  const platforms = resolveBuildPlatforms(targets, buildConfig, targetName);
+
+  for (const platform of platforms) {
+    const env = { ...process.env, VUE_APP_PLATFORM: platform };
+    const lifecycleArgs = environmentConfig.mode ? ["--mode", environmentConfig.mode] : [];
+    const steps = [
+      { command: buildConfig.before, extraArgs: lifecycleArgs },
+      { command: buildConfig.command, extraArgs: environmentConfig.args || [] },
+      { command: buildConfig.after, extraArgs: lifecycleArgs },
+    ];
+
+    for (const step of steps) {
+      const parts = commandParts(step.command);
+      const args = [...parts.args, ...step.extraArgs];
+      if (options.dryRun) printDryRun(parts.command, args, env);
+      else runCommand(parts.command, args, { cwd: configDir, env });
+    }
+  }
+
+  return { action, environment, target: targetName, platforms };
+}
+
+module.exports = {
+  loadConfig,
+  resolveBuildPlatforms,
+  runProjectCommand,
+};