@robdobsn/raftjs 1.10.7 → 1.11.6

package/src/RaftConnector.ts

@@ -14,7 +14,7 @@ import RaftChannelWebSocket from "./RaftChannelWebSocket";
 import RaftChannelWebSerial from "./RaftChannelWebSerial";
 import RaftChannelSimulated from "./RaftChannelSimulated";
 import RaftCommsStats from "./RaftCommsStats";
-import { RaftEventFn, RaftOKFail, RaftFileSendType, RaftFileDownloadResult, RaftProgressCBType, RaftBridgeSetupResp, RaftFileDownloadFn, RaftReportMsg } from "./RaftTypes";
+import { RaftEventFn, RaftOKFail, RaftFileSendType, RaftFileDownloadResult, RaftProgressCBType, RaftStreamDataProgressCBType, RaftBridgeSetupResp, RaftFileDownloadFn, RaftReportMsg } from "./RaftTypes";
 import RaftSystemUtils from "./RaftSystemUtils";
 import RaftFileHandler from "./RaftFileHandler";
 import RaftStreamHandler from "./RaftStreamHandler";
@@ -282,18 +282,7 @@ export default class RaftConnector {
     // Store locator
     this._channelConnLocator = locator;
 
-    // Get system type
-    if (this._getSystemTypeCB) {
-      // Get system type
-      this._systemType = await this._getSystemTypeCB(this._raftSystemUtils);
-
-      // Set defaults
-      if (this._systemType && this._systemType.defaultWiFiHostname) {
-        this._raftSystemUtils.setDefaultWiFiHostname(this._systemType.defaultWiFiHostname);
-      }
-    }
-
-    // Connect
+    // Connect channel first (system type resolution needs a live connection)
     let connOk = false;
     try {
       // Event
@@ -307,6 +296,16 @@ export default class RaftConnector {
 
     if (connOk) {
 
+      // Resolve system type now that the channel is connected
+      if (this._getSystemTypeCB) {
+        this._systemType = await this._getSystemTypeCB(this._raftSystemUtils);
+
+        // Set defaults
+        if (this._systemType && this._systemType.defaultWiFiHostname) {
+          this._raftSystemUtils.setDefaultWiFiHostname(this._systemType.defaultWiFiHostname);
+        }
+      }
+
       // Setup system type
       if (this._systemType) {
         this._systemType.setup(this._raftSystemUtils, this._onEventFn);
@@ -478,6 +477,28 @@ export default class RaftConnector {
 
   // Mark: Streaming --------------------------------------------------------------------------------
 
+  /**
+   * streamData - stream arbitrary data to a named firmware endpoint using the RT_STREAM protocol.
+   * @param streamContents data to stream
+   * @param fileName logical filename sent in ufStart (e.g. "pattern.thr")
+   * @param targetEndpoint REST API endpoint name on the firmware (e.g. "streampattern")
+   * @param progressCallback optional (sent, total, progress) callback
+   * @returns Promise<boolean> true on success
+   */
+  async streamData(
+    streamContents: Uint8Array,
+    fileName: string,
+    targetEndpoint: string,
+    progressCallback?: RaftStreamDataProgressCBType,
+  ): Promise<boolean> {
+    if (this._raftStreamHandler && this.isConnected()) {
+      return this._raftStreamHandler.streamData(
+        streamContents, fileName, targetEndpoint, progressCallback,
+      );
+    }
+    return false;
+  }
+
   /**
    * streamAudio - stream audio
    * @param streamContents audio data