@jayfong/x-server 1.27.3 → 1.28.1

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.28.1](https://github.com/jfWorks/x-server/compare/v1.28.0...v1.28.1) (2022-05-16)
+
+
+### Bug Fixes
+
+* rhel-openssl-1.1.x ([38bbf2f](https://github.com/jfWorks/x-server/commit/38bbf2ff3b1b22eaf37eebb7bca5bc95ee8c90a0))
+
+## [1.28.0](https://github.com/jfWorks/x-server/compare/v1.27.4...v1.28.0) (2022-05-15)
+
+
+### Features
+
+* **cache:** add rememberMany ([d6460d3](https://github.com/jfWorks/x-server/commit/d6460d363000700745834c02d145ec86658400d1))
+
+### [1.27.4](https://github.com/jfWorks/x-server/compare/v1.27.3...v1.27.4) (2022-05-15)
+
+
+### Bug Fixes
+
+* cache remove use batch ([1075902](https://github.com/jfWorks/x-server/commit/1075902984e09e766ec72b0289c4e4a5d16d5d16))
+
 ### [1.27.3](https://github.com/jfWorks/x-server/compare/v1.27.2...v1.27.3) (2022-05-11)
 
 

package/lib/_cjs/cli/build_util.js

@@ -123,12 +123,12 @@ class BuildUtil {
     const prismaSchemaFile = _nodePath.default.join(options.cwd, 'src/db/schema.prisma');
 
     if (await _fsExtra.default.pathExists(prismaSchemaFile)) {
-      // 下载 centos (rhel-openssl-1.0.x) 的可执行文件
+      // 下载 centos (rhel-openssl-1.0.x,rhel-openssl-1.1.x) 的可执行文件
       await (0, _execa.default)('tbify', ['node', require.resolve('@prisma/engines/download/index.js')], {
         env: {
           // https://www.prisma.io/docs/reference/api-reference/environment-variables-reference#prisma_cli_binary_targets
           // https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#binarytargets-options
-          PRISMA_CLI_BINARY_TARGETS: `${_os.default.platform() === 'darwin' ? 'darwin' : 'windows'},rhel-openssl-1.0.x`
+          PRISMA_CLI_BINARY_TARGETS: `${_os.default.platform() === 'darwin' ? 'darwin' : 'windows'},rhel-openssl-1.0.x,rhel-openssl-1.1.x`
         }
       });
 

package/lib/_cjs/services/cache.js

@@ -115,6 +115,28 @@ class CacheService {
 
     return value;
   }
+
+  async rememberMany(raws, key, action, ttl = this.options.ttl) {
+    const keys = raws.map(key);
+    const values = await this.getMany(...keys);
+    const shouldUpdateIndexes = [];
+
+    for (let i = 0, len = values.length; i < len; i++) {
+      if (values[i] === null) {
+        shouldUpdateIndexes.push(i);
+      }
+    }
+
+    if (shouldUpdateIndexes.length) {
+      const nextValues = await action(shouldUpdateIndexes.map(i => raws[i]));
+      await Promise.all(nextValues.map(async (nextValue, index) => {
+        values[shouldUpdateIndexes[index]] = nextValue;
+        await this.set(keys[shouldUpdateIndexes[index]], nextValue, ttl);
+      }));
+    }
+
+    return values;
+  }
   /**
    * 自增。
    *
@@ -182,10 +204,7 @@ class CacheService {
 
 
   async remove(...keys) {
-    return Promise.all(keys.map(async key => {
-      const redisKey = this.toRedisKey(key);
-      return _x.x.redis.del(redisKey);
-    }));
+    return _x.x.redis.del(...keys.map(key => this.toRedisKey(key)));
   }
   /**
    * 清空全部缓存。

package/lib/cli/build_util.js

@@ -99,12 +99,12 @@ export class BuildUtil {
     const prismaSchemaFile = path.join(options.cwd, 'src/db/schema.prisma');
 
     if (await fs.pathExists(prismaSchemaFile)) {
-      // 下载 centos (rhel-openssl-1.0.x) 的可执行文件
+      // 下载 centos (rhel-openssl-1.0.x,rhel-openssl-1.1.x) 的可执行文件
       await execa('tbify', ['node', require.resolve('@prisma/engines/download/index.js')], {
         env: {
           // https://www.prisma.io/docs/reference/api-reference/environment-variables-reference#prisma_cli_binary_targets
           // https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#binarytargets-options
-          PRISMA_CLI_BINARY_TARGETS: `${os.platform() === 'darwin' ? 'darwin' : 'windows'},rhel-openssl-1.0.x`
+          PRISMA_CLI_BINARY_TARGETS: `${os.platform() === 'darwin' ? 'darwin' : 'windows'},rhel-openssl-1.0.x,rhel-openssl-1.1.x`
         }
       });
       const distPrismaSchemaFile = path.join(distDir, 'schema.prisma');

package/lib/services/cache.d.ts

@@ -61,6 +61,7 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
      * @returns 返回获取到的内容
      */
     remember<K extends TKeyPath, V extends Value<TData, K>>(key: K, action: () => V | Promise<V>, ttl?: MsValue | ((data: V, defaultTTL: MsValue) => MsValue)): Promise<V>;
+    rememberMany<T, K extends TKeyPath, V extends Value<TData, K>>(raws: T[], key: (raw: T) => K, action: (raws: T[]) => V[] | Promise<V[]>, ttl?: MsValue | ((data: V, defaultTTL: MsValue) => MsValue)): Promise<V[]>;
     /**
      * 自增。
      *
@@ -94,7 +95,7 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
      *
      * @param keys 键列表
      */
-    remove<K extends TKeyPath>(...keys: K[]): Promise<any>;
+    remove<K extends TKeyPath>(...keys: K[]): Promise<number>;
     /**
      * 清空全部缓存。
      */

package/lib/services/cache.js

@@ -105,6 +105,28 @@ export class CacheService {
 
     return value;
   }
+
+  async rememberMany(raws, key, action, ttl = this.options.ttl) {
+    const keys = raws.map(key);
+    const values = await this.getMany(...keys);
+    const shouldUpdateIndexes = [];
+
+    for (let i = 0, len = values.length; i < len; i++) {
+      if (values[i] === null) {
+        shouldUpdateIndexes.push(i);
+      }
+    }
+
+    if (shouldUpdateIndexes.length) {
+      const nextValues = await action(shouldUpdateIndexes.map(i => raws[i]));
+      await Promise.all(nextValues.map(async (nextValue, index) => {
+        values[shouldUpdateIndexes[index]] = nextValue;
+        await this.set(keys[shouldUpdateIndexes[index]], nextValue, ttl);
+      }));
+    }
+
+    return values;
+  }
   /**
    * 自增。
    *
@@ -172,10 +194,7 @@ export class CacheService {
 
 
   async remove(...keys) {
-    return Promise.all(keys.map(async key => {
-      const redisKey = this.toRedisKey(key);
-      return x.redis.del(redisKey);
-    }));
+    return x.redis.del(...keys.map(key => this.toRedisKey(key)));
   }
   /**
    * 清空全部缓存。

package/package.json

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