@kne/fastify-aliyun 1.1.1 → 1.1.3

package/index.js

@@ -2,11 +2,11 @@ const fp = require('fastify-plugin');
 const merge = require('lodash/merge');
 const path = require('path');
 const packageJson = require('./package.json');
-const NodeCache = require('node-cache');
+const { LRUCache } = require('lru-cache');
 
 module.exports = fp(
   async (fastify, options) => {
-    const cache = new NodeCache();
+    const cache = new LRUCache({ max: 1000 });
     options = merge(
       {
         nls: {

package/libs/services/nls.js

@@ -2,12 +2,13 @@ const fp = require('fastify-plugin');
 const { RPCClient } = require('@alicloud/pop-core');
 const fetch = require('node-fetch');
 const fileType = require('file-type');
+const { parse } = require('ali-oss/shims/url');
 module.exports = fp(async (fastify, options) => {
   const { services } = fastify.aliyun;
   const getToken = async () => {
     if (options.cache.has('nls:token')) {
       const Token = options.cache.get('nls:token');
-      return { token: Token.Id };
+      return { token: Token.Id, appKey: options.nls.appKey };
     }
     const client = new RPCClient({
       accessKeyId: options.nls.token.accessKeyId,
@@ -16,8 +17,8 @@ module.exports = fp(async (fastify, options) => {
       apiVersion: options.nls.token.apiVersion
     });
     const { Token } = await client.request('CreateToken');
-    options.cache.set('nls:token', Token, Token.expireTime * 1000 - Date.now());
-    return { token: Token.Id };
+    options.cache.set('nls:token', Token, { ttl: parseInt(Token.ExpireTime * 1000 - Date.now()) - 1 });
+    return { token: Token.Id, appKey: options.nls.appKey };
   };
   const tts = async ({ text, audioName }) => {
     const { token } = await getToken();

package/libs/services/oss.js

@@ -3,32 +3,39 @@ const fp = require('fastify-plugin');
 
 module.exports = fp(async (fastify, options) => {
   const { services } = fastify.aliyun;
-  const client = new OSS({
-    region: options.oss.region,
-    accessKeyId: options.oss.accessKeyId,
-    accessKeySecret: options.oss.accessKeySecret,
-    bucket: options.oss.bucket
-  });
+  const createClient = () => {
+    return new OSS({
+      region: options.oss.region,
+      accessKeyId: options.oss.accessKeyId,
+      accessKeySecret: options.oss.accessKeySecret,
+      bucket: options.oss.bucket,
+      secure: true
+    });
+  };
 
   const uploadFile = async ({ file, filename }) => {
+    const client = createClient();
     await client.put(`${options.oss.baseDir}/${filename}`, file);
   };
 
   const uploadFileStream = async ({ stream, filename }) => {
+    const client = createClient();
     await client.putStream(`${options.oss.baseDir}/${filename}`, stream);
   };
 
   const downloadFile = async ({ filename }) => {
+    const client = createClient();
     const result = await client.get(`${options.oss.baseDir}/${filename}`);
     return result.content;
   };
 
   const getFileLink = ({ filename, expires }) => {
+    const client = createClient();
     return client.signatureUrl(`${options.oss.baseDir}/${filename}`, { expires: expires || 3600 });
   };
 
   services.oss = {
-    client,
+    createClient,
     uploadFile,
     uploadFileStream,
     getFileLink,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@kne/fastify-aliyun",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "对接阿里云服务",
   "main": "index.js",
   "scripts": {
     "init": "husky",
-    "dev": "nodemon ./index.js",
+    "dev": "cd tests && nodemon ./server.js",
     "start": "node ./index.js",
     "doc": "node ./open-api.js",
     "build:md": "npx @kne/md-doc",
@@ -43,7 +43,7 @@
     "ali-oss": "^6.20.0",
     "file-type": "^16.5.4",
     "lodash": "^4.17.21",
-    "node-cache": "^5.1.2",
+    "lru-cache": "^11.0.0",
     "node-fetch": "^2.7.0"
   },
   "devDependencies": {