feature/IO-3056-Enhanced-Lightbox-Logging

2024-12-12 13:12:47 -08:00 · 2024-12-11 12:08:29 -08:00 · 2024-12-11 12:02:27 -08:00 · 2024-12-11 12:00:02 -08:00 · 2024-12-11 09:04:33 -08:00 · 2024-12-09 21:15:35 +00:00
24 changed files with 1276 additions and 372 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,80 @@
+# Ensure all text files use LF for line endings
 * text eol=lf
+
+# Binary files should not be modified by Git
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.webp binary
+*.svg binary
+
+# Fonts
+*.woff binary
+*.woff2 binary
+*.ttf binary
+*.otf binary
+*.eot binary
+
+# Videos
+*.mp4 binary
+*.mov binary
+*.avi binary
+*.mkv binary
+*.webm binary
+
+# Audio
+*.mp3 binary
+*.wav binary
+*.ogg binary
+*.flac binary
+
+# Archives and compressed files
+*.zip binary
+*.gz binary
+*.tar binary
+*.7z binary
+*.rar binary
+
+# PDF and documents
+*.pdf binary
+*.doc binary
+*.docx binary
+*.xls binary
+*.xlsx binary
+*.ppt binary
+*.pptx binary
+
+# Exclude JSON and other data files from text processing, if necessary
+*.json text
+*.xml text
+*.csv text
+
+# Scripts and code files should maintain LF endings
+*.js text eol=lf
+*.jsx text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf
+*.css text eol=lf
+*.scss text eol=lf
+*.html text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.md text eol=lf
+*.sh text eol=lf
+*.py text eol=lf
+*.rb text eol=lf
+*.java text eol=lf
+*.php text eol=lf
+
+# Git configuration files
+.gitattributes text eol=lf
+.gitignore text eol=lf
+*.gitattributes text eol=lf
+
+# Exclude some other potential binary files
+*.db binary
+*.sqlite binary
+*.exe binary
+*.dll binary
--- a/.platform/hooks/predeploy/01-install-dd.sh
+++ b/.platform/hooks/predeploy/01-install-dd.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+DD_API_KEY=58d91898a70c6fd659f6eea768a57976 DD_SITE="us3.datadoghq.com" bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"
+
+echo "Datadog agent installed."
--- a/14
+++ b/14
@@ -7,7 +7,6 @@ RUN dnf install -y git \
    && dnf install -y nodejs \
    && dnf clean all

-
 # Install dependencies required by node-canvas
 RUN dnf install -y \
    gcc \
@@ -19,9 +18,22 @@ RUN dnf install -y \
    libpng-devel \
    make \
    python3 \
+    fontconfig \
+    freetype \
    python3-pip \
+    wget \
+    unzip \
    && dnf clean all

