page2pdf_server 1.1.2 → 1.1.3

package/src/__tests__/UrltoPdf/generatePdf.test.ts

@@ -1,207 +0,0 @@
-import { SuperAgentTest } from "supertest";
-import { OK } from "http-status/lib";
-import { initAgent } from "../helpers/index";
-
-//prettify真叼： 每个地方都给您报出 红色
-const TIMEOUT = 260000; //设置超时，避免单步歇菜
-let agent: SuperAgentTest;
-
-beforeAll(async () => {
-  agent = await initAgent();
-});
-
-/**替代： 浏览器postman等工具发送包后，后端服务器Debug模式运行单步调试模式已经没能使用了。只好改为jest来对付了。
-后面的/${CONFIG.APP.VER} 就是加了/v1结尾的该服务工程的版本号;
-* */
-describe("[PDF] => Gen", () => {
-  describe("Post: '/api/pdf'", () => {
-    it(
-      "通用基本的",
-      async () => {
-        const response = await agent.post(`/api/pdf`).send({
-          name: "asjsak啊实打实",
-          lay: {
-            head: [
-              '<div style=\\"position: relative; width:100%; text-align:center; border-bottom: 1pt solid #eeeeee; margin: 3.5mm 0px 10px; font-size: 10pt\\"></span>',
-              '<div style=\\"position: absolute; width:100%; text-align: center; bottom: 5px;\\"><span class=title></div>',
-              '<div style=\\"position: absolute; text-align: right; bottom: 5px;right: 20px;\\">version: 1.0</div>',
-              "</div>",
-            ],
-            foot: [
-              '<div style=\\"position: relative; width: 100%; text-align: left; border-top: 1pt solid #eeeeee; margin:  10px 0px 1.5mm; font-size: 8pt;\\">',
-              '<div style=\\"position: absolute; text-align: left; top: 5px;left: 60px;\\">YYYY-MM-DD</div>',
-              '<div style=\\"position: absolute; width: 100%; text-align: center; top: 5px;\\">&copy;2022 ABCD</div>',
-              '<div style=\\"position: absolute; text-align: right;top: 5px;right: 20px;\\"> <span>${pageNumber}</span> / <span>${totalPages}</span></div>',
-              "</div>",
-            ],
-          },
-          files: [
-            {
-              url: "testHtmlPrint.html",
-              out: "testHtmlPrint转",
-              headFrom: 4,
-              frNo: 0,
-            },
-            {
-              url: "横页脚的.pdf",
-              displayHeaderFooter: true,
-              rightHand: true,
-            },
-          ],
-        });
-        expect(response.status).toBe(OK);
-        expect(Object.keys(response.body.data)).toEqual(["result"]);
-      },
-      TIMEOUT,
-    );
-
-    it(
-      "汇总阶段第二个url独立pdf输出",
-      async () => {
-        const response = await agent.post(`/api/pdf`).send({
-          name: "asjsak啊实打实",
-          lay: {
-            head: [
-              '<div style=\\"position: relative; width:100%; text-align:center; border-bottom: 1pt solid #eeeeee; margin: 3.5mm 0px 10px; font-size: 10pt\\"></span>',
-              '<div style=\\"position: absolute; width:100%; text-align: center; bottom: 5px;\\"><span class=title></div>',
-              '<div style=\\"position: absolute; text-align: right; bottom: 5px;right: 20px;\\">version: 1.0</div>',
-              "</div>",
-            ],
-            foot: [
-              '<div style=\\"position: relative; width: 100%; text-align: left; border-top: 1pt solid #eeeeee; margin:  10px 0px 1.5mm; font-size: 8pt;\\">',
-              '<div style=\\"position: absolute; text-align: left; top: 5px;left: 60px;\\">YYYY-MM-DD</div>',
-              '<div style=\\"position: absolute; width: 100%; text-align: center; top: 5px;\\">&copy;2022 ABCD</div>',
-              '<div style=\\"position: absolute; text-align: right;top: 5px;right: 20px;\\"> <span>${pageNumber}</span> / <span>${totalPages}</span></div>',
-              "</div>",
-            ],
-          },
-          files: [
-            {
-              url: "testHtmlPrint.html",
-              out: "testHtmlPrint转",
-              lay: {
-                marginTop: 0.55,
-                marginBottom: 0.45,
-              },
-            },
-            {
-              url: "横页脚的.pdf",
-              merge: false,
-              displayHeaderFooter: true,
-              rightHand: true,
-              lay: {
-                marginTop: 0.55,
-                marginBottom: 0.45,
-              },
-            },
-          ],
-        });
-        expect(response.status).toBe(OK);
-        expect(Object.keys(response.body.data)).toEqual(["result"]);
-      },
-      TIMEOUT,
-    );
-
-    it(
-      "双面打印的页码_总的",
-      async () => {
-        const response = await agent.post(`/api/pdf`).send({
-          name: "asjsak啊实打实",
-          lay: {
-            head: [
-              '<div style=\\"position: relative; width:100%; text-align:center; border-bottom: 1pt solid #eeeeee; margin: 3.5mm 0px 10px; font-size: 10pt\\"></span>',
-              '<div style=\\"position: absolute; width:100%; text-align: center; bottom: 5px;\\"><span id=\\"titlespan\\" class=title></div>',
-              '<div style=\\"-NOT_DISPLAY- position: absolute; text-align: right; bottom: 5px;right: 20px;\\">',
-              "<span>${pageNumber}</span> / <span>${totalPages}</span></div>",
-              "</div>",
-            ],
-            foot: [
-              '<div style=\\"position: relative; width: 100%; text-align: left; border-top: 1pt solid #eeeeee; margin:  10px 0px 1.5mm; font-size: 8pt;\\">',
-              '<div style=\\"position: absolute; text-align: left; top: 5px;left: 60px;\\">YYYY-MM-DD</div>',
-              '<div style=\\"position: absolute; width: 100%; text-align: center; top: 5px;\\">&copy;2022 ABCD</div>',
-              '<div style=\\"position: absolute; text-align: right;top: 5px;right: 20px;\\"> <span>${pageNumber}</span> / <span>${totalPages}</span></div>',
-              "</div>",
-            ],
-          },
-          files: [
-            {
-              url: "testHtmlPrint.html",
-              out: "testHtmlPrint转",
-              headFrom: 4,
-              frNo: 5,
-            },
-            {
-              url: "横页脚的.pdf",
-              displayHeaderFooter: true,
-              rightHand: true,
-            },
-          ],
-        });
-        expect(response.status).toBe(OK);
-        expect(Object.keys(response.body.data)).toEqual(["result"]);
-      },
-      TIMEOUT,
-    );
-
-    it(
-      "双面打印的页码_单URL",
-      async () => {
-        const response = await agent.post(`/api/pdf`).send({
-          name: "asjsak啊实打实",
-          lay: {},
-          files: [
-            {
-              url: "report.pdf",
-              out: "热效率详细测试",
-              headFrom: 4,
-              frNo: 5,
-              localSumNo: true,
-              roman: true,
-              lay: {
-                head: [
-                  '<div style=\\"position: relative; width:100%; text-align:center; border-bottom: 1pt solid #eeeeee; margin: 3.5mm 0px 10px; font-size: 10pt\\"></span>',
-                  '<div style=\\"position: absolute; width:100%; text-align: center; bottom: 5px;\\"><span id=\\"titlespan\\" class=title></div>',
-                  '<div style=\\"-NOT_DISPLAY- position: absolute; text-align: right; bottom: 5px;right: 20px;\\">',
-                  "<span>${pageNumber}</span> / <span>${totalPages}</span></div>",
-                  "</div>",
-                ],
-                foot: [
-                  '<div style=\\"position: relative; width: 100%; text-align: left; border-top: 1pt solid #eeeeee; margin:  10px 0px 1.5mm; font-size: 8pt;\\">',
-                  '<div style=\\"position: absolute; text-align: left; top: 5px;left: 60px;\\">YYYY-MM-DD</div>',
-                  '<div style=\\"position: absolute; width: 100%; text-align: center; top: 5px;\\">&copy;2022 ABCD</div>',
-                  '<div style=\\"-NOT_DISPLAY- position: absolute; text-align: right;top: 5px;right: 20px;\\"> <span>${pageNumber}</span> / <span>${totalPages}</span></div>',
-                  "</div>",
-                ],
-              },
-            },
-            {
-              url: "横页脚的.pdf",
-              displayHeaderFooter: true,
-              rightHand: true,
-              lay: {
-                head: [
-                  '<div style=\\"position: relative; width:100%; text-align:center; border-bottom: 1pt solid #eeeeee; margin: 3.5mm 0px 10px; font-size: 10pt\\"></span>',
-                  '<div style=\\"position: absolute; width:100%; text-align: center; bottom: 5px;\\"><span id=\\"titlespan\\" class=title></div>',
-                  '<div style=\\"-NOT_DISPLAY- position: absolute; text-align: right; bottom: 5px;right: 20px;\\">',
-                  "<span>${pageNumber}</span> / <span>${totalPages}</span></div>",
-                  "</div>",
-                ],
-                foot: [
-                  '<div style=\\"position: relative; width: 100%; text-align: left; border-top: 1pt solid #eeeeee; margin:  10px 0px 1.5mm; font-size: 8pt;\\">',
-                  '<div style=\\"position: absolute; text-align: left; top: 5px;left: 60px;\\">YYYY-MM-DD</div>',
-                  '<div style=\\"position: absolute; width: 100%; text-align: center; top: 5px;\\">&copy;2022 ABCD</div>',
-                  '<div style=\\"-NOT_DISPLAY- position: absolute; text-align: right;top: 5px;right: 20px;\\"> <span>${pageNumber}</span> / <span>${totalPages}</span></div>',
-                  "</div>",
-                ],
-              },
-            },
-          ],
-        });
-        expect(response.status).toBe(OK);
-        expect(Object.keys(response.body.data)).toEqual(["result"]);
-        console.log("结果:", response.body.data);
-      },
-      TIMEOUT,
-    );
-  });
-});

