engage-wasm 1.235.90750003 → 1.235.90750004

package/engagewasm.api.js

@@ -1,45 +1,61 @@
+/* eslint-disable class-methods-use-this,no-undef */
+// noinspection JSUnusedGlobalSymbols
+
 //
 // Copyright (c) 2022 Rally Tactical Systems, Inc.
 //
 
-// The Engage class - DO NOT INSTANTIATE THIS!!!
-class Engage extends EventTarget {
-    #_engageWasm;
+export default class Engage extends EventTarget {
+    // The WASM object produced by awaiting the promise returned by the
+    // engagewasm.js module.
+    _wasm;
+
+    // The Engage wrapper object (representing the exported API of the WASM).
+    _wasmWrapper;
+
+    constructor(engageWasm) {
+        super();
+        this._wasm = engageWasm;
+        this._wasmWrapper = new engageWasm.EngageWasmWrapper();
+    }
 
-    constructor() {
-        super()
-        this.#_engageWasm = new Module.EngageWasmWrapper();
+    get wasm() {
+        return this._wasm;
     }
 
-    engage_dev_wasm_test_01() {
-        return this.#_engageWasm.engage_dev_wasm_test_01();
+    get wasmWrapper() {
+        return this._wasmWrapper;
     }
 
     engageSetLogLevel(level) {
-        return this.#_engageWasm.engageSetLogLevel(level);
+        return this.wasmWrapper.engageSetLogLevel(level);
     }
 
     engageInitialize(policy, identity, tmpDir) {
-        return this.#_engageWasm.engageInitialize(policy, identity, tmpDir)
+        return this.wasmWrapper.engageInitialize(policy, identity, tmpDir);
     }
 
     engageShutdown() {
-        return this.#_engageWasm.engageShutdown();
+        return this.wasmWrapper.engageShutdown();
     }
 
     engageStart() {
-        return this.#_engageWasm.engageStart();
+        return this.wasmWrapper.engageStart();
     }
 
     engageStop() {
-        return this.#_engageWasm.engageStop();
+        return this.wasmWrapper.engageStop();
     }
 
     engageSetCertStore(csUint8Array, arraySize, passwordHex) {
-        var heapSpace = Module._malloc(arraySize * 1);
-        Module.HEAPU8.set(csUint8Array, heapSpace);
-        var rc = this.#_engageWasm.engageSetCertStore(heapSpace, arraySize, passwordHex);
-        Module._free(heapSpace);
+        const heapSpace = this.wasm._malloc(arraySize * 1);
+        this.wasm.HEAPU8.set(csUint8Array, heapSpace);
+        const rc = this.wasmWrapper.engageSetCertStore(
+            heapSpace,
+            arraySize,
+            passwordHex
+        );
+        this.wasm._free(heapSpace);
         return rc;
     }
 
@@ -53,71 +69,56 @@ class Engage extends EventTarget {
 
         return this.engageSetCertStore(u8array, u8array.length, passwordHex);
     }
-    
+
     engageCreateGroup(jsonConfig) {
-        return this.#_engageWasm.engageCreateGroup(jsonConfig);
+        return this.wasmWrapper.engageCreateGroup(jsonConfig);
     }
 
     engageDeleteGroup(id) {
-        return this.#_engageWasm.engageDeleteGroup(id);
+        return this.wasmWrapper.engageDeleteGroup(id);
     }
 
     engageJoinGroup(id) {
-        return this.#_engageWasm.engageJoinGroup(id);
+        return this.wasmWrapper.engageJoinGroup(id);
     }
 
     engageLeaveGroup(id) {
-        return this.#_engageWasm.engageLeaveGroup(id);
+        return this.wasmWrapper.engageLeaveGroup(id);
     }
 
     engageBeginGroupTx(id, priority, flags) {
-        return this.#_engageWasm.engageBeginGroupTx(id, priority, flags);
+        return this.wasmWrapper.engageBeginGroupTx(id, priority, flags);
     }
 
     engageBeginGroupTxAdvanced(id, jsonParams) {
-        return this.#_engageWasm.engageBeginGroupTxAdvanced(id, jsonParams);
+        return this.wasmWrapper.engageBeginGroupTxAdvanced(id, jsonParams);
     }
 
     engageEndGroupTx(id) {
-        return this.#_engageWasm.engageEndGroupTx(id);
+        return this.wasmWrapper.engageEndGroupTx(id);
     }
 
     engageMuteGroupTx(id) {
-        return this.#_engageWasm.engageMuteGroupTx(id);
+        return this.wasmWrapper.engageMuteGroupTx(id);
     }
 
     engageUnmuteGroupTx(id) {
-        return this.#_engageWasm.engageUnmuteGroupTx(id);
+        return this.wasmWrapper.engageUnmuteGroupTx(id);
     }
 
     engageMuteGroupRx(id) {
-        return this.#_engageWasm.engageMuteGroupRx(id);
+        return this.wasmWrapper.engageMuteGroupRx(id);
     }
 
     engageUnmuteGroupRx(id) {
-        return this.#_engageWasm.engageUnmuteGroupRx(id);
+        return this.wasmWrapper.engageUnmuteGroupRx(id);
     }
-};
-
-// Our Engage object
-let __engageObject;
-
-// Global Engage object functions
-function createEngageObject() {
-    __engageObject = new Engage();
-}
-
-function destroyEngageObject() {
-}
-
-function getEngageObject() {
-    return __engageObject;
 }
 
 /*
     Events generated by the Engage object.  To subscribe to these events, follow the
     pattern of:
-        getEngageObject().addEventListener(name_of_event_as_a_string, (e) => {
+        this.wasmWrapper.addEventListener(name_of_event_as_a_string, (e) => {
             /// process the event
         });
 
@@ -125,17 +126,17 @@ function getEngageObject() {
     contains a subobject consisting of fields specific to the event.
 
     For example, to subscribe to the "onEngineStarted" event:
-        getEngageObject().addEventListener("onEngineStarted", (e) => {
+        this.wasmWrapper.addEventListener("onEngineStarted", (e) => {
             processEngineStateChange("started");
         });
 
     To subscribe to the "onGroupCreated" event:
-        getEngageObject().addEventListener("onGroupCreated", (e) => {
+        this.wasmWrapper.addEventListener("onGroupCreated", (e) => {
             processGroupStateChange(e.detail.id, "created");
         });
 
-    To subscribe to the "onGroupRxSpeakersChanged" event:        
-        getEngageObject().addEventListener("onGroupRxSpeakersChanged", (e) => {
+    To subscribe to the "onGroupRxSpeakersChanged" event:
+        this.wasmWrapper.addEventListener("onGroupRxSpeakersChanged", (e) => {
             processGroupSpeakers(e.detail.id, e.detail.talkers);
         });