@vention/machine-logic-ui-sdk 0.20.0 → 0.22.0

package/index.esm.js

@@ -2856,8 +2856,9 @@ const isOnEdge = () => {
 const getExecutionEngineHttpUrl = () => {
   return isOnEdge() ? `http://${window.location.hostname}:3100` : getExecutionEngineUrlGivenUiIframeUrl(window.location.href);
 };
-const getMqttWsUrl = () => __awaiter(void 0, void 0, void 0, function* () {
-  return isOnEdge() ? `ws://${window.location.hostname}:9001` : getMqttWsUrlGivenUiIframeUrl(window.location.href);
+const getMqttWsUrl = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (version = "v2") {
+  const urlOnEdge = version === "v2" ? "ws://192.168.5.2:9001" : `ws://${window.location.hostname}:9001`;
+  return isOnEdge() ? urlOnEdge : getMqttWsUrlGivenUiIframeUrl(window.location.href);
 });
 const connectToMqttAndGetClient = () => __awaiter(void 0, void 0, void 0, function* () {
   const websocketUrl = yield getMqttWsUrl();
@@ -2881,12 +2882,18 @@ const getMqttWsUrlGivenUiIframeUrl = uiIframeUrl => {
   const wssBaseUrl = baseUrl.replace("https:", "wss:");
   return `${wssBaseUrl}/${token}/mqtt`;
 };
+const closeCustomUi = () => {
+  window.parent.postMessage("closeCustomUi", "*");
+};
 
 const defaultContext = {
   client: null,
   connectionStatus: "disconnected"
 };
 const mqttContext = /*#__PURE__*/createContext(defaultContext);
+const defaultProps = {
+  version: "v2"
+};
 const MqttProvider = props => {
   const [connectionStatus, setConnectionStatus] = useState("disconnected");
   const [mqttClient, setMqttClient] = useState(null);
@@ -2897,8 +2904,9 @@ const MqttProvider = props => {
   useEffect(function mqttConnection() {
     function connectToMqtt() {
       return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         console.log("Connecting to MQTT");
-        const client = mqtt.connect(yield getMqttWsUrl());
+        const client = mqtt.connect(yield getMqttWsUrl((_a = props.version) !== null && _a !== void 0 ? _a : defaultProps.version));
         client.on("connect", () => {
           setConnectionStatus("connected");
           console.log("Connected to MQTT");
@@ -2929,19 +2937,6 @@ const MqttProvider = props => {
   });
 };
 
-var MqttSandingTopics;
-(function (MqttSandingTopics) {
-  MqttSandingTopics["SET_APP_STATE"] = "sandingMachineApp/setAppState";
-  MqttSandingTopics["STATION_CALIBRATION_STATE"] = "sandingMachineApp/state/stationCalibration";
-  MqttSandingTopics["STATE_APP"] = "sandingMachineApp/state/app";
-  MqttSandingTopics["STATE_ROBOT"] = "sandingMachineApp/state/robot";
-  MqttSandingTopics["STATE_STATION"] = "sandingMachineApp/state/station";
-  MqttSandingTopics["CHANGE_SANDING_PAPER"] = "sandingMachineApp/state/changeSandingPaper";
-  MqttSandingTopics["SANDING_PAPER_CHANGED"] = "sandingMachineApp/sandingPaperChanged";
-  MqttSandingTopics["GET_INITIAL_STATE"] = "sandingMachineApp/getInitialState";
-  MqttSandingTopics["NOTIFICATION_MESSAGES"] = "sandingMachineApp/notification/messages";
-})(MqttSandingTopics || (MqttSandingTopics = {}));
-
 const useMqttSubscription = props => {
   const mqtt = useContext(mqttContext);
   const [message, setMessage] = useState();
@@ -2962,4 +2957,4 @@ const useMqttSubscription = props => {
   return message;
 };
 
-export { MqttClient, MqttProvider, MqttSandingTopics, VirtualKeyboard, connectToMqttAndGetClient, getExecutionEngineHttpUrl, getMachineCodeProcessHttpUrl, getMqttWsUrl, getMqttWsUrlGivenUiIframeUrl, isOnEdge, isTouchScreenDevice, mqttContext, useMqttSubscription };
+export { MqttClient, MqttProvider, VirtualKeyboard, closeCustomUi, connectToMqttAndGetClient, getExecutionEngineHttpUrl, getMachineCodeProcessHttpUrl, getMqttWsUrl, getMqttWsUrlGivenUiIframeUrl, isOnEdge, isTouchScreenDevice, mqttContext, useMqttSubscription };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vention/machine-logic-ui-sdk",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/VentionCo/machine-cloud.git"

package/src/index.d.ts

@@ -2,5 +2,5 @@ export * from "./lib/components/virtual-keyboard/virtual-keyboard";
 export * from "./lib/utils/machine-logic-ui-sdk-utils";
 export * from "./lib/mqtt-browser/mqtt-client";
 export * from "./lib/mqtt/mqtt-context";
-export * from "./lib/mqtt/mqtt-types";
 export * from "./lib/mqtt/use-mqtt-subscription";
+export * from "./lib/mqtt/generic-mqtt-mapping";

package/src/lib/mqtt/generic-mqtt-mapping.d.ts

@@ -0,0 +1 @@
+export type MqttPayloadByTopic<TMapping extends Record<string, unknown>, T extends keyof TMapping> = TMapping[T];

package/src/lib/mqtt/mqtt-context.d.ts

@@ -7,6 +7,7 @@ interface MqttContext {
 export declare const mqttContext: import("react").Context<MqttContext>;
 interface Props {
     children: ReactNode;
+    version?: "v2" | "v3";
 }
 export declare const MqttProvider: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export {};

package/src/lib/mqtt/use-mqtt-subscription.d.ts

@@ -1,6 +1,5 @@
-import { MqttSandingTopics, MqttPayloadByTopic } from "./mqtt-types";
-interface Props<TMqttTopic> {
-    topic: TMqttTopic;
+interface Props {
+    topic: string;
 }
-export declare const useMqttSubscription: <TMqttTopic extends MqttSandingTopics>(props: Props<TMqttTopic>) => MqttPayloadByTopic<TMqttTopic>;
+export declare const useMqttSubscription: <TMessage>(props: Props) => TMessage;
 export {};

package/src/lib/utils/machine-logic-ui-sdk-utils.d.ts

@@ -2,7 +2,8 @@ import { MqttClient } from "../mqtt-browser/mqtt-client";
 export declare const isTouchScreenDevice: () => boolean;
 export declare const isOnEdge: () => boolean;
 export declare const getExecutionEngineHttpUrl: () => string;
-export declare const getMqttWsUrl: () => Promise<string>;
+export declare const getMqttWsUrl: (version?: "v2" | "v3") => Promise<string>;
 export declare const connectToMqttAndGetClient: () => Promise<MqttClient>;
 export declare const getMachineCodeProcessHttpUrl: (processName: string) => string;
 export declare const getMqttWsUrlGivenUiIframeUrl: (uiIframeUrl: string) => string;
+export declare const closeCustomUi: () => void;

package/src/lib/mqtt/mqtt-types.d.ts

@@ -1,64 +0,0 @@
-export declare enum MqttSandingTopics {
-    SET_APP_STATE = "sandingMachineApp/setAppState",
-    STATION_CALIBRATION_STATE = "sandingMachineApp/state/stationCalibration",
-    STATE_APP = "sandingMachineApp/state/app",
-    STATE_ROBOT = "sandingMachineApp/state/robot",
-    STATE_STATION = "sandingMachineApp/state/station",
-    CHANGE_SANDING_PAPER = "sandingMachineApp/state/changeSandingPaper",
-    SANDING_PAPER_CHANGED = "sandingMachineApp/sandingPaperChanged",
-    GET_INITIAL_STATE = "sandingMachineApp/getInitialState",
-    NOTIFICATION_MESSAGES = "sandingMachineApp/notification/messages"
-}
-export type SandingApplicationState = "STOP" | "START" | "HOME" | "FREEDRIVE" | "STOPPING" | "FAULT" | "CALIBRATING_LASER" | "CALIBRATING_STATION";
-export type SandingRobotState = "FAULT" | "READY";
-type MqttSetAppStatePayload = {
-    state: SandingApplicationState;
-    data?: unknown;
-};
-export type StationCalibrationState = "completed" | "calibrating" | "incomplete";
-export type MqttStationCalibrationStatePayload = {
-    station1: StationCalibrationState;
-    station2: StationCalibrationState;
-    station3: StationCalibrationState;
-    station4: StationCalibrationState;
-};
-type MqttRobotStatePayload = {
-    state: SandingRobotState;
-};
-export type StationState = {
-    completedSteps: number;
-    totalSteps: number;
-    isActive: boolean;
-    status: "waitingForPanel" | "inProgress" | "ready" | "complete";
-    isVacuumActivated: boolean;
-    isPanelInPlace: boolean;
-};
-export type MqttStationStatePayload = {
-    station1: StationState;
-    station2: StationState;
-    station3: StationState;
-    station4: StationState;
-};
-type MqttChangeSandingPaperPayload = object;
-type MqttSandingPaperChangedPayload = object;
-type MqttGetInitialStatePayload = object;
-export type MqttNotificationPayload = {
-    id: string;
-    message: string;
-    type: "info" | "warn" | "error";
-    timestamp: number;
-    isRead?: boolean;
-};
-type MqttPayloadMapping = {
-    [MqttSandingTopics.SET_APP_STATE]: MqttSetAppStatePayload;
-    [MqttSandingTopics.STATION_CALIBRATION_STATE]: MqttStationCalibrationStatePayload;
-    [MqttSandingTopics.STATE_APP]: MqttSetAppStatePayload;
-    [MqttSandingTopics.STATE_ROBOT]: MqttRobotStatePayload;
-    [MqttSandingTopics.STATE_STATION]: MqttStationStatePayload;
-    [MqttSandingTopics.CHANGE_SANDING_PAPER]: MqttChangeSandingPaperPayload;
-    [MqttSandingTopics.SANDING_PAPER_CHANGED]: MqttSandingPaperChangedPayload;
-    [MqttSandingTopics.GET_INITIAL_STATE]: MqttGetInitialStatePayload;
-    [MqttSandingTopics.NOTIFICATION_MESSAGES]: MqttNotificationPayload;
-};
-export type MqttPayloadByTopic<T extends MqttSandingTopics> = MqttPayloadMapping[T];
-export {};