@trops/dash-core 0.1.181 → 0.1.183

package/dist/index.js

@@ -27582,7 +27582,7 @@ var STATUS = {
  * @returns {Object} WebSocket provider interface
  */
 var useWebSocketProvider = function useWebSocketProvider(providerType) {
-  var _app$providers;
+  var _dashApi$api, _app$providers;
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var _options$autoConnect = options.autoConnect,
     autoConnect = _options$autoConnect === void 0 ? true : _options$autoConnect,
@@ -27629,6 +27629,10 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
   var maxMessagesRef = React.useRef(maxMessages);
   maxMessagesRef.current = maxMessages;
   var dashApi = app === null || app === void 0 ? void 0 : app.dashApi;
+  // Access the raw preload bridge (mainApi) for the webSocket sub-API.
+  // dashApi is an ElectronDashboardApi wrapper; the webSocket methods
+  // live on the underlying mainApi object (dashApi.api).
+  var wsApi = dashApi === null || dashApi === void 0 || (_dashApi$api = dashApi.api) === null || _dashApi$api === void 0 ? void 0 : _dashApi$api.webSocket;
 
   // Get the widget data
   var widgetData = widgetContext === null || widgetContext === void 0 ? void 0 : widgetContext.widgetData;
@@ -27680,7 +27684,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           }
           return _context2.abrupt("return");
         case 1:
-          if (!(!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !provider)) {
+          if (!(!wsApi || !provider)) {
             _context2.next = 2;
             break;
           }
@@ -27709,7 +27713,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           }
           _context2.prev = 5;
           _context2.next = 6;
-          return dashApi.webSocket.getStatus(selectedProviderName);
+          return wsApi.getStatus(selectedProviderName);
         case 6:
           statusResult = _context2.sent;
           if (!((statusResult === null || statusResult === void 0 ? void 0 : statusResult.status) === "connected")) {
@@ -27786,7 +27790,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
                 case 0:
                   _context.prev = 0;
                   _context.next = 1;
-                  return dashApi.webSocket.connect(selectedProviderName, {
+                  return wsApi.connect(selectedProviderName, {
                     url: provider.wsConfig.url,
                     headers: provider.wsConfig.headers || null,
                     subprotocols: provider.wsConfig.subprotocols || null,
@@ -27866,7 +27870,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           return _context2.stop();
       }
     }, _callee2, null, [[5, 8], [10, 14], [18, 22]]);
-  })), [dashApi, provider, providerType, selectedProviderName, applyConnected]);
+  })), [wsApi, provider, providerType, selectedProviderName, applyConnected]);
 
   /**
    * Disconnect from the WebSocket server.
@@ -27877,7 +27881,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
     return _regeneratorRuntime.wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          if (!(!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !selectedProviderName)) {
+          if (!(!wsApi || !selectedProviderName)) {
             _context3.next = 1;
             break;
           }
@@ -27915,7 +27919,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           pendingConnects["delete"](selectedProviderName);
           _context3.prev = 4;
           _context3.next = 5;
-          return dashApi.webSocket.disconnect(selectedProviderName);
+          return wsApi.disconnect(selectedProviderName);
         case 5:
           _context3.next = 7;
           break;
@@ -27927,7 +27931,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           return _context3.stop();
       }
     }, _callee3, null, [[4, 6]]);
-  })), [dashApi, selectedProviderName]);
+  })), [wsApi, selectedProviderName]);
 
   /**
    * Send data through the WebSocket connection
@@ -27938,14 +27942,14 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
       return _regeneratorRuntime.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            if (!(!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !selectedProviderName)) {
+            if (!(!wsApi || !selectedProviderName)) {
               _context4.next = 1;
               break;
             }
             throw new Error("WebSocket not connected");
           case 1:
             _context4.next = 2;
-            return dashApi.webSocket.send(selectedProviderName, data);
+            return wsApi.send(selectedProviderName, data);
           case 2:
             result = _context4.sent;
             if (!result.error) {
@@ -27964,7 +27968,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
     return function (_x) {
       return _ref4.apply(this, arguments);
     };
-  }(), [dashApi, selectedProviderName]);
+  }(), [wsApi, selectedProviderName]);
 
   // Keep a ref to connect so the auto-connect effect doesn't depend on it
   var connectRef = React.useRef(connect);
@@ -27972,7 +27976,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
 
   // Listen for incoming messages from main process
   React.useEffect(function () {
-    if (!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !selectedProviderName) return;
+    if (!wsApi || !selectedProviderName) return;
     var handleMessage = function handleMessage(_event, payload) {
       if (payload.provider !== selectedProviderName) return;
       if (!mountedRef.current) return;
@@ -27987,15 +27991,15 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
       setMessages(next);
       setLastMessage(msg);
     };
-    dashApi.webSocket.onMessage(handleMessage);
+    wsApi.onMessage(handleMessage);
     return function () {
-      return dashApi.webSocket.offMessage(handleMessage);
+      return wsApi.offMessage(handleMessage);
     };
-  }, [dashApi, selectedProviderName]);
+  }, [wsApi, selectedProviderName]);
 
   // Listen for status changes from main process
   React.useEffect(function () {
-    if (!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !selectedProviderName) return;
+    if (!wsApi || !selectedProviderName) return;
     var handleStatusChange = function handleStatusChange(_event, payload) {
       if (payload.provider !== selectedProviderName) return;
       if (!mountedRef.current) return;
@@ -28032,11 +28036,11 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
         }
       }
     };
-    dashApi.webSocket.onStatusChange(handleStatusChange);
+    wsApi.onStatusChange(handleStatusChange);
     return function () {
-      return dashApi.webSocket.offStatusChange(handleStatusChange);
+      return wsApi.offStatusChange(handleStatusChange);
     };
-  }, [dashApi, selectedProviderName]);
+  }, [wsApi, selectedProviderName]);
 
   // Auto-connect on mount or when provider selection changes
   React.useEffect(function () {
@@ -28053,7 +28057,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
       mountedRef.current = false;
 
       // Decrement consumer count; only disconnect if last consumer
-      if (connectedRef.current && dashApi !== null && dashApi !== void 0 && dashApi.webSocket && selectedProviderName) {
+      if (connectedRef.current && wsApi && selectedProviderName) {
         var state = connectionStates.get(selectedProviderName);
         if (state) {
           state.consumerCount = Math.max(0, state.consumerCount - 1);
@@ -28065,10 +28069,10 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           // Last consumer — disconnect
           connectionStates["delete"](selectedProviderName);
         }
-        dashApi.webSocket.disconnect(selectedProviderName)["catch"](function () {});
+        wsApi.disconnect(selectedProviderName)["catch"](function () {});
       }
     };
-  }, [dashApi, selectedProviderName]);
+  }, [wsApi, selectedProviderName]);
   return {
     isConnected: isConnected,
     isConnecting: isConnecting,
@@ -38612,6 +38616,16 @@ var WebSocketProviderForm = function WebSocketProviderForm(_ref) {
     _useState10 = _slicedToArray(_useState1, 2),
     errors = _useState10[0],
     setErrors = _useState10[1];
+  var _useState11 = React.useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    isWsTesting = _useState12[0],
+    setIsWsTesting = _useState12[1];
+  var _useState13 = React.useState(null),
+    _useState14 = _slicedToArray(_useState13, 2),
+    wsTestResult = _useState14[0],
+    setWsTestResult = _useState14[1];
+  var appContext = React.useContext(AppContext);
+  var dashApi = appContext === null || appContext === void 0 ? void 0 : appContext.dashApi;
   var nextRowIdRef = React.useRef(0);
   var nextRowId = function nextRowId() {
     return "ws_hdr_".concat(++nextRowIdRef.current);
@@ -38701,6 +38715,92 @@ var WebSocketProviderForm = function WebSocketProviderForm(_ref) {
       });
     });
   }
+  function handleTestConnection() {
+    return _handleTestConnection.apply(this, arguments);
+  }
+  function _handleTestConnection() {
+    _handleTestConnection = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var headers, _iterator4, _step4, row, subprotoArray, testName, startTime, result, latency, _t;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !url.trim() || !isValidWsUrl(url))) {
+              _context.next = 1;
+              break;
+            }
+            return _context.abrupt("return");
+          case 1:
+            setIsWsTesting(true);
+            setWsTestResult(null);
+
+            // Build config from current form state (same as handleSave)
+            headers = {};
+            _iterator4 = _createForOfIteratorHelper$4(headerRows);
+            try {
+              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                row = _step4.value;
+                if (row.key.trim()) {
+                  headers[row.key.trim()] = row.value;
+                }
+              }
+            } catch (err) {
+              _iterator4.e(err);
+            } finally {
+              _iterator4.f();
+            }
+            subprotoArray = subprotocols.split(",").map(function (s) {
+              return s.trim();
+            }).filter(Boolean);
+            testName = name.trim() || "__ws_test__";
+            startTime = Date.now();
+            _context.prev = 2;
+            _context.next = 3;
+            return dashApi.webSocket.connect(testName, {
+              url: url.trim(),
+              headers: Object.keys(headers).length > 0 ? headers : null,
+              subprotocols: subprotoArray.length > 0 ? subprotoArray : null,
+              credentials: Object.keys(credentials).length > 0 ? credentials : null
+            });
+          case 3:
+            result = _context.sent;
+            latency = Date.now() - startTime;
+            if (!result.error) {
+              _context.next = 4;
+              break;
+            }
+            setWsTestResult({
+              success: false,
+              message: result.message || "Connection failed"
+            });
+            _context.next = 5;
+            break;
+          case 4:
+            setWsTestResult({
+              success: true,
+              message: "Connected in ".concat(latency, "ms")
+            });
+            _context.next = 5;
+            return dashApi.webSocket.disconnect(testName)["catch"](function () {});
+          case 5:
+            _context.next = 7;
+            break;
+          case 6:
+            _context.prev = 6;
+            _t = _context["catch"](2);
+            setWsTestResult({
+              success: false,
+              message: (_t === null || _t === void 0 ? void 0 : _t.message) || "Connection failed"
+            });
+          case 7:
+            setIsWsTesting(false);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[2, 6]]);
+    }));
+    return _handleTestConnection.apply(this, arguments);
+  }
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "flex flex-col flex-1 min-h-0",
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -38719,7 +38819,7 @@ var WebSocketProviderForm = function WebSocketProviderForm(_ref) {
             return setName(value);
           },
           placeholder: "e.g., crypto-ws, stock-feed",
-          error: !!errors.name
+          inputClassName: errors.name ? "border-red-500" : ""
         }), errors.name && /*#__PURE__*/jsxRuntime.jsx("span", {
           className: "text-xs text-red-400",
           children: errors.name
@@ -38735,7 +38835,7 @@ var WebSocketProviderForm = function WebSocketProviderForm(_ref) {
             return setUrl(value);
           },
           placeholder: "wss://api.example.com/ws or ws://localhost:8080",
-          error: !!errors.url
+          inputClassName: errors.url ? "border-red-500" : ""
         }), errors.url && /*#__PURE__*/jsxRuntime.jsx("span", {
           className: "text-xs text-red-400",
           children: errors.url
@@ -38843,17 +38943,32 @@ var WebSocketProviderForm = function WebSocketProviderForm(_ref) {
                 });
               },
               placeholder: "Enter ".concat(field),