+# Install Montserrat fonts
+RUN cd /tmp \
+    && wget https://images.imex.online/fonts/montserrat.zip -O montserrat.zip \
+    && unzip montserrat.zip -d montserrat \
+    && mv montserrat/montserrat/*.ttf /usr/share/fonts \
+    && fc-cache -fv \
+    && rm -rf /tmp/montserrat /tmp/montserrat.zip \
+    && echo "Montserrat fonts installed and cached successfully."
+
 # Set the working directory
 WORKDIR /app

--- a/client/src/components/card-payment-modal/card-payment-modal.component..jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.component..jsx
@@ -1,6 +1,6 @@
-import { DeleteFilled, CopyFilled } from "@ant-design/icons";
+import { CopyFilled, DeleteFilled } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
-import { Button, Card, Col, Form, Input, Row, Space, Spin, Statistic, message, notification } from "antd";
+import { Button, Card, Col, Form, Input, message, notification, Row, Space, Spin, Statistic } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -23,7 +23,14 @@ const mapStateToProps = createStructuredSelector({
 });

 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    ),
  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment"))
 });

@@ -39,7 +46,6 @@ const CardPaymentModalComponent = ({
  const [form] = Form.useForm();
  const [paymentLink, setPaymentLink] = useState();
  const [loading, setLoading] = useState(false);
-  // const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
  const { t } = useTranslation();

@@ -48,24 +54,33 @@ const CardPaymentModalComponent = ({
    skip: !context?.jobid
  });

-  //Initialize the intellipay window.
+  const collectIPayFields = () => {
+    const iPayFields = document.querySelectorAll(".ipayfield");
+    const iPayData = {};
+    iPayFields.forEach((field) => {
+      iPayData[field.dataset.ipayname] = field.value;
+    });
+    return iPayData;
+  };
+
  const SetIntellipayCallbackFunctions = () => {
    console.log("*** Set IntelliPay callback functions.");
+
    window.intellipay.runOnClose(() => {
      //window.intellipay.initialize();
    });

-    window.intellipay.runOnApproval(async function (response) {
+    window.intellipay.runOnApproval(() => {
      //2024-04-25: Nothing is going to happen here anymore. We'll completely rely on the callback.
      //Add a slight delay to allow the refetch to properly get the data.
      setTimeout(() => {
-        if (actions && actions.refetch && typeof actions.refetch === "function") actions.refetch();
+        if (actions?.refetch) actions.refetch();
        setLoading(false);
        toggleModalVisible();
      }, 750);
    });

-    window.intellipay.runOnNonApproval(async function (response) {
+    window.intellipay.runOnNonApproval(async (response) => {
      // Mutate unsuccessful payment

      const { payments } = form.getFieldsValue();
@@ -98,16 +113,21 @@ const CardPaymentModalComponent = ({
    //Validate
    try {
      await form.validateFields();
-    } catch (error) {
+    } catch {
      setLoading(false);
      return;
    }

+    const iPayData = collectIPayFields();
+    const { payments } = form.getFieldsValue();
+
    try {
      const response = await axios.post("/intellipay/lightbox_credentials", {
        bodyshop,
        refresh: !!window.intellipay,
-        paymentSplitMeta: form.getFieldsValue()
+        paymentSplitMeta: form.getFieldsValue(),
+        iPayData: iPayData,
+        comment: btoa(JSON.stringify({ payments, userEmail: currentUser.email }))
      });

      if (window.intellipay) {
@@ -116,8 +136,8 @@ const CardPaymentModalComponent = ({
        SetIntellipayCallbackFunctions();
        window.intellipay.autoOpen();
      } else {
-        var rg = document.createRange();
-        let node = rg.createContextualFragment(response.data);
+        const rg = document.createRange();
+        const node = rg.createContextualFragment(response.data);
        document.documentElement.appendChild(node);
        SetIntellipayCallbackFunctions();
        window.intellipay.isAutoOpen = true;
@@ -137,25 +157,27 @@ const CardPaymentModalComponent = ({
    //Validate
    try {
      await form.validateFields();
-    } catch (error) {
+    } catch {
      setLoading(false);
      return;
    }

+    const iPayData = collectIPayFields();
+
    try {
      const { payments } = form.getFieldsValue();
      const response = await axios.post("/intellipay/generate_payment_url", {
        bodyshop,
-        amount: payments?.reduce((acc, val) => {
-          return acc + (val?.amount || 0);
-        }, 0),
-        account: payments && data && data.jobs.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null,
+        amount: payments.reduce((acc, val) => acc + (val?.amount || 0), 0),
+        account: payments && data?.jobs?.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null,
        comment: btoa(JSON.stringify({ payments, userEmail: currentUser.email })),
-        paymentSplitMeta: form.getFieldsValue()
+        paymentSplitMeta: form.getFieldsValue(),
+        iPayData: iPayData
      });
-      if (response.data) {
-        setPaymentLink(response.data?.shorUrl);
-        navigator.clipboard.writeText(response.data?.shorUrl);
+
+      if (response?.data?.shorUrl) {
+        setPaymentLink(response.data.shorUrl);
+        await navigator.clipboard.writeText(response.data.shorUrl);
        message.success(t("general.actions.copied"));
      }
      setLoading(false);
@@ -179,67 +201,44 @@ const CardPaymentModalComponent = ({
          }}
        >
          <Form.List name={["payments"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item key={field.key}>
-                      <Row gutter={[16, 16]}>
-                        <Col span={16}>
-                          <Form.Item
-                            key={`${index}jobid`}
-                            label={t("jobs.fields.ro_number")}
-                            name={[field.name, "jobid"]}
-                            rules={[
-                              {
-                                required: true
-                                //message: t("general.validation.required"),
-                              }
-                            ]}
-                          >
-                            <JobSearchSelectComponent notExported={false} clm_no />
-                          </Form.Item>
-                        </Col>
-                        <Col span={6}>
-                          <Form.Item
-                            key={`${index}amount`}
-                            label={t("payments.fields.amount")}
-                            name={[field.name, "amount"]}
-                            rules={[
-                              {
-                                required: true
-                                //message: t("general.validation.required"),
-                              }
-                            ]}
-                          >
-                            <CurrencyFormItemComponent />
-                          </Form.Item>
-                        </Col>
-                        <Col span={2}>
-                          <DeleteFilled
-                            style={{ margin: "1rem" }}
-                            onClick={() => {
-                              remove(field.name);
-                            }}
-                          />
-                        </Col>
-                      </Row>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("general.actions.add")}
-                    </Button>
+            {(fields, { add, remove }) => (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <Row gutter={[16, 16]}>
+                      <Col span={16}>
+                        <Form.Item
+                          key={`${index}jobid`}
+                          label={t("jobs.fields.ro_number")}
+                          name={[field.name, "jobid"]}
+                          rules={[{ required: true }]}
+                        >
+                          <JobSearchSelectComponent notExported={false} clm_no />
+                        </Form.Item>
+                      </Col>
+                      <Col span={6}>
+                        <Form.Item
+                          key={`${index}amount`}
+                          label={t("payments.fields.amount")}
+                          name={[field.name, "amount"]}
+                          rules={[{ required: true }]}
+                        >
+                          <CurrencyFormItemComponent />
+                        </Form.Item>
+                      </Col>
+                      <Col span={2}>
+                        <DeleteFilled style={{ margin: "1rem" }} onClick={() => remove(field.name)} />
+                      </Col>
+                    </Row>
                  </Form.Item>
-                </div>
-              );
-            }}
+                ))}
+                <Form.Item>
+                  <Button type="dashed" onClick={() => add()} style={{ width: "100%" }}>
+                    {t("general.actions.add")}
+                  </Button>
+                </Form.Item>
+              </div>
+            )}
          </Form.List>

          <Form.Item
@@ -283,9 +282,7 @@ const CardPaymentModalComponent = ({
          >
            {() => {
              const { payments } = form.getFieldsValue();
-              const totalAmountToCharge = payments?.reduce((acc, val) => {
-                return acc + (val?.amount || 0);
-              }, 0);
+              const totalAmountToCharge = payments?.reduce((acc, val) => acc + (val?.amount || 0), 0);
              return (
                <Space style={{ float: "right" }}>
                  <Statistic title="Amount To Charge" value={totalAmountToCharge} precision={2} />
--- a/client/src/components/chat-affix/registerMessagingSocketHandlers.js
+++ b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
@@ -334,29 +334,75 @@ export const registerMessagingHandlers = ({ socket, client }) => {
          break;

        case "tag-added":
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              job_conversations: (existing = []) => [...existing, ...job_conversations]
+          // Ensure `job_conversations` is properly formatted
+          const formattedJobConversations = job_conversations.map((jc) => ({
+            __typename: "job_conversations",
+            jobid: jc.jobid || jc.job?.id,
+            conversationid: conversationId,
+            job: jc.job || {
+              __typename: "jobs",
+              id: data.selectedJob.id,
+              ro_number: data.selectedJob.ro_number,
+              ownr_co_nm: data.selectedJob.ownr_co_nm,
+              ownr_fn: data.selectedJob.ownr_fn,
+              ownr_ln: data.selectedJob.ownr_ln
            }
-          });
-          break;
+          }));

-        case "tag-removed":
          client.cache.modify({
            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
            fields: {
-              job_conversations: (existing = [], { readField }) => {
-                return existing.filter((jobRef) => {
-                  // Read the `jobid` field safely, even if the structure is normalized
-                  const jobId = readField("jobid", jobRef);
-                  return jobId !== fields.jobId;
+              job_conversations: (existing = []) => {
+                // Ensure no duplicates based on both `conversationid` and `jobid`
+                const existingLinks = new Set(
+                  existing.map((jc) => {
+                    const jobId = client.cache.readFragment({
+                      id: client.cache.identify(jc),
+                      fragment: gql`
+                        fragment JobConversationLinkAdded on job_conversations {
+                          jobid
+                          conversationid
+                        }
+                      `
+                    })?.jobid;
+                    return `${jobId}:${conversationId}`; // Unique identifier for a job-conversation link
+                  })
+                );
+
+                const newItems = formattedJobConversations.filter((jc) => {
+                  const uniqueLink = `${jc.jobid}:${jc.conversationid}`;
+                  return !existingLinks.has(uniqueLink);
                });
+
+                return [...existing, ...newItems];
              }
            }
          });
+
          break;

+        case "tag-removed":
+          try {
+            const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
+
+            // Evict the specific cache entry for job_conversations
+            client.cache.evict({
+              id: conversationCacheId,
+              fieldName: "job_conversations"
+            });
+
+            // Garbage collect evicted entries
+            client.cache.gc();
+
+            logLocal("handleConversationChanged - tag removed - Refetched conversation list after state change", {
+              conversationId,
+              type
+            });
+          } catch (error) {
+            console.error("Error refetching queries after conversation state change: (Tag Removed)", error);
+          }
+
+          break;
        default:
          logLocal("handleConversationChanged - Unhandled type", { type });
          client.cache.modify({
--- a/client/src/components/chat-messages-list/chat-message-list.component.jsx
+++ b/client/src/components/chat-messages-list/chat-message-list.component.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 import { Virtuoso } from "react-virtuoso";
 import { renderMessage } from "./renderMessage";
 import "./chat-message-list.styles.scss";
@@ -16,7 +16,7 @@ export default function ChatMessageListComponent({ messages }) {
    loadedImagesRef.current = 0;
  };

-  const preloadImages = (imagePaths, onComplete) => {
+  const preloadImages = useCallback((imagePaths, onComplete) => {
    resetImageLoadState();

    if (imagePaths.length === 0) {
@@ -34,7 +34,7 @@ export default function ChatMessageListComponent({ messages }) {
        }
      };
    });
-  };
+  }, []);

  // Ensure all images are loaded on initial render
  useEffect(() => {
@@ -51,7 +51,7 @@ export default function ChatMessageListComponent({ messages }) {
        });
      }
    });
-  }, [messages]);
+  }, [messages, preloadImages]);

  // Handle scrolling when new messages are added
  useEffect(() => {
@@ -69,7 +69,7 @@ export default function ChatMessageListComponent({ messages }) {
        });
      }
    });
-  }, [messages, atBottom]);
+  }, [messages, atBottom, preloadImages]);

  return (
    <div className="chat">
--- a/client/src/components/chat-popup/chat-popup.component.jsx
+++ b/client/src/components/chat-popup/chat-popup.component.jsx
@@ -1,11 +1,11 @@
 import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons";
-import { useApolloClient, useLazyQuery } from "@apollo/client";
+import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
 import React, { useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { CONVERSATION_LIST_QUERY } from "../../graphql/conversations.queries";
+import { CONVERSATION_LIST_QUERY, UNREAD_CONVERSATION_COUNT } from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
 import { selectChatVisible, selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import ChatConversationListComponent from "../chat-conversation-list/chat-conversation-list.component";
@@ -38,6 +38,14 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
    ...(pollInterval > 0 ? { pollInterval } : {})
  });

+  // Query for unread count when chat is not visible
+  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    skip: chatVisible, // Skip when chat is visible
+    ...(pollInterval > 0 ? { pollInterval } : {})
+  });
+
  // Socket connection status
  useEffect(() => {
    const handleSocketStatus = () => {
@@ -77,23 +85,29 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh

  // Get unread count from the cache
  const unreadCount = (() => {
-    try {
-      const cachedData = client.readQuery({
-        query: CONVERSATION_LIST_QUERY,
-        variables: { offset: 0 }
-      });
+    if (chatVisible) {
+      try {
+        const cachedData = client.readQuery({
+          query: CONVERSATION_LIST_QUERY,
+          variables: { offset: 0 }
+        });

-      if (!cachedData?.conversations) return 0;
+        if (!cachedData?.conversations) return 0;

-      // Aggregate unread message count
-      return cachedData.conversations.reduce((total, conversation) => {
-        const unread = conversation.messages_aggregate?.aggregate?.count || 0;
-        return total + unread;
-      }, 0);
-    } catch (error) {
-      console.warn("Unread count not found in cache:", error);
-      return 0; // Fallback if not in cache
+        // Aggregate unread message count
+        return cachedData.conversations.reduce((total, conversation) => {
+          const unread = conversation.messages_aggregate?.aggregate?.count || 0;
+          return total + unread;
+        }, 0);
+      } catch (error) {
+        console.warn("Unread count not found in cache:", error);
+        return 0; // Fallback if not in cache
+      }
+    } else if (unreadData?.messages_aggregate?.aggregate?.count) {
+      // Use the unread count from the query result
+      return unreadData.messages_aggregate.aggregate.count;
    }
+    return 0;
  })();

  return (
--- a/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
+++ b/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
@@ -52,20 +52,26 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
      // Find the job details from the search data
      const selectedJob = data?.search_jobs.find((job) => job.id === option.key);
      if (!selectedJob) return;
-      const newJobConversation = {
-        __typename: "job_conversations",
-        jobid: selectedJob.id,
-        conversationid: conversation.id,
-        job: {
-          __typename: "jobs",
-          ...selectedJob
-        }
-      };
      socket.emit("conversation-modified", {
        conversationId: conversation.id,
        bodyshopId: bodyshop.id,
        type: "tag-added",
-        job_conversations: [newJobConversation]
+        selectedJob,
+        job_conversations: [
+          {
+            __typename: "job_conversations",
+            jobid: selectedJob.id,
+            conversationid: conversation.id,
+            job: {
+              __typename: "jobs",
+              id: selectedJob.id,
+              ro_number: selectedJob.ro_number,
+              ownr_co_nm: selectedJob.ownr_co_nm,
+              ownr_fn: selectedJob.ownr_fn,
+              ownr_ln: selectedJob.ownr_ln
+            }
+          }
+        ]
      });
    }

--- a/client/src/components/owner-detail-form/owner-detail-form.component.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
@@ -25,6 +25,9 @@ export default function OwnerDetailFormComponent({ form, loading }) {
        <Form.Item label={t("owners.fields.ownr_co_nm")} name="ownr_co_nm">
          <Input />
        </Form.Item>
+        <Form.Item label={t("owners.fields.accountingid")} name="accountingid">
+          <Input disabled/>
+        </Form.Item>
      </LayoutFormRow>
      <LayoutFormRow header={t("owners.forms.address")}>
        <Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -48,6 +48,7 @@ export const QUERY_OWNER_BY_ID = gql`
  query QUERY_OWNER_BY_ID($id: uuid!) {
    owners_by_pk(id: $id) {
      id
+      accountingid
      allow_text_message
      ownr_addr1
      ownr_addr2
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2394,6 +2394,7 @@
        "selectexistingornew": "Select an existing owner record or create a new one. "
      },
      "fields": {
+        "accountingid": "Accounting ID",
        "address": "Address",
        "allow_text_message": "Permission to Text?",
        "name": "Name",
@@ -3057,6 +3058,7 @@
        "production_not_production_status": "Production not in Production Status",
        "production_over_time": "Production Level over Time",
        "psr_by_make": "Percent of Sales by Vehicle Make",
+        "purchase_return_ratio_excel": "Purchase & Return Ratio - Excel",
        "purchase_return_ratio_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)",
        "purchase_return_ratio_grouped_by_vendor_summary": "Purchase & Return Ratio by Vendor (Summary)",
        "purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)",
@@ -3082,6 +3084,7 @@
        "timetickets": "Time Tickets",
        "timetickets_employee": "Employee Time Tickets",
        "timetickets_summary": "Time Tickets Summary",
+        "total_loss_jobs": "Jobs Marked as Total Loss",
        "unclaimed_hrs": "Unflagged Hours",
        "void_ros": "Void ROs",
        "work_in_progress_committed_labour": "Work in Progress - Committed Labor",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2394,6 +2394,7 @@
        "selectexistingornew": ""
      },
      "fields": {
+        "accountingid": "",
        "address": "Dirección",
        "allow_text_message": "Permiso de texto?",
        "name": "Nombre",
@@ -3057,6 +3058,7 @@
        "production_not_production_status": "",
        "production_over_time": "",
        "psr_by_make": "",
+        "purchase_return_ratio_excel": "",
        "purchase_return_ratio_grouped_by_vendor_detail": "",
        "purchase_return_ratio_grouped_by_vendor_summary": "",
        "purchases_by_cost_center_detail": "",
@@ -3082,6 +3084,7 @@
        "timetickets": "",
        "timetickets_employee": "",
        "timetickets_summary": "",
+        "total_loss_jobs": "",
        "unclaimed_hrs": "",
        "void_ros": "",
        "work_in_progress_committed_labour": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2394,6 +2394,7 @@
        "selectexistingornew": ""
      },
      "fields": {
+        "accountingid": "",
        "address": "Adresse",
        "allow_text_message": "Autorisation de texte?",
        "name": "Prénom",
@@ -3057,6 +3058,7 @@
        "production_not_production_status": "",
        "production_over_time": "",
        "psr_by_make": "",
+        "purchase_return_ratio_excel": "",
        "purchase_return_ratio_grouped_by_vendor_detail": "",
        "purchase_return_ratio_grouped_by_vendor_summary": "",
        "purchases_by_cost_center_detail": "",
@@ -3082,6 +3084,7 @@
        "timetickets": "",
        "timetickets_employee": "",
        "timetickets_summary": "",
+        "total_loss_jobs": "",
        "unclaimed_hrs": "",
        "void_ros": "",
        "work_in_progress_committed_labour": "",
--- a/client/src/utils/GraphQLClient.js
+++ b/client/src/utils/GraphQLClient.js
@@ -3,7 +3,7 @@ import { setContext } from "@apollo/client/link/context";
 import { HttpLink } from "@apollo/client/link/http"; //"apollo-link-http";
 import { RetryLink } from "@apollo/client/link/retry";
 import { WebSocketLink } from "@apollo/client/link/ws";
-import { getMainDefinition, offsetLimitPagination } from "@apollo/client/utilities";
+import { getMainDefinition } from "@apollo/client/utilities";
 //import { split } from "apollo-link";
 import apolloLogger from "apollo-link-logger";
 //import axios from "axios";
@@ -143,36 +143,7 @@ middlewares.push(
  new SentryLink().concat(roundTripLink.concat(retryLink.concat(errorLink.concat(authLink.concat(link)))))
 );

-const cache = new InMemoryCache({
-  typePolicies: {
-    conversations: {
-      fields: {
-        job_conversations: {
-          merge(existing = [], incoming = [], { readField }) {
-            const merged = new Map();
-
-            // Add existing data to the map
-            existing.forEach((jobConversation) => {
-              // Use `readField` to get the unique `jobid`, fallback to `__ref`
-              const jobId = readField("jobid", jobConversation) || jobConversation.__ref;
-              if (jobId) merged.set(jobId, jobConversation);
-            });
-
-            // Add or replace with incoming data
-            incoming.forEach((jobConversation) => {
-              // Use `readField` to get the unique `jobid`, fallback to `__ref`
-              const jobId = readField("jobid", jobConversation) || jobConversation.__ref;
-              if (jobId) merged.set(jobId, jobConversation);
-            });
-
-            // Return the merged data as an array
-            return Array.from(merged.values());
-          }
-        }
-      }
-    }
-  }
-});
+const cache = new InMemoryCache({});
 const client = new ApolloClient({
  link: ApolloLink.from(middlewares),
  cache,
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -2184,6 +2184,30 @@ export const TemplateList = (type, context) => {
            },
            group: "payroll",
            adp_payroll: true
+          },
+          purchase_return_ratio_excel: {
+            title: i18n.t("reportcenter.templates.purchase_return_ratio_excel"),
+            subject: i18n.t("reportcenter.templates.purchase_return_ratio_excel"),
+            key: "purchase_return_ratio_excel",
+            //idtype: "vendor",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date")
+            },
+            group: "purchases"
+          },
+          total_loss_jobs: {
+            title: i18n.t("reportcenter.templates.total_loss_jobs"),
+            subject: i18n.t("reportcenter.templates.total_loss_jobs"),
+            key: "total_loss_jobs",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open")
+            },
+            group: "jobs"
          }
        }
      : {}),
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,7 @@
        "cors": "2.8.5",
        "crisp-status-reporter": "^1.2.2",
        "csrf": "^3.1.0",
+        "dd-trace": "^5.28.0",
        "dinero.js": "^1.9.1",
        "dotenv": "^16.4.5",
        "express": "^4.21.1",
@@ -53,6 +54,7 @@
        "recursive-diff": "^1.0.9",
        "redis": "^4.7.0",
        "rimraf": "^6.0.1",
+        "skia-canvas": "^2.0.0",
        "soap": "^1.1.6",
        "socket.io": "^4.8.1",
        "socket.io-adapter": "^2.5.5",
@@ -1634,6 +1636,114 @@
        "kuler": "^2.0.0"
      }
    },
+    "node_modules/@datadog/libdatadog": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@datadog/libdatadog/-/libdatadog-0.2.2.tgz",
+      "integrity": "sha512-rTWo96mEPTY5UbtGoFj8/wY0uKSViJhsPg/Z6aoFWBFXQ8b45Ix2e/yvf92AAwrhG+gPLTxEqTXh3kef2dP8Ow==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/@datadog/native-appsec": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@datadog/native-appsec/-/native-appsec-8.3.0.tgz",
+      "integrity": "sha512-RYHbSJ/MwJcJaLzaCaZvUyNLUKFbMshayIiv4ckpFpQJDiq1T8t9iM2k7008s75g1vRuXfsRNX7MaLn4aoFuWA==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-gyp-build": "^3.9.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@datadog/native-iast-rewriter": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.5.0.tgz",
+      "integrity": "sha512-WRu34A3Wwp6oafX8KWNAbedtDaaJO+nzfYQht7pcJKjyC2ggfPeF7SoP+eDo9wTn4/nQwEOscSR4hkJqTRlpXQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lru-cache": "^7.14.0",
+        "node-gyp-build": "^4.5.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@datadog/native-iast-rewriter/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@datadog/native-iast-rewriter/node_modules/node-gyp-build": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
+      "license": "MIT",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/@datadog/native-iast-taint-tracking": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-3.2.0.tgz",
+      "integrity": "sha512-Mc6FzCoyvU5yXLMsMS9yKnEqJMWoImAukJXolNWCTm+JQYCMf2yMsJ8pBAm7KyZKliamM9rCn7h7Tr2H3lXwjA==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-gyp-build": "^3.9.0"
+      }
+    },
+    "node_modules/@datadog/native-metrics": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@datadog/native-metrics/-/native-metrics-3.0.1.tgz",
+      "integrity": "sha512-0GuMyYyXf+Qpb/F+Fcekz58f2mO37lit9U3jMbWY/m8kac44gCPABzL5q3gWbdH+hWgqYfQoEYsdNDGSrKfwoQ==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-addon-api": "^6.1.0",
+        "node-gyp-build": "^3.9.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@datadog/pprof": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/@datadog/pprof/-/pprof-5.4.1.tgz",
+      "integrity": "sha512-IvpL96e/cuh8ugP5O8Czdup7XQOLHeIDgM5pac5W7Lc1YzGe5zTtebKFpitvb1CPw1YY+1qFx0pWGgKP2kOfHg==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "delay": "^5.0.0",
+        "node-gyp-build": "<4.0",
+        "p-limit": "^3.1.0",
+        "pprof-format": "^2.1.0",
+        "source-map": "^0.7.4"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@datadog/pprof/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@datadog/sketches-js": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@datadog/sketches-js/-/sketches-js-2.1.1.tgz",
+      "integrity": "sha512-d5RjycE+MObE/hU+8OM5Zp4VjTwiPLRa8299fj7muOmR16fb942z8byoMbCErnGh0lBevvgkGrLclQDvINbIyg==",
+      "license": "Apache-2.0"
+    },
    "node_modules/@fastify/busboy": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-3.0.0.tgz",
@@ -1964,6 +2074,15 @@
        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
      }
    },
+    "node_modules/@isaacs/ttlcache": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz",
+      "integrity": "sha512-RQgQ4uQ+pLbqXfOmieB91ejmLwvSgv9nLx6sT6sD83s7umBypgg+OIBOBbEUiJXrfpnp9j0mRhYYdzp9uqq3lA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/@jonkemp/package-utils": {
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/@jonkemp/package-utils/-/package-utils-1.0.8.tgz",
@@ -2179,6 +2298,30 @@
        "node": ">=8.0.0"
      }
    },
+    "node_modules/@opentelemetry/core": {
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.29.0.tgz",
+      "integrity": "sha512-gmT7vAreXl0DTHD2rVZcw3+l2g84+5XiHIqdBUxXbExymPCvSsGOpiwMmn8nkiJur28STV31wnhIDrzWDPzjfA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/semantic-conventions": "1.28.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz",
+      "integrity": "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
    "node_modules/@pkgjs/parseargs": {
      "version": "0.11.0",
      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -2192,36 +2335,31 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/base64": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/codegen": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/eventemitter": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/fetch": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
      "license": "BSD-3-Clause",
-      "optional": true,
      "dependencies": {
        "@protobufjs/aspromise": "^1.1.1",
        "@protobufjs/inquire": "^1.1.0"
@@ -2231,36 +2369,31 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/inquire": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/path": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/pool": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@protobufjs/utf8": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
    },
    "node_modules/@redis/bloom": {
      "version": "1.2.0",
@@ -3341,6 +3474,15 @@
        "node": ">=0.4.0"
      }
    },
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
    "node_modules/acorn-walk": {
      "version": "8.3.0",
      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
@@ -3744,6 +3886,15 @@
        "node": ">=6"
      }
    },
+    "node_modules/cargo-cp-artifact": {
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/cargo-cp-artifact/-/cargo-cp-artifact-0.1.9.tgz",
+      "integrity": "sha512-6F+UYzTaGB+awsTXg0uSJA1/b/B3DDJzpKVRu0UmyI7DmNeaAl2RFHuTGIN6fEgpadRxoXGb7gbC1xo4C3IdyA==",
+      "license": "MIT",
+      "bin": {
+        "cargo-cp-artifact": "bin/cargo-cp-artifact.js"
+      }
+    },
    "node_modules/chalk": {
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -3826,6 +3977,12 @@
        "node": ">=10"
      }
    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
+      "license": "MIT"
+    },
    "node_modules/cliui": {
      "version": "8.0.1",
      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -4243,6 +4400,12 @@
        "node": ">= 8"
      }
    },
+    "node_modules/crypto-randomuuid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-randomuuid/-/crypto-randomuuid-1.0.0.tgz",
+      "integrity": "sha512-/RC5F4l1SCqD/jazwUF6+t34Cd8zTSAGZ7rvvZu1whZUhD2a5MOGKjSGowoGcpj/cbVZk1ZODIooJEQQq3nNAA==",
+      "license": "MIT"
+    },
    "node_modules/csrf": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.1.0.tgz",
@@ -4324,6 +4487,77 @@
      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
    },
+    "node_modules/dc-polyfill": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/dc-polyfill/-/dc-polyfill-0.1.6.tgz",
+      "integrity": "sha512-UV33cugmCC49a5uWAApM+6Ev9ZdvIUMTrtCO9fj96TPGOQiea54oeO3tiEVdVeo3J9N2UdJEmbS4zOkkEA35uQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/dd-trace": {
+      "version": "5.28.0",
+      "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-5.28.0.tgz",
+      "integrity": "sha512-jyF7JLx2Yw16MHcD97sYKXbVd7ZT1hKJ5/NkRRGeG9cgen5+d/ilIvfzgh2qRjeow+9a5ligoZoUOYJ3nYn9hw==",
+      "hasInstallScript": true,
+      "license": "(Apache-2.0 OR BSD-3-Clause)",
+      "dependencies": {
+        "@datadog/libdatadog": "^0.2.2",
+        "@datadog/native-appsec": "8.3.0",
+        "@datadog/native-iast-rewriter": "2.5.0",
+        "@datadog/native-iast-taint-tracking": "3.2.0",
+        "@datadog/native-metrics": "^3.0.1",
+        "@datadog/pprof": "5.4.1",
+        "@datadog/sketches-js": "^2.1.0",
+        "@isaacs/ttlcache": "^1.4.1",
+        "@opentelemetry/api": ">=1.0.0 <1.9.0",
+        "@opentelemetry/core": "^1.14.0",
+        "crypto-randomuuid": "^1.0.0",
+        "dc-polyfill": "^0.1.4",
+        "ignore": "^5.2.4",
+        "import-in-the-middle": "1.11.2",
+        "int64-buffer": "^0.1.9",
+        "istanbul-lib-coverage": "3.2.0",
+        "jest-docblock": "^29.7.0",
+        "koalas": "^1.0.2",
+        "limiter": "1.1.5",
+        "lodash.sortby": "^4.7.0",
+        "lru-cache": "^7.14.0",
+        "module-details-from-path": "^1.0.3",
+        "msgpack-lite": "^0.1.26",
+        "opentracing": ">=0.12.1",
+        "path-to-regexp": "^0.1.10",
+        "pprof-format": "^2.1.0",
+        "protobufjs": "^7.2.5",
+        "retry": "^0.13.1",
+        "rfdc": "^1.3.1",
+        "semver": "^7.5.4",
+        "shell-quote": "^1.8.1",
+        "tlhunter-sorted-set": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/dd-trace/node_modules/@opentelemetry/api": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.8.0.tgz",
+      "integrity": "sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/dd-trace/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/debug": {
      "version": "4.3.7",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
@@ -4404,6 +4638,18 @@
        "node": ">= 6"
      }
    },
+    "node_modules/delay": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz",
+      "integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/delayed-stream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -4460,6 +4706,15 @@
        "node": ">=8"
      }
    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/dev-null": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz",
@@ -4818,6 +5073,12 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/event-lite": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/event-lite/-/event-lite-0.1.3.tgz",
+      "integrity": "sha512-8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw==",
+      "license": "MIT"
+    },
    "node_modules/event-target-shim": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
@@ -5763,6 +6024,47 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-in-the-middle": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.2.tgz",
+      "integrity": "sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "acorn": "^8.8.2",
+        "acorn-import-attributes": "^1.9.5",
+        "cjs-module-lexer": "^1.2.2",
+        "module-details-from-path": "^1.0.3"
+      }
+    },
    "node_modules/inflight": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -5794,6 +6096,12 @@
        "node": ">=8"
      }
    },
+    "node_modules/int64-buffer": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz",
+      "integrity": "sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==",
+      "license": "MIT"
+    },
    "node_modules/intuit-oauth": {
      "version": "4.1.3",
      "resolved": "https://registry.npmjs.org/intuit-oauth/-/intuit-oauth-4.1.3.tgz",
@@ -5910,6 +6218,15 @@
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/jackspeak": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz",
@@ -5973,6 +6290,18 @@
      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
      "dev": true
    },
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "license": "MIT",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
    "node_modules/jose": {
      "version": "4.15.4",
      "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.4.tgz",
@@ -6202,6 +6531,15 @@
        "safe-buffer": "^5.0.1"
      }
    },
+    "node_modules/koalas": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/koalas/-/koalas-1.0.2.tgz",
+      "integrity": "sha512-RYhBbYaTTTHId3l6fnMZc3eGQNW6FVCqMG6AMwA5I1Mafr6AflaXeoi6x3xQuATRotGYRLk6+1ELZH4dstFNOA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/kuler": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
@@ -6321,6 +6659,12 @@
      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
    },
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
+      "license": "MIT"
+    },
    "node_modules/logform": {
      "version": "2.7.0",
      "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz",
@@ -6342,8 +6686,7 @@
      "version": "5.2.3",
      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
-      "license": "Apache-2.0",
-      "optional": true
+      "license": "Apache-2.0"
    },
    "node_modules/lru-cache": {
      "version": "6.0.0",
@@ -6550,6 +6893,12 @@
        "mkdirp": "bin/cmd.js"
      }
    },
+    "node_modules/module-details-from-path": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz",
+      "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==",
+      "license": "MIT"
+    },
    "node_modules/moment": {
      "version": "2.30.1",
      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
@@ -6575,6 +6924,21 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
    },
+    "node_modules/msgpack-lite": {
+      "version": "0.1.26",
+      "resolved": "https://registry.npmjs.org/msgpack-lite/-/msgpack-lite-0.1.26.tgz",
+      "integrity": "sha512-SZ2IxeqZ1oRFGo0xFGbvBJWMp3yLIY9rlIJyxy8CGrwZn1f0ZK4r6jV/AM1r0FZMDUkWkglOk/eeKIL9g77Nxw==",
+      "license": "MIT",
+      "dependencies": {
+        "event-lite": "^0.1.1",
+        "ieee754": "^1.1.8",
+        "int64-buffer": "^0.1.9",
+        "isarray": "^1.0.0"
+      },
+      "bin": {
+        "msgpack": "bin/msgpack"
+      }
+    },
    "node_modules/multer": {
      "version": "1.4.5-lts.1",
      "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz",
@@ -6613,6 +6977,12 @@
        "node": ">= 0.4.0"
      }
    },
+    "node_modules/node-addon-api": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+      "license": "MIT"
+    },
    "node_modules/node-eta": {
      "version": "0.9.0",
      "resolved": "https://registry.npmjs.org/node-eta/-/node-eta-0.9.0.tgz",
@@ -6645,6 +7015,17 @@
        "node": ">= 6.13.0"
      }
    },
+    "node_modules/node-gyp-build": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.9.0.tgz",
+      "integrity": "sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A==",
+      "license": "MIT",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
    "node_modules/node-mailjet": {
      "version": "6.0.6",
      "resolved": "https://registry.npmjs.org/node-mailjet/-/node-mailjet-6.0.6.tgz",
@@ -6813,6 +7194,15 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/opentracing": {
+      "version": "0.14.7",
+      "resolved": "https://registry.npmjs.org/opentracing/-/opentracing-0.14.7.tgz",
+      "integrity": "sha512-vz9iS7MJ5+Bp1URw8Khvdyw1H/hGvzHWlKQ7eRrQojSCDL1/SrWfrY9QebLw97n2deyRtzHRC3MkQfVNUCo91Q==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
    "node_modules/optionator": {
      "version": "0.8.3",
      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -6833,7 +7223,6 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "devOptional": true,
      "license": "MIT",
      "dependencies": {
        "yocto-queue": "^0.1.0"
@@ -6882,6 +7271,12 @@
      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw=="
    },
+    "node_modules/parenthesis": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/parenthesis/-/parenthesis-3.1.8.tgz",
+      "integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw==",
+      "license": "MIT"
+    },
    "node_modules/parse5": {
      "version": "7.1.2",
      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
@@ -6926,6 +7321,12 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "license": "MIT"
+    },
    "node_modules/path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -6988,6 +7389,12 @@
        "@jonkemp/package-utils": "^1.0.8"
      }
    },
+    "node_modules/pprof-format": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pprof-format/-/pprof-format-2.1.0.tgz",
+      "integrity": "sha512-0+G5bHH0RNr8E5hoZo/zJYsL92MhkZjwrHp3O2IxmY8RJL9ooKeuZ8Tm0ZNBw5sGZ9TiM71sthTjWoR2Vf5/xw==",
+      "license": "MIT"
+    },
    "node_modules/prelude-ls": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -7055,7 +7462,6 @@
      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
      "hasInstallScript": true,
      "license": "BSD-3-Clause",
-      "optional": true,
      "dependencies": {
        "@protobufjs/aspromise": "^1.1.2",
        "@protobufjs/base64": "^1.1.2",
@@ -7295,7 +7701,6 @@
      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
      "license": "MIT",
-      "optional": true,
      "engines": {
        "node": ">= 4"
      }
@@ -7315,6 +7720,12 @@
        "node": ">=14"
      }
    },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "license": "MIT"
+    },
    "node_modules/rimraf": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz",
@@ -7525,7 +7936,6 @@
      "version": "1.8.1",
      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
-      "dev": true,
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -7596,6 +8006,73 @@
        "is-arrayish": "^0.3.1"
      }
    },
+    "node_modules/skia-canvas": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/skia-canvas/-/skia-canvas-2.0.0.tgz",
+      "integrity": "sha512-wpYkmr9mCxBme5HAnlm6YOEiuaN9tIm9CL+HN8e5AFD4K2FAJXCcWiWvc9+LM8jUXt+AyYXgiwUTBxdQ6P+PEg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.11",
+        "cargo-cp-artifact": "^0.1",
+        "glob": "^11.0.0",
+        "path-browserify": "^1.0.1",
+        "simple-get": "^4.0.1",
+        "string-split-by": "^1.0.0"
+      }
+    },
+    "node_modules/skia-canvas/node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/skia-canvas/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/skia-canvas/node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
    "node_modules/slick": {
      "version": "1.12.2",
      "resolved": "https://registry.npmjs.org/slick/-/slick-1.12.2.tgz",
@@ -7988,6 +8465,15 @@
        }
      ]
    },
+    "node_modules/string-split-by": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string-split-by/-/string-split-by-1.0.0.tgz",
+      "integrity": "sha512-KaJKY+hfpzNyet/emP81PJA9hTVSfxNLS9SFTWxdCnnW1/zOOwiV248+EfoX7IQFcBaOp4G5YE6xTJMF+pLg6A==",
+      "license": "MIT",
+      "dependencies": {
+        "parenthesis": "^3.1.5"
+      }
+    },
    "node_modules/string-width": {
      "version": "4.2.3",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -8307,6 +8793,12 @@
      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
    },
+    "node_modules/tlhunter-sorted-set": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/tlhunter-sorted-set/-/tlhunter-sorted-set-0.1.0.tgz",
+      "integrity": "sha512-eGYW4bjf1DtrHzUYxYfAcSytpOkA44zsr7G2n3PV7yOUR23vmkGe3LL4R+1jL9OsXtbsFOwe8XtbCrabeaEFnw==",
+      "license": "MIT"
+    },
    "node_modules/to-fast-properties": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -8997,7 +9489,6 @@
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "devOptional": true,
      "license": "MIT",
      "engines": {
        "node": ">=10"
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
    "cors": "2.8.5",
    "crisp-status-reporter": "^1.2.2",
    "csrf": "^3.1.0",
+    "dd-trace": "^5.28.0",
    "dinero.js": "^1.9.1",
    "dotenv": "^16.4.5",
    "express": "^4.21.1",
@@ -63,6 +64,7 @@
    "recursive-diff": "^1.0.9",
    "redis": "^4.7.0",
    "rimraf": "^6.0.1",
+    "skia-canvas": "^2.0.0",
    "soap": "^1.1.6",
    "socket.io": "^4.8.1",
    "socket.io-adapter": "^2.5.5",
--- a/server.js
+++ b/server.js
@@ -4,6 +4,14 @@ require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });

+if (process.env.NODE_ENV) {
+  const tracer = require("dd-trace").init({
+    profiling: true,
+    env: process.env.NODE_ENV,
+    service: "bodyshop-api"
+  });
+}
+
 const cors = require("cors");
 const http = require("http");
 const Redis = require("ioredis");
--- a/server/accounting/qbo/qbo-receivables.js
+++ b/server/accounting/qbo/qbo-receivables.js
@@ -328,6 +328,7 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
      PostalCode: job.ownr_zip,
      CountrySubDivisionCode: job.ownr_st
    },
+    ...(job.ownr_ea ? { PrimaryEmailAddr: { Address: job.ownr_ea.trim() } } : {}),
    ...(isThreeTier
      ? {
          Job: true,
@@ -395,7 +396,7 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
      PostalCode: job.ownr_zip,
      CountrySubDivisionCode: job.ownr_st
    },
-
+    ...(job.ownr_ea ? { PrimaryEmailAddr: { Address: job.ownr_ea.trim() } } : {}),
    Job: true,
    ParentRef: {
      value: parentTierRef.Id
@@ -556,7 +557,8 @@ async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, paren
      Line3: `${job.ownr_city || ""}, ${job.ownr_st || ""} ${job.ownr_zip || ""}`.trim(),
      Line2: job.ownr_addr1 || "",
      Line1: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`
-    }
+    },
+    ...(job.ownr_ea ? { BillEmail: { Address: job.ownr_ea.trim() } } : {})
  };

  logger.log("qbo-receivable-objectlog", "DEBUG", req.user.email, job.id, {
@@ -673,7 +675,8 @@ async function InsertInvoiceMultiPayerInvoice(
      Line3: `${job.ownr_city || ""}, ${job.ownr_st || ""} ${job.ownr_zip || ""}`.trim(),
      Line2: job.ownr_addr1 || "",
      Line1: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`
-    }
+    },
+    ...(job.ownr_ea ? { BillEmail: { Address: job.ownr_ea.trim() } } : {})
  };

  logger.log("qbo-receivable-objectlog", "DEBUG", req.user.email, job.id, {
--- a/server/intellipay/intellipay.js
+++ b/server/intellipay/intellipay.js
@@ -1,18 +1,16 @@
-const GraphQLClient = require("graphql-request").GraphQLClient;
 const path = require("path");
+require("dotenv").config({
+  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
+});
 const queries = require("../graphql-client/queries");
 const Dinero = require("dinero.js");
 const qs = require("query-string");
 const axios = require("axios");
 const moment = require("moment");
 const logger = require("../utils/logger");
-const InstanceManager = require("../utils/instanceMgr").default;
 const { sendTaskEmail } = require("../email/sendemail");
 const generateEmailTemplate = require("../email/generateTemplate");
 const { getEndpoints } = require("../email/tasksEmails");
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});

 const domain = process.env.NODE_ENV ? "secure" : "test";

@@ -52,15 +50,43 @@ const getShopCredentials = async (bodyshop) => {
  }
 };

+const decodeComment = (comment) => {
+  try {
+    return comment ? JSON.parse(Buffer.from(comment, "base64").toString()) : null;
+  } catch (error) {
+    return null; // Handle malformed base64 string gracefully
+  }
+};
+
 exports.lightbox_credentials = async (req, res) => {
-  logger.log("intellipay-lightbox-credentials", "DEBUG", req.user?.email, null, null);
+  const decodedComment = decodeComment(req.body?.comment);
+  const logMeta = {
+    iPayData: req.body?.iPayData,
+    decodedComment,
+    bodyshop: {
+      id: req.body?.bodyshop?.id,
+      imexshopid: req.body?.bodyshop?.imexshopid,
+      name: req.body?.bodyshop?.shopname
+    }
+  };
+
+  logger.log("intellipay-lightbox-credentials", "DEBUG", req.user?.email, null, logMeta);

  const shopCredentials = await getShopCredentials(req.body.bodyshop);

  if (shopCredentials.error) {
-    res.json(shopCredentials);
+    logger.log("intellipay-credentials-error", "ERROR", req.user?.email, null, {
+      message: shopCredentials.error?.message,
+      ...logMeta
+    });
+    res.json({
+      message: shopCredentials.error?.message,
+      type: "intellipay-credentials-error",
+      ...logMeta
+    });
    return;
  }
+
  try {
    const options = {
      method: "POST",
@@ -74,26 +100,61 @@ exports.lightbox_credentials = async (req, res) => {

    const response = await axios(options);

+    logger.log("intellipay-lightbox-success", "DEBUG", req.user?.email, null, {
+      requestOptions: options,
+      ...logMeta
+    });
+
    res.send(response.data);
  } catch (error) {
-    //console.log(error);
-    logger.log("intellipay-lightbox-credentials-error", "ERROR", req.user?.email, null, {
-      error: JSON.stringify(error)
+    logger.log("intellipay-lightbox-error", "ERROR", req.user?.email, null, {
+      message: error?.message,
+      ...logMeta
+    });
+    res.json({
+      message: error?.message,
+      type: "intellipay-lightbox-error",
+      ...logMeta
    });
-    res.json({ error });
  }
 };

 exports.payment_refund = async (req, res) => {
-  logger.log("intellipay-refund", "DEBUG", req.user?.email, null, null);
+  const decodedComment = decodeComment(req.body.iPayData?.comment);
+  const logResponseMeta = {
+    iPayData: req.body?.iPayData,
+    bodyshop: {
+      id: req.body.bodyshop?.id,
+      imexshopid: req.body.bodyshop?.imexshopid,
+      name: req.body.bodyshop?.shopname
+    },
+    paymentid: req.body?.paymentid,
+    amount: req.body?.amount,
+    decodedComment
+  };
+
+  logger.log("intellipay-refund-request-received", "DEBUG", req.user?.email, null, logResponseMeta);

  const shopCredentials = await getShopCredentials(req.body.bodyshop);

+  if (shopCredentials.error) {
+    logger.log("intellipay-refund-credentials-error", "ERROR", req.user?.email, null, {
+      credentialsError: shopCredentials.error,
+      ...logResponseMeta
+    });
+
+    res.status(400).json({
+      credentialsError: shopCredentials.error,
+      type: "intellipay-refund-credentials-error",
+      ...logResponseMeta
+    });
+    return;
+  }
+
  try {
    const options = {
      method: "POST",
      headers: { "content-type": "application/x-www-form-urlencoded" },
-
      data: qs.stringify({
        method: "payment_refund",
        ...shopCredentials,
@@ -103,132 +164,255 @@ exports.payment_refund = async (req, res) => {
      url: `https://${domain}.cpteller.com/api/26/webapi.cfc?method=payment_refund`
    };

+    logger.log("intellipay-refund-options-prepared", "DEBUG", req.user?.email, null, {
+      requestOptions: options,
+      ...logResponseMeta
+    });
+
    const response = await axios(options);

+    logger.log("intellipay-refund-success", "DEBUG", req.user?.email, null, {
+      requestOptions: options,
+      ...logResponseMeta
+    });
+
    res.send(response.data);
  } catch (error) {
-    //console.log(error);
    logger.log("intellipay-refund-error", "ERROR", req.user?.email, null, {
-      error: JSON.stringify(error)
+      message: error?.message,
+      ...logResponseMeta
+    });
+    res.status(500).json({
+      message: error?.message,
+      type: "intellipay-refund-error",
+      ...logResponseMeta
    });
-    res.json({ error });
  }
 };

 exports.generate_payment_url = async (req, res) => {
-  logger.log("intellipay-payment-url", "DEBUG", req.user?.email, null, null);
+  const decodedComment = decodeComment(req.body.comment);
+  const logResponseMeta = {
+    iPayData: req.body?.iPayData,
+    bodyshop: {
+      id: req.body.bodyshop?.id,
+      imexshopid: req.body.bodyshop?.imexshopid,
+      name: req.body.bodyshop?.shopname
+    },
+    amount: req.body?.amount,
+    account: req.body?.account,
+    comment: req.body?.comment,
+    invoice: req.body?.invoice,
+    decodedComment
+  };
+
+  logger.log("intellipay-generate-payment-url-received", "DEBUG", req.user?.email, null, logResponseMeta);
+
  const shopCredentials = await getShopCredentials(req.body.bodyshop);

+  if (shopCredentials.error) {
+    logger.log("intellipay-generate-payment-url-credentials-error", "ERROR", req.user?.email, null, {
+      message: shopCredentials.error?.message,
+      ...logResponseMeta
+    });
+    res.status(400).json({
+      message: shopCredentials.error?.message,
+      type: "intellipay-generate-payment-url-credentials-error",
+      ...logResponseMeta
+    });
+    return;
+  }
+
  try {
    const options = {
      method: "POST",
      headers: { "content-type": "application/x-www-form-urlencoded" },
-      //TODO: Move these to environment variables/database.
      data: qs.stringify({
        ...shopCredentials,
-        //...req.body,
        amount: Dinero({ amount: Math.round(req.body.amount * 100) }).toFormat("0.00"),
        account: req.body.account,
        comment: req.body.comment,
        invoice: req.body.invoice,
        createshorturl: true
-        //The postback URL is set at the CP teller global terminal settings page.
      }),
      url: `https://${domain}.cpteller.com/api/custapi.cfc?method=generate_lightbox_url`
    };

+    logger.log("intellipay-generate-payment-url-options-prepared", "DEBUG", req.user?.email, null, {
+      requestOptions: options,
+      ...logResponseMeta
+    });
+
    const response = await axios(options);

+    logger.log("intellipay-generate-payment-url-success", "DEBUG", req.user?.email, null, {
+      requestOptions: options,
+      shortUrl: response.data?.shorturl,
+      ...logResponseMeta
+    });
+
    res.send(response.data);
  } catch (error) {
-    //console.log(error);
-    logger.log("intellipay-payment-url-error", "ERROR", req.user?.email, null, {
-      error: JSON.stringify(error)
+    logger.log("intellipay-generate-payment-url-error", "ERROR", req.user?.email, null, {
+      message: error?.message,
+      ...logResponseMeta
    });
-    res.json({ error });
+    res.status(500).json({ message: error?.message, ...logResponseMeta });
  }
 };

 //Reference: https://intellipay.com/dist/webapi26.html#operation/fee
 exports.checkfee = async (req, res) => {
-  // Requires amount, bodyshop.imexshopid, and state? to get data.
-  logger.log("intellipay-fee-check", "DEBUG", req.user?.email, null, null);
+  const logResponseMeta = {
+    bodyshop: {
+      id: req.body?.bodyshop?.id,
+      imexshopid: req.body?.bodyshop?.imexshopid,
+      name: req.body?.bodyshop?.shopname,
+      state: req.body?.bodyshop?.state
+    },
+    amount: req.body?.amount
+  };
+
+  logger.log("intellipay-checkfee-request-received", "DEBUG", req.user?.email, null, logResponseMeta);

-  //If there's no amount, there can't be a fee. Skip the call.
  if (!req.body.amount || req.body.amount <= 0) {
+    logger.log("intellipay-checkfee-skip", "DEBUG", req.user?.email, null, {
+      message: "Amount is zero or undefined, skipping fee check.",
+      ...logResponseMeta
+    });
    res.json({ fee: 0 });
    return;
  }

  const shopCredentials = await getShopCredentials(req.body.bodyshop);

+  if (shopCredentials.error) {
+    logger.log("intellipay-checkfee-credentials-error", "ERROR", req.user?.email, null, {
+      message: shopCredentials.error?.message,
+      ...logResponseMeta
+    });
+    res.status(400).json({ error: shopCredentials.error?.message, ...logResponseMeta });
+    return;
+  }
+
  try {
    const options = {
      method: "POST",
      headers: { "content-type": "application/x-www-form-urlencoded" },
-      //TODO: Move these to environment variables/database.
      data: qs.stringify(
        {
          method: "fee",
          ...shopCredentials,
          amount: req.body.amount,
          paymenttype: `CC`,
-          cardnum: "4111111111111111", //Not needed per documentation, but incorrect values come back without it.
+          cardnum: "4111111111111111", // Required for compatibility with API
          state:
-            req.body.bodyshop?.state && req.body.bodyshop.state?.length === 2
+            req.body.bodyshop?.state && req.body.bodyshop.state.length === 2
              ? req.body.bodyshop.state.toUpperCase()
-              : "ZZ" //Same as above
+              : "ZZ"
        },
-        { sort: false } //ColdFusion Query Strings depend on order. This preserves it.
+        { sort: false } // Ensure query string order is preserved
      ),
      url: `https://${domain}.cpteller.com/api/26/webapi.cfc`
    };

+    logger.log("intellipay-checkfee-options-prepared", "DEBUG", req.user?.email, null, {
+      requestOptions: options,
+      ...logResponseMeta
+    });
+
    const response = await axios(options);
+
    if (response.data?.error) {
-      res.status(400).json({ error: response.data.error });
+      logger.log("intellipay-checkfee-api-error", "ERROR", req.user?.email, null, {
+        message: response.data?.error,
+        ...logResponseMeta
+      });
+      res.status(400).json({
+        error: response.data?.error,
+        type: "intellipay-checkfee-api-error",
+        ...logResponseMeta
+      });
    } else if (response.data < 0) {
-      res.json({ error: "Fee amount negative. Check API credentials & account configuration." });
+      logger.log("intellipay-checkfee-negative-fee", "ERROR", req.user?.email, null, {
+        message: "Fee amount returned is negative.",
+        ...logResponseMeta
+      });
+      res.json({
+        error: "Fee amount negative. Check API credentials & account configuration.",
+        ...logResponseMeta,
+        type: "intellipay-checkfee-negative-fee"
+      });
    } else {
-      res.json({ fee: response.data });
+      logger.log("intellipay-checkfee-success", "DEBUG", req.user?.email, null, {
+        fee: response.data,
+        ...logResponseMeta
+      });
+      res.json({ fee: response.data, ...logResponseMeta });
    }
  } catch (error) {
-    //console.log(error);
-    logger.log("intellipay-fee-check-error", "ERROR", req.user?.email, null, {
-      error: error.message
+    logger.log("intellipay-checkfee-error", "ERROR", req.user?.email, null, {
+      message: error?.message,
+      ...logResponseMeta
    });
-    res.status(400).json({ error });
+    res.status(500).json({ error: error?.message, logResponseMeta });
  }
 };

 exports.postback = async (req, res) => {
+  const { body: values } = req;
+  const decodedComment = decodeComment(values?.comment);
+  const logResponseMeta = {
+    bodyshop: {
+      id: req.body?.bodyshop?.id,
+      imexshopid: req.body?.bodyshop?.imexshopid,
+      name: req.body?.bodyshop?.shopname,
+      state: req.body?.bodyshop?.state
+    },
+    iprequest: values,
+    decodedComment
+  };
+
+  logger.log("intellipay-postback-received", "DEBUG", req.user?.email, null, logResponseMeta);
+
  try {
-    logger.log("intellipay-postback", "DEBUG", req.user?.email, null, req.body);
-    const { body: values } = req;
-
-    const comment = Buffer.from(values?.comment, "base64").toString();
-
-    if ((!values.invoice || values.invoice === "") && !comment) {
+    if ((!values.invoice || values.invoice === "") && !decodedComment) {
      //invoice is specified through the pay link. Comment by IO.
-      logger.log("intellipay-postback-ignored", "DEBUG", req.user?.email, null, req.body);
+      logger.log("intellipay-postback-ignored", "DEBUG", req.user?.email, null, {
+        message: "No invoice or comment provided",
+        ...logResponseMeta
+      });
      res.sendStatus(200);
      return;
    }

-    if (comment) {
+    if (decodedComment) {
      //Shifted the order to have this first to retain backwards compatibility for the old style of short link.
      //This has been triggered by IO and may have multiple jobs.
-      const parsedComment = JSON.parse(comment);
+      const parsedComment = JSON.parse(decodedComment);
+
+      logger.log("intellipay-postback-parsed-comment", "DEBUG", req.user?.email, null, {
+        parsedComment,
+        ...logResponseMeta
+      });

      //Adding in the user email to the short pay email.
      //Need to check this to ensure backwards compatibility for clients that don't update.

      const partialPayments = Array.isArray(parsedComment) ? parsedComment : parsedComment.payments;

+      // Fetch jobs by job IDs
      const jobs = await gqlClient.request(queries.GET_JOBS_BY_PKS, {
        ids: partialPayments.map((p) => p.jobid)
      });

+      logger.log("intellipay-postback-jobs-fetched", "DEBUG", req.user?.email, null, {
+        jobs,
+        parsedComment,
+        ...logResponseMeta
+      });
+
+      // Insert new payments
      const paymentResult = await gqlClient.request(queries.INSERT_NEW_PAYMENT, {
        paymentInput: partialPayments.map((p) => ({
          amount: p.amount,
@@ -250,13 +434,15 @@ exports.postback = async (req, res) => {
          }
        }))
      });
-      logger.log("intellipay-postback-app-success", "DEBUG", req.user?.email, JSON.stringify(jobs), {
-        iprequest: values,
-        paymentResult
+
+      logger.log("intellipay-postback-payment-success", "DEBUG", req.user?.email, null, {
+        paymentResult,
+        jobs,
+        parsedComment,
+        ...logResponseMeta
      });

      if (values.origin === "OneLink" && parsedComment.userEmail) {
-        //Send an email, it was a text to pay link.
        try {
          const endPoints = getEndpoints();
          sendTaskEmail({
@@ -275,20 +461,25 @@ exports.postback = async (req, res) => {
            })
          });
        } catch (error) {
-          logger.log("intellipay-postback-app-email-error", "DEBUG", req.user?.email, JSON.stringify(jobs), {
-            iprequest: values,
+          logger.log("intellipay-postback-email-error", "ERROR", req.user?.email, null, {
+            message: error.message,
+            jobs,
            paymentResult,
-            error: error.message
+            ...logResponseMeta
          });
        }
      }
      res.sendStatus(200);
    } else if (values.invoice) {
-      //This is a link email that's been sent out.
      const job = await gqlClient.request(queries.GET_JOB_BY_PK, {
        id: values.invoice
      });

+      logger.log("intellipay-postback-invoice-job-fetched", "DEBUG", req.user?.email, null, {
+        job,
+        ...logResponseMeta
+      });
+
      const paymentResult = await gqlClient.request(queries.INSERT_NEW_PAYMENT, {
        paymentInput: {
          amount: values.total,
@@ -300,6 +491,11 @@ exports.postback = async (req, res) => {
        }
      });

+      logger.log("intellipay-postback-invoice-payment-success", "DEBUG", req.user?.email, null, {
+        paymentResult,
+        ...logResponseMeta
+      });
+
      const responseResults = await gqlClient.request(queries.INSERT_PAYMENT_RESPONSE, {
        paymentResponse: {
          amount: values.total,
@@ -313,18 +509,17 @@ exports.postback = async (req, res) => {
        }
      });

-      logger.log("intellipay-postback-link-success", "DEBUG", req.user?.email, values.invoice, {
-        iprequest: values,
+      logger.log("intellipay-postback-invoice-response-success", "DEBUG", req.user?.email, null, {
        responseResults,
-        paymentResult
+        ...logResponseMeta
      });
      res.sendStatus(200);
    }
  } catch (error) {
-    logger.log("intellipay-postback-total-error", "ERROR", req.user?.email, null, {
-      error: JSON.stringify(error),
-      body: req.body
+    logger.log("intellipay-postback-error", "ERROR", req.user?.email, null, {
+      message: error?.message,
+      ...logResponseMeta
    });
-    res.status(400).json({ succesful: false, error: error.message });
+    res.status(400).json({ successful: false, error: error.message, ...logResponseMeta });
  }
 };
--- a/server/middleware/validateCanvasInputMiddleware.js
+++ b/server/middleware/validateCanvasInputMiddleware.js
@@ -0,0 +1,32 @@
+const { isObject } = require("lodash");
+
+const validateCanvasInputMiddleware = (req, res, next) => {
+  const { values, keys, override, w, h } = req.body;
+
+  if (!Array.isArray(values) || !Array.isArray(keys)) {
+    return res.status(400).send("Invalid input: 'values' and 'keys' must be arrays.");
+  }
+
+  if (values.some((value) => typeof value !== "number")) {
+    return res.status(400).send("Invalid input: 'values' must be an array of numbers.");
+  }
+
+  if (keys.some((key) => typeof key !== "string")) {
+    return res.status(400).send("Invalid input: 'keys' must be an array of strings.");
+  }
+
+  if (override && !isObject(override)) {
+    return res.status(400).send("Override must be an object");
+  }
+
+  if (w && (!Number.isFinite(w) || w <= 0)) {
+    return res.status(400).send("Width must be a positive number");
+  }
+  if (h && (!Number.isFinite(h) || h <= 0)) {
+    return res.status(400).send("Height must be a positive number");
+  }
+
+  next(); // Proceed to the next middleware or route handler
+};
+
+module.exports = validateCanvasInputMiddleware;
--- a/server/middleware/validateCanvasRequestMiddleware.js
+++ b/server/middleware/validateCanvasRequestMiddleware.js
@@ -1,20 +0,0 @@
-const { isObject } = require("lodash");
-
-const validateCanvasRequestMiddleware = (req, res, next) => {
-  const { w, h, values, keys, override } = req.body;
-  if (!values || !keys) {
-    return res.status(400).send("Missing required data");
-  }
-  if (override && !isObject(override)) {
-    return res.status(400).send("Override must be an object");
-  }
-  if (w && (!Number.isFinite(w) || w <= 0)) {
-    return res.status(400).send("Width must be a positive number");
-  }
-  if (h && (!Number.isFinite(h) || h <= 0)) {
-    return res.status(400).send("Height must be a positive number");
-  }
-  next();
-};
-
-module.exports = validateCanvasRequestMiddleware;
--- a/server/render/canvas-handler.js
+++ b/server/render/canvas-handler.js
@@ -1,124 +1,149 @@
 const { createCanvas } = require("canvas");
+const { Canvas, FontLibrary } = require("skia-canvas");
 const Chart = require("chart.js/auto");
-const logger = require("../utils/logger");

 const { backgroundColors, borderColors } = require("./canvas-colors");
-const { isObject, defaultsDeep, isNumber } = require("lodash");
+const { defaultsDeep, isNumber } = require("lodash");
+
+const CANVAS_QUEUE_LIMIT = 100;

 let isProcessing = false;
 const requestQueue = [];

-const processCanvasRequest = async (req, res) => {
-  try {
-    const { w, h, values, keys, override } = req.body;
-    logger.log("inbound-canvas-creation", "debug", "jsr", null, { w, h, values, keys, override });
+try {
+  FontLibrary.use("Montserrat", [
+    "/usr/share/fonts/Montserrat-Regular.ttf",
+    "/usr/share/fonts/Montserrat-Bold.ttf",
+    "/usr/share/fonts/Montserrat-Italic.ttf"
+  ]);
+} catch (error) {
+  console.error(
+    "Error loading fonts Skia Canvas Fonts, please be sure to install Montserrat font package",
+    error.message
+  );
+}

-    // Set dimensions with defaults
-    const width = isNumber(w) ? w : 500;
-    const height = isNumber(h) ? h : 275;
-
-    const configuration = {
-      type: "doughnut",
-      data: {
-        labels: keys,
-        datasets: [
-          {
-            data: values,
-            backgroundColor: backgroundColors,
-            borderColor: borderColors,
-            borderWidth: 1
-          }
-        ]
-      },
-      options: {
-        animation: false,
-        devicePixelRatio: 4,
-        responsive: false,
-        maintainAspectRatio: true,
-        circumference: 180,
-        rotation: -90,
-        plugins: {
-          legend: {
-            labels: {
-              boxWidth: 20,
-              font: {
-                family: "'Montserrat'",
-                size: 10,
-                style: "normal",
-                weight: "normal"
-              }
-            },
-            position: "left"
-          }
+// Utility to create a chart configuration
+const getChartConfiguration = (keys, values, override) => {
+  const defaultConfiguration = {
+    type: "doughnut",
+    data: {
+      labels: keys,
+      datasets: [
+        {
+          data: values,
+          backgroundColor: backgroundColors,
+          borderColor: borderColors,
+          borderWidth: 1
+        }
+      ]
+    },
+    options: {
+      devicePixelRatio: 4,
+      responsive: false,
+      animation: false,
+      maintainAspectRatio: true,
+      circumference: 180,
+      rotation: -90,
+      plugins: {
+        legend: {
+          labels: {
+            boxWidth: 20,
+            font: {
+              family: "'Montserrat'",
+              size: 10,
+              style: "normal",
+              weight: "normal"
+            }
+          },
+          position: "left"
        }
      }
-    };
-
-    // If we have a valid override object, merge it with the default configuration object.
-    // This allows for you to override the default configuration with a custom one.
-    const defaults = () => {
-      if (!override || !isObject(override)) {
-        return configuration;
-      }
-      return defaultsDeep(override, configuration);
-    };
-
-    // Generate chart
-    let canvas = createCanvas(width, height);
-    let ctx = canvas.getContext("2d");
-    let chart = new Chart(ctx, defaults());
-    const result = canvas.toDataURL();
-
-    chart.destroy();
-    canvas.width = 0;
-    canvas.height = 0;
-    ctx = null;
-    canvas = null;
-    chart = null;
-
-    res.status(200).send(result);
-  } catch (error) {
-    if (chart) chart.destroy();
-    if (canvas) {
-      canvas.width = 0;
-      canvas.height = 0;
    }
-    ctx = null;
-    canvas = null;
-    chart = null;
+  };

-    logger.log("inbound-canvas-creation", "error", "jsr", null, { error: error.message, stack: error.stack });
-    res.status(500).send("Error generating canvas");
+  return defaultsDeep(override || {}, defaultConfiguration);
+};
+
+const processCanvasRequest = async (req, res, isSkia = false) => {
+  const { logger } = req;
+  const { w, h, values, keys, override } = req.body;
+
+  logger.log("inbound-canvas-creation", "debug", "jsr", null, { w, h, values, keys, override });
+
+  // Default width and height
+  const width = isNumber(w) && w > 0 ? w : 500;
+  const height = isNumber(h) && h > 0 ? h : 275;
+
+  const configuration = getChartConfiguration(keys, values, override);
+
+  // Placeholders to allow fine control over GAC
+  let canvas = null;
+  let ctx = null;
+  let chart = null;
+  let chartImage = null;
+
+  try {
+    // Create the canvas
+    canvas = isSkia ? new Canvas(width, height) : createCanvas(width, height);
+    ctx = canvas.getContext("2d");
+
+    // Render the chart
+    chart = new Chart(ctx, configuration);
+
+    // Generate and send the image
+    chartImage = isSkia ? (await canvas.toBuffer("image/png")).toString("base64") : canvas.toDataURL();
+
+    res.status(200).send(isSkia ? `data:image/png;base64,${chartImage}` : chartImage);
+  } catch (error) {
+    // Log the error and send the response
+    logger.log("canvas-error", "error", "jsr", null, { error: error.message });
+    res.status(500).send("Failed to generate canvas.");
+  } finally {
+    // Cleanup resources
+    if (chart) {
+      chart.destroy();
+    }
+    ctx = null; // Explicitly nullify for garbage collection
+    canvas = null; // Explicitly nullify for garbage collection
+    chartImage = null;
  }
 };

-const processNextInQueue = async () => {
-  if (requestQueue.length === 0) {
-    isProcessing = false;
-    return;
+const enqueueRequest = (req, res, isSkia) => {
+  if (requestQueue.length >= CANVAS_QUEUE_LIMIT) {
+    res.status(503).send("Server is busy. Please try again later.");
+    return false;
  }
+  requestQueue.push({ req, res, isSkia });
+  req.logger.log("inbound-canvas-creation-queue", "debug", "jsr", null, { queue: requestQueue.length });
+  return true;
+};

-  const { req, res } = requestQueue.shift();
-  await processCanvasRequest(req, res);
-  processNextInQueue();
+const processNextInQueue = async () => {
+  while (requestQueue.length > 0) {
+    const { req, res, isSkia } = requestQueue.shift();
+    try {
+      await processCanvasRequest(req, res, isSkia);
+    } catch (err) {
+      console.error("canvas-queue-error", "error", "jsr", null, { error: err.message });
+    }
+  }
+  isProcessing = false;
 };

 exports.canvastest = function (req, res) {
  res.status(200).send("OK");
 };

-exports.canvas = async function (req, res) {
-  if (isProcessing) {
-    if (requestQueue.length >= 100) {
-      // Set a maximum queue size
-      return res.status(503).send("Server is busy. Please try again later.");
-    }
-    requestQueue.push({ req, res });
-    logger.log("inbound-canvas-creation-queue", "debug", "jsr", null, { queue: requestQueue.length });
-    return;
-  }
-
+exports.canvas = async (req, res) => {
+  if (isProcessing || !enqueueRequest(req, res, false)) return;
  isProcessing = true;
-  await processCanvasRequest(req, res);
-  processNextInQueue();
+  processNextInQueue().catch((err) => console.error("canvas-processing-error", { error: err.message }));
+};
+
+exports.canvasSkia = async (req, res) => {
+  if (isProcessing || !enqueueRequest(req, res, true)) return;
+  isProcessing = true;
+  processNextInQueue().catch((err) => console.error("canvas-processing-error", { error: err.message }));
 };
--- a/server/routes/renderRoutes.js
+++ b/server/routes/renderRoutes.js
@@ -2,11 +2,12 @@ const express = require("express");
 const router = express.Router();
 const { inlinecss } = require("../render/inlinecss");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
-const validateCanvasRequestMiddleware = require("../middleware/validateCanvasRequestMiddleware");
-const { canvas } = require("../render/canvas-handler");
+const { canvas, canvasSkia } = require("../render/canvas-handler");
+const validateCanvasInputMiddleware = require("../middleware/validateCanvasInputMiddleware");

 // Define the route for inline CSS rendering
 router.post("/inlinecss", validateFirebaseIdTokenMiddleware, inlinecss);
-router.post("/canvas", [validateFirebaseIdTokenMiddleware, validateCanvasRequestMiddleware], canvas);
+router.post("/canvas", [validateFirebaseIdTokenMiddleware, validateCanvasInputMiddleware], canvas);
+router.post("/canvas-skia", [validateFirebaseIdTokenMiddleware, validateCanvasInputMiddleware], canvasSkia);

 module.exports = router;
Author	SHA1	Message	Date
Dave Richer	8cee795d70	feature/IO-3056-Enhanced-Lightbox-Logging	2024-12-12 13:12:47 -08:00
Dave Richer	b3c948f0c7	feature/IO-3056-Enhanced-Lightbox-Logging	2024-12-11 12:08:29 -08:00
Dave Richer	b955eb01b4	feature/IO-3056-Enhanced-Lightbox-Logging	2024-12-11 12:02:27 -08:00
Dave Richer	39640d254a	feature/IO-3056-Enhanced-Lightbox-Logging	2024-12-11 12:00:02 -08:00
Dave Richer	532eb842b3	feature/IO-3056-Enhanced-Logging: Fix up git attributes	2024-12-11 09:04:33 -08:00
Allan Carr	e1b00f5081	Merged in hotfix/2024-12-09 (pull request #2008 ) IO-3050 Adjust Customer setup	2024-12-09 21:15:35 +00:00
Allan Carr	cfbf59cd48	Merged in feature/IO-3050-QBO-BillEmail (pull request #2006 ) IO-3050 Adjust Customer setup	2024-12-09 19:56:44 +00:00
Allan Carr	6a09209659	IO-3050 Adjust Customer setup Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-12-09 11:00:49 -08:00
Dave Richer	cec5f6e6e7	Merged in release/2024-12-06 (pull request #2005 ) Release/2024 12 06 into master-AIO IO-3047 IO-3046 IO-3051 IO-3050 IO-3042 IO-3052	2024-12-07 04:46:43 +00:00
Dave Richer	82acaa35e1	Merged master-AIO into release/2024-12-06	2024-12-07 04:42:07 +00:00
Dave Richer	09b8a05b5a	Merged in feature/IO-3051-canvas-handler-optimization (pull request #2002 ) IO-3051 Replace inlince css with juice.	2024-12-05 23:31:44 +00:00
Dave Richer	e5d55f27b5	Merged in feature/IO-3052-Skia-Canvas-Handler (pull request #2000 ) Feature/IO-3052 Skia Canvas Handler	2024-12-05 21:06:33 +00:00
Dave Richer	bfde72eed8	feature/IO-3052-Skia-Canvas-Handler: Fix missing checks Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-05 12:29:11 -08:00
Dave Richer	8fbd08d57f	Merge branch 'feature/IO-3052-Skia-Canvas-Handler' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3052-Skia-Canvas-Handler	2024-12-05 12:16:47 -08:00
Dave Richer	20bddb43b6	feature/IO-3052-Skia-Canvas-Handler: Fix missing checks Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-05 12:16:32 -08:00
Dave Richer	b38e0f611b	Merged release/2024-12-06 into feature/IO-3052-Skia-Canvas-Handler	2024-12-05 20:14:53 +00:00
Dave Richer	c84fbcaba1	feature/IO-3052-Skia-Canvas-Handler: Optimizations Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-05 12:14:06 -08:00
Dave Richer	8f752d575a	feature/IO-3052-Skia-Canvas-Handler: Optimizations Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-05 12:13:49 -08:00
Patrick Fic	2fe9ae513d	Merged in feature/IO-3053-datadog (pull request #1999 ) IO-3053 Add datadog watcher for Production and Test instances.	2024-12-05 20:10:24 +00:00
Patrick Fic	0001604552	Merged in feature/IO-3053-datadog (pull request #1998 ) IO-3053 Add datadog watcher for Production and Test instances.	2024-12-05 20:09:26 +00:00
Patrick Fic	5cb93b1a2c	IO-3053 Add datadog watcher for Production and Test instances.	2024-12-05 12:07:16 -08:00
Dave Richer	a04dcffc4c	feature/IO-3052-Skia-Canvas-Handler: Merge release and fix PR's Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-05 12:01:58 -08:00
Dave Richer	50c99f7a1e	feature/IO-3052-Skia-Canvas-Handler: Cleanup Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-05 11:52:14 -08:00
Dave Richer	86f3179bc0	feature/IO-3052-Skia-Canvas-Handler: Initial commit Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-05 11:26:36 -08:00
Dave Richer	6336e7568f	feature/IO-3052-Skia-Canvas-Handler: Initial commit Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-05 11:26:23 -08:00
Allan Carr	f0f199335c	Merged in feature/IO-3050-QBO-BillEmail (pull request #1995 ) IO-3050 QBO BillEmail required if NeedToSend Approved-by: Dave Richer	2024-12-05 17:23:18 +00:00
Allan Carr	9c7c9f4b6d	Merged in feature/IO-3042-Jobs-Marked-Total-Loss (pull request #1996 ) IO-3042 Jobs Marked as Total Loss Approved-by: Dave Richer	2024-12-05 17:23:01 +00:00
Allan Carr	9001ceaed8	Merged in feature/IO-3051-canvas-handler-optimization (pull request #1994 ) IO-3051 canvas-handler optimization Approved-by: Dave Richer	2024-12-05 17:22:42 +00:00
Allan Carr	ab82e85c57	Merge branch 'release/2024-12-06' into feature/IO-3042-Jobs-Marked-Total-Loss Signed-off-by: Allan Carr <allan.carr@thinkimex.com> # Conflicts: # client/src/utils/TemplateConstants.js	2024-12-04 18:33:35 -08:00
Allan Carr	2effe5ef50	IO-3042 Jobs Marked as Total Loss Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-12-04 18:30:22 -08:00
Allan Carr	006a2a5dca	IO-3050 QBO BillEmail required if NeedToSend Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-12-04 15:59:05 -08:00
Dave Richer	8d2bdb171b	Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1986 ) feature/IO-3048-Fix-Job-Bug-Messaging - Job Tag weirdness, Messaging Name Display, Unread Messages	2024-12-03 23:51:54 +00:00
Dave Richer	5d7eabbfa9	Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1992 ) feature/IO-3048-Fix-Job-Bug-Messaging - Unread count	2024-12-03 22:01:37 +00:00
Dave Richer	a2ada7d88e	feature/IO-3048-Fix-Job-Bug-Messaging - Unread count Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-03 13:58:16 -08:00
Dave Richer	3a6af12446	Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1990 ) feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation	2024-12-03 20:24:09 +00:00
Dave Richer	b490ab96be	feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-03 12:17:11 -08:00
Dave Richer	ca462f51ec	Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1987 ) feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation	2024-12-03 18:40:29 +00:00
Dave Richer	44721019fa	feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-03 10:39:14 -08:00
Dave Richer	8ed81e9aed	Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1984 ) feature/IO-3048-Fix-Job-Bug-Messaging - Fix tag weirdness and a vite error Approved-by: Patrick Fic	2024-12-03 17:55:30 +00:00
Dave Richer	15ba2a1caf	feature/IO-3048-Fix-Job-Bug-Messaging - Fix tag weirdness and a vite error Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-12-03 09:48:52 -08:00
Allan Carr	aad22f2e2d	Merged in feature/IO-3047-accountingid-on-Owner-Page (pull request #1982 ) IO-3047 Accounting ID on Owner Page Approved-by: Dave Richer	2024-12-02 20:30:50 +00:00
Allan Carr	7a11b18037	Merged in feature/IO-3046-purchase_return_ratio_excel (pull request #1983 ) IO-3046 purchase_return_ratio_excel Approved-by: Dave Richer	2024-12-02 20:30:16 +00:00
Allan Carr	241322fa30	IO-3046 purchase_return_ratio_excel Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-12-02 11:09:30 -08:00
Allan Carr	f0461270de	IO-3047 Accounting ID on Owner Page Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-12-02 08:52:18 -08:00