ota-hub-reactjs 0.0.13 → 0.0.14

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

@@ -27,7 +27,6 @@ export type DeviceConnectionState = {
 export declare function createDefaultInitialDeviceState<T extends DeviceConnectionState>(uuid: string, props?: any): T;
 export type DeviceWhispererProps<T extends DeviceConnectionState> = {
     createInitialConnectionState?: (uuid: string) => Partial<T>;
-    connectOn?: boolean;
 };
 export declare function MultiDeviceWhisperer<T extends DeviceConnectionState>({ createInitialConnectionState, }?: DeviceWhispererProps<T>): {
     connections: T[];

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

@@ -256,7 +256,7 @@ export function ESP32MultiDeviceWhisperer({ ...props } = {}) {
         const port = await navigator.serial.requestPort({
             filters: [{ usbVendorId: 0x303a }]
         });
-        return await base.addConnection({
+        const return_uuid = await base.addConnection({
             uuid,
             propCreator: (id) => {
                 const props = propCreator?.(id);
@@ -271,6 +271,10 @@ export function ESP32MultiDeviceWhisperer({ ...props } = {}) {
                 };
             }
         });
+        const conn = base.getConnection(return_uuid);
+        if (conn?.autoConnect)
+            await connect(return_uuid);
+        return return_uuid;
     };
     const removeConnection = async (uuid) => {
         try {

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

@@ -3,7 +3,7 @@ export type MQTTConnectionState = DeviceConnectionState & {
     pingFunction?: (props?: any) => void;
     touchHeartbeat?: () => void;
 };
-export declare function MQTTMultiDeviceWhisperer<AppOrMessageLayer extends MQTTConnectionState>({ serverUrl, uuidFromMessage, subTopicFromUuid, pubTopicFromUuid, serverPort, clientId, username, password, autoConnect, ...props }: {
+export declare function MQTTMultiDeviceWhisperer<AppOrMessageLayer extends MQTTConnectionState>({ serverUrl, uuidFromMessage, subTopicFromUuid, pubTopicFromUuid, serverPort, clientId, username, password, serverAutoConnect, serverConnectOn, ...props }: {
     serverUrl: string;
     uuidFromMessage: (topic: string, payload: Buffer<ArrayBufferLike>) => string;
     subTopicFromUuid?: (uuid: string) => string;
@@ -12,7 +12,8 @@ export declare function MQTTMultiDeviceWhisperer<AppOrMessageLayer extends MQTTC
     clientId?: string;
     username?: string;
     password?: string;
-    autoConnect?: boolean;
+    serverAutoConnect?: boolean;
+    serverConnectOn?: boolean;
 } & DeviceWhispererProps<AppOrMessageLayer>): {
     addConnection: ({ uuid, propCreator }: AddConnectionProps<AppOrMessageLayer>) => Promise<string | undefined>;
     removeConnection: (uuid: string) => Promise<void>;

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

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from "react";
 import { MultiDeviceWhisperer } from "../base/device-whisperer.js";
 import mqtt from "mqtt";
-export function MQTTMultiDeviceWhisperer({ serverUrl, uuidFromMessage, subTopicFromUuid = undefined, pubTopicFromUuid = undefined, serverPort = 8883, clientId = undefined, username = undefined, password = undefined, autoConnect = true, ...props }) {
+export function MQTTMultiDeviceWhisperer({ serverUrl, uuidFromMessage, subTopicFromUuid = undefined, pubTopicFromUuid = undefined, serverPort = 8883, clientId = undefined, username = undefined, password = undefined, serverAutoConnect = true, serverConnectOn = false, ...props }) {
     const base = MultiDeviceWhisperer(props);
     const clientRef = useRef(null);
     const isUnmountedRef = useRef(false);
@@ -211,7 +211,9 @@ export function MQTTMultiDeviceWhisperer({ serverUrl, uuidFromMessage, subTopicF
         // Delete this adding connections item
         addingConnections.current.delete(uuid);
         // Connect immediately
-        connect(uuid);
+        const conn = base.getConnection(uuid);
+        if (conn?.autoConnect)
+            await connect(uuid);
         return uuid;
     };
     const removeConnection = async (uuid) => {
@@ -228,11 +230,11 @@ export function MQTTMultiDeviceWhisperer({ serverUrl, uuidFromMessage, subTopicF
         }
     };
     useEffect(() => {
-        if (!(autoConnect || props.connectOn))
+        if (!(serverAutoConnect || serverConnectOn))
             return;
         const cleanup = connectToMQTTServer();
         return cleanup;
-    }, [serverUrl, props.connectOn]);
+    }, [serverUrl, serverConnectOn]);
     return {
         ...base,
         addConnection,

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

@@ -292,7 +292,7 @@ export function SerialMultiDeviceWhisperer({ ...props } = {}) {
             const device = await navigator.usb.requestDevice({
                 filters: []
             });
-            return await base.addConnection({
+            const return_uuid = await base.addConnection({
                 uuid,
                 propCreator: (id) => {
                     const props = propCreator?.(id);
@@ -308,6 +308,10 @@ export function SerialMultiDeviceWhisperer({ ...props } = {}) {
                     };
                 }
             });
+            const conn = base.getConnection(return_uuid);
+            if (conn?.autoConnect)
+                await connect(return_uuid);
+            return return_uuid;
         }
         catch (e) {
             console.log("User cancelled or no device selected");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ota-hub-reactjs",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "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",