-              error: !!errors["cred_".concat(field)]
+              inputClassName: errors["cred_".concat(field)] ? "border-red-500" : ""
             }), errors["cred_".concat(field)] && /*#__PURE__*/jsxRuntime.jsx("span", {
               className: "text-xs text-red-400",
               children: errors["cred_".concat(field)]
             })]
           }, field);
         })]
+      }), wsTestResult && /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "p-3 rounded-lg text-sm ".concat(wsTestResult.success ? "bg-green-900/30 border border-green-700 text-green-300" : "bg-red-900/30 border border-red-700 text-red-300"),
+        children: /*#__PURE__*/jsxRuntime.jsxs("div", {
+          className: "flex items-center gap-2",
+          children: [/*#__PURE__*/jsxRuntime.jsx(DashReact.FontAwesomeIcon, {
+            icon: wsTestResult.success ? "circle-check" : "circle-exclamation"
+          }), /*#__PURE__*/jsxRuntime.jsx("span", {
+            children: wsTestResult.message
+          })]
+        })
       })]
     }), /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex-shrink-0 flex flex-row justify-end gap-2 px-6 py-4 border-t border-white/10",
-      children: [/*#__PURE__*/jsxRuntime.jsx(DashReact.Button, {
+      children: [(dashApi === null || dashApi === void 0 ? void 0 : dashApi.webSocket) && /*#__PURE__*/jsxRuntime.jsx(DashReact.Button, {
+        title: isWsTesting ? "Testing..." : "Test Connection",
+        onClick: handleTestConnection,
+        size: "sm",
+        disabled: !url.trim() || !isValidWsUrl(url)
+      }), /*#__PURE__*/jsxRuntime.jsx(DashReact.Button, {
         title: "Cancel",
         onClick: onCancel,
         size: "sm"