package/src/__tests__/UrltoPdf/pdfSplit.test.d.ts

@@ -1 +0,0 @@
-export {};

package/src/__tests__/UrltoPdf/pdfSplit.test.ts

@@ -1,69 +0,0 @@
-import { SuperAgentTest } from "supertest";
-import { OK } from "http-status/lib";
-import { initAgent } from "../helpers/index";
-// import CONFIG from "../../src/configEnv";
-
-//prettify真叼： 每个地方都给您报出 红色
-const TIMEOUT = 260000; //设置超时，避免单步歇菜
-let agent: SuperAgentTest;
-
-beforeAll(async () => {
-  agent = await initAgent();
-});
-
-/**替代： 浏览器postman等工具发送包后，后端服务器Debug模式运行单步调试模式已经没能使用了。只好改为jest来对付了。
-后面的/${CONFIG.APP.VER} 就是加了/v1结尾的该服务工程的版本号;
-* */
-describe("[PDF] => Gen", () => {
-  describe("Post: '/api/pdf'", () => {
-    it(
-      "全部合并工作目录的所有pdf文件",
-      async () => {
-        const response = await agent.post(`/api/pdf`).send({});
-        expect(response.status).toBe(OK);
-        expect(Object.keys(response.body.data)).toEqual(["result"]);
-      },
-      TIMEOUT,
-    );
-
-    it(
-      "pdf建议拆分成多个pdf",
-      async () => {
-        const response = await agent.post(`/api/split`).send({
-          input: "产生的22.pdf",
-          files: [
-            {
-              pageRanges: "1-3,7-8",
-              out: "拆分achaRErint转",
-            },
-            {
-              pageRanges: "7,6,1",
-              out: "最小那3QWDS",
-            },
-          ],
-        });
-        expect(response.status).toBe(OK);
-        expect(Object.keys(response.body.data)).toEqual(["result"]);
-        expect(response.body.data).toEqual({ result: "成功！" });
-        console.log("结果:", response.body.data);
-      },
-      TIMEOUT,
-    );
-  });
-});
-
-/*这里发送的和IDEA工具发送差异： .post(`/api/split`).send({})是对象化的。
-{
-  "input": "产生的22.pdf",
-  "files": [
-    {
-      "pageRanges": "1-3,5,8",
-      "out": "ch拆分achaRErint转"
-    },
-    {
-      "pageRanges": "4,8",
-      "out": "tesrint2323QWDS"
-    }
-  ]
-}
-* */

