@ancon/wildcat-utils 1.40.33 → 1.40.34

package/package.json

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

package/printing/createStarCloudScanHook.js

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

package/printing/createStarCloudScanHook.mjs

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