@jayfong/x-server 2.21.8 → 2.21.10

package/lib/_cjs/cli/env_util.js

@@ -148,7 +148,7 @@ class EnvUtil {
                          ${env.comment.split(/[\r\n]+/g).map(line => `* ${line.trim()}`).join('\n*\n')}
                         */
                       ` : ''}
-                ${env.key}: ${Array.isArray(env.value) ? `Array<${env.value[0] ? typeof env.value[0] : 'any'}>` : typeof env.value};
+                ${env.key}: ${EnvUtil.getTypesFromValue(env.value)};
               `).join('\n')}
         }
       }
@@ -160,6 +160,9 @@ class EnvUtil {
     const types = EnvUtil.makeTypes(envs);
     await _fsExtra.default.outputFile(outFile, types);
   }
+  static getTypesFromValue(value) {
+    return Array.isArray(value) ? `Array<${value[0] ? EnvUtil.getTypesFromValue(value[0]) : 'any'}>` : (0, _vtils.isPlainObject)(value) ? Object.keys(value).length ? `Record<any, ${EnvUtil.getTypesFromValue(value[Object.keys(value)[0]])}>` : `Record<any, any>` : typeof value;
+  }
 }
 exports.EnvUtil = EnvUtil;
 EnvUtil.NEWLINE = '\n';

package/lib/_cjs/services/cache.js

@@ -31,13 +31,17 @@ class CacheService {
     const ttl = ttlOrOptions == null ? this.options.ttl : typeof ttlOrOptions === 'object' ? ttlOrOptions.ttl : ttlOrOptions;
     const redisTtl = typeof ttl === 'function' ? ttl(value, this.options.ttl) : ttl;
     if (redisTtl) {
-      const redisKey = this.toRedisKey(key);
-      const redisValue = JSON.stringify(value);
-      await _x.x.redis.set(redisKey, redisValue,
-      // 毫秒
-      'PX', (0, _vtils.ms)(redisTtl));
-      if (this.options.memory) {
-        this.memoryCache.set(redisKey, value);
+      const redisTtlMs = (0, _vtils.ms)(redisTtl);
+      // Redis 的 TTL 不能小于等于 0
+      if (redisTtlMs > 0) {
+        const redisKey = this.toRedisKey(key);
+        const redisValue = JSON.stringify(value);
+        await _x.x.redis.set(redisKey, redisValue,
+        // 毫秒
+        'PX', redisTtlMs);
+        if (this.options.memory) {
+          this.memoryCache.set(redisKey, value);
+        }
       }
     }
     return value;

package/lib/cli/env_util.d.ts

@@ -29,4 +29,5 @@ export declare class EnvUtil {
         file: string;
         outFile: string;
     }): Promise<void>;
+    private static getTypesFromValue;
 }

package/lib/cli/env_util.js

@@ -1,6 +1,6 @@
 import fs from 'fs-extra';
 import path from 'node:path';
-import { dedent, devOrProd, escapeRegExp, isNumeric } from 'vtils';
+import { dedent, devOrProd, escapeRegExp, isNumeric, isPlainObject } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
   static normalizeValue(value) {
@@ -143,7 +143,7 @@ export class EnvUtil {
                          ${env.comment.split(/[\r\n]+/g).map(line => `* ${line.trim()}`).join('\n*\n')}
                         */
                       ` : ''}
-                ${env.key}: ${Array.isArray(env.value) ? `Array<${env.value[0] ? typeof env.value[0] : 'any'}>` : typeof env.value};
+                ${env.key}: ${EnvUtil.getTypesFromValue(env.value)};
               `).join('\n')}
         }
       }
@@ -155,6 +155,9 @@ export class EnvUtil {
     const types = EnvUtil.makeTypes(envs);
     await fs.outputFile(outFile, types);
   }
+  static getTypesFromValue(value) {
+    return Array.isArray(value) ? `Array<${value[0] ? EnvUtil.getTypesFromValue(value[0]) : 'any'}>` : isPlainObject(value) ? Object.keys(value).length ? `Record<any, ${EnvUtil.getTypesFromValue(value[Object.keys(value)[0]])}>` : `Record<any, any>` : typeof value;
+  }
 }
 EnvUtil.NEWLINE = '\n';
 EnvUtil.RE_INI_KEY_VAL = /^\s*([\w.-]+)\s*=\s*(.*)?\s*$/;

package/lib/services/cache.js

@@ -26,13 +26,17 @@ export class CacheService {
     const ttl = ttlOrOptions == null ? this.options.ttl : typeof ttlOrOptions === 'object' ? ttlOrOptions.ttl : ttlOrOptions;
     const redisTtl = typeof ttl === 'function' ? ttl(value, this.options.ttl) : ttl;
     if (redisTtl) {
-      const redisKey = this.toRedisKey(key);
-      const redisValue = JSON.stringify(value);
-      await x.redis.set(redisKey, redisValue,
-      // 毫秒
-      'PX', ms(redisTtl));
-      if (this.options.memory) {
-        this.memoryCache.set(redisKey, value);
+      const redisTtlMs = ms(redisTtl);
+      // Redis 的 TTL 不能小于等于 0
+      if (redisTtlMs > 0) {
+        const redisKey = this.toRedisKey(key);
+        const redisValue = JSON.stringify(value);
+        await x.redis.set(redisKey, redisValue,
+        // 毫秒
+        'PX', redisTtlMs);
+        if (this.options.memory) {
+          this.memoryCache.set(redisKey, value);
+        }
       }
     }
     return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.21.8",
+  "version": "2.21.10",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -67,7 +67,7 @@
     "tsx": "^3.12.7",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
-    "vtils": "^4.92.0",
+    "vtils": "^4.95.0",
     "yaml": "^2.3.1",
     "yargs": "^17.4.1"
   },