package/src/__tests__/helpers/index.d.ts

@@ -1,2 +0,0 @@
-import { SuperAgentTest } from "supertest";
-export declare const initAgent: () => Promise<SuperAgentTest>;

package/src/__tests__/helpers/index.ts

@@ -1,21 +0,0 @@
-import supertest, { SuperAgentTest } from "supertest";
-
-import { createApp } from "@/app";
-
-// let dbConnection: Mongoose;
-
-export const initAgent = async (): Promise<SuperAgentTest> => {
-  const app = createApp();
-  const agent = supertest.agent(app);
-  // dbConnection = await mongoDbConnection();
-  // await agent.post("/api/v2/auth/signin").send({
-  //   email: testUser.email,
-  //   password: testUser.password,
-  // });
-
-  return agent;
-};
-
-// export const closeClients = async (): Promise<void> => {
-//   await dbConnection.disconnect();
-// };

package/src/__tests__/home.test.d.ts

@@ -1 +0,0 @@
-export {};

package/src/__tests__/home.test.ts

@@ -1,77 +0,0 @@
-import { SuperAgentTest } from "supertest";
-import HttpStatus, { OK, BAD_REQUEST } from "http-status/lib";
-import { initAgent } from "./helpers/index";
-import CONFIG from "@/configEnv";
-
-//prettify真叼： 每个地方都给您报出 红色
-const TIMEOUT = 60000; //设置超时，避免单步歇菜
-let agent: SuperAgentTest;
-
-beforeAll(async () => {
-  agent = await initAgent();
-});
-
-describe("[UNIT] => HOME", () => {
-  describe("GET: '/'", () => {
-    it(
-      "Should return API app information",
-      async () => {
-        const response = await agent.get(`/api`);
-        // const response = await agent.get(`/api/${CONFIG.APP.VER}`);  框架例子原始的 版本号;
-        expect(response.status).toBe(OK);
-        expect(Object.keys(response.body.data)).toEqual([
-          "NAME",
-          "VERSION",
-          "VER",
-          "DESCRIPTION",
-          "AUTHORS",
-          "HOST",
-          "PORT",
-          "ENV",
-          "PATH",
-          "MERGE",
-        ]);
-      },
-      TIMEOUT,
-    );
-
-    it.each`
-      query            | field            | expectedStatus
-      ${"name"}        | ${"NAME"}        | ${OK}
-      ${"version"}     | ${"VERSION"}     | ${OK}
-      ${"description"} | ${"DESCRIPTION"} | ${OK}
-      ${"authors"}     | ${"AUTHORS"}     | ${OK}
-      ${"port"}        | ${"PORT"}        | ${OK}
-      ${"env"}         | ${"ENV"}         | ${OK}
-    `(
-      "Should return CONFIG.APP[$field] value when query.key is `$query`",
-      async ({
-        query,
-        field,
-        expectedStatus,
-      }: {
-        query: string;
-        field: keyof typeof CONFIG.APP;
-        expectedStatus: string;
-      }) => {
-        const response = await agent.get(`/api`).query({ key: query });
-
-        expect(response.body.status).toBe(expectedStatus);
-        expect(response.body.data[field]).toBe(CONFIG.APP[field]);
-      },
-      TIMEOUT,
-    );
-
-    it(
-      "Should return 400 status Validation Error",
-      async () => {
-        const invalidQuery = "invalid-field";
-        const response = await agent.get(`/api`).query({ key: invalidQuery });
-
-        expect(response.body.status).toBe(BAD_REQUEST);
-        expect(response.body.message).toBe(HttpStatus[BAD_REQUEST]);
-      },
-      TIMEOUT,
-    );
-  });
-});

