@ancon/wildcat-utils 1.50.11 → 1.50.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.50.11",
+  "version": "1.50.12",
   "private": false,
   "main": "index.js",
   "module": "index.mjs",

package/printing/createStarCloudScanHook.d.ts

@@ -9,7 +9,20 @@ declare type ReduxHooksArg<RootState = unknown> = {
     };
     useStarPrinterDiscover: () => (timeout: number) => Promise<DiscoveredStarPrinter[]>;
 };
-declare function createUseStarCloudScanHook<RootState = unknown>(initialStatus: StarCloudScanStatus, hooks: ReduxHooksArg<RootState>, selectors: ReduxSelectorsArg<RootState>, initialReading?: string, shouldSanitizeRawOutput?: boolean): () => {
+export declare type SanitizeRawOutputOptions = {
+    /** Enable or disable sanitization of raw output */
+    sanitizeEnabled: boolean;
+    /**
+     * Custom regex to sanitize raw output. Default removes all non-digit characters.
+     * @default /[\D]/gi
+     */
+    sanitizeRegex?: RegExp;
+};
+declare function createUseStarCloudScanHook<RootState = unknown>(initialStatus: StarCloudScanStatus, hooks: ReduxHooksArg<RootState>, selectors: ReduxSelectorsArg<RootState>, initialReading?: string, 
+/**
+ * @deprecated Use `sanitizeRawOutputOptions` instead
+ */
+shouldSanitizeRawOutput?: boolean, sanitizeRawOutputOptions?: SanitizeRawOutputOptions): () => {
     startScan: () => Promise<void>;
     changeDeviceStatus: (nextStatus: StarCloudScanStatus) => void;
     scanStatus: StarCloudScanStatus;

package/printing/createStarCloudScanHook.js

@@ -1 +1 @@
-"use strict";const o=require("react"),k=require("dayjs"),R=require("@ancon/wildcat-printing"),j=require("../shared/hooks/usePrevious.js"),G=require("../shared/hooks/useMountedRef.js"),e=require("./types.js"),I=["TSP654"],V=1;function z(b,q,L,O,T=!1){const{useAppStore:N,useStarPrinterDiscover:_}=q,{selectedClientPrinterSelector:F}=L;function M(){const n=G(),v=N(),D=_(),f=o.useRef(void 0),[s,x]=o.useState(b),[a,l]=o.useState(),[S,P]=o.useState(),g=j(S),[A,p]=o.useState(),[U,w]=o.useState(O),r=o.useCallback(c=>{n!=null&&n.current&&x(c)},[n]),y=o.useCallback(async c=>{var i;(i=f.current)==null||i.stop(),r(e.StarCloudScanStatus.ScanningComplete);const u=String.fromCharCode(...c).trim();w(T?u.replace(/[\D]/gi,""):u)},[r]),h=o.useCallback(async({macAddress:c,ipAddress:u})=>{function i(t){r(e.StarCloudScanStatus.CommunicationError),n!=null&&n.current&&p(t==null?void 0:t.message)}const C={onStarted:t=>{if(t&&t.inputDevicesCount>0){const{inputDevicesCount:d}=t;r(e.StarCloudScanStatus.ReadyToScan),l({inputDeviceCount:d,lastConnectedOn:new Date})}},onStopped:t=>{t&&i(t),l(void 0)},inputDevice:{onConnected:()=>{const t=((a==null?void 0:a.inputDeviceCount)||0)+1;r(t>0?e.StarCloudScanStatus.ReadyToScan:e.StarCloudScanStatus.PrinterDetected),l({inputDeviceCount:t,lastConnectedOn:new Date})},onDisconnected:()=>{const t=((a==null?void 0:a.inputDeviceCount)||0)-1>=0?((a==null?void 0:a.inputDeviceCount)||0)-1:0;r(t>0?e.StarCloudScanStatus.ReadyToScan:e.StarCloudScanStatus.PrinterDetected),l({inputDeviceCount:t})},onCommunicationError:i,onDataReceived:t=>P({data:t,lastReceivedOn:new Date})}};if(f.current=R.monitor(u||c,C),n!=null&&n.current)try{await f.current.start()}catch(t){r(e.StarCloudScanStatus.CommunicationError),n!=null&&n.current&&p(t==null?void 0:t.message)}},[a,r,n]),m=o.useCallback(async()=>{n!=null&&n.current&&(r(e.StarCloudScanStatus.WaitingForPrinter),p(void 0),P(void 0),l(void 0),w(void 0));const c=F(v.getState()),{macAddress:u,serialNumber:i}=c;try{const t=(await D(2e3)).find(d=>u&&d.macAddress.toLowerCase()===u.toLowerCase()||i&&d.serialNumber===i);if(n!=null&&n.current){if(t){if(I.some(d=>{var E;return(E=t.model)==null?void 0:E.toLowerCase().includes(d.toLowerCase())})){r(e.StarCloudScanStatus.UnsupportedPrinter);return}h(t)}r(t?e.StarCloudScanStatus.PrinterDetected:e.StarCloudScanStatus.PrinterNotDetected)}}catch{n!=null&&n.current&&r(e.StarCloudScanStatus.PrinterNotDetected)}},[n,v,r,D,h]),W=s===e.StarCloudScanStatus.WaitingForPrinter||s===e.StarCloudScanStatus.PrinterDetected||s===e.StarCloudScanStatus.ReadyToScan||s===e.StarCloudScanStatus.ScanningComplete,H=s===e.StarCloudScanStatus.PrinterNotDetected||s===e.StarCloudScanStatus.ScanFailed||s===e.StarCloudScanStatus.CommunicationError||s===e.StarCloudScanStatus.UnsupportedPrinter;return o.useEffect(()=>{if(!g&&(S==null?void 0:S.data)&&a&&(a!=null&&a.lastConnectedOn)){const{lastConnectedOn:u}=a,{lastReceivedOn:i,data:C}=S;k(i).diff(k(u),"second",!0)>V?y(C):P(void 0)}},[S,g,a,y]),o.useEffect(()=>(s===e.StarCloudScanStatus.WaitingForPrinter&&m(),()=>{var c;(c=f.current)==null||c.stop()}),[]),{startScan:m,changeDeviceStatus:r,scanStatus:s,reading:U,connectionError:A,isLoading:W,isError:H}}return M}module.exports=z;
+"use strict";const o=require("react"),L=require("dayjs"),B=require("@ancon/wildcat-printing"),J=require("../shared/hooks/usePrevious.js"),K=require("../shared/hooks/useMountedRef.js"),n=require("./types.js"),Q=["TSP654"],V=1;function X(T,p,x,N,_=!1,d){const{useAppStore:F,useStarPrinterDiscover:M}=p,{selectedClientPrinterSelector:w}=x;function A(){const e=K(),D=F(),h=M(),P=o.useRef(void 0),[i,U]=o.useState(T),[r,f]=o.useState(),[l,v]=o.useState(),y=J(l),[W,g]=o.useState(),[H,E]=o.useState(N),a=o.useCallback(c=>{e!=null&&e.current&&U(c)},[e]),j=c=>{if((d==null?void 0:d.sanitizeEnabled)??_){const s=(d==null?void 0:d.sanitizeRegex)??/[\D]/gi;return c.replace(s,"")}return c},m=o.useCallback(async c=>{var u;(u=P.current)==null||u.stop(),a(n.StarCloudScanStatus.ScanningComplete);const S=String.fromCharCode(...c).trim(),s=j(S);E(s)},[a]),k=o.useCallback(async({macAddress:c,ipAddress:S})=>{function s(t){a(n.StarCloudScanStatus.CommunicationError),e!=null&&e.current&&g(t==null?void 0:t.message)}const u={onStarted:t=>{if(t&&t.inputDevicesCount>0){const{inputDevicesCount:C}=t;a(n.StarCloudScanStatus.ReadyToScan),f({inputDeviceCount:C,lastConnectedOn:new Date})}},onStopped:t=>{t&&s(t),f(void 0)},inputDevice:{onConnected:()=>{const t=((r==null?void 0:r.inputDeviceCount)||0)+1;a(t>0?n.StarCloudScanStatus.ReadyToScan:n.StarCloudScanStatus.PrinterDetected),f({inputDeviceCount:t,lastConnectedOn:new Date})},onDisconnected:()=>{const t=((r==null?void 0:r.inputDeviceCount)||0)-1>=0?((r==null?void 0:r.inputDeviceCount)||0)-1:0;a(t>0?n.StarCloudScanStatus.ReadyToScan:n.StarCloudScanStatus.PrinterDetected),f({inputDeviceCount:t})},onCommunicationError:s,onDataReceived:t=>v({data:t,lastReceivedOn:new Date})}};if(P.current=B.monitor(S||c,u),e!=null&&e.current)try{await P.current.start()}catch(t){a(n.StarCloudScanStatus.CommunicationError),e!=null&&e.current&&g(t==null?void 0:t.message)}},[r,a,e]),b=o.useCallback(async()=>{e!=null&&e.current&&(a(n.StarCloudScanStatus.WaitingForPrinter),g(void 0),v(void 0),f(void 0),E(void 0));const c=w(D.getState()),{macAddress:S,serialNumber:s}=c;try{const t=(await h(2e3)).find(C=>S&&C.macAddress.toLowerCase()===S.toLowerCase()||s&&C.serialNumber===s);if(e!=null&&e.current){if(t){if(Q.some(C=>{var q;return(q=t.model)==null?void 0:q.toLowerCase().includes(C.toLowerCase())})){a(n.StarCloudScanStatus.UnsupportedPrinter);return}k(t)}a(t?n.StarCloudScanStatus.PrinterDetected:n.StarCloudScanStatus.PrinterNotDetected)}}catch{e!=null&&e.current&&a(n.StarCloudScanStatus.PrinterNotDetected)}},[e,D,a,h,k]),G=i===n.StarCloudScanStatus.WaitingForPrinter||i===n.StarCloudScanStatus.PrinterDetected||i===n.StarCloudScanStatus.ReadyToScan||i===n.StarCloudScanStatus.ScanningComplete,I=i===n.StarCloudScanStatus.PrinterNotDetected||i===n.StarCloudScanStatus.ScanFailed||i===n.StarCloudScanStatus.CommunicationError||i===n.StarCloudScanStatus.UnsupportedPrinter;return o.useEffect(()=>{if(!y&&(l==null?void 0:l.data)&&r&&(r!=null&&r.lastConnectedOn)){const{lastConnectedOn:S}=r,{lastReceivedOn:s,data:u}=l;L(s).diff(L(S),"second",!0)>V?m(u):v(void 0)}},[l,y,r,m]),o.useEffect(()=>(i===n.StarCloudScanStatus.WaitingForPrinter&&b(),()=>{var c;(c=P.current)==null||c.stop()}),[]),{startScan:b,changeDeviceStatus:a,scanStatus:i,reading:H,connectionError:W,isLoading:G,isError:I}}return A}module.exports=X;

package/printing/createStarCloudScanHook.mjs

@@ -1,134 +1,138 @@
-import { useRef as V, useState as S, useCallback as p, useEffect as O } from "react";
-import T from "dayjs";
-import { monitor as q } from "@ancon/wildcat-printing";
-import z from "../shared/hooks/usePrevious.mjs";
-import B from "../shared/hooks/useMountedRef.mjs";
-import { StarCloudScanStatus as e } from "./types.mjs";
-const J = ["TSP654"], K = 1;
-function tt(N, k, F, M, b = !1) {
-  const { useAppStore: x, useStarPrinterDiscover: A } = k, { selectedClientPrinterSelector: U } = F;
-  function W() {
-    const n = B(), P = x(), D = A(), f = V(void 0), [i, H] = S(N), [o, C] = S(), [d, m] = S(), g = z(d), [R, v] = S(), [j, w] = S(M), r = p(
+import { useRef as Q, useState as f, useCallback as v, useEffect as N } from "react";
+import b from "dayjs";
+import { monitor as V } from "@ancon/wildcat-printing";
+import X from "../shared/hooks/usePrevious.mjs";
+import Y from "../shared/hooks/useMountedRef.mjs";
+import { StarCloudScanStatus as t } from "./types.mjs";
+const Z = ["TSP654"], _ = 1;
+function te(k, F, M, A, U = !1, u) {
+  const { useAppStore: W, useStarPrinterDiscover: w } = F, { selectedClientPrinterSelector: H } = M;
+  function j() {
+    const n = Y(), g = W(), y = w(), m = Q(void 0), [s, G] = f(k), [r, C] = f(), [l, P] = f(), E = X(l), [I, D] = f(), [q, p] = f(A), o = v(
       (c) => {
-        n != null && n.current && H(c);
+        n != null && n.current && G(c);
       },
       [n]
-    ), y = p(
+    ), B = (c) => {
+      if ((u == null ? void 0 : u.sanitizeEnabled) ?? U) {
+        const i = (u == null ? void 0 : u.sanitizeRegex) ?? /[\D]/gi;
+        return c.replace(i, "");
+      }
+      return c;
+    }, h = v(
       async (c) => {
-        var s;
-        (s = f.current) == null || s.stop(), r(e.ScanningComplete);
-        const a = String.fromCharCode(...c).trim();
-        w(
-          b ? a.replace(/[\D]/gi, "") : a
-        );
+        var d;
+        (d = m.current) == null || d.stop(), o(t.ScanningComplete);
+        const a = String.fromCharCode(...c).trim(), i = B(a);
+        p(i);
       },
-      [r]
-    ), E = p(
+      [o]
+    ), L = v(
       async ({ macAddress: c, ipAddress: a }) => {
-        function s(t) {
-          r(e.CommunicationError), n != null && n.current && v(t == null ? void 0 : t.message);
+        function i(e) {
+          o(t.CommunicationError), n != null && n.current && D(e == null ? void 0 : e.message);
         }
-        const l = {
-          onStarted: (t) => {
-            if (t && t.inputDevicesCount > 0) {
-              const { inputDevicesCount: u } = t;
-              r(e.ReadyToScan), C({
-                inputDeviceCount: u,
+        const d = {
+          onStarted: (e) => {
+            if (e && e.inputDevicesCount > 0) {
+              const { inputDevicesCount: S } = e;
+              o(t.ReadyToScan), C({
+                inputDeviceCount: S,
                 lastConnectedOn: /* @__PURE__ */ new Date()
               });
             }
           },
-          onStopped: (t) => {
-            t && s(t), C(void 0);
+          onStopped: (e) => {
+            e && i(e), C(void 0);
           },
           inputDevice: {
             onConnected: () => {
-              const t = ((o == null ? void 0 : o.inputDeviceCount) || 0) + 1;
-              r(
-                t > 0 ? e.ReadyToScan : e.PrinterDetected
+              const e = ((r == null ? void 0 : r.inputDeviceCount) || 0) + 1;
+              o(
+                e > 0 ? t.ReadyToScan : t.PrinterDetected
               ), C({
-                inputDeviceCount: t,
+                inputDeviceCount: e,
                 lastConnectedOn: /* @__PURE__ */ new Date()
               });
             },
             onDisconnected: () => {
-              const t = ((o == null ? void 0 : o.inputDeviceCount) || 0) - 1 >= 0 ? ((o == null ? void 0 : o.inputDeviceCount) || 0) - 1 : 0;
-              r(
-                t > 0 ? e.ReadyToScan : e.PrinterDetected
+              const e = ((r == null ? void 0 : r.inputDeviceCount) || 0) - 1 >= 0 ? ((r == null ? void 0 : r.inputDeviceCount) || 0) - 1 : 0;
+              o(
+                e > 0 ? t.ReadyToScan : t.PrinterDetected
               ), C({
-                inputDeviceCount: t
+                inputDeviceCount: e
               });
             },
-            onCommunicationError: s,
-            onDataReceived: (t) => m({ data: t, lastReceivedOn: /* @__PURE__ */ new Date() })
+            onCommunicationError: i,
+            onDataReceived: (e) => P({ data: e, lastReceivedOn: /* @__PURE__ */ new Date() })
           }
         };
-        if (f.current = q(a || c, l), n != null && n.current)
+        if (m.current = V(a || c, d), n != null && n.current)
           try {
-            await f.current.start();
-          } catch (t) {
-            r(e.CommunicationError), n != null && n.current && v(t == null ? void 0 : t.message);
+            await m.current.start();
+          } catch (e) {
+            o(t.CommunicationError), n != null && n.current && D(e == null ? void 0 : e.message);
           }
       },
-      [o, r, n]
-    ), h = p(async () => {
-      n != null && n.current && (r(e.WaitingForPrinter), v(void 0), m(void 0), C(void 0), w(void 0));
-      const c = U(P.getState()), { macAddress: a, serialNumber: s } = c;
+      [r, o, n]
+    ), T = v(async () => {
+      n != null && n.current && (o(t.WaitingForPrinter), D(void 0), P(void 0), C(void 0), p(void 0));
+      const c = H(g.getState()), { macAddress: a, serialNumber: i } = c;
       try {
-        const t = (await D(2e3)).find(
-          (u) => a && u.macAddress.toLowerCase() === a.toLowerCase() || s && u.serialNumber === s
+        const e = (await y(2e3)).find(
+          (S) => a && S.macAddress.toLowerCase() === a.toLowerCase() || i && S.serialNumber === i
         );
         if (n != null && n.current) {
-          if (t) {
-            if (J.some(
-              (u) => {
-                var L;
-                return (L = t.model) == null ? void 0 : L.toLowerCase().includes(u.toLowerCase());
+          if (e) {
+            if (Z.some(
+              (S) => {
+                var x;
+                return (x = e.model) == null ? void 0 : x.toLowerCase().includes(S.toLowerCase());
               }
             )) {
-              r(e.UnsupportedPrinter);
+              o(t.UnsupportedPrinter);
               return;
             }
-            E(t);
+            L(e);
           }
-          r(
-            t ? e.PrinterDetected : e.PrinterNotDetected
+          o(
+            e ? t.PrinterDetected : t.PrinterNotDetected
           );
         }
       } catch {
-        n != null && n.current && r(e.PrinterNotDetected);
+        n != null && n.current && o(t.PrinterNotDetected);
       }
     }, [
       n,
-      P,
-      r,
-      D,
-      E
-    ]), G = i === e.WaitingForPrinter || i === e.PrinterDetected || i === e.ReadyToScan || i === e.ScanningComplete, I = i === e.PrinterNotDetected || i === e.ScanFailed || i === e.CommunicationError || i === e.UnsupportedPrinter;
-    return O(() => {
-      if (!g && (d == null ? void 0 : d.data) && o && (o != null && o.lastConnectedOn)) {
-        const { lastConnectedOn: a } = o, { lastReceivedOn: s, data: l } = d;
-        T(s).diff(
-          T(a),
+      g,
+      o,
+      y,
+      L
+    ]), J = s === t.WaitingForPrinter || s === t.PrinterDetected || s === t.ReadyToScan || s === t.ScanningComplete, K = s === t.PrinterNotDetected || s === t.ScanFailed || s === t.CommunicationError || s === t.UnsupportedPrinter;
+    return N(() => {
+      if (!E && (l == null ? void 0 : l.data) && r && (r != null && r.lastConnectedOn)) {
+        const { lastConnectedOn: a } = r, { lastReceivedOn: i, data: d } = l;
+        b(i).diff(
+          b(a),
           "second",
           !0
-        ) > K ? y(l) : m(void 0);
+        ) > _ ? h(d) : P(void 0);
       }
-    }, [d, g, o, y]), O(() => (i === e.WaitingForPrinter && h(), () => {
+    }, [l, E, r, h]), N(() => (s === t.WaitingForPrinter && T(), () => {
       var c;
-      (c = f.current) == null || c.stop();
+      (c = m.current) == null || c.stop();
     }), []), {
-      startScan: h,
-      changeDeviceStatus: r,
-      scanStatus: i,
-      reading: j,
-      connectionError: R,
-      isLoading: G,
-      isError: I
+      startScan: T,
+      changeDeviceStatus: o,
+      scanStatus: s,
+      reading: q,
+      connectionError: I,
+      isLoading: J,
+      isError: K
     };
   }
-  return W;
+  return j;
 }
 export {
-  tt as default
+  te as default
 };