iosignal 1.5.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iosignal",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "iosignal",
   "type": "module",
   "main": "./dist/iosignal.cjs",

package/src/client/IOCore.js

@@ -352,7 +352,7 @@ export class IOCore extends EventEmitter {
               break;
 
             default:
-              // console.log('## Unkown payloadtype', payloadType)
+            // console.log('## Unkown payloadtype', payloadType)
           }
 
         } catch (err) {

package/src/client/IOWebSocket.js

@@ -1,25 +1,27 @@
 import { IOCore } from "./IOCore.js";
 import { Buffer } from 'meta-buffer-pack'
-export { Boho, RAND, BohoMsg, Meta, MetaSize , sha256, MBP, Buffer } from 'boho'
+export { Boho, RAND, BohoMsg, Meta, MetaSize, sha256, MBP, Buffer } from 'boho'
 export * from '../common/constants.js'
 
 // Browser WebSocket
-export class IO extends IOCore{
-  constructor(url  ) {
+export class IO extends IOCore {
+  static binaryType = "arraybuffer"
+
+  constructor(url) {
     super(url);
     document.addEventListener('visibilitychange', this.browserVisiblePing.bind(this));
-    if(url) this.open();
+    if (url) this.open();
   }
 
-  browserVisiblePing(){
+  browserVisiblePing() {
     if (document.visibilityState === 'visible') {
       this.ping()
     }
   }
 
-  
+
   close() {
-    if(this.socket ){
+    if (this.socket) {
       this.socket.onclose = null
       this.socket.onmessage = null
       this.socket.onerror = null
@@ -30,66 +32,81 @@ export class IO extends IOCore{
   }
 
 
-  stop(){
+  stop() {
     this.close()
     clearInterval(this.connectionCheckerIntervalID);
     this.connectionCheckerIntervalID = null
-  } 
-  
-  
+  }
+
+
   keepAlive() {
-    if ( !this.socket || this.socket?.readyState === 3 ) { //closed
+    if (!this.socket || this.socket?.readyState === 3) { //closed
       this.open();
     }
   }
 
-  createConnection(url){
+
+
+  createConnection(url) {
     // Web Browser WebSocket
-    this.socket = new WebSocket (url );
+    this.socket = new WebSocket(url);
+    this.socket.binaryType = IO.binaryType
+
     this.stateChange('opening')
 
-    this.socket.binaryType = "arraybuffer"
     this.socket.onopen = () => {
-      this.socket.onmessage = this.onWebSocketMessage.bind(this) ;
-      this.emit('open' );
+      if (this.socket.binaryType == "arraybuffer") {
+        this.socket.onmessage = this.onWebSocketMessage.bind(this);
+      } else {  // blob
+        this.socket.onmessage = this.onWebSocketMessageBlob.bind(this);
+      }
+      this.emit('open');
     };
 
-    this.socket.onerror = (e)=>{ 
+    this.socket.onerror = (e) => {
       this.emit('error', e)
     }
 
-    this.socket.onclose = ()=>{ 
-      this.emit('close' );
+    this.socket.onclose = () => {
+      this.emit('close');
     }
   }
 
-  onWebSocketMessage( event ) {
+  onWebSocketMessage(event) {
+    // event.data is arrayBuffer  or text_message
     this.rxCounter++;
     this.lastTxRxTime = Date.now();
-    let buffer;
-
-    // if( event.data instanceof ArrayBuffer ){
-    //   //binary frame
-    // }else{
-    //   //text frame
-    // }
-    buffer = Buffer.from( event.data )
+    let buffer = Buffer.from(event.data)
     this.rxBytes += buffer.byteLength
+    this.emit('socket_data', buffer);
+  }
 
-    this.emit('socket_data', buffer  );
+  async onWebSocketMessageBlob(event) {
+    // event.data is Blob or text_message
+    this.rxCounter++;
+    this.lastTxRxTime = Date.now();
+    let buffer;
+    if( event.data instanceof Blob){
+      let ab = await event.data.arrayBuffer()
+      buffer = Buffer.from(ab)
+    }else{
+      buffer = Buffer.from(event.data)
+    }
+    this.rxBytes += buffer.byteLength
+    this.emit('socket_data', buffer);
   }
 
-  socket_send(data) {  
-    if( this.socket?.readyState === 1 ){ //open
+  socket_send(data) {
+    if (this.socket?.readyState === 1) { //open
       // console.log('websocket send', data)
-      this.socket.send( data )
+      this.socket.send(data)
       this.txCounter++;
       this.txBytes += data.byteLength
       this.lastTxRxTime = Date.now();
-    }else{
+    } else {
       console.log('.')
     }
   }
- 
+
 }
 

package/test-browser/index.html

@@ -33,6 +33,7 @@
     console.log('sha256.hash("hi")',  IO.Boho.sha256.hash('hi'))
 
     var ESM_IO ;
+    // IO.binaryType = "blob"
     var io1 = new IO('ws://localhost:7777')
     var io2 = new IO('ws://localhost:7777')
     var io3 = new IO('ws://localhost:7777')
@@ -79,7 +80,7 @@
       addMessage('ws.error')
     }
   </script>
-  <script type="module">
+  <!-- <script type="module">
     import { IO, Boho, MBP, Buffer, sha256  } from "../dist/iosignal.esm.js"
     ESM_IO = IO 
     console.log('ESM:')
@@ -88,6 +89,6 @@
     console.log('MBP', MBP )
     console.log('Buffer', Buffer)
     console.log('sha256.hash("hi")',  sha256.hash('hi'))
-  </script>
+  </script> -->
 </body>
 </html>