package/src/app.ts

@@ -1,49 +0,0 @@
-import { EventEmitter } from "events";
-import cors from "cors";
-import express from "express";
-import helmet from "helmet";
-import morgan from "morgan";
-import timeout from "connect-timeout";
-import CONFIG from "./configEnv";
-import { expressPinoLogger } from "./helpers";
-import * as errorHandler from "./middlewares/errorHandler";
-import routes from "./routes";
-
-/**打印不全，太多页数情形：
- * */
-EventEmitter.defaultMaxListeners = 100;
-
-export const createApp = (): express.Application => {
-  const app = express();
-
-  app.use(cors());
-  app.use(helmet());
-  app.use(express.json());
-  app.use(
-    express.urlencoded({
-      extended: true,
-    }),
-  );
-
-  if (CONFIG.APP.ENV !== "test") {
-    app.use(morgan("dev"));
-    app.use(expressPinoLogger());
-  }
-
-  // @ts-ignore
-  app.use(timeout(CONFIG.SERVER.TIMEOUT));
-
-  // API Routes
-  // API Routes 如果代码非常简单，完全可以 app.get('/',....),如果路由比较复杂，需要路由的嵌套分层拆解模式：使用 express.Router() 更合适。
-  app.use(`/api`, routes);
-  //框架例子有：版本号的插入的。
-  //app.use(`/api/${CONFIG.APP.VER}`, routes);
-
-  // Error Middleware
-  app.use(errorHandler.genericErrorHandler);
-  app.use(errorHandler.notFoundError);
-
-  return app;
-};
-
-//【CDP文档】  https://chromedevtools.github.io/devtools-protocol/tot/Target/

