@infly/libs 2.0.42 → 2.0.44

package/module/cjs/request-url-rules.cjs

@@ -16,6 +16,11 @@ function normalizePathIncludes(pathIncludes) {
   return pathIncludes.filter(Boolean).map((path) => String(path));
 }
 
+function matchesConfiguredBaseURL(baseURL, configuredBaseURLs) {
+  const normalizedBaseURL = String(baseURL || "").trim().replace(/\/+$/, "");
+  return normalizeRuleDomains(configuredBaseURLs).includes(normalizedBaseURL);
+}
+
 function resolveInternalServiceURL(url, rules = []) {
   if (!url || !Array.isArray(rules) || rules.length === 0) {
     return null;
@@ -51,5 +56,6 @@ function resolveInternalServiceURL(url, rules = []) {
 }
 
 module.exports = {
+  matchesConfiguredBaseURL,
   resolveInternalServiceURL
 };

package/module/cjs/rest-error-rules.cjs

@@ -0,0 +1,33 @@
+function normalizeErrorPayload(payload) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+    return undefined;
+  }
+
+  const message = payload.error || payload.detail || payload.message || payload.msg;
+  if (message && !payload.error) {
+    payload.error = message;
+  }
+
+  return message;
+}
+
+function resolveStatusErrorMessage(status, payload) {
+  const backendMessage = normalizeErrorPayload(payload);
+  const fallbackMessage = `请求失败(${status})`;
+  const statusMessages = {
+    400: backendMessage || fallbackMessage,
+    401: backendMessage || "登录信息已过期，请重新登录",
+    403: "您没有权限访问，请联系管理员",
+    500: backendMessage || fallbackMessage,
+    502: "网关错误，请稍后重试或联系开发人员",
+    503: "服务暂时不可用，请稍后重试",
+    504: "网关超时，请稍后重试或联系开发人员",
+  };
+
+  return statusMessages[status];
+}
+
+module.exports = {
+  normalizeErrorPayload,
+  resolveStatusErrorMessage,
+};

package/package.json

