virtual-keypad 4.0.7 → 5.0.0

package/dist/receiver.html

@@ -86,11 +86,10 @@
       var receiver = new virtualKeypad.Receiver(
         keypad_options,
         ondata_callback,
-        ()=>console.log("Handshake complete"),
-        ()=>console.log("Connection disconnected"),
-        ()=>console.log("Connection connected"),
-        ()=>console.log("Connection closed"),
-        ()=>console.log("Connection error")
+        ()=>console.log("RECEIV Handshake complete"),
+        ()=>console.log("RECEIV Connection connected"),
+        ()=>console.log("RECEIV Connection closed"),
+        ()=>console.log("RECEIV Connection error")
       );
     </script>
   </body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "virtual-keypad",
-  "version": "4.0.7",
+  "version": "5.0.0",
   "description": "User response at a distance. Simple utility to summon forth a virtual keypad webapp.",
   "main": "dist/main.js",
   "directories": {

package/src/receiver.js

@@ -5,17 +5,16 @@ import { KeypadPeer } from "./keypadPeer.js";
 
 const doNothing = () => undefined;
 
-class Receiver extends KeypadPeer {
   /**
    * @param {{alphabet: string[], font:string}} keypadParameters 
    * @param {(data) => void} onDataCallback 
    * @param {() => void} handshakeCallback 
-   * @param {() => void} customDisonnectedCallback 
    * @param {(connection) => void} customConnectionCallback 
    * @param {() => void} customCloseCallback 
    * @param {(error) => void} customErrorCallback 
    */
-  constructor(keypadParameters, onDataCallback=doNothing, handshakeCallback=doNothing, customDisonnectedCallback=doNothing, customConnectionCallback=doNothing, customCloseCallback=doNothing, customErrorCallback=doNothing) {
+class Receiver extends KeypadPeer {
+  constructor(keypadParameters, onDataCallback=doNothing, handshakeCallback=doNothing, customConnectionCallback=doNothing, customCloseCallback=doNothing, customErrorCallback=doNothing) {
     super({ targetElementId: keypadParameters.targetElementId });
     keypadParameters = this.#verifyKeypadParameters(keypadParameters);
 
@@ -25,14 +24,13 @@ class Receiver extends KeypadPeer {
     this.onData = onDataCallback; // What to do on a button-press
     this.onHandshake = handshakeCallback; // What to do when the connection is established
     this.onConnection = (connection) => {customConnectionCallback(connection); this.#onPeerConnection(connection)};
-    this.onDisconnected = () => {customDisonnectedCallback(); this.onPeerDisconnected()};
     this.onClose = () => {customCloseCallback(); this.onPeerClose()};
     this.onError = (err) => {customErrorCallback(err); this.onPeerError(err)};
 
     /* Set up callbacks that handle any events related to our peer object. */
     this.peer.on("open", this.#onPeerOpen); // On creation of Receiver (local) Peer object
     this.peer.on("connection", this.onConnection); // On connection with Keypad (remote) Peer object
-    this.peer.on("disconnected", this.onDisconnected);
+    this.peer.on("disconnected", this.onPeerDisconnected);
     this.peer.on("close", this.onClose);
     this.peer.on("error", this.onError);
   }
@@ -170,6 +168,7 @@ class Receiver extends KeypadPeer {
       }
     });
     this.conn.on("close", () => {
+      this.onClose();
       this.displayUpdate("Connection reset. Awaiting connection...");
       this.conn = null;
     });