package/src/components/home/controller.ts

@@ -1,32 +0,0 @@
-import { OK } from "http-status/lib";
-import { Request, Response, NextFunction } from "express";
-import { getAppInfoQuery } from "../../types/request/home";
-import { apiResponse } from "../../helpers/apiResponse";
-import { HomeServices } from "./services";
-
-/**
- * 为何为了保证单步模式调试运行"test:watchAll": "cross-env NODE_ENV=development jest --watchAll --runInBand --detectOpenHandles",
- * 只能单独创建一个文件和类PdfController了，不能和HomeController合并在一个类class的俩个并行api处理函数啊？
- * */
-export class HomeController {
-  /**
-   * @description Gets the API information.
-   * @param {Req} req
-   * @param {Res} res
-   */
-  static getAppInfo = async (
-    req: Request,
-    res: Response,
-    next: NextFunction,
-  ) => {
-    try {
-      const appInfoKey = req.query.key as getAppInfoQuery;
-      const homeServices = new HomeServices();
-      const result = await homeServices.getAppInfo(appInfoKey);
-
-      res.status(OK).json(apiResponse(result));
-    } catch (error) {
-      next(error);
-    }
-  };
-}

package/src/components/home/index.ts

@@ -1,4 +0,0 @@
-export { HomeController } from "./controller";
-export { PdfController } from "./pdfController";
-export { appKeyValidator } from "./validators";
-export { SplitController } from "./splitController";

package/src/components/home/pdfController.ts