@@ -1,92 +1,121 @@
-{
-  "name": "@infly/libs",
-  "version": "2.0.42",
-  "description": "工具组件库",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node index.js",
-    "publishPkg": "npm version patch && npm publish --access=public --registry=https://registry.npmjs.org/",
-    "preview": "infly-libs --preview",
-    "preview:no-build": "infly-libs --preview --no-build",
-    "origin:preview": "infly-libs --preview",
-    "origin:preview:no-build": "infly-libs --preview --no-build"
-  },
-  "bin": {
-    "infly-libs": "bin/cli.js"
-  },
-  "exports": {
-    "./module/*": "./module/*",
-    "./dataInit/*": "./dataInit/*",
-    "./tools/*": "./tools/*",
-    "./store/*": "./store/*",
-    "./build/*": "./build/*",
-    "./script/build/*": "./script/build/*"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/kahal/npm-package"
-  },
-  "keywords": [
-    "infly",
-    "infly-libs",
-    "libs"
-  ],
-  "author": "Kahal",
-  "license": "ISC",
-  "dependencies": {
-    "enquirer": "^2.4.1",
-    "path-browserify": "^1.0.1"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.23.3",
-    "@babel/preset-env": "^7.23.3",
-    "babel-loader": "^10.0.0",
-    "webpack": "^5.88.2",
-    "webpack-cli": "^5.1.4",
-    "webpack-node-externals": "^3.0.0"
-  },
-  "peerDependencies": {
-    "axios": "^0.27.2",
-    "html-webpack-plugin": "^5.5.3"
-  },
-  "optionalDependencies": {
-    "axios": "^0.27.2",
-    "html-webpack-plugin": "^5.5.3"
-  },
-  "infly": {
-    "buildConfigs": {
-      "buildFoldName": "[构建后目录名] 可选, 默认取值vue.config.js的outputDir, 配置化 eg: postal-benefits-level-pc",
-      "outputPath": "[输出文件目录链接] eg: ./ ",
-      "enabled": "[是否启用压缩] eg: true",
-      "gitAuto": "[是否自动提交git] eg: true",
-      "gitAutoPushReposBranchMap": {
-        "release-eg": "develop-eg [自动提交推送项目构建分支和构建仓库推送分支对应配置，必须]"
-      },
-      "gitAutoCommitText": "[自动提交文案] eg: build: 更新版本为v{version}, 推送构建文件与zip压缩包  --build by infly-libs",
-      "enablePreview": "[是否启用项目预览] eg: true",
-      "enableClipboard": "[是否启用粘贴板粘贴git信息] eg: true",
-      "openExplorer": "[是否自动打开资源管理器] eg: true",
-      "webhookUrl": "[消息推送机器人链接配置] eg: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=",
-      "webhookAtUser": [
-        "@人手机号"
-      ],
-      "webhookExtraText": "[消息推送额外文案] eg: 麻烦发下版",
-      "compressionLevel": 9
-    },
-    "versionConfig": {
-      "mainVersion": "[主版本号] 可选, 默认取值项目package version, eg: 1",
-      "links": {
-        "master": "[master分支构建文件推送地址] eg: https://e.sutpay.com",
-        "release": "[release分支构建文件推送地址] eg: http://114.132.55.214:8081/"
-      },
-      "platformName": "[用以split的项目平台名称] eg: 邮惠权益平台-运营端",
-      "baseName": "v{version}-{timestamp}.zip",
-      "versionList": [],
-      "disableUpdateVersionEnv": [
-        "development",
-        "staging  [禁用更新版本号的环境， 比如测试环境构建不需要更新version, 不配置默认禁用stage测试环境]"
-      ]
-    }
-  }
-}
+{
+  "name": "@infly/libs",
+  "version": "2.0.44",
+  "description": "不受前端框架限制的独立工具库",
+  "main": "index.js",
+  "files": [
+    "index.js",
+    "bin/",
+    "compat/",
+    "adapters/vue2/",
+    "build/",
+    "module/",
+    "script/build/",
+    "script/git-automation/",
+    "script/index.js",
+    "script/webhook/",
+    "store/",
+    "tools/",
+    "README.md",
+    "LICENSE",
+    "!**/*.test.js",
+    "!**/*.test.cjs",
+    "!**/*.test.mjs"
+  ],
+  "scripts": {
+    "test": "node --test --test-timeout=30000 core-entry.test.js adapters/vue2/compatibility.test.js build/build-dist/script-management.test.js build/docker/compose-command.test.js build/docker/compose-release.test.js build/docker/docker-build-push.test.js build/webpack5/webpack.base.test.js tools/project-command.test.js tools/select-option.test.js module/cjs/request-url-rules.test.cjs module/cjs/rest-error-rules.test.cjs script/build/webhook.test.js script/pts/generate-cloud-params.test.mjs",
+    "test:coverage": "node --test --test-timeout=30000 --experimental-test-coverage core-entry.test.js adapters/vue2/compatibility.test.js build/build-dist/script-management.test.js build/docker/compose-command.test.js build/docker/compose-release.test.js build/docker/docker-build-push.test.js build/webpack5/webpack.base.test.js tools/project-command.test.js tools/select-option.test.js module/cjs/request-url-rules.test.cjs module/cjs/rest-error-rules.test.cjs script/build/webhook.test.js script/pts/generate-cloud-params.test.mjs",
+    "check": "node --test --test-timeout=30000 core-entry.test.js",
+    "lint": "eslint .",
+    "lint:strict": "eslint . --max-warnings 0",
+    "postinstall": "node adapters/vue2/postinstall.js",
+    "publishPkg": "npm publish --access=public --registry=https://registry.npmjs.org/",
+    "preview": "infly-libs --preview",
+    "preview:no-build": "infly-libs --preview --no-build",
+    "origin:preview": "infly-libs --preview",
+    "origin:preview:no-build": "infly-libs --preview --no-build"
+  },
+  "bin": {
+    "infly-libs": "bin/cli.js"
+  },
+  "exports": {
+    ".": "./index.js",
+    "./adapters/vue2/*": "./adapters/vue2/*",
+    "./adapters/vue2/build/*": "./adapters/vue2/build/*",
+    "./module/*": "./module/*",
+    "./tools/*": "./tools/*",
+    "./store/*": "./store/*",
+    "./build/*": "./build/*",
+    "./script/build/*": "./script/build/*"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/kahal/npm-package"
+  },
+  "keywords": [
+    "infly",
+    "infly-libs",
+    "libs"
+  ],
+  "author": "Kahal",
+  "license": "ISC",
+  "dependencies": {
+    "@infly/ts-libs": "workspace:*",
+    "connect": "^3.7.0",
+    "enquirer": "^2.4.1",
+    "path-browserify": "^1.0.1",
+    "serve-static": "^1.15.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.23.3",
+    "@babel/preset-env": "^7.23.3",
+    "@babel/preset-typescript": "^7.23.3",
+    "babel-loader": "^10.0.0",
+    "webpack": "^5.88.2",
+    "webpack-cli": "^5.1.4",
+    "webpack-node-externals": "^3.0.0"
+  },
+  "peerDependencies": {
+    "axios": "^0.27.2",
+    "html-webpack-plugin": "^5.5.3"
+  },
+  "optionalDependencies": {
+    "axios": "^0.27.2",
+    "html-webpack-plugin": "^5.5.3"
+  },
+  "infly": {
+    "buildConfigs": {
+      "buildFoldName": "[构建后目录名] 可选, 默认取值vue.config.js的outputDir, 配置化 eg: example-admin",
+      "outputPath": "[输出文件目录链接] eg: ./ ",
+      "enabled": "[是否启用压缩] eg: true",
+      "gitAuto": "[是否自动提交git] eg: true",
+      "gitAutoPushReposBranchMap": {
+        "release-eg": "develop-eg [自动提交推送项目构建分支和构建仓库推送分支对应配置，必须]"
+      },
+      "gitAutoCommitText": "[自动提交文案] eg: build: 更新版本为v{version}, 推送构建文件与zip压缩包  --build by infly-libs",
+      "enablePreview": "[是否启用项目预览] eg: true",
+      "enableClipboard": "[是否启用粘贴板粘贴git信息] eg: true",
+      "openExplorer": "[是否自动打开资源管理器] eg: true",
+      "webhookUrl": "[消息推送机器人链接配置] eg: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=",
+      "webhookAtUser": [
+        "@人手机号"
+      ],
+      "webhookExtraText": "[消息推送额外文案] eg: 麻烦发下版",
+      "compressionLevel": 9
+    },
+    "versionConfig": {
+      "mainVersion": "[主版本号] 可选, 默认取值项目package version, eg: 1",
+      "links": {
+        "master": "[master分支构建文件推送地址] eg: https://example.com",
+        "release": "[release分支构建文件推送地址] eg: https://staging.example.com"
+      },
+      "platformName": "[用以split的项目平台名称] eg: 示例平台-运营端",
+      "baseName": "v{version}-{timestamp}.zip",
+      "versionList": [],
+      "disableUpdateVersionEnv": [
+        "development",
+        "staging  [禁用更新版本号的环境， 比如测试环境构建不需要更新version, 不配置默认禁用stage测试环境]"
+      ]
+    }
+  }
+}

