@jayfong/x-server 2.37.1 → 2.39.0

package/lib/_cjs/cli/build_util.js

@@ -4,12 +4,12 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.BuildUtil = void 0;
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _compressing = _interopRequireDefault(require("compressing"));
 var esbuild = _interopRequireWildcard(require("esbuild"));
 var _execa = _interopRequireDefault(require("execa"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _globby = _interopRequireDefault(require("globby"));
-var _nodePath = _interopRequireDefault(require("node:path"));
 var _vtils = require("vtils");
 class BuildUtil {
   static async build(options) {
@@ -162,6 +162,8 @@ class BuildUtil {
           apps: [
             {
               name: ${JSON.stringify(pkgContent.name)},
+              interpreter: 'fnm',
+              interpreter_args: ['exec'],
               script: './main.js',
               ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },

package/lib/_cjs/services/cache.js

@@ -224,6 +224,13 @@ class CacheService {
    * 清空全部缓存。
    */
   async clearAll() {
+    if (this.options.memory) {
+      this.memoryCache.forEach((_v, k) => {
+        if (k.startsWith(this.prefix)) {
+          this.memoryCache.delete(k);
+        }
+      });
+    }
     const keys = await _x.x.redis.keys(`${this.prefix}*`);
     if (keys.length) {
       return _x.x.redis.del(...keys);
@@ -238,6 +245,13 @@ class CacheService {
     if (!prefixes.length) {
       return 0;
     }
+    if (this.options.memory) {
+      this.memoryCache.forEach((_v, k) => {
+        if (prefixes.some(prefix => k.startsWith(prefix))) {
+          this.memoryCache.delete(k);
+        }
+      });
+    }
     const keys = (await Promise.all(prefixes.map(prefix => _x.x.redis.keys(`${this.toRedisKey(prefix)}*`)))).flat();
     if (keys.length) {
       return _x.x.redis.del(...keys);

package/lib/cli/build_util.js

@@ -1,9 +1,9 @@
+import path from 'node:path';
 import compressing from 'compressing';
 import * as esbuild from 'esbuild';
 import exec from 'execa';
 import fs from 'fs-extra';
 import globby from 'globby';
-import path from 'node:path';
 import { dedent, uniq } from 'vtils';
 export class BuildUtil {
   static async build(options) {
@@ -156,6 +156,8 @@ export class BuildUtil {
           apps: [
             {
               name: ${JSON.stringify(pkgContent.name)},
+              interpreter: 'fnm',
+              interpreter_args: ['exec'],
               script: './main.js',
               ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },

package/lib/services/cache.d.ts

@@ -4,7 +4,7 @@ import { BaseService } from './base';
 export interface CacheServiceOptions {
     /** 默认过期时间 */
     ttl: MsValue;
-    /** 启用内存缓存，仅 get, set, remove, remember 支持 */
+    /** 启用内存缓存，仅 get, set, remove, remember, clear, clearAll 支持 */
     memory?: boolean;
 }
 type Data = {

package/lib/services/cache.js

@@ -219,6 +219,13 @@ export class CacheService {
    * 清空全部缓存。
    */
   async clearAll() {
+    if (this.options.memory) {
+      this.memoryCache.forEach((_v, k) => {
+        if (k.startsWith(this.prefix)) {
+          this.memoryCache.delete(k);
+        }
+      });
+    }
     const keys = await x.redis.keys(`${this.prefix}*`);
     if (keys.length) {
       return x.redis.del(...keys);
@@ -233,6 +240,13 @@ export class CacheService {
     if (!prefixes.length) {
       return 0;
     }
+    if (this.options.memory) {
+      this.memoryCache.forEach((_v, k) => {
+        if (prefixes.some(prefix => k.startsWith(prefix))) {
+          this.memoryCache.delete(k);
+        }
+      });
+    }
     const keys = (await Promise.all(prefixes.map(prefix => x.redis.keys(`${this.toRedisKey(prefix)}*`)))).flat();
     if (keys.length) {
       return x.redis.del(...keys);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.37.1",
+  "version": "2.39.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",