@kne/fastify-puppeteer 1.1.5 → 1.1.7

package/libs/controllers.js

@@ -1,5 +1,5 @@
 const fp = require('fastify-plugin');
-const path = require('node:path');
+const { decode } = require('plantuml-encoder');
 module.exports = fp(async (fastify, options) => {
   const { services } = fastify.puppeteer;
   fastify.post(
@@ -24,6 +24,25 @@ module.exports = fp(async (fastify, options) => {
       return reply.sendFile(filename, { root: options.root });
     }
   );
+  fastify.get(
+    `${options.prefix}/parseHtmlToPdf`,
+    {
+      description: '接口说明',
+      summary: 'html生成pdf文件流',
+      query: {
+        type: 'object',
+        required: ['content'],
+        properties: {
+          options: { type: 'object' },
+          content: { type: 'string' }
+        }
+      }
+    },
+    async (request, reply) => {
+      const filename = await services.parseHtmlToPdf({ html: decode(request.query.content), options: request.query.options });
+      return reply.sendFile(filename, { root: options.root });
+    }
+  );
 
   fastify.post(
     `${options.prefix}/parseHtmlToPdfBatch`,
@@ -56,6 +75,37 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
+  fastify.get(
+    `${options.prefix}/parseHtmlToPdfBatch`,
+    {
+      onRequest: options.authenticate,
+      schema: {
+        description: '接口说明',
+        summary: '批量将html生成pdf的zip文件流',
+        query: {
+          type: 'object',
+          required: ['contentList'],
+          properties: {
+            options: { type: 'object' },
+            contentList: {
+              type: 'array',
+              items: {
+                type: 'string'
+              }
+            }
+          }
+        }
+      }
+    },
+    async (request, reply) => {
+      const filename = await services.parseHtmlToPdfBatch({
+        htmlList: request.query.contentList.map(item => decode(item)),
+        options: request.query.options
+      });
+      return reply.sendFile(filename, { root: options.root });
+    }
+  );
+
   fastify.post(
     `${options.prefix}/parseHtmlToPhotoBatch`,
     {
@@ -87,6 +137,37 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
+  fastify.get(
+    `${options.prefix}/parseHtmlToPhotoBatch`,
+    {
+      onRequest: options.authenticate,
+      schema: {
+        description: '接口说明',
+        summary: '批量将html生成png的zip文件流',
+        query: {
+          type: 'object',
+          required: ['contentList'],
+          properties: {
+            options: { type: 'object' },
+            contentList: {
+              type: 'array',
+              items: {
+                type: 'string'
+              }
+            }
+          }
+        }
+      }
+    },
+    async (request, reply) => {
+      const filename = await services.parseHtmlToPhotoBatch({
+        htmlList: request.query.contentList.map(item => decode(item)),
+        options: request.query.options
+      });
+      return reply.sendFile(filename, { root: options.root });
+    }
+  );
+
   fastify.post(
     `${options.prefix}/parseHtmlToPhoto`,
     {
@@ -113,6 +194,32 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
+  fastify.get(
+    `${options.prefix}/parseHtmlToPhoto`,
+    {
+      onRequest: options.authenticate,
+      schema: {
+        description: '接口说明',
+        summary: 'html生成png文件流',
+        query: {
+          type: 'object',
+          required: ['content'],
+          properties: {
+            options: { type: 'object' },
+            content: { type: 'string' }
+          }
+        }
+      }
+    },
+    async (request, reply) => {
+      const filename = await services.parseHtmlToPhoto({
+        html: decode(request.query.content),
+        options: request.query.options
+      });
+      return reply.sendFile(filename, { root: options.root });
+    }
+  );
+
   fastify.post(
     `${options.prefix}/parseUrlToPdf`,
     {
@@ -136,14 +243,37 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
-  fastify.post(
+  fastify.get(
+    `${options.prefix}/parseUrlToPdf`,
+    {
+      onRequest: options.authenticate,
+      schema: {
+        description: '接口说明',
+        summary: 'url生成pdf文件流',
+        query: {
+          type: 'object',
+          required: ['url'],
+          properties: {
+            options: { type: 'object' },
+            url: { type: 'string' }
+          }
+        }
+      }
+    },
+    async (request, reply) => {
+      const filename = await services.parseUrlToPdf({ url: request.query.url, options: request.query.options });
+      return reply.sendFile(filename, { root: options.root });
+    }
+  );
+
+  fastify.get(
     `${options.prefix}/parseUrlToPdfBatch`,
     {
       onRequest: options.authenticate,
       schema: {
         description: '接口说明',
         summary: 'url生成pdf文件流',
-        body: {
+        query: {
           type: 'object',
           required: ['urlList'],
           properties: {
@@ -155,8 +285,8 @@ module.exports = fp(async (fastify, options) => {
     },
     async (request, reply) => {
       const filename = await services.parseUrlToPdfBatch({
-        urlList: request.body.urlList,
-        options: request.body.options
+        urlList: request.query.urlList,
+        options: request.query.options
       });
       return reply.sendFile(filename, { root: options.root });
     }
@@ -190,6 +320,34 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
+  fastify.get(
+    `${options.prefix}/parseUrlToPhoto`,
+    {
+      onRequest: options.authenticate,
+      schema: {
+        description: '接口说明',
+        summary: 'url生成png文件流',
+        query: {
+          type: 'object',
+          required: ['url'],
+          properties: {
+            options: { type: 'object' },
+            url: { type: 'string' },
+            selector: { type: 'string' }
+          }
+        }
+      }
+    },
+    async (request, reply) => {
+      const filename = await services.parseUrlToPhoto({
+        url: request.query.url,
+        selector: request.query.selector,
+        options: request.query.options
+      });
+      return reply.sendFile(filename, { root: options.root });
+    }
+  );
+
   fastify.post(
     `${options.prefix}/parseUrlToPhotoBatch`,
     {
@@ -217,4 +375,32 @@ module.exports = fp(async (fastify, options) => {
       return reply.sendFile(filename, { root: options.root });
     }
   );
+
+  fastify.get(
+    `${options.prefix}/parseUrlToPhotoBatch`,
+    {
+      onRequest: options.authenticate,
+      schema: {
+        description: '接口说明',
+        summary: 'url生成png文件流',
+        query: {
+          type: 'object',
+          required: ['urlList'],
+          properties: {
+            options: { type: 'object' },
+            urlList: { type: 'array', items: { type: 'string' } },
+            selector: { type: 'string' }
+          }
+        }
+      }
+    },
+    async (request, reply) => {
+      const filename = await services.parseUrlToPhotoBatch({
+        urlList: request.query.urlList,
+        selector: request.query.selector,
+        options: request.query.options
+      });
+      return reply.sendFile(filename, { root: options.root });
+    }
+  );
 });

package/libs/core/setup.js

@@ -2,14 +2,14 @@ const puppeteer = require('puppeteer');
 const createDeferred = require('@kne/create-deferred');
 
 module.exports = async options => {
-  options = Object.assign({ maxTaskSize: 100 }, options);
+  options = Object.assign({ maxTaskSize: 100, pageViewport: {}, puppeteerOptions: {} }, options);
   const browser = await puppeteer.launch(options.puppeteerOptions);
   const deferred = createDeferred(options.maxTaskSize);
   return {
     task: async callback => {
       return await deferred(async () => {
         const page = await browser.newPage();
-        await page.setViewport({ width: options.pageWidth, height: options.pageHeight });
+        await page.setViewport(Object.assign({}, options.pageViewport, { width: options.pageWidth, height: options.pageHeight }));
         const output = await (async () => {
           try {
             return {

package/libs/services.js

@@ -2,7 +2,7 @@ const fp = require('fastify-plugin');
 const setup = require('./core/setup');
 const createCache = require('./core/file-cache');
 const compressing = require('compressing');
-const path = require('path');
+const path = require('node:path');
 const createDeferred = require('@kne/create-deferred');
 
 module.exports = fp(async (fastify, options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-puppeteer",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "用于操作无头浏览器截图保存pdf等",
   "main": "index.js",
   "scripts": {
@@ -49,6 +49,7 @@
     "lodash": "^4.17.21",
     "lru-cache": "^11.0.0",
     "object-hash": "^3.0.0",
+    "plantuml-encoder": "^1.4.0",
     "puppeteer": "^22.13.1",
     "puppeteer-core": "^22.13.1",
     "uuid": "^10.0.0"