ota-hub-reactjs 0.0.10 → 0.0.13

package/dist/base/device-whisperer.d.ts

@@ -26,7 +26,7 @@ export type DeviceConnectionState = {
 };
 export declare function createDefaultInitialDeviceState<T extends DeviceConnectionState>(uuid: string, props?: any): T;
 export type DeviceWhispererProps<T extends DeviceConnectionState> = {
-    createInitialConnectionState?: (uuid: string) => T;
+    createInitialConnectionState?: (uuid: string) => Partial<T>;
     connectOn?: boolean;
 };
 export declare function MultiDeviceWhisperer<T extends DeviceConnectionState>({ createInitialConnectionState, }?: DeviceWhispererProps<T>): {
@@ -43,5 +43,6 @@ export declare function MultiDeviceWhisperer<T extends DeviceConnectionState>({
     appendLog: (uuid: string, log: LogLine) => void;
     isReady: boolean;
     setIsReady: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    createInitialConnectionState: (uuid: string) => Partial<T>;
 };
 export {};

package/dist/base/device-whisperer.js

@@ -46,6 +46,7 @@ export function MultiDeviceWhisperer({ createInitialConnectionState = createDefa
         uuid = uuid ?? uniqueNamesGenerator({ dictionaries: [animals] });
         const props = propCreator?.(uuid);
         const newConnection = {
+            ...createDefaultInitialDeviceState(uuid),
             ...createInitialConnectionState(uuid),
             ...props
         };
@@ -76,6 +77,7 @@ export function MultiDeviceWhisperer({ createInitialConnectionState = createDefa
         getConnection,
         appendLog,
         isReady,
-        setIsReady
+        setIsReady,
+        createInitialConnectionState
     };
 }

package/dist/message_layers/protobuf-wrapper.d.ts

@@ -31,4 +31,5 @@ export declare function ProtobufMultiDeviceWhisperer<AppLayer extends DeviceConn
     appendLog: (uuid: string, log: import("../base/device-whisperer.js").LogLine) => void;
     isReady: boolean;
     setIsReady: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    createInitialConnectionState: (uuid: string) => Partial<AppLayer>;
 };

package/dist/transport_layers/esp32-device-whisperer.d.ts

@@ -33,4 +33,5 @@ export declare function ESP32MultiDeviceWhisperer<AppOrMessageLayer extends ESP3
     appendLog: (uuid: string, log: import("../base/device-whisperer.js").LogLine) => void;
     isReady: boolean;
     setIsReady: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    createInitialConnectionState: (uuid: string) => Partial<AppOrMessageLayer>;
 };

package/dist/transport_layers/esp32-device-whisperer.js

@@ -137,20 +137,13 @@ export function ESP32MultiDeviceWhisperer({ ...props } = {}) {
                 level: 0,
                 message: `[!] Read loop error: ${e}`,
             });
-            await disconnect(uuid);
         }
         finally {
-            base.updateConnection(uuid, (c) => ({
-                ...c,
-                transport: null,
-                isConnected: false,
-                isConnecting: false,
-                autoConnect: false,
-            }));
             base.appendLog(uuid, {
                 level: 0,
                 message: "[!] Serial disconnected",
             });
+            await disconnect(uuid);
         }
     };
     const restartDevice = async (uuid, default_transport) => {
@@ -168,15 +161,19 @@ export function ESP32MultiDeviceWhisperer({ ...props } = {}) {
     };
     const connect = async (uuid, baudrate, restart_on_connect = true) => {
         const conn = base.getConnection(uuid);
-        if (!conn?.port)
+        if (!conn)
             return;
-        if (!conn?.transport) {
-            await disconnect(uuid);
+        let port = conn?.port;
+        if (!port) {
+            port = await navigator.serial.requestPort({
+                filters: [{ usbVendorId: 0x303a }]
+            });
+            base.updateConnection(uuid, (c) => ({ ...c, port }));
         }
         ;
         base.updateConnection(uuid, (c) => ({ ...c, isConnecting: true }));
         const use_baudrate = baudrate ?? conn.baudrate ?? 115200;
-        const transport = new Transport(conn.port, false, false);
+        const transport = new Transport(port, false, false);
         try {
             const esploader = new ESPLoader({
                 transport,
@@ -247,6 +244,7 @@ export function ESP32MultiDeviceWhisperer({ ...props } = {}) {
         // Always clear the transport and reset connection state
         base.updateConnection(uuid, (c) => ({
             ...c,
+            port: null,
             transport: null,
             isConnected: false,
             isConnecting: false,
@@ -263,9 +261,12 @@ export function ESP32MultiDeviceWhisperer({ ...props } = {}) {
             propCreator: (id) => {
                 const props = propCreator?.(id);
                 return {
-                    send: props?.send || ((d) => defaultSend(id, d)),
-                    onReceive: props?.onReceive || ((d) => defaultOnReceive(id, d)),
+                    send: (d) => defaultSend(id, d),
+                    onReceive: (d) => defaultOnReceive(id, d),
                     port,
+                    // Initial connection state
+                    ...base.createInitialConnectionState(id),
+                    // From props
                     ...props
                 };
             }
@@ -292,7 +293,7 @@ export function ESP32MultiDeviceWhisperer({ ...props } = {}) {
         const conn = base.getConnection(uuid);
         if (!conn || !conn.port || assetsToFlash.length === 0)
             return;
-        await base.disconnect(uuid);
+        await disconnect(uuid);
         base.updateConnection(uuid, (c) => ({ ...c, isFlashing: true, flashProgress: 0, flashError: undefined }));
         try {
             // --- Connect ONCE ---

package/dist/transport_layers/mqtt-device-whisperer.d.ts

@@ -28,4 +28,5 @@ export declare function MQTTMultiDeviceWhisperer<AppOrMessageLayer extends MQTTC
     appendLog: (uuid: string, log: import("../base/device-whisperer.js").LogLine) => void;
     isReady: boolean;
     setIsReady: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    createInitialConnectionState: (uuid: string) => Partial<AppOrMessageLayer>;
 };

package/dist/transport_layers/mqtt-device-whisperer.js

@@ -6,7 +6,7 @@ export function MQTTMultiDeviceWhisperer({ serverUrl, uuidFromMessage, subTopicF
     const clientRef = useRef(null);
     const isUnmountedRef = useRef(false);
     const watchdogTimers = useRef({});
-    const addingConnections = new Set();
+    const addingConnections = useRef(new Set());
     const connectToMQTTServer = () => {
         isUnmountedRef.current = false;
         if (clientRef.current) {
@@ -189,7 +189,7 @@ export function MQTTMultiDeviceWhisperer({ serverUrl, uuidFromMessage, subTopicF
             Error("In MQTT you MUST define a UUID otherwise we don't know what device we're connecting to!");
             return;
         }
-        if (base.connectionsRef.current.some(c => c.uuid === uuid) || addingConnections.has(uuid)) {
+        if (base.connectionsRef.current.some(c => c.uuid === uuid) || addingConnections.current.has(uuid)) {
             return;
         }
         await base.addConnection({
@@ -197,15 +197,19 @@ export function MQTTMultiDeviceWhisperer({ serverUrl, uuidFromMessage, subTopicF
             propCreator: (id) => {
                 const props = propCreator?.(id);
                 return {
-                    send: props?.send || ((d) => defaultSend(id, d)),
-                    onReceive: props?.onReceive || ((d) => defaultOnReceive(id, d)),
-                    touchHeartbeat: props?.touchHeartbeat || (() => touchHeartbeat(id)),
+                    // Defaults, may be overridden by props
+                    send: (d) => defaultSend(id, d),
+                    onReceive: (d) => defaultOnReceive(id, d),
+                    touchHeartbeat: () => touchHeartbeat(id),
+                    // Initial connection state
+                    ...base.createInitialConnectionState(id),
+                    // From props
                     ...props
                 };
             }
         });
         // Delete this adding connections item
-        addingConnections.delete(uuid);
+        addingConnections.current.delete(uuid);
         // Connect immediately
         connect(uuid);
         return uuid;
@@ -224,8 +228,10 @@ export function MQTTMultiDeviceWhisperer({ serverUrl, uuidFromMessage, subTopicF
         }
     };
     useEffect(() => {
-        if (autoConnect || props.connectOn)
-            connectToMQTTServer();
+        if (!(autoConnect || props.connectOn))
+            return;
+        const cleanup = connectToMQTTServer();
+        return cleanup;
     }, [serverUrl, props.connectOn]);
     return {
         ...base,

package/dist/transport_layers/serial-device-whisperer.d.ts

@@ -51,4 +51,5 @@ export declare function SerialMultiDeviceWhisperer<AppOrMessageLayer extends Ser
     appendLog: (uuid: string, log: import("../base/device-whisperer.js").LogLine) => void;
     isReady: boolean;
     setIsReady: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    createInitialConnectionState: (uuid: string) => Partial<AppOrMessageLayer>;
 };

package/dist/transport_layers/serial-device-whisperer.js

@@ -289,18 +289,21 @@ export function SerialMultiDeviceWhisperer({ ...props } = {}) {
     };
     const addConnection = async ({ uuid, propCreator }) => {
         try {
-            // NATIVE WEBUSB REQUEST
             const device = await navigator.usb.requestDevice({
-                filters: [] // Espressif Vendor ID
+                filters: []
             });
             return await base.addConnection({
                 uuid,
                 propCreator: (id) => {
                     const props = propCreator?.(id);
                     return {
-                        send: props?.send || ((d) => defaultSend(id, d)),
-                        onReceive: props?.onReceive || ((d) => defaultOnReceive(id, d)),
-                        device, // Storing USBDevice instead of SerialPort
+                        // Defaults, may be overridden by props
+                        send: (d) => defaultSend(id, d),
+                        onReceive: (d) => defaultOnReceive(id, d),
+                        device,
+                        // Initial connection state
+                        ...base.createInitialConnectionState(id),
+                        // From props
                         ...props
                     };
                 }

package/dist/transport_layers/websocket-device-whisperer.d.ts

@@ -27,4 +27,5 @@ export declare function WebsocketMultiDeviceWhisperer<AppOrMessageLayer extends
     appendLog: (uuid: string, log: import("../base/device-whisperer.js").LogLine) => void;
     isReady: boolean;
     setIsReady: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    createInitialConnectionState: (uuid: string) => Partial<AppOrMessageLayer>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ota-hub-reactjs",
-  "version": "0.0.10",
+  "version": "0.0.13",
   "description": "ReactJS tools for building web apps to flash MCU devices such as esp32, brought to you by OTA Hub.",
   "type": "module",
   "main": "dist/index.js",