@jayfong/x-utils 1.0.0-202407020954 → 1.0.0-202407021055

package/_cjs/env.js

@@ -37,20 +37,22 @@ var import_fs = require("./fs.js");
 var import_path = require("./path.js");
 var import_yaml = require("./yaml.js");
 class XEnv {
-  static getEnvVarsFromFile = (0, import_vtils.memoize)(async () => {
-    const envYmlFile = import_path.XPath.join(process.cwd(), ".env.yml");
+  static getEnvVarsFromFile = (0, import_vtils.memoize)(async function get(local = true) {
+    const baseName = local ? ".env.local" : ".env";
+    const envYmlFile = import_path.XPath.join(process.cwd(), `${baseName}.yml`);
     if (await import_fs.XFs.pathExists(envYmlFile)) {
       return import_yaml.XYaml.read(envYmlFile);
     }
-    const envYamlFile = import_path.XPath.join(process.cwd(), ".env.yaml");
+    const envYamlFile = import_path.XPath.join(process.cwd(), `${baseName}.yaml`);
     if (await import_fs.XFs.pathExists(envYamlFile)) {
       return import_yaml.XYaml.read(envYamlFile);
     }
-    const dotenvFile = import_path.XPath.join(process.cwd(), ".env");
+    const dotenvFile = import_path.XPath.join(process.cwd(), baseName);
     if (await import_fs.XFs.pathExists(dotenvFile)) {
       const dotenvContent = await import_fs.XFs.readFile(dotenvFile, "utf-8");
       return import_dotenv.default.parse(dotenvContent);
     }
+    if (local) return get(false);
   });
   static async getEnvVar(name) {
     if (process.env[name] != null) {

package/_cjs/ksb.js

@@ -23,9 +23,10 @@ __export(ksb_exports, {
 module.exports = __toCommonJS(ksb_exports);
 var import_x_request = require("@jayfong/x-request");
 var import_vtils = require("vtils");
+var import_env = require("./env.js");
 class XKsb {
-  static request(url, data) {
-    const token = "%22ZpWKMcjeUIsZMwZIMUdkhEfAq93e3dPsQyWxAtkRNbc=%22";
+  static async request(url, data) {
+    const token = await import_env.XEnv.getEnvVar("X_KSB_USER_TOKEN");
     const key = "12b6bb84e093532fb72b4d65fec3f00b";
     const clientId = "ca37dd67-f885-4678-91a7-6531bb153ef2";
     const ts = (/* @__PURE__ */ new Date()).getTime();

package/env.js

@@ -4,20 +4,22 @@ import { XFs } from "./fs.js";
 import { XPath } from "./path.js";
 import { XYaml } from "./yaml.js";
 class XEnv {
-  static getEnvVarsFromFile = memoize(async () => {
-    const envYmlFile = XPath.join(process.cwd(), ".env.yml");
+  static getEnvVarsFromFile = memoize(async function get(local = true) {
+    const baseName = local ? ".env.local" : ".env";
+    const envYmlFile = XPath.join(process.cwd(), `${baseName}.yml`);
     if (await XFs.pathExists(envYmlFile)) {
       return XYaml.read(envYmlFile);
     }
-    const envYamlFile = XPath.join(process.cwd(), ".env.yaml");
+    const envYamlFile = XPath.join(process.cwd(), `${baseName}.yaml`);
     if (await XFs.pathExists(envYamlFile)) {
       return XYaml.read(envYamlFile);
     }
-    const dotenvFile = XPath.join(process.cwd(), ".env");
+    const dotenvFile = XPath.join(process.cwd(), baseName);
     if (await XFs.pathExists(dotenvFile)) {
       const dotenvContent = await XFs.readFile(dotenvFile, "utf-8");
       return dotenv.parse(dotenvContent);
     }
+    if (local) return get(false);
   });
   static async getEnvVar(name) {
     if (process.env[name] != null) {

package/ksb.d.ts

@@ -1,4 +1,9 @@
 /// <reference types="lodash" />
+/**
+ * 环境变量：
+ *
+ * `X_KSB_USER_TOKEN`: 用户令牌
+ */
 export declare class XKsb {
     static request<T>(url: string, data?: any): Promise<T>;
     static desensitize(text: string): string;

package/ksb.js

@@ -1,8 +1,9 @@
 import { xr } from "@jayfong/x-request";
 import { castArray, md5, memoize } from "vtils";
+import { XEnv } from "./env.js";
 class XKsb {
-  static request(url, data) {
-    const token = "%22ZpWKMcjeUIsZMwZIMUdkhEfAq93e3dPsQyWxAtkRNbc=%22";
+  static async request(url, data) {
+    const token = await XEnv.getEnvVar("X_KSB_USER_TOKEN");
     const key = "12b6bb84e093532fb72b4d65fec3f00b";
     const clientId = "ca37dd67-f885-4678-91a7-6531bb153ef2";
     const ts = (/* @__PURE__ */ new Date()).getTime();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jayfong/x-utils",
   "description": "123456",
-  "version": "1.0.0-202407020954",
+  "version": "1.0.0-202407021055",
   "type": "module",
   "dependencies": {
     "vtils": "^4.115.0",
@@ -22,13 +22,15 @@
     "nzh": "^1.0.12",
     "pathe": "^1.1.2",
     "pinyin-pro": "^3.19.4",
-    "puppeteer": "^22.3.0",
     "consola": "^3.2.3",
     "html-entities": "^2.5.2",
     "file-type": "^19.0.0",
     "sharp": "^0.32.5",
     "yaml": "^2.3.4"
   },
+  "peerDependencies": {
+    "puppeteer": "^22.3.0"
+  },
   "exports": {
     "./package.json": "./package.json",
     "./ai": {