package/script/build/deps.js

@@ -9,7 +9,7 @@ const path = require("path");
  *
  * 示例（vue.config.js）：
  *   alias: {
- *     "@postal-benefits-platform": projectResolve("../postal-benefits-platform/src")
+ *     "@example-admin": projectResolve("../example-admin/src")
  *   }
  *
  * @param {string} appDir - 当前 app 目录的绝对路径

package/script/build/webhook.js

@@ -36,7 +36,7 @@ function getRecordContent(record, deployUrl) {
       publishText,
       `构建文件：已推送对应仓库【${repos || ""}】- 分支【${targetBranch}】`,
       `构建人：${author || ""}`,
-      `部署系统：${deployUrl}`
+      deployUrl ? `部署系统：${deployUrl}` : ""
     ]
       .filter(Boolean)
       .join("\n");
@@ -77,7 +77,7 @@ async function postBatchWebhook(batchWebhookFile, extraArgs, mode) {
   }
 
   const [firstRecord] = records;
-  const { webhookUrl, webhookAtUser = [], gitInfo = {}, deployUrl = "https://cicd.sutpay.com/" } =
+  const { webhookUrl, webhookAtUser = [], gitInfo = {}, deployUrl = "" } =
     firstRecord.extraParams || {};
 
   if (!webhookUrl) {
@@ -114,5 +114,6 @@ async function postBatchWebhook(batchWebhookFile, extraArgs, mode) {
 }
 
 module.exports = {
+  getRecordContent,
   postBatchWebhook
 };

package/script/git-automation/git-clone.js

@@ -25,7 +25,7 @@ function cloneRepository(url, branch, targetDir) {
  * @description
  * eg: package.json
  *  {
-        "name": "postal-benefits-monorepo",
+        "name": "example-monorepo",
         "version": "1.0.0",
         "private": true,
         "projectConfig": {
@@ -34,9 +34,8 @@ function cloneRepository(url, branch, targetDir) {
             "baseGitUrl": "https://gitee.com/gdinfly_1/"
         },
         "workspaces": [
-            "apps/postal-benefits-platform",
-            "apps/postal-benefits-platform-merchant",
-            "apps/postal-benefits-platform-level"
+            "apps/example-admin",
+            "apps/example-portal"
         ]
     }
  *  

package/script/git-automation/index.js

@@ -521,8 +521,8 @@ function checkAndUpdateRootPackages(packagesDir, targetBranch = "master") {
     stdio: "inherit"
   });
 
-  // 只同步共享内容，保留当前分支配置和子模块集合
-  const mergeScriptPath = path.join(rootDir, "script", "sync-from-branch.sh");
+  // 只同步共享内容，保留当前分支配置和子模块集合
+  const mergeScriptPath = path.join(rootDir, "script", "sync-from-branch.sh");
   if (fs.existsSync(mergeScriptPath)) {
     execSync(`bash "${mergeScriptPath}" ${targetBranch}`, {
       cwd: rootDir,

package/script/index.js

@@ -1,26 +1 @@
-module.exports = {
-  previewList: [
-    {
-      key: "preview",
-      value: "infly-libs --preview"
-    },
-    {
-      key: "preview:no-build",
-      value: "infly-libs --preview --no-build"
-    }
-  ],
-  buildList: [
-    {
-      key: "build:prod",
-      value: "infly-libs beforeBuild && vue-cli-service build && infly-libs afterBuild"
-    },
-    {
-      key: "build:stage",
-      value: "infly-libs beforeBuild && vue-cli-service build --mode staging && infly-libs afterBuild"
-    },
-    {
-      key: "build:test",
-      value: "infly-libs beforeBuild && infly-libs afterBuild"
-    }
-  ]
-};
+module.exports = require("../adapters/vue2/script-config.js");

package/script/webhook/webhook.js

@@ -63,7 +63,7 @@ function postVersionFileAndMsg(publishText, extraParams = {}) {
     gitAutoPushRepos,
     gitAutoPushReposBranchMap,
     repos,
-    deployUrl = "https://cicd.sutpay.com/"
+    deployUrl = ""
   } = extraParams || {};
   const { branch, commitMsg, author } = gitInfo || {};
   const webhookMessage = getWebhookMessage();
@@ -82,7 +82,12 @@ function postVersionFileAndMsg(publishText, extraParams = {}) {
     } */
   let content = publishText;
   if (gitAutoPushReposBranchMap) {
-    content = `${publishText}\n构建文件：已推送对应仓库【${repos}】- 分支【${gitAutoPushReposBranchMap[branch]}】\n构建人：${author}\n部署系统：${deployUrl}`;
+    content = [
+      publishText,
+      `构建文件：已推送对应仓库【${repos}】- 分支【${gitAutoPushReposBranchMap[branch]}】`,
+      `构建人：${author}`,
+      deployUrl ? `部署系统：${deployUrl}` : ""
+    ].filter(Boolean).join("\n");
   } else {
     content = `${publishText}\n构建文件下载地址：${GITPATH}\n${webhookExtraText}\n`;
   }

package/store/index.js

@@ -0,0 +1 @@
+module.exports = require("../adapters/vue2/store/index.js");

package/store/modules/user.js

@@ -1,268 +1 @@
-import Uts from "../../module/Uts.js";
-import TokenService from "../../module/TokenService.js";
-
-const CONFIG = {
-  router: {},
-  settings: {},
-  login: () => Promise.resolve(),
-  getInfo: () => Promise.resolve(),
-  redirectRoute: {}
-};
-
-function init(config = {}) {
-  const { settings } = config || {};
-  if (Uts.notEmptyObject(settings)) {
-    TokenService.init(settings);
-  }
-
-  if (Uts.notEmptyObject(config)) {
-    Uts.mergeObjectWithReference(CONFIG, config);
-  }
-}
-
-const getDefaultState = () => {
-  return {
-    token: TokenService.getToken(),
-    name: "",
-    avatar: "",
-    user: {
-      id: "",
-      email: "",
-      header: "",
-      level_id: "",
-      level_name: "",
-      is_active_str: "",
-      mobile: "",
-      nickname: "",
-      role: "",
-      username: "",
-      company: "",
-      affiliation: {
-        province: "",
-        city: "",
-        district: ""
-      },
-      dimensionality_choices: [],
-      merchant_set: [],
-      merchantinfo: {},
-      map_key: ""
-    },
-    chatToken: TokenService.getChatToken() // 商家端聊天管理token
-  };
-};
-
-const userModule = {
-  namespaced: true,
-  state: () => getDefaultState(),
-  mutations: {
-    RESET_STATE: (state) => {
-      Uts.mergeObjectWithReference(state, getDefaultState());
-    },
-    SET_USER: (state, user) => (state.user = user),
-    SET_TOKEN: (state, token) => {
-      state.token = token;
-      TokenService.setToken(token);
-    },
-    SET_NAME: (state, name) => {
-      state.name = name;
-    },
-    SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar;
-    },
-    SET_MAPKEY: (state, mapKey) => {
-      Uts.storage.set("mapKey", mapKey);
-    },
-    //邮惠权益商家端聊天管理的登录凭证
-    SET_CHAT_TOKEN: (state, token) => {
-      state.chatToken = token;
-      TokenService.setChatToken(token);
-    },
-    SET_PERMISSION_CODES: (state, codes) => {
-      state.permission_codes = codes || [];
-      Uts.storage.set(CONFIG.settings.permissionsCodeKey, codes);
-    },
-    UPDATE_ROUTES: (state, menus_permission_codes) => {
-      const constantRoutes = CONFIG?.router?.options?.routes || [];
-      updateRoutesPermission(constantRoutes, menus_permission_codes);
-      CONFIG?.router?.resetRouter?.(constantRoutes);
-    }
-  },
-  actions: {
-    login({ commit }, userInfo) {
-      const { mobile, sms_code } = userInfo;
-      return new Promise((resolve, reject) => {
-        CONFIG?.login?.({
-          mobile: mobile,
-          sms_code: sms_code
-        })
-          .then((response) => {
-            commit("SET_TOKEN", response.token);
-            resolve();
-          })
-          .catch((error) => {
-            reject(error);
-          });
-      });
-    },
-
-    getInfo({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        CONFIG.getInfo(state.token)
-          .then((response) => {
-            if (!response) {
-              reject("验证失败，请重新登录。");
-            }
-
-            const {
-              name,
-              header,
-              map_key,
-              merchantinfo,
-              permission_codes = [],
-              menus,
-              menus_permission_codes = Uts.pluck(menus, "path") || []
-            } = response;
-            const { service_token } = merchantinfo || {};
-            const fullePermissionCodes = [...permission_codes, ...menus_permission_codes];
-
-            commit("SET_USER", response);
-            commit("SET_NAME", name);
-            commit("SET_AVATAR", header);
-            commit("SET_MAPKEY", map_key);
-
-            if (service_token) {
-              commit("SET_CHAT_TOKEN", service_token);
-            }
-
-            if (
-              CONFIG.settings.permissionsCodeKey &&
-              JSON.stringify(fullePermissionCodes) !==
-                JSON.stringify(Uts.storage.get(CONFIG.settings.permissionsCodeKey))
-            ) {
-              commit("SET_PERMISSION_CODES", fullePermissionCodes);
-            }
-            commit("UPDATE_ROUTES", menus_permission_codes);
-            resolve({ ...response, PMRedirectPath: CONFIG.redirectRoute.redirect });
-          })
-          .catch((error) => {
-            reject(error);
-          });
-      });
-    },
-
-    logout({ commit, state }, payload) {
-      return new Promise((resolve, reject) => {
-        TokenService.removeAllTokens();
-        commit("RESET_STATE");
-        commit("SET_MAPKEY", "");
-        commit("SET_CHAT_TOKEN", "");
-        commit("SET_PERMISSION_CODES", "");
-
-        if (payload?.redirectLogin) {
-          CONFIG?.router?.push?.("/login");
-        }
-
-        if (TokenService.getUrlToken()) {
-          TokenService.removeUrlToken();
-        }
-        resolve();
-      });
-    },
-
-    resetToken({ commit }) {
-      return new Promise((resolve) => {
-        commit("SET_TOKEN", "");
-        commit("SET_MAPKEY", "");
-        commit("RESET_STATE");
-        resolve();
-      });
-    },
-
-    refreshToken({ commit }, { token }) {
-      return new Promise((resolve, reject) => {
-        commit("SET_TOKEN", token);
-        resolve();
-      });
-    }
-  }
-};
-
-// 递归更新路由权限
-// 递归应用路由权限（设置 hidden）
-const applyRoutesPermission = (routes = []) => {
-  routes.forEach((route) => {
-    if (route.meta?.permission && !route.hidden) {
-      route.hidden = !Uts.getPM(route.meta.permission);
-    }
-    if (route.children?.length) {
-      applyRoutesPermission(route.children);
-    }
-  });
-};
-
-// 深度优先查找第一个可访问的叶子路由完整路径
-const getFirstAccessiblePath = (routes = [], parentPath = "") => {
-  for (const route of routes) {
-    if (route.hidden || !route.path) continue;
-
-    // 绝对路径直接用，相对路径拼接父路径
-    const fullPath = route.path.startsWith("/")
-      ? route.path
-      : parentPath
-        ? `${parentPath}/${route.path}`
-        : route.path;
-
-    if (route.children?.length) {
-      const childPath = getFirstAccessiblePath(route.children, fullPath);
-      if (childPath) return childPath;
-    } else {
-      return fullPath;
-    }
-  }
-  return "";
-};
-
-// 更新路由权限并设置重定向
-const findAccessibleRouteByPath = (routes = [], targetPath, parentPath = "") => {
-  if (!targetPath) return null;
-
-  for (const route of routes) {
-    if (route.hidden || !route.path) continue;
-
-    const fullPath = route.path.startsWith("/")
-      ? route.path
-      : parentPath
-        ? `${parentPath}/${route.path}`
-        : route.path;
-
-    if (fullPath === targetPath) {
-      return route;
-    }
-
-    if (route.children?.length) {
-      const matched = findAccessibleRouteByPath(route.children, targetPath, fullPath);
-      if (matched) return matched;
-    }
-  }
-
-  return null;
-};
-
-const updateRoutesPermission = (routes = []) => {
-  applyRoutesPermission(routes);
-
-  const redirectRoute = routes.find((r) => r.path === "");
-  if (redirectRoute) {
-    const availableRoutes = routes.filter((r) => r.path !== "");
-    const initRoutePath = CONFIG.settings?.projectConfig?.initRoutePath;
-    const initRoute = findAccessibleRouteByPath(availableRoutes, initRoutePath);
-    const firstPath = getFirstAccessiblePath(availableRoutes);
-    redirectRoute.redirect = initRoute ? initRoutePath : firstPath || "*";
-    CONFIG.redirectRoute = redirectRoute;
-  }
-};
-
-export default {
-  ...userModule,
-  init
-};
+export { default } from "../../adapters/vue2/store/modules/user.js";