@@ -1,118 +0,0 @@
-import { OK } from "http-status/lib";
-import { NextFunction, Request, Response } from "express";
-import { HeadFooter } from "../../types/request/config";
-import { apiResponse } from "../../helpers/apiResponse";
-import { RenderPDF } from "../../utils/pdfgen";
-import CONFIG from "../../configEnv";
-import { ConfigRoot, FileTransform } from "../../types";
-
-export class PdfController {
-  /** node.js对比前端App 太严格了，一点小毛病页不行啊。
-   * @description 生成pdf.
-   * @param {Req} req
-   * @param {Res} res
-   * 正常分解成两大步：task.files每一个文件生成，最后才是task.merge合并(包括页码生成)。
-   * @param next
-   */
-  static postMakePdf = async (
-    req: Request,
-    res: Response,
-    next: NextFunction,
-  ) => {
-    try {
-      // const appInfoKey1 = req.query.key as getAppInfoQuery; 所有打印都走ConfigRoot配置包=task：可能有多个URL合并输出的。
-      const task = req.body as ConfigRoot<FileTransform>;
-      task.lay as HeadFooter;
-      //预处理汇总输出的pdf页眉页脚, 转换页眉页脚的html存储
-      if (task.lay) {
-        const newfoot = "";
-        const formfoot =
-          task.lay.foot &&
-          newfoot.concat(...task.lay.foot).replaceAll(`\\"`, '"');
-        task.footerTemplate = formfoot ?? undefined;
-        const formhead =
-          task.lay.head &&
-          newfoot.concat(...task.lay.head).replaceAll(`\\"`, '"');
-        task.headerTemplate = formhead ?? undefined;
-        const formfootL =
-          task.lay.footL &&
-          newfoot.concat(...task.lay.footL).replaceAll(`\\"`, '"');
-        task.footerTemplateL = formfootL ?? undefined;
-        const formheadL =
-          task.lay.headL &&
-          newfoot.concat(...task.lay.headL).replaceAll(`\\"`, '"');
-        task.headerTemplateL = formheadL ?? undefined;
-      }
-      //const homeServices = new HomeServices();
-      //let result = { ["文件名"]: "产生的.pdf" };
-      let result;
-      //若是用RenderPDF.generateSinglePdf(会导致没有等待该函数执行结果就会去执行下一步了，应答res,客户端立刻获得http回答，无等待=异步模式的。还是由客户端主动取消等待为佳。这里死等的；
-      try {
-        //const jobs = generateJobList(urls, pdfs);  分解成多个URL文件多个步骤的情况，可能还有个汇总步骤的：
-        // generateSinglePdf  mergePdfs  pageNoForPdf yeMeiyeJiaoPdf
-        if (
-          (task.merge === undefined || task.merge) &&
-          task.files === undefined &&
-          !task.lay
-        ) {
-          await RenderPDF.mergeAllPdfto(); //特殊的特殊？ 没有涉及到CDP()函数：
-          result = `简易合并输出是: ${CONFIG.APP.MERGE}`;
-        } else {
-          //有涉及到CDP()函数：
-          const renderer = new RenderPDF({}); //提升上来：复用全局的
-          if (!task.files || task.files?.length <= 0) {
-            console.error("没配置files输入");
-            res.status(OK).json(apiResponse({ result: "没配置files输入" }));
-            return;
-          } else {
-            for (const meta of task.files) {
-              if (!meta.out) {
-                if (meta.url.endsWith(".pdf") && !meta.url.startsWith("http"))
-                  continue;
-                else {
-                  res
-                    .status(OK)
-                    .json(apiResponse({ result: meta.url + " 没配置out" }));
-                  return;
-                }
-              } else {
-                //本地pdf情形实际会有webview/iframe的？跳转?,实际会看到pdf之外的浏览控件框框的。 避免再次转换pdf实际捕获窗口并非pdf自身内容；
-                if (meta.url.endsWith(".pdf") && !meta.url.startsWith("http"))
-                  throw new Error(
-                    "url是本地的pdf文件，不应该设置out参数:" + meta.url,
-                  );
-              }
-              try {
-                result = await renderer.generateSinglePdf(meta, task, {});
-              } catch (e) {
-                result = "算url失败:" + meta.url;
-                console.error(e);
-              }
-              if (result) {
-                result = "URL:" + meta.url + " > " + result;
-                break; //说明有某种报错
-              }
-            }
-          }
-          //正常的合并阶段的事情： 前一阶段页眉页脚也不打印了。也要放这里了
-          if (!result && (task.merge === undefined || task.merge))
-            result = await RenderPDF.MergeAllPdfs(task, {});
-          //关闭多余窗口
-          if (task.closeTab)
-            await renderer.closeAllTab(renderer.getCDPhostPort(), task);
-        }
-      } catch (e) {
-        result = "算失败了" + e;
-        console.error(e);
-      }
-
-      if (!result || result === "") {
-        result = "成功！";
-        console.log(result, "输出是:", task.name ?? CONFIG.APP.MERGE);
-      }
-      res.status(OK).json(apiResponse({ result: result }));
-    } catch (error) {
-      next(error);
-    }
-  };
-}

package/src/components/home/services.ts

@@ -1,31 +0,0 @@
-import AppInformation from "../../types/response/AppInformation";
-import { HomeDAO } from "../../db/home";
-import { getAppInfoQuery } from "../../types/request/home";
-
-export class HomeServices {
-  homeDAO!: HomeDAO;
-  constructor() {
-    this.homeDAO = new HomeDAO();
-  }
-  // NAME: pkg.name,
-  // VERSION: pkg.version,
-  // VER: `v${pkg.version[0]}`,
-  // DESCRIPTION: pkg.description,
-  // AUTHORS: pkg.authors,
-  // HOST: process.env.APP_HOST,
-  // BASE_URL: process.env.API_BASE_URL,
-  // PORT: process.env.NODE_ENV === "test" ? 8888 : process.env.PORT || 8080,
-  // ENV: process.env.NODE_ENV,
-
-  /**
-   * @description Get application information.
-   * @returns AppInformation
-   */
-  getAppInfo = async (
-    appInfoKey?: getAppInfoQuery,
-  ): Promise<AppInformation> => {
-    const result = await this.homeDAO.get(appInfoKey);
-
-    return result;
-  };
-}