@kne/fastify-puppeteer 1.1.2 → 1.1.4

package/index.js

@@ -10,6 +10,7 @@ module.exports = fp(
         root: path.resolve(process.cwd(), '.puppeteer_cache'),
         prefix: `/api/v${packageJson.version.split('.')[0]}/puppeteer`,
         maxCacheKeys: 1000,
+        maxConcurrent: 10,
         maxTaskSize: 100,
         pageWidth: 1366,
         pageHeight: 768,

package/libs/core/file-cache.js

@@ -1,25 +1,19 @@
-const { LRUCache } = require('lru-cache');
+const {LRUCache} = require('lru-cache');
 const path = require('path');
 const fs = require('fs-extra');
 const merge = require('lodash/merge');
 const fileType = require('file-type');
 const objectHash = require('object-hash');
-const { v4: uuidv4 } = require('uuid');
+const {v4: uuidv4} = require('uuid');
 const crypto = require('crypto');
 
 module.exports = async options => {
-  options = merge(
-    {},
-    {
-      maxCacheKeys: 1000,
-      root: path.resolve(process.cwd(), '.puppeteer_cache')
-    },
-    options
-  );
+  options = merge({}, {
+    maxCacheKeys: 1000, root: path.resolve(process.cwd(), '.puppeteer_cache')
+  }, options);
   await fs.emptyDir(options.root);
   const cache = new LRUCache({
-    max: options.maxCacheKeys,
-    dispose: async value => {
+    max: options.maxCacheKeys, dispose: async value => {
       await fs.remove(path.resolve(options.root, value));
     }
   });
@@ -27,26 +21,31 @@ module.exports = async options => {
   return {
     setCache: async (object, file) => {
       const hash = objectHash(object);
-      const md5 = crypto.createHash('md5').update(file).digest('hex');
       if (Buffer.isBuffer(file)) {
-        const { ext } = await fileType.fromBuffer(file);
-        const filename = md5 + '.' + ext;
+        const {ext} = await fileType.fromBuffer(file);
+        const filename = crypto.createHash('md5').update(file).digest('hex') + '.' + ext;
         const filePath = path.resolve(options.root, filename);
         await fs.writeFile(filePath, file);
         cache.set(hash, filename);
         return filename;
       } else {
-        const filename = md5 + '.zip';
+        const filename = uuidv4() + '.zip';
         const filePath = path.resolve(options.root, filename);
+        const hash = crypto.createHash('md5');
         await new Promise((resolve, reject) => {
-          file.pipe(fs.createWriteStream(filePath)).on('error', reject).on('finish', resolve);
+          file
+            .on('data', chunk => hash.update(chunk))
+            .pipe(fs.createWriteStream(filePath))
+            .on('error', reject)
+            .on('finish', resolve);
         });
-
-        cache.set(hash, filename);
-        return filename;
+        const newFilename = hash.digest('hex') + '.zip';
+        const newFilePath = path.resolve(options.root, newFilename);
+        await fs.move(filePath, newFilePath);
+        cache.set(hash, newFilename);
+        return newFilename;
       }
-    },
-    getCache: async object => {
+    }, getCache: async object => {
       const filename = cache.get(objectHash(object));
       if (!filename) {
         return null;

package/libs/services.js

@@ -6,22 +6,23 @@ const path = require('path');
 const createDeferred = require('@kne/create-deferred');
 
 module.exports = fp(async (fastify, options) => {
-  const { maxCacheKeys, maxConcurrency = 10, root } = options;
+  const { maxCacheKeys, maxConcurrent, root } = options;
   const cache = await createCache(options);
   const puppeteerPage = await setup(options);
 
-  const deferred = createDeferred(maxConcurrency);
+  const deferred = createDeferred(maxConcurrent);
 
   const memoCache = (cacheName, callback) => async props => {
-    const currentCache = await cache.getCache(Object.assign({}, props, { cacheName }));
-    if (currentCache) {
+    const inputProps = Object.assign({}, props, { cacheName });
+    const currentCache = await cache.getCache(inputProps);
+    if (currentCache && !inputProps.force) {
       return currentCache;
     }
     const output = await callback(props);
     if (!output.success) {
       throw output.error;
     }
-    return await cache.setCache(props, output.result);
+    return await cache.setCache(inputProps, output.result);
   };
 
   const batchTask = async (list, callback) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-puppeteer",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "用于操作无头浏览器截图保存pdf等",
   "main": "index.js",
   "scripts": {