@vonage/client-sdk 1.3.0-rc.1 → 1.3.0-rc.3

package/dist/vonageClientSDK.mjs

@@ -18968,7 +18968,6 @@ function requireClientsdkClientcore () {
 		  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.q;
 		  var Json = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.m;
 		  var numberToLong = kotlin_kotlin.$_$.i6;
-		  var Exception_init_$Create$ = kotlin_kotlin.$_$.z;
 		  var Map = kotlin_kotlin.$_$.v2;
 		  var MutableMap = kotlin_kotlin.$_$.x2;
 		  var getKClassFromExpression = kotlin_kotlin.$_$.d;
@@ -18988,6 +18987,7 @@ function requireClientsdkClientcore () {
 		  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.h;
 		  var listOf = kotlin_kotlin.$_$.f4;
 		  var listOf_0 = kotlin_kotlin.$_$.e4;
+		  var Exception_init_$Create$ = kotlin_kotlin.$_$.z;
 		  var replaceFirst = kotlin_kotlin.$_$.f7;
 		  var charSequenceLength = kotlin_kotlin.$_$.c5;
 		  var Exception_init_$Init$_1 = kotlin_kotlin.$_$.y;
@@ -19594,6 +19594,9 @@ function requireClientsdkClientcore () {
 		  function onLegStatusUpdate(conversationId, legId, fromUserId, status) {
 		  }
 		  setMetadataFor(RTCEventListener, 'RTCEventListener', interfaceMeta);
+		  function onConversationEvent(event) {
+		  }
+		  setMetadataFor(ConversationEventListener, 'ConversationEventListener', interfaceMeta);
 		  function onAudioSay() {
 		  }
 		  function onAudioMuteUpdate(conversationId, legId, isMuted) {
@@ -19603,10 +19606,7 @@ function requireClientsdkClientcore () {
 		  function onAudioDTMFUpdate(conversationId, legId, digits) {
 		  }
 		  setMetadataFor(AudioEventListener, 'AudioEventListener', interfaceMeta);
-		  function onConversationEvent(event) {
-		  }
-		  setMetadataFor(ConversationEventListener, 'ConversationEventListener', interfaceMeta);
-		  setMetadataFor(ChatAPIImpl$1, VOID, classMeta, VOID, [RTCEventListener, AudioEventListener, ConversationEventListener]);
+		  setMetadataFor(ChatAPIImpl$1, VOID, classMeta, VOID, [RTCEventListener, ConversationEventListener, AudioEventListener]);
 		  setMetadataFor(ChatAPIImpl, 'ChatAPIImpl', classMeta, VOID, [ChatAPI]);
 		  setMetadataFor(LoggingLevel, 'LoggingLevel', classMeta, Enum);
 		  setMetadataFor(ClientConfigRegion, 'ClientConfigRegion', classMeta, Enum);
@@ -19616,8 +19616,10 @@ function requireClientsdkClientcore () {
 		  setMetadataFor(CSErrorCodes, 'CSErrorCodes', objectMeta);
 		  setMetadataFor(InternalError, 'InternalError', classMeta, Exception);
 		  setMetadataFor(CustomLoggersLimitReached, 'CustomLoggersLimitReached', classMeta, InternalError);
+		  setMetadataFor(MediaTimeout, 'MediaTimeout', classMeta, InternalError);
 		  setMetadataFor(NoInviteFound, 'NoInviteFound', classMeta, InternalError);
 		  setMetadataFor(InvalidCallAction, 'InvalidCallAction', classMeta, InternalError);
+		  setMetadataFor(NoOfferFound, 'NoOfferFound', classMeta, InternalError);
 		  setMetadataFor(InboundCallFailed, 'InboundCallFailed', classMeta, InternalError);
 		  setMetadataFor(NoCallFound, 'NoCallFound', classMeta, InternalError);
 		  setMetadataFor(AuthorizationError_0, 'AuthorizationError', classMeta, InternalError);
@@ -19625,8 +19627,8 @@ function requireClientsdkClientcore () {
 		  setMetadataFor(NoConversationFound, 'NoConversationFound', classMeta, InternalError);
 		  setMetadataFor(NoLegFound, 'NoLegFound', classMeta, InternalError);
 		  setMetadataFor(IllegalArgumentException_0, 'IllegalArgumentException', classMeta, InternalError);
-		  setMetadataFor(UnexpectedNullValue, 'UnexpectedNullValue', classMeta, InternalError);
 		  setMetadataFor(ServiceTempNotAvailable, 'ServiceTempNotAvailable', classMeta, InternalError);
+		  setMetadataFor(UnexpectedNullValue, 'UnexpectedNullValue', classMeta, InternalError);
 		  setMetadataFor(ServiceNotAvailable, 'ServiceNotAvailable', classMeta, InternalError);
 		  setMetadataFor(ParsingException, 'ParsingException', classMeta, InternalError);
 		  setMetadataFor(SessionErrorCodes, 'SessionErrorCodes', objectMeta);
@@ -19713,7 +19715,7 @@ function requireClientsdkClientcore () {
 		  setMetadataFor(HangupReason, 'HangupReason', classMeta, Enum);
 		  setMetadataFor(LegStatus, 'LegStatus', classMeta, Enum);
 		  setMetadataFor(CallDisconnectReason, 'CallDisconnectReason', classMeta, Enum);
-		  setMetadataFor(VoiceAPIImpl$1, VOID, classMeta, VOID, [RTCEventListener, AudioEventListener, ConversationEventListener]);
+		  setMetadataFor(VoiceAPIImpl$1, VOID, classMeta, VOID, [RTCEventListener, ConversationEventListener, AudioEventListener]);
 		  setMetadataFor(VoiceAPIImpl, 'VoiceAPIImpl', classMeta);
 		  setMetadataFor(CallEvent, 'CallEvent', interfaceMeta);
 		  setMetadataFor(SetupOutboundCall, 'SetupOutboundCall', classMeta, VOID, [CallEvent]);
@@ -42934,12 +42936,11 @@ function requireClientsdkClientcore () {
 		  function ChatAPIImpl$updateConversation$lambda($callback) {
 		    return function (response) {
 		      var tmp0_subject = response;
-		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(response), null);
+		      if (tmp0_subject instanceof GetConversation) {
+		        $callback(null, Companion_getInstance_127().z2j(response));
 		      } else {
-		        if (tmp0_subject instanceof GetConversation) {
-		          $callback(null, Companion_getInstance_127().z2j(response));
-		        }
+		        invokeCallbackWithError(response, $callback);
+		        Unit_getInstance();
 		      }
 		      return Unit_getInstance();
 		    };
@@ -43153,7 +43154,7 @@ function requireClientsdkClientcore () {
 		            // Inline function 'kotlin.run' call
 		            // Inline function 'kotlin.contracts.contract' call
 		            var message = 'At least one between text, imageUrl, videoUrl, audioUrl, fileUrl, vCardUrl or customBody must be provided.';
-		            $callback(toVonageError(new IllegalArgumentException_0(message)), null);
+		            invokeCallbackWithError(new IllegalArgumentException_0(message), $callback);
 		            return Unit_getInstance();
 		            tmp_1 = tmp$ret$0;
 		          } else {
@@ -43163,7 +43164,7 @@ function requireClientsdkClientcore () {
 		        } catch ($p) {
 		          if ($p instanceof IllegalArgumentException) {
 		            var error = $p;
-		            $callback(toVonageError(new IllegalArgumentException_0(VOID, error)), null);
+		            invokeCallbackWithError(new IllegalArgumentException_0(VOID, error), $callback);
 		            return Unit_getInstance();
 		          } else {
 		            throw $p;
@@ -43203,7 +43204,7 @@ function requireClientsdkClientcore () {
 		        } catch ($p) {
 		          if ($p instanceof IllegalArgumentException) {
 		            var error = $p;
-		            $callback(toVonageError(new IllegalArgumentException_0(VOID, error)), null);
+		            invokeCallbackWithError(new IllegalArgumentException_0(VOID, error), $callback);
 		            return Unit_getInstance();
 		          } else {
 		            throw $p;
@@ -43243,7 +43244,7 @@ function requireClientsdkClientcore () {
 		        } catch ($p) {
 		          if ($p instanceof IllegalArgumentException) {
 		            var error = $p;
-		            $callback(toVonageError(new IllegalArgumentException_0(VOID, error)), null);
+		            invokeCallbackWithError(new IllegalArgumentException_0(VOID, error), $callback);
 		            return Unit_getInstance();
 		          } else {
 		            throw $p;
@@ -43308,7 +43309,7 @@ function requireClientsdkClientcore () {
 		    } catch ($p) {
 		      if ($p instanceof IllegalArgumentException) {
 		        var error = $p;
-		        callback(toVonageError(new IllegalArgumentException_0(VOID, error)), null);
+		        invokeCallbackWithError(new IllegalArgumentException_0(VOID, error), callback);
 		        return Unit_getInstance();
 		      } else {
 		        throw $p;
@@ -43326,7 +43327,7 @@ function requireClientsdkClientcore () {
 		    } catch ($p) {
 		      if ($p instanceof IllegalArgumentException) {
 		        var error = $p;
-		        callback(toVonageError(new IllegalArgumentException_0(VOID, error)), null);
+		        invokeCallbackWithError(new IllegalArgumentException_0(VOID, error), callback);
 		        return Unit_getInstance();
 		      } else {
 		        throw $p;
@@ -43439,20 +43440,6 @@ function requireClientsdkClientcore () {
 		    var tmp = new GetMyMemberRequest(cid);
 		    this.q2j_1.c1a(new Action_0(tmp, new ActionMeta(VOID, VOID, ChatAPIImpl$deleteEvent$lambda(this, id, cid, callback))));
 		  };
-		  function invokeCallbackWithError(e, callback) {
-		    if (e instanceof Exception)
-		      callback(toVonageError(e), null);
-		    else {
-		      callback(toVonageError(new UnexpectedNullValue()), null);
-		    }
-		  }
-		  function invokeCallbackWithError_0(e, callback) {
-		    if (e instanceof Exception)
-		      callback(toVonageError(e));
-		    else {
-		      callback(toVonageError(new UnexpectedNullValue()));
-		    }
-		  }
 		  var LoggingLevel_Verbose_instance;
 		  var LoggingLevel_Debug_instance;
 		  var LoggingLevel_Info_instance;
@@ -43577,7 +43564,8 @@ function requireClientsdkClientcore () {
 		    return function (response) {
 		      var tmp0_subject = response;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(response), null);
+		        invokeCallbackWithError(response, $callback);
+		        Unit_getInstance();
 		      } else {
 		        if (tmp0_subject instanceof GetConversation) {
 		          var tmp1_safe_receiver = response.b1k_1;
@@ -43598,7 +43586,8 @@ function requireClientsdkClientcore () {
 		    return function (response) {
 		      var tmp0_subject = response;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(response), null);
+		        invokeCallbackWithError(response, $callback);
+		        Unit_getInstance();
 		      } else {
 		        if (tmp0_subject instanceof GetUser) {
 		          var tmp1_safe_receiver = response.e1q_1;
@@ -43706,6 +43695,10 @@ function requireClientsdkClientcore () {
 		    InternalError.call(this, 'internal:error:custom_loggers_limit_exceeded', 'Exceeded Max number of Custom Client Loggers. Provided: ' + provided + ', Limit: ' + limit);
 		    captureStack(this, CustomLoggersLimitReached);
 		  }
+		  function MediaTimeout() {
+		    InternalError.call(this, 'voice:error:media_timeout', 'Media Timeout');
+		    captureStack(this, MediaTimeout);
+		  }
 		  function NoInviteFound() {
 		    InternalError.call(this, 'voice:error:no_invite_found', 'No invite found');
 		    captureStack(this, NoInviteFound);
@@ -43714,6 +43707,10 @@ function requireClientsdkClientcore () {
 		    InternalError.call(this, 'voice:error:invalid_call_action', 'Invalid call action');
 		    captureStack(this, InvalidCallAction);
 		  }
+		  function NoOfferFound() {
+		    InternalError.call(this, 'voice:error:no_offer_found', 'No offer found');
+		    captureStack(this, NoOfferFound);
+		  }
 		  function InboundCallFailed(cause) {
 		    cause = cause === VOID ? null : cause;
 		    InternalError.call(this, 'voice:error:inbound_call_failed', 'Inbound call failed', cause);
@@ -43746,10 +43743,6 @@ function requireClientsdkClientcore () {
 		    InternalError.call(this, 'internal:error:illegal_argument_exception', message == null ? 'Incorrect arguments provided to method' : message, cause);
 		    captureStack(this, IllegalArgumentException_0);
 		  }
-		  function UnexpectedNullValue() {
-		    InternalError.call(this, 'internal:error:unexpected_null_value', 'Unexpected Null Value');
-		    captureStack(this, UnexpectedNullValue);
-		  }
 		  function InternalError(code, message, cause) {
 		    message = message === VOID ? null : message;
 		    cause = cause === VOID ? null : cause;
@@ -43761,6 +43754,10 @@ function requireClientsdkClientcore () {
 		    InternalError.call(this, 'internal:error:serviceNotAvailable', 'ServiceTempNotAvailable');
 		    captureStack(this, ServiceTempNotAvailable);
 		  }
+		  function UnexpectedNullValue() {
+		    InternalError.call(this, 'internal:error:unexpected_null_value', 'Unexpected Null Value');
+		    captureStack(this, UnexpectedNullValue);
+		  }
 		  function ServiceNotAvailable(statusCode) {
 		    statusCode = statusCode === VOID ? 500 : statusCode;
 		    InternalError.call(this, 'internal:error:service_no_available', 'ServiceNotAvailable:' + statusCode);
@@ -43820,16 +43817,8 @@ function requireClientsdkClientcore () {
 		      new SessionErrorMessages();
 		    return SessionErrorMessages_instance;
 		  }
-		  function VonageError_init_$Init$($this) {
-		    VonageError.call($this, VonageErrorType_UNKNOWN_ERROR_getInstance());
-		    return $this;
-		  }
-		  function VonageError_init_$Create$() {
-		    var tmp = VonageError_init_$Init$(objectCreate(protoOf(VonageError)));
-		    captureStack(tmp, VonageError_init_$Create$);
-		    return tmp;
-		  }
 		  function VonageError(type, code, message, cause) {
+		    type = type === VOID ? VonageErrorType_UNKNOWN_ERROR_getInstance() : type;
 		    code = code === VOID ? null : code;
 		    message = message === VOID ? null : message;
 		    cause = cause === VOID ? null : cause;
@@ -43838,9 +43827,6 @@ function requireClientsdkClientcore () {
 		    this.i2o_1 = type;
 		    this.j2o_1 = code;
 		  }
-		  protoOf(VonageError).toString = function () {
-		    return 'VonageError(type=' + this.i2o_1 + ', code=' + this.j2o_1 + ', message=' + this.message + ', cause=' + this.cause + ')';
-		  };
 		  var VonageErrorType_CS_ERROR_instance;
 		  var VonageErrorType_SESSION_ERROR_instance;
 		  var VonageErrorType_INTERNAL_ERROR_instance;
@@ -43864,49 +43850,69 @@ function requireClientsdkClientcore () {
 		  }
 		  function toVonageError(_this__u8e3s4) {
 		    var tmp;
-		    if (_this__u8e3s4 instanceof SessionError) {
-		      var tmp_0 = VonageErrorType_SESSION_ERROR_getInstance();
-		      var tmp_1 = _this__u8e3s4.j2d();
-		      var tmp_2 = _this__u8e3s4.i5();
-		      var tmp1_elvis_lhs = _this__u8e3s4.cause;
-		      tmp = new VonageError(tmp_0, tmp_1, tmp_2, tmp1_elvis_lhs == null ? _this__u8e3s4 : tmp1_elvis_lhs);
+		    if (_this__u8e3s4 instanceof VonageError) {
+		      tmp = _this__u8e3s4;
 		    } else {
-		      if (_this__u8e3s4 instanceof CSError) {
-		        var tmp_3 = VonageErrorType_CS_ERROR_getInstance();
-		        var tmp2_safe_receiver = _this__u8e3s4.x1i_1;
-		        var tmp_4;
-		        if (tmp2_safe_receiver == null) {
-		          tmp_4 = null;
-		        } else {
-		          // Inline function 'kotlin.let' call
-		          // Inline function 'kotlin.contracts.contract' call
-		          // Inline function 'com.vonage.clientcore.core.api.errors.toVonageError.<anonymous>' call
-		          tmp_4 = 'Invalid Parameters:' + tmp2_safe_receiver;
-		        }
-		        tmp = new VonageError(tmp_3, _this__u8e3s4.u1i_1, _this__u8e3s4.v1i_1 + ' - ' + tmp_4);
+		      if (_this__u8e3s4 instanceof SessionError) {
+		        var tmp_0 = VonageErrorType_SESSION_ERROR_getInstance();
+		        var tmp_1 = _this__u8e3s4.j2d();
+		        var tmp_2 = _this__u8e3s4.i5();
+		        var tmp1_elvis_lhs = _this__u8e3s4.cause;
+		        tmp = new VonageError(tmp_0, tmp_1, tmp_2, tmp1_elvis_lhs == null ? _this__u8e3s4 : tmp1_elvis_lhs);
 		      } else {
-		        if (_this__u8e3s4 instanceof HTTPClientError) {
-		          tmp = new VonageError(VonageErrorType_NETWORK_ERROR_getInstance(), VOID, _this__u8e3s4.message, _this__u8e3s4);
+		        if (_this__u8e3s4 instanceof CSError) {
+		          var tmp_3 = VonageErrorType_CS_ERROR_getInstance();
+		          var tmp2_safe_receiver = _this__u8e3s4.x1i_1;
+		          var tmp_4;
+		          if (tmp2_safe_receiver == null) {
+		            tmp_4 = null;
+		          } else {
+		            // Inline function 'kotlin.let' call
+		            // Inline function 'kotlin.contracts.contract' call
+		            // Inline function 'com.vonage.clientcore.core.api.errors.toVonageError.<anonymous>' call
+		            tmp_4 = 'Invalid Parameters:' + tmp2_safe_receiver;
+		          }
+		          tmp = new VonageError(tmp_3, _this__u8e3s4.u1i_1, _this__u8e3s4.v1i_1 + ' - ' + tmp_4);
 		        } else {
-		          if (_this__u8e3s4 instanceof InternalError) {
-		            var tmp_5;
-		            if (_this__u8e3s4 instanceof ServiceTempNotAvailable) {
-		              tmp_5 = new VonageError(VonageErrorType_NETWORK_ERROR_getInstance(), _this__u8e3s4.b2n_1, _this__u8e3s4.message, _this__u8e3s4);
+		          if (_this__u8e3s4 instanceof HTTPClientError) {
+		            tmp = new VonageError(VonageErrorType_NETWORK_ERROR_getInstance(), VOID, _this__u8e3s4.message, _this__u8e3s4);
+		          } else {
+		            if (_this__u8e3s4 instanceof InternalError) {
+		              var tmp_5;
+		              if (_this__u8e3s4 instanceof ServiceTempNotAvailable) {
+		                tmp_5 = new VonageError(VonageErrorType_NETWORK_ERROR_getInstance(), _this__u8e3s4.b2n_1, _this__u8e3s4.message, _this__u8e3s4);
+		              } else {
+		                tmp_5 = new VonageError(VonageErrorType_INTERNAL_ERROR_getInstance(), _this__u8e3s4.b2n_1, _this__u8e3s4.message, _this__u8e3s4.cause);
+		              }
+		              tmp = tmp_5;
 		            } else {
-		              tmp_5 = new VonageError(VonageErrorType_INTERNAL_ERROR_getInstance(), _this__u8e3s4.b2n_1, _this__u8e3s4.message, _this__u8e3s4.cause);
+		              var tmp_6 = VonageErrorType_UNKNOWN_ERROR_getInstance();
+		              var tmp_7 = _this__u8e3s4.message;
+		              var tmp4_elvis_lhs = _this__u8e3s4.cause;
+		              tmp = new VonageError(tmp_6, null, tmp_7, tmp4_elvis_lhs == null ? _this__u8e3s4 : tmp4_elvis_lhs);
 		            }
-		            tmp = tmp_5;
-		          } else {
-		            var tmp_6 = VonageErrorType_UNKNOWN_ERROR_getInstance();
-		            var tmp_7 = _this__u8e3s4.message;
-		            var tmp4_elvis_lhs = _this__u8e3s4.cause;
-		            tmp = new VonageError(tmp_6, null, tmp_7, tmp4_elvis_lhs == null ? _this__u8e3s4 : tmp4_elvis_lhs);
 		          }
 		        }
 		      }
 		    }
 		    return tmp;
 		  }
+		  function invokeCallbackWithError(e, callback) {
+		    if (e instanceof Exception)
+		      callback(toVonageError(e), null);
+		    else {
+		      callback(toVonageError(new UnexpectedNullValue()), null);
+		    }
+		  }
+		  function invokeCallbackWithError_0(e, callback) {
+		    return invokeCallbackWithError(e, invokeCallbackWithError$lambda(callback));
+		  }
+		  function invokeCallbackWithError$lambda($callback) {
+		    return function (exception, _anonymous_parameter_1__qggqgd) {
+		      $callback(exception);
+		      return Unit_getInstance();
+		    };
+		  }
 		  function VonageErrorType_CS_ERROR_getInstance() {
 		    VonageErrorType_initEntries();
 		    return VonageErrorType_CS_ERROR_instance;
@@ -46979,7 +46985,8 @@ function requireClientsdkClientcore () {
 		  function SessionAPIImpl$createSession$lambda($callback, this$0, $token, $sessionId) {
 		    return function (e) {
 		      if (!(e == null)) {
-		        $callback(new SessionNoActiveSessionError(), null);
+		        invokeCallbackWithError(new SessionNoActiveSessionError(), $callback);
+		        Unit_getInstance();
 		      } else {
 		        onCreateSession(this$0, $callback);
 		        this$0.z2v_1.c1a(Action_init_$Create$(new SocketConnect($token, $sessionId)));
@@ -46992,7 +46999,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(it);
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        this$0.z2v_1.c1a(Action_init_$Create$(new SocketSetSession($sessionId, $token)));
 		        $callback(null);
@@ -47103,7 +47111,8 @@ function requireClientsdkClientcore () {
 		        if (state.g2w_1.r2e_1.equals(SocketConnectionStatus_Connected_getInstance())) {
 		          this$0.z2v_1.c1a(Action_init_$Create$(SocketDisconnect_getInstance()));
 		        }
-		        $callback(s.p2w_1.q2_1, null);
+		        invokeCallbackWithError(s.p2w_1.q2_1, $callback);
+		        Unit_getInstance();
 		      } else {
 		        if (s instanceof Resolved) {
 		          var tmp1_safe_receiver = $cleanup._v;
@@ -47188,7 +47197,7 @@ function requireClientsdkClientcore () {
 		    var tmp0_elvis_lhs = this.z2v_1.t2o(getKClass(SessionReducer));
 		    var tmp;
 		    if (tmp0_elvis_lhs == null) {
-		      return callback(new SessionFailedInternalError(), null);
+		      return invokeCallbackWithError(new SessionFailedInternalError(), callback);
 		    } else {
 		      tmp = tmp0_elvis_lhs;
 		    }
@@ -47206,13 +47215,13 @@ function requireClientsdkClientcore () {
 		    var tmp0_elvis_lhs = this.z2v_1.t2o(getKClass(SessionReducer));
 		    var tmp;
 		    if (tmp0_elvis_lhs == null) {
-		      return callback(new SessionFailedInternalError());
+		      return invokeCallbackWithError_0(new SessionFailedInternalError(), callback);
 		    } else {
 		      tmp = tmp0_elvis_lhs;
 		    }
 		    var state = tmp;
 		    if (state.f2w_1.f1().n1z() == null)
-		      return callback(new SessionNoActiveSessionError());
+		      return invokeCallbackWithError_0(new SessionNoActiveSessionError(), callback);
 		    onDeleteSession(this, callback);
 		    this.z2v_1.c1a(Action_init_$Create$(DeleteSession_getInstance()));
 		    this.z2v_1.c1a(Action_init_$Create$(SocketDisconnect_getInstance()));
@@ -47221,13 +47230,13 @@ function requireClientsdkClientcore () {
 		    var tmp0_elvis_lhs = this.z2v_1.t2o(getKClass(SessionReducer));
 		    var tmp;
 		    if (tmp0_elvis_lhs == null) {
-		      return callback(new SessionFailedInternalError());
+		      return invokeCallbackWithError_0(new SessionFailedInternalError(), callback);
 		    } else {
 		      tmp = tmp0_elvis_lhs;
 		    }
 		    var state = tmp;
 		    if (state.f2w_1.f1().n1z() == null)
-		      return callback(new SessionNoActiveSessionError());
+		      return invokeCallbackWithError_0(new SessionNoActiveSessionError(), callback);
 		    var sessionId = ensureNotNull(state.f2w_1.f1().n1z());
 		    var tmp_0 = new UpdateSessionRequest(sessionId, token);
 		    this.z2v_1.c1a(new Action_0(tmp_0, new ActionMeta(VOID, VOID, SessionAPIImpl$refreshSession$lambda(callback, this, sessionId, token))));
@@ -47371,7 +47380,7 @@ function requireClientsdkClientcore () {
 		    var tmp0_elvis_lhs = getCallStateByLeg($this, callId);
 		    var tmp;
 		    if (tmp0_elvis_lhs == null) {
-		      return toVonageError(new NoCallFound());
+		      return new NoCallFound();
 		    } else {
 		      tmp = tmp0_elvis_lhs;
 		    }
@@ -47382,7 +47391,7 @@ function requireClientsdkClientcore () {
 		      action(callMemberShipState.n2x_1, callMemberShipState.o2x_1);
 		      tmp_0 = null;
 		    } else {
-		      tmp_0 = toVonageError(new InvalidCallAction());
+		      tmp_0 = new InvalidCallAction();
 		    }
 		    return tmp_0;
 		  }
@@ -47572,7 +47581,7 @@ function requireClientsdkClientcore () {
 		          ;
 		        else
 		          tmp1_safe_receiver();
-		        $callback(toVonageError(Exception_init_$Create$('Media Timeout')), null);
+		        invokeCallbackWithError(new MediaTimeout(), $callback);
 		        this$0.q2x_1.c1a(Action_init_$Create$(new CallCleanup($legId)));
 		        Unit_getInstance();
 		      } else {
@@ -47601,7 +47610,8 @@ function requireClientsdkClientcore () {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
 		        this$0.q2x_1.c1a(Action_init_$Create$(new CallKnockingRequestFailure($tmp0_safe_receiver.h2x_1, it)));
-		        $callback(toVonageError(it), null);
+		        invokeCallbackWithError(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        var tmp_0 = getKClass(CallReducer);
 		        $cancel._v = this$0.q2x_1.a2p(tmp_0, VoiceAPIImpl$serverCall$lambda$lambda$lambda$lambda$lambda($tmp0_safe_receiver, $cancel, $callback, this$0, $legId));
@@ -47649,7 +47659,7 @@ function requireClientsdkClientcore () {
 		              ;
 		            else
 		              tmp4_safe_receiver();
-		            $callback(toVonageError(Exception_init_$Create$('Media Timeout')), null);
+		            invokeCallbackWithError(new MediaTimeout(), $callback);
 		            this$0.q2x_1.c1a(Action_init_$Create$(new CallCleanup($legId)));
 		            Unit_getInstance();
 		            break;
@@ -47684,30 +47694,39 @@ function requireClientsdkClientcore () {
 		        cancel._v = this$0.q2x_1.a2p(tmp_0, VoiceAPIImpl$serverCall$lambda$lambda(this$0, legId, cancel, $callback));
 		        Unit_getInstance();
 		      } else {
-		        if (tmp0_subject instanceof Exception) {
-		          $callback(toVonageError(it), null);
-		        } else {
-		          $callback(VonageError_init_$Create$(), null);
-		        }
+		        invokeCallbackWithError(it, $callback);
+		        Unit_getInstance();
 		      }
 		      return Unit_getInstance();
 		    };
 		  }
 		  function VoiceAPIImpl$reconnectCall$lambda$lambda(this$0, $callId, $once, $callback) {
 		    return function () {
-		      var state = ensureNotNull(this$0.q2x_1.t2o(getKClass(CallReducer)));
-		      var tmp0_safe_receiver = state.u2x_1.u1($callId);
-		      var legState = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.j2x_1;
-		      var call = state.u2x_1.u1($callId);
-		      var tmp1_safe_receiver = legState;
-		      var tmp2_subject = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.f1();
+		      var tmp0_elvis_lhs = this$0.q2x_1.t2o(getKClass(CallReducer));
+		      var tmp;
+		      if (tmp0_elvis_lhs == null) {
+		        return Unit_getInstance();
+		      } else {
+		        tmp = tmp0_elvis_lhs;
+		      }
+		      var state = tmp;
+		      var tmp1_elvis_lhs = state.u2x_1.u1($callId);
+		      var tmp_0;
+		      if (tmp1_elvis_lhs == null) {
+		        return Unit_getInstance();
+		      } else {
+		        tmp_0 = tmp1_elvis_lhs;
+		      }
+		      var call = tmp_0;
+		      var legState = call.j2x_1;
+		      var tmp2_subject = legState.f1();
 		      if (tmp2_subject instanceof Started) {
 		        var tmp3_safe_receiver = $once._v;
 		        if (tmp3_safe_receiver == null)
 		          ;
 		        else
 		          tmp3_safe_receiver();
-		        if (ensureNotNull(call).e2x_1) {
+		        if (call.e2x_1) {
 		          $callback(null);
 		        }
 		      } else {
@@ -47725,7 +47744,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        $callback(null);
 		      }
@@ -47743,7 +47763,8 @@ function requireClientsdkClientcore () {
 		      switch (tmp0) {
 		        case -1:
 		          // Inline function 'kotlin.let' call
-		          $callback(toVonageError(new NoInviteFound()));
+		          invokeCallbackWithError_0(new NoInviteFound(), $callback);
+		          Unit_getInstance();
 		          // Inline function 'com.vonage.clientcore.core.api.VoiceAPIImpl.answerCall.<anonymous>.<anonymous>.<anonymous>.<anonymous>.<anonymous>' call
 		          var tmp0_safe_receiver_0 = $cancel._v;
 		          tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0();
@@ -47767,7 +47788,7 @@ function requireClientsdkClientcore () {
 		          tmp5_safe_receiver == null ? null : tmp5_safe_receiver();
 		          // Inline function 'kotlin.contracts.contract' call
 		          // Inline function 'com.vonage.clientcore.core.api.VoiceAPIImpl.answerCall.<anonymous>.<anonymous>.<anonymous>.<anonymous>.<anonymous>' call
-		          $callback(toVonageError(new InboundCallFailed()));
+		          invokeCallbackWithError_0(new InboundCallFailed(), $callback);
 
 		          Unit_getInstance();
 		          break;
@@ -47783,32 +47804,37 @@ function requireClientsdkClientcore () {
 		      return new StoredSubscription(VoiceAPIImpl$answerCall$lambda$lambda$lambda$lambda(this$0, $legIdOrErr, $callback, $cancel));
 		    };
 		  }
-		  function VoiceAPIImpl$answerCall$lambda$lambda($callback, this$0) {
+		  function VoiceAPIImpl$answerCall$lambda$lambda(this$0, $callback) {
 		    return function (legIdOrErr) {
 		      var tmp0_subject = legIdOrErr;
-		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(new InboundCallFailed(legIdOrErr)));
+		      if (!(tmp0_subject == null) ? typeof tmp0_subject === 'string' : false) {
+		        var cancel = {_v: null};
+		        var tmp_0 = getKClass(CallReducer);
+		        cancel._v = this$0.q2x_1.a2p(tmp_0, VoiceAPIImpl$answerCall$lambda$lambda$lambda(this$0, legIdOrErr, $callback, cancel));
+		        Unit_getInstance();
 		      } else {
-		        if (!(tmp0_subject == null) ? typeof tmp0_subject === 'string' : false) {
-		          var cancel = {_v: null};
-		          var tmp_0 = getKClass(CallReducer);
-		          cancel._v = this$0.q2x_1.a2p(tmp_0, VoiceAPIImpl$answerCall$lambda$lambda$lambda(this$0, legIdOrErr, $callback, cancel));
-		          Unit_getInstance();
-		        } else {
-		          $callback(VonageError_init_$Create$());
-		        }
+		        invokeCallbackWithError_0(new InboundCallFailed(legIdOrErr instanceof Exception ? legIdOrErr : null), $callback);
+		        Unit_getInstance();
 		      }
 		      return Unit_getInstance();
 		    };
 		  }
-		  function VoiceAPIImpl$answerCall$lambda($callback, this$0, $callId, $invite) {
+		  function VoiceAPIImpl$answerCall$lambda($callback, $invite, this$0, $callId) {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
-		        var tmp_0 = new SetupInboundCall($callId, $invite.c2y_1, $invite.b2y_1, $invite.z2x_1, ensureNotNull($invite.d2y_1), null);
-		        this$0.q2x_1.c1a(new Action_0(tmp_0, new ActionMeta(VOID, VOID, VoiceAPIImpl$answerCall$lambda$lambda($callback, this$0))));
+		        var tmp1_elvis_lhs = $invite.d2y_1;
+		        if (tmp1_elvis_lhs == null) {
+		          // Inline function 'kotlin.run' call
+		          // Inline function 'kotlin.contracts.contract' call
+		          invokeCallbackWithError_0(new NoOfferFound(), $callback);
+		          return Unit_getInstance();
+		        }
+		        var tmp_0 = new SetupInboundCall($callId, $invite.c2y_1, $invite.b2y_1, $invite.z2x_1, $invite.d2y_1, null);
+		        this$0.q2x_1.c1a(new Action_0(tmp_0, new ActionMeta(VOID, VOID, VoiceAPIImpl$answerCall$lambda$lambda(this$0, $callback))));
 		        Unit_getInstance();
 		      }
 		      return Unit_getInstance();
@@ -47818,7 +47844,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        $callback(null);
 		      }
@@ -47829,7 +47856,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        $callback(null);
 		      }
@@ -47840,7 +47868,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        $callback(null);
 		      }
@@ -47859,7 +47888,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        $callback(null);
 		      }
@@ -47878,7 +47908,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        $callback(null);
 		      }
@@ -47897,7 +47928,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        $callback(null);
 		      }
@@ -47916,7 +47948,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        $callback(null);
 		      }
@@ -47935,7 +47968,8 @@ function requireClientsdkClientcore () {
 		    return function (it) {
 		      var tmp0_subject = it;
 		      if (tmp0_subject instanceof Exception) {
-		        $callback(toVonageError(it));
+		        invokeCallbackWithError_0(it, $callback);
+		        Unit_getInstance();
 		      } else {
 		        $callback(null);
 		      }
@@ -48733,10 +48767,11 @@ function requireClientsdkClientcore () {
 		          this$0.q2x_1.c1a(Action_init_$Create$(new CallReconnect($legId, memberResponse.k1j_1, $legResponse.c1d_1)));
 		          Unit_getInstance();
 		        } else {
-		          $callback(toVonageError(new MemberNotInConversation()));
+		          invokeCallbackWithError_0(new MemberNotInConversation(), $callback);
+		          Unit_getInstance();
 		        }
 		      } else {
-		        $callback(toVonageError(new NoConversationFound()));
+		        invokeCallbackWithError_0(new NoConversationFound(), $callback);
 		        this$0.q2x_1.c1a(Action_init_$Create$(new CallCleanup($legId)));
 		        Unit_getInstance();
 		      }
@@ -48751,7 +48786,7 @@ function requireClientsdkClientcore () {
 		        this$0.q2x_1.c1a(new Action_0(tmp_0, new ActionMeta(VOID, legResponse.b1d_1, VoiceAPIImpl$getCallDetailsAndDispatchCallReconnect$lambda$lambda(this$0, $legId, legResponse, $callback))));
 		        Unit_getInstance();
 		      } else {
-		        $callback(toVonageError(new NoLegFound()));
+		        invokeCallbackWithError_0(new NoLegFound(), $callback);
 		        this$0.q2x_1.c1a(Action_init_$Create$(new CallCleanup($legId)));
 		        Unit_getInstance();
 		      }
@@ -48779,71 +48814,44 @@ function requireClientsdkClientcore () {
 		    this.t2x_1 = listener;
 		  };
 		  protoOf(VoiceAPIImpl).z17 = function (legId, callback) {
-		    var sessionState = ensureNotNull(this.q2x_1.t2o(getKClass(SessionReducer)));
-		    var tmp;
-		    if (sessionState.f2w_1.f1() instanceof Active) {
-		      tmp = '';
-		    } else {
-		      // Inline function 'kotlin.let' call
-		      callback(toVonageError(new SessionNoActiveSessionError()), null);
-		      // Inline function 'kotlin.contracts.contract' call
-		      // Inline function 'com.vonage.clientcore.core.api.VoiceAPIImpl.getLeg.<anonymous>' call
-		      tmp = null;
-		    }
-		    if (tmp == null)
+		    if (getSessionUserOrError(this.q2x_1, callback) == null)
 		      return Unit_getInstance();
-		    var tmp_0 = new GetLegRequest(legId);
-		    this.q2x_1.c1a(new Action_0(tmp_0, new ActionMeta(VOID, VOID, VoiceAPIImpl$getLeg$lambda(callback))));
+		    var tmp = new GetLegRequest(legId);
+		    this.q2x_1.c1a(new Action_0(tmp, new ActionMeta(VOID, VOID, VoiceAPIImpl$getLeg$lambda(callback))));
 		  };
 		  protoOf(VoiceAPIImpl).x17 = function (context, callback) {
-		    var sessionState = ensureNotNull(this.q2x_1.t2o(getKClass(SessionReducer)));
-		    var s = sessionState.f2w_1.f1();
+		    var tmp0_elvis_lhs = getSessionUserOrError(this.q2x_1, callback);
 		    var tmp;
-		    if (s instanceof Active) {
-		      tmp = s.v2d_1.p2k_1;
-		    } else {
-		      // Inline function 'kotlin.let' call
-		      callback(toVonageError(new SessionNoActiveSessionError()), null);
-		      // Inline function 'kotlin.contracts.contract' call
-		      // Inline function 'com.vonage.clientcore.core.api.VoiceAPIImpl.serverCall.<anonymous>' call
-		      tmp = null;
-		    }
-		    var tmp0_elvis_lhs = tmp;
-		    var tmp_0;
 		    if (tmp0_elvis_lhs == null) {
 		      return Unit_getInstance();
 		    } else {
-		      tmp_0 = tmp0_elvis_lhs;
+		      tmp = tmp0_elvis_lhs;
 		    }
-		    var user = tmp_0;
-		    var tmp_1 = new SetupOutboundCall(user, context);
-		    this.q2x_1.c1a(new Action_0(tmp_1, new ActionMeta(VOID, VOID, VoiceAPIImpl$serverCall$lambda(this, callback))));
+		    var user = tmp;
+		    var tmp_0 = new SetupOutboundCall(user.p2k_1, context);
+		    this.q2x_1.c1a(new Action_0(tmp_0, new ActionMeta(VOID, VOID, VoiceAPIImpl$serverCall$lambda(this, callback))));
 		  };
 		  protoOf(VoiceAPIImpl).y17 = function (callId, callback) {
 		    var once = {_v: null};
 		    var tmp = getKClass(CallReducer);
 		    once._v = this.q2x_1.a2p(tmp, VoiceAPIImpl$reconnectCall$lambda(this, callId, once, callback));
-		    var sessionState = this.q2x_1.t2o(getKClass(SessionReducer));
-		    var tmp1_safe_receiver = sessionState == null ? null : sessionState.f2w_1;
-		    if ((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.f1())instanceof Active) {
-		      var callState = ensureNotNull(this.q2x_1.t2o(getKClass(CallReducer)));
-		      var call = callState.u2x_1.u1(callId);
-		      var tmp4_safe_receiver = call == null ? null : call.i2x_1;
-		      var tmp_0 = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.f1();
-		      var memberState = tmp_0 instanceof Joined ? tmp_0 : null;
-		      if (call == null ? true : memberState == null) {
-		        getCallDetailsAndDispatchCallReconnect(this, callId, callback);
-		      } else {
-		        this.q2x_1.c1a(Action_init_$Create$(new CallReconnect(callId, memberState.o2x_1, memberState.n2x_1)));
-		      }
+		    if (getSessionUserOrError_0(this.q2x_1, callback) == null)
+		      return Unit_getInstance();
+		    var callState = ensureNotNull(this.q2x_1.t2o(getKClass(CallReducer)));
+		    var call = callState.u2x_1.u1(callId);
+		    var tmp2_safe_receiver = call == null ? null : call.i2x_1;
+		    var tmp_0 = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.f1();
+		    var memberState = tmp_0 instanceof Joined ? tmp_0 : null;
+		    if (call == null ? true : memberState == null) {
+		      getCallDetailsAndDispatchCallReconnect(this, callId, callback);
 		    } else {
-		      callback(toVonageError(new SessionNoActiveSessionError()));
+		      this.q2x_1.c1a(Action_init_$Create$(new CallReconnect(callId, memberState.o2x_1, memberState.n2x_1)));
 		    }
 		  };
 		  protoOf(VoiceAPIImpl).a18 = function (callId, callback) {
 		    var invite = ensureNotNull(this.q2x_1.t2o(getKClass(InviteReducer))).s2y_1.u1(callId);
 		    if (invite == null) {
-		      callback(toVonageError(new NoInviteFound()));
+		      invokeCallbackWithError_0(new NoInviteFound(), callback);
 		      return Unit_getInstance();
 		    }
 		    var tmp;
@@ -48862,7 +48870,7 @@ function requireClientsdkClientcore () {
 		      tmp = tmp_3 instanceof Left;
 		    }
 		    if (tmp) {
-		      callback(toVonageError(new InvalidCallAction()));
+		      invokeCallbackWithError_0(new InvalidCallAction(), callback);
 		      return Unit_getInstance();
 		    }
 		    StaticConfig_getInstance();
@@ -48873,7 +48881,7 @@ function requireClientsdkClientcore () {
 		  protoOf(VoiceAPIImpl).b18 = function (callId, callback) {
 		    var invite = ensureNotNull(this.q2x_1.t2o(getKClass(InviteReducer))).s2y_1.u1(callId);
 		    if (invite == null) {
-		      callback(toVonageError(new NoInviteFound()));
+		      invokeCallbackWithError_0(new NoInviteFound(), callback);
 		      return Unit_getInstance();
 		    }
 		    var tmp;
@@ -48892,16 +48900,16 @@ function requireClientsdkClientcore () {
 		      tmp = tmp_3 instanceof Left;
 		    }
 		    if (tmp) {
-		      callback(toVonageError(new InvalidCallAction()));
+		      invokeCallbackWithError_0(new InvalidCallAction(), callback);
 		      return Unit_getInstance();
 		    }
 		    var tmp_4 = new MemberJoinRequest(invite.c2y_1, invite.b2y_1);
-		    this.q2x_1.c1a(new Action_0(tmp_4, new ActionMeta(VOID, callId, VoiceAPIImpl$answerCall$lambda(callback, this, callId, invite))));
+		    this.q2x_1.c1a(new Action_0(tmp_4, new ActionMeta(VOID, callId, VoiceAPIImpl$answerCall$lambda(callback, invite, this, callId))));
 		  };
 		  protoOf(VoiceAPIImpl).c18 = function (callId, reasonText, reasonCode, callback) {
 		    var call = ensureNotNull(this.q2x_1.t2o(getKClass(CallReducer))).u2x_1.u1(callId);
 		    if (call == null) {
-		      callback(toVonageError(new NoCallFound()));
+		      invokeCallbackWithError_0(new NoCallFound(), callback);
 		      return Unit_getInstance();
 		    }
 		    this.q2x_1.c1a(Action_init_$Create$(new MediaDisable(callId)));
@@ -48914,7 +48922,7 @@ function requireClientsdkClientcore () {
 		        var tmp_0 = new DeleteKnockerRequest(callMemberShipState.o2z_1);
 		        this.q2x_1.c1a(new Action_0(tmp_0, new ActionMeta(VOID, callId, VoiceAPIImpl$hangupCall$lambda_0(callback))));
 		      } else {
-		        callback(toVonageError(new InvalidCallAction()));
+		        invokeCallbackWithError_0(new InvalidCallAction(), callback);
 		      }
 		    }
 		  };
@@ -48925,7 +48933,7 @@ function requireClientsdkClientcore () {
 		    else {
 		      // Inline function 'kotlin.let' call
 		      // Inline function 'kotlin.contracts.contract' call
-		      callback(tmp0_safe_receiver);
+		      invokeCallbackWithError_0(tmp0_safe_receiver, callback);
 		    }
 		  };
 		  protoOf(VoiceAPIImpl).e18 = function (callId, callback) {
@@ -48935,7 +48943,7 @@ function requireClientsdkClientcore () {
 		    else {
 		      // Inline function 'kotlin.let' call
 		      // Inline function 'kotlin.contracts.contract' call
-		      callback(tmp0_safe_receiver);
+		      invokeCallbackWithError_0(tmp0_safe_receiver, callback);
 		    }
 		  };
 		  protoOf(VoiceAPIImpl).f18 = function (callId, callback) {
@@ -48945,7 +48953,7 @@ function requireClientsdkClientcore () {
 		    else {
 		      // Inline function 'kotlin.let' call
 		      // Inline function 'kotlin.contracts.contract' call
-		      callback(tmp0_safe_receiver);
+		      invokeCallbackWithError_0(tmp0_safe_receiver, callback);
 		    }
 		  };
 		  protoOf(VoiceAPIImpl).g18 = function (callId, callback) {
@@ -48955,7 +48963,7 @@ function requireClientsdkClientcore () {
 		    else {
 		      // Inline function 'kotlin.let' call
 		      // Inline function 'kotlin.contracts.contract' call
-		      callback(tmp0_safe_receiver);
+		      invokeCallbackWithError_0(tmp0_safe_receiver, callback);
 		    }
 		  };
 		  protoOf(VoiceAPIImpl).h18 = function (callId, digits, callback) {
@@ -48965,7 +48973,7 @@ function requireClientsdkClientcore () {
 		    else {
 		      // Inline function 'kotlin.let' call
 		      // Inline function 'kotlin.contracts.contract' call
-		      callback(tmp0_safe_receiver);
+		      invokeCallbackWithError_0(tmp0_safe_receiver, callback);
 		    }
 		  };
 		  protoOf(VoiceAPIImpl).i18 = function (callId, text, level, loop, queue, voiceName, ssml, callback) {
@@ -48975,7 +48983,7 @@ function requireClientsdkClientcore () {
 		    else {
 		      // Inline function 'kotlin.let' call
 		      // Inline function 'kotlin.contracts.contract' call
-		      callback(tmp0_safe_receiver);
+		      invokeCallbackWithError_0(tmp0_safe_receiver, callback);
 		    }
 		  };
 		  function SetupOutboundCall(user, context) {
@@ -58379,7 +58387,7 @@ function requireClientsdkClientcore () {
 		      tmp = s.v2d_1;
 		    } else {
 		      // Inline function 'kotlin.let' call
-		      callback(toVonageError(new SessionNoActiveSessionError()), null);
+		      invokeCallbackWithError(new SessionNoActiveSessionError(), callback);
 		      // Inline function 'kotlin.contracts.contract' call
 		      // Inline function 'com.vonage.clientcore.utils.getSessionUserOrError.<anonymous>' call
 		      tmp = null;
@@ -59126,24 +59134,24 @@ function requireClientsdkClientcore () {
 	  setMetadataFor(EventDeleteConversationEventJS, 'EventDeleteConversationEventJS', classMeta, VOID, [PersistentConversationEventJS, JSONBodyEventJS]);
 	  setMetadataFor(MessageEventJS, 'MessageEventJS', interfaceMeta);
 	  setMetadataFor(MessageEventBodyJS, 'MessageEventBodyJS', interfaceMeta);
-	  setMetadataFor(Body, 'Body', classMeta, VOID, [MessageEventBodyJS]);
+	  setMetadataFor(MessageTextEventBody, 'Body', classMeta, VOID, [MessageEventBodyJS]);
 	  setMetadataFor(MessageTextEventJS, 'MessageTextEventJS', classMeta, VOID, [MessageEventJS, PersistentConversationEventJS]);
-	  setMetadataFor(Body_0, 'Body', classMeta, VOID, [MessageEventBodyJS]);
+	  setMetadataFor(MessageCustomEventBody, 'Body', classMeta, VOID, [MessageEventBodyJS]);
 	  setMetadataFor(MessageCustomEventJS, 'MessageCustomEventJS', classMeta, VOID, [MessageEventJS, PersistentConversationEventJS]);
-	  setMetadataFor(Body_1, 'Body', classMeta, VOID, [MessageEventBodyJS]);
+	  setMetadataFor(MessageAudioEventBody, 'Body', classMeta, VOID, [MessageEventBodyJS]);
 	  setMetadataFor(MessageAudioEventJS, 'MessageAudioEventJS', classMeta, VOID, [MessageEventJS, PersistentConversationEventJS]);
-	  setMetadataFor(Body_2, 'Body', classMeta, VOID, [MessageEventBodyJS]);
+	  setMetadataFor(MessageVideoEventBody, 'Body', classMeta, VOID, [MessageEventBodyJS]);
 	  setMetadataFor(MessageVideoEventJS, 'MessageVideoEventJS', classMeta, VOID, [MessageEventJS, PersistentConversationEventJS]);
-	  setMetadataFor(Body_3, 'Body', classMeta, VOID, [MessageEventBodyJS]);
+	  setMetadataFor(MessageImageEventBody, 'Body', classMeta, VOID, [MessageEventBodyJS]);
 	  setMetadataFor(MessageImageEventJS, 'MessageImageEventJS', classMeta, VOID, [MessageEventJS, PersistentConversationEventJS]);
-	  setMetadataFor(Body_4, 'Body', classMeta, VOID, [MessageEventBodyJS]);
+	  setMetadataFor(MessageFileEventBody, 'Body', classMeta, VOID, [MessageEventBodyJS]);
 	  setMetadataFor(MessageFileEventJS, 'MessageFileEventJS', classMeta, VOID, [MessageEventJS, PersistentConversationEventJS]);
-	  setMetadataFor(Body_5, 'Body', classMeta, VOID, [MessageEventBodyJS]);
+	  setMetadataFor(MessageVCardEventBody, 'Body', classMeta, VOID, [MessageEventBodyJS]);
 	  setMetadataFor(MessageVCardEventJS, 'MessageVCardEventJS', classMeta, VOID, [MessageEventJS, PersistentConversationEventJS]);
-	  setMetadataFor(Body_6, 'Body', classMeta, VOID, [MessageEventBodyJS]);
+	  setMetadataFor(MessageLocationEventBody, 'Body', classMeta, VOID, [MessageEventBodyJS]);
 	  setMetadataFor(Location_0, 'Location', classMeta);
 	  setMetadataFor(MessageLocationEventJS, 'MessageLocationEventJS', classMeta, VOID, [MessageEventJS, PersistentConversationEventJS]);
-	  setMetadataFor(Body_7, 'Body', classMeta, VOID, [MessageEventBodyJS]);
+	  setMetadataFor(MessageTemplateEventBody, 'Body', classMeta, VOID, [MessageEventBodyJS]);
 	  setMetadataFor(TemplateObject_0, 'TemplateObject', classMeta);
 	  setMetadataFor(WhatsappObject_0, 'WhatsappObject', classMeta);
 	  setMetadataFor(MessageTemplateEventJS, 'MessageTemplateEventJS', classMeta, VOID, [MessageEventJS, PersistentConversationEventJS]);
@@ -59457,268 +59465,163 @@ function requireClientsdkClientcore () {
 	    return this.user;
 	  };
 	  function MemberInvitedEventJS(event) {
-	    this.c3f_1 = 'member:invited';
-	    this.d3f_1 = event.w2q_1;
-	    this.e3f_1 = event.x2q_1;
-	    this.f3f_1 = event.y2q_1;
-	    this.g3f_1 = map(event.z2q_1);
-	    this.h3f_1 = new MemberEventBodyJS(event.a2r_1);
+	    this.kind = 'member:invited';
+	    this.id = event.w2q_1;
+	    this.timestamp = event.x2q_1;
+	    this.conversationId = event.y2q_1;
+	    this.from = map(event.z2q_1);
+	    this.body = new MemberEventBodyJS(event.a2r_1);
 	  }
 	  protoOf(MemberInvitedEventJS).lf = function () {
-	    return this.c3f_1;
+	    return this.kind;
 	  };
 	  protoOf(MemberInvitedEventJS).n1z = function () {
-	    return this.d3f_1;
+	    return this.id;
 	  };
 	  protoOf(MemberInvitedEventJS).g2b = function () {
-	    return this.e3f_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MemberInvitedEventJS).z3e = function () {
-	    return this.f3f_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MemberInvitedEventJS).a3f = function () {
-	    return this.g3f_1;
+	    return this.from;
 	  };
 	  protoOf(MemberInvitedEventJS).b3f = function () {
-	    return this.h3f_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MemberInvitedEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MemberInvitedEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MemberInvitedEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MemberInvitedEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MemberInvitedEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MemberInvitedEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
 	  function MemberJoinedEventJS(event) {
-	    this.i3f_1 = 'member:joined';
-	    this.j3f_1 = event.b2r_1;
-	    this.k3f_1 = event.c2r_1;
-	    this.l3f_1 = event.d2r_1;
-	    this.m3f_1 = map(event.e2r_1);
-	    this.n3f_1 = new MemberEventBodyJS(event.f2r_1);
+	    this.kind = 'member:joined';
+	    this.id = event.b2r_1;
+	    this.timestamp = event.c2r_1;
+	    this.conversationId = event.d2r_1;
+	    this.from = map(event.e2r_1);
+	    this.body = new MemberEventBodyJS(event.f2r_1);
 	  }
 	  protoOf(MemberJoinedEventJS).lf = function () {
-	    return this.i3f_1;
+	    return this.kind;
 	  };
 	  protoOf(MemberJoinedEventJS).n1z = function () {
-	    return this.j3f_1;
+	    return this.id;
 	  };
 	  protoOf(MemberJoinedEventJS).g2b = function () {
-	    return this.k3f_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MemberJoinedEventJS).z3e = function () {
-	    return this.l3f_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MemberJoinedEventJS).a3f = function () {
-	    return this.m3f_1;
+	    return this.from;
 	  };
 	  protoOf(MemberJoinedEventJS).b3f = function () {
-	    return this.n3f_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MemberJoinedEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MemberJoinedEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MemberJoinedEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MemberJoinedEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MemberJoinedEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MemberJoinedEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
 	  function MemberLeftEventJS(event) {
-	    this.o3f_1 = 'member:left';
-	    this.p3f_1 = event.g2r_1;
-	    this.q3f_1 = event.h2r_1;
-	    this.r3f_1 = event.i2r_1;
-	    this.s3f_1 = map(event.j2r_1);
-	    this.t3f_1 = new MemberEventBodyJS(event.k2r_1);
+	    this.kind = 'member:left';
+	    this.id = event.g2r_1;
+	    this.timestamp = event.h2r_1;
+	    this.conversationId = event.i2r_1;
+	    this.from = map(event.j2r_1);
+	    this.body = new MemberEventBodyJS(event.k2r_1);
 	  }
 	  protoOf(MemberLeftEventJS).lf = function () {
-	    return this.o3f_1;
+	    return this.kind;
 	  };
 	  protoOf(MemberLeftEventJS).n1z = function () {
-	    return this.p3f_1;
+	    return this.id;
 	  };
 	  protoOf(MemberLeftEventJS).g2b = function () {
-	    return this.q3f_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MemberLeftEventJS).z3e = function () {
-	    return this.r3f_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MemberLeftEventJS).a3f = function () {
-	    return this.s3f_1;
+	    return this.from;
 	  };
 	  protoOf(MemberLeftEventJS).b3f = function () {
-	    return this.t3f_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MemberLeftEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MemberLeftEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MemberLeftEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MemberLeftEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MemberLeftEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MemberLeftEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
 	  function JSONBodyEventJS() {
 	  }
 	  function CustomConversationEventJS(event) {
-	    this.u3f_1 = 'custom';
-	    this.v3f_1 = event.l2r_1;
-	    this.w3f_1 = event.m2r_1;
-	    this.x3f_1 = event.n2r_1;
-	    this.y3f_1 = map(event.o2r_1);
+	    this.kind = 'custom';
+	    this.id = event.l2r_1;
+	    this.timestamp = event.m2r_1;
+	    this.conversationId = event.n2r_1;
+	    this.from = map(event.o2r_1);
 	    this.eventType = event.q2r_1;
-	    this.z3f_1 = event.p2r_1;
+	    this.body = event.p2r_1;
 	  }
 	  protoOf(CustomConversationEventJS).lf = function () {
-	    return this.u3f_1;
+	    return this.kind;
 	  };
 	  protoOf(CustomConversationEventJS).n1z = function () {
-	    return this.v3f_1;
+	    return this.id;
 	  };
 	  protoOf(CustomConversationEventJS).g2b = function () {
-	    return this.w3f_1;
+	    return this.timestamp;
 	  };
 	  protoOf(CustomConversationEventJS).z3e = function () {
-	    return this.x3f_1;
+	    return this.conversationId;
 	  };
 	  protoOf(CustomConversationEventJS).a3f = function () {
-	    return this.y3f_1;
+	    return this.from;
 	  };
-	  protoOf(CustomConversationEventJS).a3g = function () {
+	  protoOf(CustomConversationEventJS).c3f = function () {
 	    return this.eventType;
 	  };
 	  protoOf(CustomConversationEventJS).b3f = function () {
-	    return this.z3f_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(CustomConversationEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(CustomConversationEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(CustomConversationEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(CustomConversationEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(CustomConversationEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(CustomConversationEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
 	  function EphemeralConversationEventJS(event) {
-	    this.b3g_1 = 'ephemeral';
-	    this.c3g_1 = event.r2r_1;
-	    this.d3g_1 = event.s2r_1;
-	    this.e3g_1 = map(event.t2r_1);
-	    this.f3g_1 = event.u2r_1;
+	    this.kind = 'ephemeral';
+	    this.timestamp = event.r2r_1;
+	    this.conversationId = event.s2r_1;
+	    this.from = map(event.t2r_1);
+	    this.body = event.u2r_1;
 	  }
 	  protoOf(EphemeralConversationEventJS).lf = function () {
-	    return this.b3g_1;
+	    return this.kind;
 	  };
 	  protoOf(EphemeralConversationEventJS).g2b = function () {
-	    return this.c3g_1;
+	    return this.timestamp;
 	  };
 	  protoOf(EphemeralConversationEventJS).z3e = function () {
-	    return this.d3g_1;
+	    return this.conversationId;
 	  };
 	  protoOf(EphemeralConversationEventJS).a3f = function () {
-	    return this.e3g_1;
+	    return this.from;
 	  };
 	  protoOf(EphemeralConversationEventJS).b3f = function () {
-	    return this.f3g_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(EphemeralConversationEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(EphemeralConversationEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(EphemeralConversationEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(EphemeralConversationEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(EphemeralConversationEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
 	  function EventDeleteConversationEventJS(event) {
-	    this.g3g_1 = 'event:delete';
-	    this.h3g_1 = event.v2r_1;
-	    this.i3g_1 = event.w2r_1;
-	    this.j3g_1 = event.x2r_1;
-	    this.k3g_1 = map(event.y2r_1);
-	    this.l3g_1 = event.z2r_1;
+	    this.kind = 'event:delete';
+	    this.id = event.v2r_1;
+	    this.timestamp = event.w2r_1;
+	    this.conversationId = event.x2r_1;
+	    this.from = map(event.y2r_1);
+	    this.body = event.z2r_1;
 	  }
 	  protoOf(EventDeleteConversationEventJS).lf = function () {
-	    return this.g3g_1;
+	    return this.kind;
 	  };
 	  protoOf(EventDeleteConversationEventJS).n1z = function () {
-	    return this.h3g_1;
+	    return this.id;
 	  };
 	  protoOf(EventDeleteConversationEventJS).g2b = function () {
-	    return this.i3g_1;
+	    return this.timestamp;
 	  };
 	  protoOf(EventDeleteConversationEventJS).z3e = function () {
-	    return this.j3g_1;
+	    return this.conversationId;
 	  };
 	  protoOf(EventDeleteConversationEventJS).a3f = function () {
-	    return this.k3g_1;
+	    return this.from;
 	  };
 	  protoOf(EventDeleteConversationEventJS).b3f = function () {
-	    return this.l3g_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(EventDeleteConversationEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(EventDeleteConversationEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(EventDeleteConversationEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(EventDeleteConversationEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(EventDeleteConversationEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(EventDeleteConversationEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
 	  function map(_this__u8e3s4) {
 	    var tmp;
 	    if (_this__u8e3s4 instanceof EmbeddedInfo) {
@@ -59810,527 +59713,356 @@ function requireClientsdkClientcore () {
 	  }
 	  function MessageEventBodyJS() {
 	  }
-	  function Body(body) {
+	  function MessageTextEventBody(body) {
 	    this.text = body.w2s_1;
-	    this.n3g_1 = body.x2s_1;
+	    this.deleted = body.x2s_1;
 	  }
-	  protoOf(Body).o3g = function () {
+	  protoOf(MessageTextEventBody).d3f = function () {
 	    return this.text;
 	  };
-	  protoOf(Body).m3g = function () {
-	    return this.n3g_1;
+	  protoOf(MessageTextEventBody).e3f = function () {
+	    return this.deleted;
 	  };
-	  defineProp(protoOf(Body), 'deleted', function () {
-	    return this.m3g();
-	  }, VOID);
 	  function MessageTextEventJS(event) {
-	    this.p3g_1 = 'message:text';
-	    this.q3g_1 = event.a2t_1;
-	    this.r3g_1 = event.y2s_1;
-	    this.s3g_1 = event.z2s_1;
-	    this.t3g_1 = map(event.b2t_1);
-	    this.u3g_1 = new Body(event.c2t_1);
+	    this.kind = 'message:text';
+	    this.id = event.a2t_1;
+	    this.timestamp = event.y2s_1;
+	    this.conversationId = event.z2s_1;
+	    this.from = map(event.b2t_1);
+	    this.body = new MessageTextEventBody(event.c2t_1);
 	  }
 	  protoOf(MessageTextEventJS).lf = function () {
-	    return this.p3g_1;
+	    return this.kind;
 	  };
 	  protoOf(MessageTextEventJS).n1z = function () {
-	    return this.q3g_1;
+	    return this.id;
 	  };
 	  protoOf(MessageTextEventJS).g2b = function () {
-	    return this.r3g_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MessageTextEventJS).z3e = function () {
-	    return this.s3g_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MessageTextEventJS).a3f = function () {
-	    return this.t3g_1;
+	    return this.from;
 	  };
 	  protoOf(MessageTextEventJS).b3f = function () {
-	    return this.u3g_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MessageTextEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MessageTextEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MessageTextEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MessageTextEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MessageTextEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MessageTextEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
-	  function Body_0(body) {
+	  function MessageCustomEventBody(body) {
 	    this.customData = body.d2t_1;
-	    this.v3g_1 = body.e2t_1;
+	    this.deleted = body.e2t_1;
 	  }
-	  protoOf(Body_0).w3g = function () {
+	  protoOf(MessageCustomEventBody).f3f = function () {
 	    return this.customData;
 	  };
-	  protoOf(Body_0).m3g = function () {
-	    return this.v3g_1;
+	  protoOf(MessageCustomEventBody).e3f = function () {
+	    return this.deleted;
 	  };
-	  defineProp(protoOf(Body_0), 'deleted', function () {
-	    return this.m3g();
-	  }, VOID);
 	  function MessageCustomEventJS(event) {
-	    this.x3g_1 = 'message:custom';
-	    this.y3g_1 = event.h2t_1;
-	    this.z3g_1 = event.f2t_1;
-	    this.a3h_1 = event.g2t_1;
-	    this.b3h_1 = map(event.i2t_1);
-	    this.c3h_1 = new Body_0(event.j2t_1);
+	    this.kind = 'message:custom';
+	    this.id = event.h2t_1;
+	    this.timestamp = event.f2t_1;
+	    this.conversationId = event.g2t_1;
+	    this.from = map(event.i2t_1);
+	    this.body = new MessageCustomEventBody(event.j2t_1);
 	  }
 	  protoOf(MessageCustomEventJS).lf = function () {
-	    return this.x3g_1;
+	    return this.kind;
 	  };
 	  protoOf(MessageCustomEventJS).n1z = function () {
-	    return this.y3g_1;
+	    return this.id;
 	  };
 	  protoOf(MessageCustomEventJS).g2b = function () {
-	    return this.z3g_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MessageCustomEventJS).z3e = function () {
-	    return this.a3h_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MessageCustomEventJS).a3f = function () {
-	    return this.b3h_1;
+	    return this.from;
 	  };
 	  protoOf(MessageCustomEventJS).b3f = function () {
-	    return this.c3h_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MessageCustomEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MessageCustomEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MessageCustomEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MessageCustomEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MessageCustomEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MessageCustomEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
-	  function Body_1(body) {
+	  function MessageAudioEventBody(body) {
 	    this.audioUrl = body.y2t_1;
-	    this.d3h_1 = body.z2t_1;
+	    this.deleted = body.z2t_1;
 	  }
-	  protoOf(Body_1).e3h = function () {
+	  protoOf(MessageAudioEventBody).g3f = function () {
 	    return this.audioUrl;
 	  };
-	  protoOf(Body_1).m3g = function () {
-	    return this.d3h_1;
+	  protoOf(MessageAudioEventBody).e3f = function () {
+	    return this.deleted;
 	  };
-	  defineProp(protoOf(Body_1), 'deleted', function () {
-	    return this.m3g();
-	  }, VOID);
 	  function MessageAudioEventJS(event) {
-	    this.f3h_1 = 'message:audio';
-	    this.g3h_1 = event.c2u_1;
-	    this.h3h_1 = event.a2u_1;
-	    this.i3h_1 = event.b2u_1;
-	    this.j3h_1 = map(event.d2u_1);
-	    this.k3h_1 = new Body_1(event.e2u_1);
+	    this.kind = 'message:audio';
+	    this.id = event.c2u_1;
+	    this.timestamp = event.a2u_1;
+	    this.conversationId = event.b2u_1;
+	    this.from = map(event.d2u_1);
+	    this.body = new MessageAudioEventBody(event.e2u_1);
 	  }
 	  protoOf(MessageAudioEventJS).lf = function () {
-	    return this.f3h_1;
+	    return this.kind;
 	  };
 	  protoOf(MessageAudioEventJS).n1z = function () {
-	    return this.g3h_1;
+	    return this.id;
 	  };
 	  protoOf(MessageAudioEventJS).g2b = function () {
-	    return this.h3h_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MessageAudioEventJS).z3e = function () {
-	    return this.i3h_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MessageAudioEventJS).a3f = function () {
-	    return this.j3h_1;
+	    return this.from;
 	  };
 	  protoOf(MessageAudioEventJS).b3f = function () {
-	    return this.k3h_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MessageAudioEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MessageAudioEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MessageAudioEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MessageAudioEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MessageAudioEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MessageAudioEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
-	  function Body_2(body) {
+	  function MessageVideoEventBody(body) {
 	    this.videoUrl = body.r2t_1;
-	    this.l3h_1 = body.s2t_1;
+	    this.deleted = body.s2t_1;
 	  }
-	  protoOf(Body_2).m3h = function () {
+	  protoOf(MessageVideoEventBody).h3f = function () {
 	    return this.videoUrl;
 	  };
-	  protoOf(Body_2).m3g = function () {
-	    return this.l3h_1;
+	  protoOf(MessageVideoEventBody).e3f = function () {
+	    return this.deleted;
 	  };
-	  defineProp(protoOf(Body_2), 'deleted', function () {
-	    return this.m3g();
-	  }, VOID);
 	  function MessageVideoEventJS(event) {
-	    this.n3h_1 = 'message:video';
-	    this.o3h_1 = event.v2t_1;
-	    this.p3h_1 = event.t2t_1;
-	    this.q3h_1 = event.u2t_1;
-	    this.r3h_1 = map(event.w2t_1);
-	    this.s3h_1 = new Body_2(event.x2t_1);
+	    this.kind = 'message:video';
+	    this.id = event.v2t_1;
+	    this.timestamp = event.t2t_1;
+	    this.conversationId = event.u2t_1;
+	    this.from = map(event.w2t_1);
+	    this.body = new MessageVideoEventBody(event.x2t_1);
 	  }
 	  protoOf(MessageVideoEventJS).lf = function () {
-	    return this.n3h_1;
+	    return this.kind;
 	  };
 	  protoOf(MessageVideoEventJS).n1z = function () {
-	    return this.o3h_1;
+	    return this.id;
 	  };
 	  protoOf(MessageVideoEventJS).g2b = function () {
-	    return this.p3h_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MessageVideoEventJS).z3e = function () {
-	    return this.q3h_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MessageVideoEventJS).a3f = function () {
-	    return this.r3h_1;
+	    return this.from;
 	  };
 	  protoOf(MessageVideoEventJS).b3f = function () {
-	    return this.s3h_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MessageVideoEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MessageVideoEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MessageVideoEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MessageVideoEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MessageVideoEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MessageVideoEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
-	  function Body_3(body) {
+	  function MessageImageEventBody(body) {
 	    this.imageUrl = body.k2t_1;
-	    this.t3h_1 = body.l2t_1;
+	    this.deleted = body.l2t_1;
 	  }
-	  protoOf(Body_3).u3h = function () {
+	  protoOf(MessageImageEventBody).i3f = function () {
 	    return this.imageUrl;
 	  };
-	  protoOf(Body_3).m3g = function () {
-	    return this.t3h_1;
+	  protoOf(MessageImageEventBody).e3f = function () {
+	    return this.deleted;
 	  };
-	  defineProp(protoOf(Body_3), 'deleted', function () {
-	    return this.m3g();
-	  }, VOID);
 	  function MessageImageEventJS(event) {
-	    this.v3h_1 = 'message:image';
-	    this.w3h_1 = event.o2t_1;
-	    this.x3h_1 = event.m2t_1;
-	    this.y3h_1 = event.n2t_1;
-	    this.z3h_1 = map(event.p2t_1);
-	    this.a3i_1 = new Body_3(event.q2t_1);
+	    this.kind = 'message:image';
+	    this.id = event.o2t_1;
+	    this.timestamp = event.m2t_1;
+	    this.conversationId = event.n2t_1;
+	    this.from = map(event.p2t_1);
+	    this.body = new MessageImageEventBody(event.q2t_1);
 	  }
 	  protoOf(MessageImageEventJS).lf = function () {
-	    return this.v3h_1;
+	    return this.kind;
 	  };
 	  protoOf(MessageImageEventJS).n1z = function () {
-	    return this.w3h_1;
+	    return this.id;
 	  };
 	  protoOf(MessageImageEventJS).g2b = function () {
-	    return this.x3h_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MessageImageEventJS).z3e = function () {
-	    return this.y3h_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MessageImageEventJS).a3f = function () {
-	    return this.z3h_1;
+	    return this.from;
 	  };
 	  protoOf(MessageImageEventJS).b3f = function () {
-	    return this.a3i_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MessageImageEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MessageImageEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MessageImageEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MessageImageEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MessageImageEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MessageImageEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
-	  function Body_4(body) {
+	  function MessageFileEventBody(body) {
 	    this.fileUrl = body.f2u_1;
-	    this.b3i_1 = body.g2u_1;
+	    this.deleted = body.g2u_1;
 	  }
-	  protoOf(Body_4).c3i = function () {
+	  protoOf(MessageFileEventBody).j3f = function () {
 	    return this.fileUrl;
 	  };
-	  protoOf(Body_4).m3g = function () {
-	    return this.b3i_1;
+	  protoOf(MessageFileEventBody).e3f = function () {
+	    return this.deleted;
 	  };
-	  defineProp(protoOf(Body_4), 'deleted', function () {
-	    return this.m3g();
-	  }, VOID);
 	  function MessageFileEventJS(event) {
-	    this.d3i_1 = 'message:file';
-	    this.e3i_1 = event.j2u_1;
-	    this.f3i_1 = event.h2u_1;
-	    this.g3i_1 = event.i2u_1;
-	    this.h3i_1 = map(event.k2u_1);
-	    this.i3i_1 = new Body_4(event.l2u_1);
+	    this.kind = 'message:file';
+	    this.id = event.j2u_1;
+	    this.timestamp = event.h2u_1;
+	    this.conversationId = event.i2u_1;
+	    this.from = map(event.k2u_1);
+	    this.body = new MessageFileEventBody(event.l2u_1);
 	  }
 	  protoOf(MessageFileEventJS).lf = function () {
-	    return this.d3i_1;
+	    return this.kind;
 	  };
 	  protoOf(MessageFileEventJS).n1z = function () {
-	    return this.e3i_1;
+	    return this.id;
 	  };
 	  protoOf(MessageFileEventJS).g2b = function () {
-	    return this.f3i_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MessageFileEventJS).z3e = function () {
-	    return this.g3i_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MessageFileEventJS).a3f = function () {
-	    return this.h3i_1;
+	    return this.from;
 	  };
 	  protoOf(MessageFileEventJS).b3f = function () {
-	    return this.i3i_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MessageFileEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MessageFileEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MessageFileEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MessageFileEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MessageFileEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MessageFileEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
-	  function Body_5(body) {
+	  function MessageVCardEventBody(body) {
 	    this.vcardUrl = body.m2u_1;
-	    this.j3i_1 = body.n2u_1;
+	    this.deleted = body.n2u_1;
 	  }
-	  protoOf(Body_5).k3i = function () {
+	  protoOf(MessageVCardEventBody).k3f = function () {
 	    return this.vcardUrl;
 	  };
-	  protoOf(Body_5).m3g = function () {
-	    return this.j3i_1;
+	  protoOf(MessageVCardEventBody).e3f = function () {
+	    return this.deleted;
 	  };
-	  defineProp(protoOf(Body_5), 'deleted', function () {
-	    return this.m3g();
-	  }, VOID);
 	  function MessageVCardEventJS(event) {
-	    this.l3i_1 = 'message:vcard';
-	    this.m3i_1 = event.q2u_1;
-	    this.n3i_1 = event.o2u_1;
-	    this.o3i_1 = event.p2u_1;
-	    this.p3i_1 = map(event.r2u_1);
-	    this.q3i_1 = new Body_5(event.s2u_1);
+	    this.kind = 'message:vcard';
+	    this.id = event.q2u_1;
+	    this.timestamp = event.o2u_1;
+	    this.conversationId = event.p2u_1;
+	    this.from = map(event.r2u_1);
+	    this.body = new MessageVCardEventBody(event.s2u_1);
 	  }
 	  protoOf(MessageVCardEventJS).lf = function () {
-	    return this.l3i_1;
+	    return this.kind;
 	  };
 	  protoOf(MessageVCardEventJS).n1z = function () {
-	    return this.m3i_1;
+	    return this.id;
 	  };
 	  protoOf(MessageVCardEventJS).g2b = function () {
-	    return this.n3i_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MessageVCardEventJS).z3e = function () {
-	    return this.o3i_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MessageVCardEventJS).a3f = function () {
-	    return this.p3i_1;
+	    return this.from;
 	  };
 	  protoOf(MessageVCardEventJS).b3f = function () {
-	    return this.q3i_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MessageVCardEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MessageVCardEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MessageVCardEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MessageVCardEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MessageVCardEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MessageVCardEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
-	  function Body_6(body) {
+	  function MessageLocationEventBody(body) {
 	    this.location = new Location_0(body.b2v_1);
-	    this.r3i_1 = body.c2v_1;
+	    this.deleted = body.c2v_1;
 	  }
-	  protoOf(Body_6).s3i = function () {
+	  protoOf(MessageLocationEventBody).l3f = function () {
 	    return this.location;
 	  };
-	  protoOf(Body_6).m3g = function () {
-	    return this.r3i_1;
+	  protoOf(MessageLocationEventBody).e3f = function () {
+	    return this.deleted;
 	  };
-	  defineProp(protoOf(Body_6), 'deleted', function () {
-	    return this.m3g();
-	  }, VOID);
 	  function Location_0(location) {
 	    this.longitude = location.f2c_1;
 	    this.latitude = location.g2c_1;
 	    this.name = location.h2c_1;
 	    this.address = location.i2c_1;
 	  }
-	  protoOf(Location_0).t3i = function () {
+	  protoOf(Location_0).m3f = function () {
 	    return this.longitude;
 	  };
-	  protoOf(Location_0).u3i = function () {
+	  protoOf(Location_0).n3f = function () {
 	    return this.latitude;
 	  };
 	  protoOf(Location_0).mc = function () {
 	    return this.name;
 	  };
-	  protoOf(Location_0).v3i = function () {
+	  protoOf(Location_0).o3f = function () {
 	    return this.address;
 	  };
 	  function MessageLocationEventJS(event) {
-	    this.w3i_1 = 'message:location';
-	    this.x3i_1 = event.f2v_1;
-	    this.y3i_1 = event.d2v_1;
-	    this.z3i_1 = event.e2v_1;
-	    this.a3j_1 = map(event.g2v_1);
-	    this.b3j_1 = new Body_6(event.h2v_1);
+	    this.kind = 'message:location';
+	    this.id = event.f2v_1;
+	    this.timestamp = event.d2v_1;
+	    this.conversationId = event.e2v_1;
+	    this.from = map(event.g2v_1);
+	    this.body = new MessageLocationEventBody(event.h2v_1);
 	  }
 	  protoOf(MessageLocationEventJS).lf = function () {
-	    return this.w3i_1;
+	    return this.kind;
 	  };
 	  protoOf(MessageLocationEventJS).n1z = function () {
-	    return this.x3i_1;
+	    return this.id;
 	  };
 	  protoOf(MessageLocationEventJS).g2b = function () {
-	    return this.y3i_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MessageLocationEventJS).z3e = function () {
-	    return this.z3i_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MessageLocationEventJS).a3f = function () {
-	    return this.a3j_1;
+	    return this.from;
 	  };
 	  protoOf(MessageLocationEventJS).b3f = function () {
-	    return this.b3j_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MessageLocationEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MessageLocationEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MessageLocationEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MessageLocationEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MessageLocationEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MessageLocationEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
-	  function Body_7(body) {
+	  function MessageTemplateEventBody(body) {
 	    this.body = body;
 	    this.template = new TemplateObject_0(this.body.t2u_1);
 	    this.whatsapp = new WhatsappObject_0(this.body.u2u_1);
-	    this.c3j_1 = this.body.v2u_1;
+	    this.deleted = this.body.v2u_1;
 	  }
-	  protoOf(Body_7).b3f = function () {
+	  protoOf(MessageTemplateEventBody).b3f = function () {
 	    return this.body;
 	  };
-	  protoOf(Body_7).d3j = function () {
+	  protoOf(MessageTemplateEventBody).p3f = function () {
 	    return this.template;
 	  };
-	  protoOf(Body_7).e3j = function () {
+	  protoOf(MessageTemplateEventBody).q3f = function () {
 	    return this.whatsapp;
 	  };
-	  protoOf(Body_7).m3g = function () {
-	    return this.c3j_1;
+	  protoOf(MessageTemplateEventBody).e3f = function () {
+	    return this.deleted;
 	  };
-	  protoOf(Body_7).r2 = function () {
+	  protoOf(MessageTemplateEventBody).r2 = function () {
 	    return this.body;
 	  };
-	  protoOf(Body_7).f3j = function (body) {
-	    return new Body_7(body);
+	  protoOf(MessageTemplateEventBody).r3f = function (body) {
+	    return new MessageTemplateEventBody(body);
 	  };
-	  protoOf(Body_7).copy = function (body, $super) {
+	  protoOf(MessageTemplateEventBody).copy = function (body, $super) {
 	    body = body === VOID ? this.body : body;
-	    return this.f3j(body);
+	    return this.r3f(body);
 	  };
-	  protoOf(Body_7).toString = function () {
+	  protoOf(MessageTemplateEventBody).toString = function () {
 	    return 'Body(body=' + this.body + ')';
 	  };
-	  protoOf(Body_7).hashCode = function () {
+	  protoOf(MessageTemplateEventBody).hashCode = function () {
 	    return this.body.hashCode();
 	  };
-	  protoOf(Body_7).equals = function (other) {
+	  protoOf(MessageTemplateEventBody).equals = function (other) {
 	    if (this === other)
 	      return true;
-	    if (!(other instanceof Body_7))
+	    if (!(other instanceof MessageTemplateEventBody))
 	      return false;
-	    var tmp0_other_with_cast = other instanceof Body_7 ? other : THROW_CCE();
+	    var tmp0_other_with_cast = other instanceof MessageTemplateEventBody ? other : THROW_CCE();
 	    if (!this.body.equals(tmp0_other_with_cast.body))
 	      return false;
 	    return true;
 	  };
-	  defineProp(protoOf(Body_7), 'deleted', function () {
-	    return this.m3g();
-	  }, VOID);
 	  function TemplateObject_0(template) {
 	    this.name = template.x2b_1;
 	    var tmp = this;
@@ -60347,63 +60079,45 @@ function requireClientsdkClientcore () {
 	  protoOf(TemplateObject_0).mc = function () {
 	    return this.name;
 	  };
-	  protoOf(TemplateObject_0).g3j = function () {
+	  protoOf(TemplateObject_0).s3f = function () {
 	    return this.parameters;
 	  };
 	  function WhatsappObject_0(whatsapp) {
 	    this.policy = whatsapp.b2c_1;
 	    this.locale = whatsapp.c2c_1;
 	  }
-	  protoOf(WhatsappObject_0).h3j = function () {
+	  protoOf(WhatsappObject_0).t3f = function () {
 	    return this.policy;
 	  };
-	  protoOf(WhatsappObject_0).i3j = function () {
+	  protoOf(WhatsappObject_0).u3f = function () {
 	    return this.locale;
 	  };
 	  function MessageTemplateEventJS(event) {
-	    this.j3j_1 = 'message:template';
-	    this.k3j_1 = event.y2u_1;
-	    this.l3j_1 = event.w2u_1;
-	    this.m3j_1 = event.x2u_1;
-	    this.n3j_1 = map(event.z2u_1);
-	    this.o3j_1 = new Body_7(event.a2v_1);
+	    this.kind = 'message:template';
+	    this.id = event.y2u_1;
+	    this.timestamp = event.w2u_1;
+	    this.conversationId = event.x2u_1;
+	    this.from = map(event.z2u_1);
+	    this.body = new MessageTemplateEventBody(event.a2v_1);
 	  }
 	  protoOf(MessageTemplateEventJS).lf = function () {
-	    return this.j3j_1;
+	    return this.kind;
 	  };
 	  protoOf(MessageTemplateEventJS).n1z = function () {
-	    return this.k3j_1;
+	    return this.id;
 	  };
 	  protoOf(MessageTemplateEventJS).g2b = function () {
-	    return this.l3j_1;
+	    return this.timestamp;
 	  };
 	  protoOf(MessageTemplateEventJS).z3e = function () {
-	    return this.m3j_1;
+	    return this.conversationId;
 	  };
 	  protoOf(MessageTemplateEventJS).a3f = function () {
-	    return this.n3j_1;
+	    return this.from;
 	  };
 	  protoOf(MessageTemplateEventJS).b3f = function () {
-	    return this.o3j_1;
+	    return this.body;
 	  };
-	  defineProp(protoOf(MessageTemplateEventJS), 'kind', function () {
-	    return this.lf();
-	  }, VOID);
-	  defineProp(protoOf(MessageTemplateEventJS), 'id', function () {
-	    return this.n1z();
-	  }, VOID);
-	  defineProp(protoOf(MessageTemplateEventJS), 'timestamp', function () {
-	    return this.g2b();
-	  }, VOID);
-	  defineProp(protoOf(MessageTemplateEventJS), 'conversationId', function () {
-	    return this.z3e();
-	  }, VOID);
-	  defineProp(protoOf(MessageTemplateEventJS), 'from', function () {
-	    return this.a3f();
-	  }, VOID);
-	  defineProp(protoOf(MessageTemplateEventJS), 'body', function () {
-	    return this.b3f();
-	  }, VOID);
 	  var PresentingOrderJS_ASC_instance;
 	  var PresentingOrderJS_DESC_instance;
 	  function values() {
@@ -60433,7 +60147,7 @@ function requireClientsdkClientcore () {
 	    Enum.call(this, name, ordinal);
 	    this.corePresentingOrder = corePresentingOrder;
 	  }
-	  protoOf(PresentingOrderJS).r3j = function () {
+	  protoOf(PresentingOrderJS).x3f = function () {
 	    return this.corePresentingOrder;
 	  };
 	  defineProp(protoOf(PresentingOrderJS), 'name', protoOf(PresentingOrderJS).mc, VOID);
@@ -60467,7 +60181,7 @@ function requireClientsdkClientcore () {
 	    Enum.call(this, name, ordinal);
 	    this.coreOrderBy = coreOrderBy;
 	  }
-	  protoOf(OrderByJS).u3j = function () {
+	  protoOf(OrderByJS).a3g = function () {
 	    return this.coreOrderBy;
 	  };
 	  defineProp(protoOf(OrderByJS), 'name', protoOf(OrderByJS).mc, VOID);
@@ -60480,13 +60194,13 @@ function requireClientsdkClientcore () {
 	    var tmp_1 = this;
 	    tmp_1.customData = properties == null ? null : properties.x2p_1;
 	  }
-	  protoOf(Properties).v3j = function () {
+	  protoOf(Properties).b3g = function () {
 	    return this.ttl;
 	  };
-	  protoOf(Properties).w3j = function () {
+	  protoOf(Properties).c3g = function () {
 	    return this.customSortKey;
 	  };
-	  protoOf(Properties).w3g = function () {
+	  protoOf(Properties).f3f = function () {
 	    return this.customData;
 	  };
 	  function ConversationJS(conversation) {
@@ -60516,13 +60230,13 @@ function requireClientsdkClientcore () {
 	  protoOf(ConversationJS).y3e = function () {
 	    return this.memberId;
 	  };
-	  protoOf(ConversationJS).x3j = function () {
+	  protoOf(ConversationJS).d3g = function () {
 	    return this.memberState;
 	  };
-	  protoOf(ConversationJS).y3j = function () {
+	  protoOf(ConversationJS).e3g = function () {
 	    return this.displayName;
 	  };
-	  protoOf(ConversationJS).u3h = function () {
+	  protoOf(ConversationJS).i3f = function () {
 	    return this.imageUrl;
 	  };
 	  protoOf(ConversationJS).h3a = function () {
@@ -60537,13 +60251,13 @@ function requireClientsdkClientcore () {
 	    this.INACTIVE = 'INACTIVE';
 	    this.DELETED = 'DELETED';
 	  }
-	  protoOf(ConversationStateJS).z3j = function () {
+	  protoOf(ConversationStateJS).f3g = function () {
 	    return this.ACTIVE;
 	  };
-	  protoOf(ConversationStateJS).a3k = function () {
+	  protoOf(ConversationStateJS).g3g = function () {
 	    return this.INACTIVE;
 	  };
-	  protoOf(ConversationStateJS).b3k = function () {
+	  protoOf(ConversationStateJS).h3g = function () {
 	    return this.DELETED;
 	  };
 	  protoOf(ConversationStateJS).toString = function () {
@@ -60571,13 +60285,13 @@ function requireClientsdkClientcore () {
 	    this.updated = conversationTimestamp.k2q_1;
 	    this.destroyed = conversationTimestamp.l2q_1;
 	  }
-	  protoOf(ConversationTimestampJS).c3k = function () {
+	  protoOf(ConversationTimestampJS).i3g = function () {
 	    return this.created;
 	  };
-	  protoOf(ConversationTimestampJS).d3k = function () {
+	  protoOf(ConversationTimestampJS).j3g = function () {
 	    return this.updated;
 	  };
-	  protoOf(ConversationTimestampJS).e3k = function () {
+	  protoOf(ConversationTimestampJS).k3g = function () {
 	    return this.destroyed;
 	  };
 	  function ConversationsPageJS(conversationsPage) {
@@ -60599,7 +60313,7 @@ function requireClientsdkClientcore () {
 	    this.previousCursor = conversationsPage.n2q_1;
 	    this.nextCursor = conversationsPage.o2q_1;
 	  }
-	  protoOf(ConversationsPageJS).f3k = function () {
+	  protoOf(ConversationsPageJS).l3g = function () {
 	    return this.conversations;
 	  };
 	  protoOf(ConversationsPageJS).w3e = function () {
@@ -60657,7 +60371,7 @@ function requireClientsdkClientcore () {
 	  protoOf(MemberJS).r2d = function () {
 	    return this.user;
 	  };
-	  protoOf(MemberJS).g3k = function () {
+	  protoOf(MemberJS).m3g = function () {
 	    return this.channel;
 	  };
 	  protoOf(MemberJS).g2b = function () {
@@ -60670,16 +60384,16 @@ function requireClientsdkClientcore () {
 	    this.LEFT = 'LEFT';
 	    this.UNKNOWN = 'UNKNOWN';
 	  }
-	  protoOf(MemberStateJSObj).h3k = function () {
+	  protoOf(MemberStateJSObj).n3g = function () {
 	    return this.INVITED;
 	  };
-	  protoOf(MemberStateJSObj).i3k = function () {
+	  protoOf(MemberStateJSObj).o3g = function () {
 	    return this.JOINED;
 	  };
-	  protoOf(MemberStateJSObj).j3k = function () {
+	  protoOf(MemberStateJSObj).p3g = function () {
 	    return this.LEFT;
 	  };
-	  protoOf(MemberStateJSObj).k3k = function () {
+	  protoOf(MemberStateJSObj).q3g = function () {
 	    return this.UNKNOWN;
 	  };
 	  protoOf(MemberStateJSObj).toString = function () {
@@ -60707,13 +60421,13 @@ function requireClientsdkClientcore () {
 	    this.joined = memberTimestamp.r2s_1;
 	    this.left = memberTimestamp.s2s_1;
 	  }
-	  protoOf(MemberTimestampJS).l3k = function () {
+	  protoOf(MemberTimestampJS).r3g = function () {
 	    return this.invited;
 	  };
-	  protoOf(MemberTimestampJS).m3k = function () {
+	  protoOf(MemberTimestampJS).s3g = function () {
 	    return this.joined;
 	  };
-	  protoOf(MemberTimestampJS).n3k = function () {
+	  protoOf(MemberTimestampJS).t3g = function () {
 	    return this.left;
 	  };
 	  function MembersPageJS(membersPage) {
@@ -60735,7 +60449,7 @@ function requireClientsdkClientcore () {
 	    this.previousCursor = membersPage.u2s_1;
 	    this.nextCursor = membersPage.v2s_1;
 	  }
-	  protoOf(MembersPageJS).o3k = function () {
+	  protoOf(MembersPageJS).u3g = function () {
 	    return this.members;
 	  };
 	  protoOf(MembersPageJS).w3e = function () {
@@ -60781,19 +60495,19 @@ function requireClientsdkClientcore () {
 	  protoOf(UserJS).mc = function () {
 	    return this.name;
 	  };
-	  protoOf(UserJS).y3j = function () {
+	  protoOf(UserJS).e3g = function () {
 	    return this.displayName;
 	  };
-	  protoOf(UserJS).p3k = function () {
+	  protoOf(UserJS).v3g = function () {
 	    return this.channels;
 	  };
 	  protoOf(UserJS).g2b = function () {
 	    return this.timestamp;
 	  };
-	  protoOf(UserJS).u3h = function () {
+	  protoOf(UserJS).i3f = function () {
 	    return this.imageUrl;
 	  };
-	  protoOf(UserJS).w3g = function () {
+	  protoOf(UserJS).f3f = function () {
 	    return this.customData;
 	  };
 	  function UserTimestampJS(userTimestamp) {
@@ -60801,13 +60515,13 @@ function requireClientsdkClientcore () {
 	    this.updated = userTimestamp.u2v_1;
 	    this.destroyed = userTimestamp.v2v_1;
 	  }
-	  protoOf(UserTimestampJS).c3k = function () {
+	  protoOf(UserTimestampJS).i3g = function () {
 	    return this.created;
 	  };
-	  protoOf(UserTimestampJS).d3k = function () {
+	  protoOf(UserTimestampJS).j3g = function () {
 	    return this.updated;
 	  };
-	  protoOf(UserTimestampJS).e3k = function () {
+	  protoOf(UserTimestampJS).k3g = function () {
 	    return this.destroyed;
 	  };
 	  function UserChannelsJS(userChannels) {
@@ -61120,37 +60834,37 @@ function requireClientsdkClientcore () {
 	    }
 	    tmp_29.messenger = tmp_31;
 	  }
-	  protoOf(UserChannelsJS).q3k = function () {
+	  protoOf(UserChannelsJS).w3g = function () {
 	    return this.app;
 	  };
-	  protoOf(UserChannelsJS).r3k = function () {
+	  protoOf(UserChannelsJS).x3g = function () {
 	    return this.phone;
 	  };
-	  protoOf(UserChannelsJS).s3k = function () {
+	  protoOf(UserChannelsJS).y3g = function () {
 	    return this.pstn;
 	  };
-	  protoOf(UserChannelsJS).t3k = function () {
+	  protoOf(UserChannelsJS).z3g = function () {
 	    return this.sip;
 	  };
-	  protoOf(UserChannelsJS).u3k = function () {
+	  protoOf(UserChannelsJS).a3h = function () {
 	    return this.vbc;
 	  };
-	  protoOf(UserChannelsJS).v3k = function () {
+	  protoOf(UserChannelsJS).b3h = function () {
 	    return this.websocket;
 	  };
-	  protoOf(UserChannelsJS).w3k = function () {
+	  protoOf(UserChannelsJS).c3h = function () {
 	    return this.sms;
 	  };
-	  protoOf(UserChannelsJS).x3k = function () {
+	  protoOf(UserChannelsJS).d3h = function () {
 	    return this.mms;
 	  };
-	  protoOf(UserChannelsJS).e3j = function () {
+	  protoOf(UserChannelsJS).q3f = function () {
 	    return this.whatsapp;
 	  };
-	  protoOf(UserChannelsJS).y3k = function () {
+	  protoOf(UserChannelsJS).e3h = function () {
 	    return this.viber;
 	  };
-	  protoOf(UserChannelsJS).z3k = function () {
+	  protoOf(UserChannelsJS).f3h = function () {
 	    return this.messenger;
 	  };
 	  function MemberChannelJS(memberChannel) {
@@ -61186,7 +60900,7 @@ function requireClientsdkClientcore () {
 	  protoOf(MemberChannelJS).a3f = function () {
 	    return this.from;
 	  };
-	  protoOf(MemberChannelJS).a3l = function () {
+	  protoOf(MemberChannelJS).g3h = function () {
 	    return this.to;
 	  };
 	  function ChannelJS(channel) {
@@ -61196,7 +60910,7 @@ function requireClientsdkClientcore () {
 	  protoOf(ChannelJS).n1z = function () {
 	    return this.id;
 	  };
-	  protoOf(ChannelJS).b3l = function () {
+	  protoOf(ChannelJS).h3h = function () {
 	    return this.number;
 	  };
 	  function LegChannelJS(channel) {
@@ -61210,7 +60924,7 @@ function requireClientsdkClientcore () {
 	  protoOf(LegChannelJS).r2d = function () {
 	    return this.user;
 	  };
-	  protoOf(LegChannelJS).b3l = function () {
+	  protoOf(LegChannelJS).h3h = function () {
 	    return this.number;
 	  };
 	  function LegJS(leg) {
@@ -61230,25 +60944,25 @@ function requireClientsdkClientcore () {
 	  protoOf(LegJS).w2y = function () {
 	    return this.type;
 	  };
-	  protoOf(LegJS).c3l = function () {
+	  protoOf(LegJS).i3h = function () {
 	    return this.direction;
 	  };
 	  protoOf(LegJS).z3e = function () {
 	    return this.conversationId;
 	  };
-	  protoOf(LegJS).d3l = function () {
+	  protoOf(LegJS).j3h = function () {
 	    return this.status;
 	  };
-	  protoOf(LegJS).e3l = function () {
+	  protoOf(LegJS).k3h = function () {
 	    return this.startTime;
 	  };
-	  protoOf(LegJS).f3l = function () {
+	  protoOf(LegJS).l3h = function () {
 	    return this.endTime;
 	  };
 	  protoOf(LegJS).a3f = function () {
 	    return this.from;
 	  };
-	  protoOf(LegJS).a3l = function () {
+	  protoOf(LegJS).g3h = function () {
 	    return this.to;
 	  };
 	  var ChannelTypeJS_APP_instance;
@@ -61436,34 +61150,34 @@ function requireClientsdkClientcore () {
 	    this.CONVERSATION_MAX_NUMBER_OF_MEMBERS = 'conversation:error:maximum-number-of-members';
 	    this.CUSTOM_DATA_OVERALL_LIMIT_EXCEEDED = 'custom-data:error:max-data-sum-limit-exceeded';
 	  }
-	  protoOf(CSErrorCodesJS).i3l = function () {
+	  protoOf(CSErrorCodesJS).o3h = function () {
 	    return this.CONVERSATION_DUPLICATE_NAME;
 	  };
-	  protoOf(CSErrorCodesJS).j3l = function () {
+	  protoOf(CSErrorCodesJS).p3h = function () {
 	    return this.MEMBER_ALREADY_JOINED;
 	  };
-	  protoOf(CSErrorCodesJS).k3l = function () {
+	  protoOf(CSErrorCodesJS).q3h = function () {
 	    return this.MEMBER_ALREADY_INVITED;
 	  };
-	  protoOf(CSErrorCodesJS).l3l = function () {
+	  protoOf(CSErrorCodesJS).r3h = function () {
 	    return this.CONVERSATION_NOT_FOUND;
 	  };
-	  protoOf(CSErrorCodesJS).m3l = function () {
+	  protoOf(CSErrorCodesJS).s3h = function () {
 	    return this.MEMBER_NOT_FOUND;
 	  };
-	  protoOf(CSErrorCodesJS).n3l = function () {
+	  protoOf(CSErrorCodesJS).t3h = function () {
 	    return this.USER_NOT_FOUND;
 	  };
-	  protoOf(CSErrorCodesJS).o3l = function () {
+	  protoOf(CSErrorCodesJS).u3h = function () {
 	    return this.INVALID_CURSOR;
 	  };
-	  protoOf(CSErrorCodesJS).p3l = function () {
+	  protoOf(CSErrorCodesJS).v3h = function () {
 	    return this.VALIDATION_FAIL;
 	  };
-	  protoOf(CSErrorCodesJS).q3l = function () {
+	  protoOf(CSErrorCodesJS).w3h = function () {
 	    return this.CONVERSATION_MAX_NUMBER_OF_MEMBERS;
 	  };
-	  protoOf(CSErrorCodesJS).r3l = function () {
+	  protoOf(CSErrorCodesJS).x3h = function () {
 	    return this.CUSTOM_DATA_OVERALL_LIMIT_EXCEEDED;
 	  };
 	  var CSErrorCodesJS_instance;
@@ -61491,52 +61205,52 @@ function requireClientsdkClientcore () {
 	    this.PING_TIMEOUT_DISCONNECT = 'session:disconnect:ping-timeout';
 	    this.TRANSPORT_CLOSED_DISCONNECT = 'session:disconnect:websocket-transport-closed';
 	  }
-	  protoOf(SessionErrorCodesJS).s3l = function () {
+	  protoOf(SessionErrorCodesJS).y3h = function () {
 	    return this.EMPTY_TOKEN;
 	  };
-	  protoOf(SessionErrorCodesJS).t3l = function () {
+	  protoOf(SessionErrorCodesJS).z3h = function () {
 	    return this.FORCED_DISCONNECT;
 	  };
-	  protoOf(SessionErrorCodesJS).u3l = function () {
+	  protoOf(SessionErrorCodesJS).a3i = function () {
 	    return this.TIMEOUT;
 	  };
-	  protoOf(SessionErrorCodesJS).v3l = function () {
+	  protoOf(SessionErrorCodesJS).b3i = function () {
 	    return this.INTERNAL_FAILURE;
 	  };
-	  protoOf(SessionErrorCodesJS).w3l = function () {
+	  protoOf(SessionErrorCodesJS).c3i = function () {
 	    return this.NO_ACTIVE_SESSION;
 	  };
-	  protoOf(SessionErrorCodesJS).x3l = function () {
+	  protoOf(SessionErrorCodesJS).d3i = function () {
 	    return this.ALREADY_ACTIVE_SESSION;
 	  };
-	  protoOf(SessionErrorCodesJS).y3l = function () {
+	  protoOf(SessionErrorCodesJS).e3i = function () {
 	    return this.INVALID_TOKEN;
 	  };
-	  protoOf(SessionErrorCodesJS).z3l = function () {
+	  protoOf(SessionErrorCodesJS).f3i = function () {
 	    return this.EXPIRED_TOKEN;
 	  };
-	  protoOf(SessionErrorCodesJS).a3m = function () {
+	  protoOf(SessionErrorCodesJS).g3i = function () {
 	    return this.INVALID_USER;
 	  };
-	  protoOf(SessionErrorCodesJS).b3m = function () {
+	  protoOf(SessionErrorCodesJS).h3i = function () {
 	    return this.AUTHORIZATION_ERROR;
 	  };
-	  protoOf(SessionErrorCodesJS).c3m = function () {
+	  protoOf(SessionErrorCodesJS).i3i = function () {
 	    return this.INVALID_SESSION;
 	  };
-	  protoOf(SessionErrorCodesJS).d3m = function () {
+	  protoOf(SessionErrorCodesJS).j3i = function () {
 	    return this.MAX_OPEN_SESSIONS;
 	  };
-	  protoOf(SessionErrorCodesJS).e3m = function () {
+	  protoOf(SessionErrorCodesJS).k3i = function () {
 	    return this.INVALID_SOCKET_TRANSPORT;
 	  };
-	  protoOf(SessionErrorCodesJS).f3m = function () {
+	  protoOf(SessionErrorCodesJS).l3i = function () {
 	    return this.CLIENT_DISCONNECT;
 	  };
-	  protoOf(SessionErrorCodesJS).g3m = function () {
+	  protoOf(SessionErrorCodesJS).m3i = function () {
 	    return this.PING_TIMEOUT_DISCONNECT;
 	  };
-	  protoOf(SessionErrorCodesJS).h3m = function () {
+	  protoOf(SessionErrorCodesJS).n3i = function () {
 	    return this.TRANSPORT_CLOSED_DISCONNECT;
 	  };
 	  var SessionErrorCodesJS_instance;
@@ -61558,7 +61272,7 @@ function requireClientsdkClientcore () {
 	  protoOf(VonageErrorJS).j2d = function () {
 	    return this.code;
 	  };
-	  protoOf(VonageErrorJS).i3m = function () {
+	  protoOf(VonageErrorJS).o3i = function () {
 	    return this.kmpCause;
 	  };
 	  var VonageErrorTypeJS_CS_ERROR_instance;
@@ -62563,15 +62277,39 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function IChatClientJS$deleteEvent$lambda$lambda($reject, $resolve) {
-	    return function (it) {
-	      if (it instanceof VonageError) {
-	        $reject(new VonageErrorJS(it));
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
 	      } else {
-	        if (!(it == null)) {
-	          $reject(it);
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
 	        } else {
-	          $resolve(null);
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
 	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
+	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
 	      }
 	      return Unit_getInstance();
 	    };
@@ -62670,7 +62408,7 @@ function requireClientsdkClientcore () {
 	    Enum.call(this, name, ordinal);
 	    this.coreRegion = coreRegion;
 	  }
-	  protoOf(CoreClientConfigRegionJS).n3m = function () {
+	  protoOf(CoreClientConfigRegionJS).t3i = function () {
 	    return this.coreRegion;
 	  };
 	  defineProp(protoOf(CoreClientConfigRegionJS), 'name', protoOf(CoreClientConfigRegionJS).mc, VOID);
@@ -62678,73 +62416,73 @@ function requireClientsdkClientcore () {
 	  function CoreClientConfigJS(region) {
 	    region = region === VOID ? get_DEFAULT_REGION() : region;
 	    this.region = region;
-	    this.o3m_1 = this.region.coreRegion.j2l_1;
-	    this.p3m_1 = this.region.coreRegion.k2l_1;
+	    this.u3i_1 = this.region.coreRegion.j2l_1;
+	    this.v3i_1 = this.region.coreRegion.k2l_1;
 	    var tmp = this;
 	    DefaultConfig_getInstance();
-	    tmp.q3m_1 = '/v2/rtc';
+	    tmp.w3i_1 = '/v2/rtc';
 	    var tmp_0 = this;
 	    DefaultConfig_getInstance();
-	    tmp_0.r3m_1 = true;
-	    this.s3m_1 = false;
+	    tmp_0.x3i_1 = true;
+	    this.y3i_1 = false;
 	  }
-	  protoOf(CoreClientConfigJS).t3m = function () {
+	  protoOf(CoreClientConfigJS).z3i = function () {
 	    return this.region;
 	  };
-	  protoOf(CoreClientConfigJS).u3m = function (_set____db54di) {
-	    this.o3m_1 = _set____db54di;
+	  protoOf(CoreClientConfigJS).a3j = function (_set____db54di) {
+	    this.u3i_1 = _set____db54di;
 	  };
-	  protoOf(CoreClientConfigJS).v3m = function () {
-	    return this.o3m_1;
+	  protoOf(CoreClientConfigJS).b3j = function () {
+	    return this.u3i_1;
 	  };
-	  protoOf(CoreClientConfigJS).w3m = function (_set____db54di) {
-	    this.p3m_1 = _set____db54di;
+	  protoOf(CoreClientConfigJS).c3j = function (_set____db54di) {
+	    this.v3i_1 = _set____db54di;
 	  };
-	  protoOf(CoreClientConfigJS).x3m = function () {
-	    return this.p3m_1;
+	  protoOf(CoreClientConfigJS).d3j = function () {
+	    return this.v3i_1;
 	  };
-	  protoOf(CoreClientConfigJS).y3m = function (_set____db54di) {
-	    this.q3m_1 = _set____db54di;
+	  protoOf(CoreClientConfigJS).e3j = function (_set____db54di) {
+	    this.w3i_1 = _set____db54di;
 	  };
-	  protoOf(CoreClientConfigJS).z3m = function () {
-	    return this.q3m_1;
+	  protoOf(CoreClientConfigJS).f3j = function () {
+	    return this.w3i_1;
 	  };
-	  protoOf(CoreClientConfigJS).a3n = function (_set____db54di) {
-	    this.r3m_1 = _set____db54di;
+	  protoOf(CoreClientConfigJS).g3j = function (_set____db54di) {
+	    this.x3i_1 = _set____db54di;
 	  };
-	  protoOf(CoreClientConfigJS).b3n = function () {
-	    return this.r3m_1;
+	  protoOf(CoreClientConfigJS).h3j = function () {
+	    return this.x3i_1;
 	  };
-	  protoOf(CoreClientConfigJS).c3n = function (_set____db54di) {
-	    this.s3m_1 = _set____db54di;
+	  protoOf(CoreClientConfigJS).i3j = function (_set____db54di) {
+	    this.y3i_1 = _set____db54di;
 	  };
-	  protoOf(CoreClientConfigJS).d3n = function () {
-	    return this.s3m_1;
+	  protoOf(CoreClientConfigJS).j3j = function () {
+	    return this.y3i_1;
 	  };
 	  defineProp(protoOf(CoreClientConfigJS), 'apiUrl', function () {
-	    return this.v3m();
+	    return this.b3j();
 	  }, function (value) {
-	    this.u3m(value);
+	    this.a3j(value);
 	  });
 	  defineProp(protoOf(CoreClientConfigJS), 'websocketUrl', function () {
-	    return this.x3m();
+	    return this.d3j();
 	  }, function (value) {
-	    this.w3m(value);
+	    this.c3j(value);
 	  });
 	  defineProp(protoOf(CoreClientConfigJS), 'websocketPath', function () {
-	    return this.z3m();
+	    return this.f3j();
 	  }, function (value) {
-	    this.y3m(value);
+	    this.e3j(value);
 	  });
 	  defineProp(protoOf(CoreClientConfigJS), 'rtcStatsTelemetry', function () {
-	    return this.b3n();
+	    return this.h3j();
 	  }, function (value) {
-	    this.a3n(value);
+	    this.g3j(value);
 	  });
 	  defineProp(protoOf(CoreClientConfigJS), 'autoReconnectMedia', function () {
-	    return this.d3n();
+	    return this.j3j();
 	  }, function (value) {
-	    this.c3n(value);
+	    this.i3j(value);
 	  });
 	  function TopicJS(name, tag) {
 	    this.name = name;
@@ -62753,7 +62491,7 @@ function requireClientsdkClientcore () {
 	  protoOf(TopicJS).mc = function () {
 	    return this.name;
 	  };
-	  protoOf(TopicJS).e3n = function () {
+	  protoOf(TopicJS).k3j = function () {
 	    return this.tag;
 	  };
 	  protoOf(TopicJS).r2 = function () {
@@ -62762,13 +62500,13 @@ function requireClientsdkClientcore () {
 	  protoOf(TopicJS).s2 = function () {
 	    return this.tag;
 	  };
-	  protoOf(TopicJS).f3n = function (name, tag) {
+	  protoOf(TopicJS).l3j = function (name, tag) {
 	    return new TopicJS(name, tag);
 	  };
 	  protoOf(TopicJS).copy = function (name, tag, $super) {
 	    name = name === VOID ? this.name : name;
 	    tag = tag === VOID ? this.tag : tag;
-	    return this.f3n(name, tag);
+	    return this.l3j(name, tag);
 	  };
 	  protoOf(TopicJS).toString = function () {
 	    return 'TopicJS(name=' + this.name + ', tag=' + this.tag + ')';
@@ -62947,30 +62685,87 @@ function requireClientsdkClientcore () {
 	  };
 	  defineProp(protoOf(SessionErrorReasonJS), 'name', protoOf(SessionErrorReasonJS).mc, VOID);
 	  defineProp(protoOf(SessionErrorReasonJS), 'ordinal', protoOf(SessionErrorReasonJS).nc, VOID);
-	  function ICoreClientJS$createSession$lambda$lambda($reject, $resolve) {
+	  function ICoreClientJS$createSession$lambda$lambda($resolve, $reject) {
 	    return function (err, sessionId) {
-	      if (!(err == null))
-	        $reject(err);
-	      else if (!(sessionId == null))
-	        $resolve(sessionId);
-	      else
-	        $reject(newThrowable(''));
+	      var tmp0_safe_receiver = sessionId;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $resolve(tmp0_safe_receiver);
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err instanceof VonageError ? err : null;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(new VonageErrorJS(tmp1_safe_receiver));
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp4_elvis_lhs = tmp_0;
+	      if (tmp4_elvis_lhs == null) {
+	        var tmp3_elvis_lhs = err;
+	        $reject(tmp3_elvis_lhs == null ? newThrowable() : tmp3_elvis_lhs);
+	      } else {
+	        Unit_getInstance();
+	      }
 	      return Unit_getInstance();
 	    };
 	  }
 	  function ICoreClientJS$createSession$lambda(this$0, $token, $sessionId) {
 	    return function (resolve, reject) {
 	      var tmp = this$0.core;
-	      tmp.v19($token, $sessionId, ICoreClientJS$createSession$lambda$lambda(reject, resolve));
+	      tmp.v19($token, $sessionId, ICoreClientJS$createSession$lambda$lambda(resolve, reject));
 	      return Unit_getInstance();
 	    };
 	  }
 	  function ICoreClientJS$deleteSession$lambda$lambda($reject, $resolve) {
 	    return function (err) {
-	      if (!(err == null))
-	        $reject(err);
-	      else
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
+	      }
 	      return Unit_getInstance();
 	    };
 	  }
@@ -62983,10 +62778,39 @@ function requireClientsdkClientcore () {
 	  }
 	  function ICoreClientJS$refreshSession$lambda$lambda($reject, $resolve) {
 	    return function (err) {
-	      if (!(err == null))
-	        $reject(err);
-	      else
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
+	      }
 	      return Unit_getInstance();
 	    };
 	  }
@@ -63010,9 +62834,26 @@ function requireClientsdkClientcore () {
 	        tmp = Unit_getInstance();
 	      }
 	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
 	      if (tmp2_elvis_lhs == null) {
-	        var tmp1_elvis_lhs = err;
-	        $reject(tmp1_elvis_lhs == null ? newThrowable() : tmp1_elvis_lhs);
+	        var tmp1_safe_receiver = err instanceof VonageError ? err : null;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(new VonageErrorJS(tmp1_safe_receiver));
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp4_elvis_lhs = tmp_0;
+	      if (tmp4_elvis_lhs == null) {
+	        var tmp3_elvis_lhs = err;
+	        $reject(tmp3_elvis_lhs == null ? newThrowable() : tmp3_elvis_lhs);
 	      } else {
 	        Unit_getInstance();
 	      }
@@ -63039,9 +62880,26 @@ function requireClientsdkClientcore () {
 	        tmp = Unit_getInstance();
 	      }
 	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
 	      if (tmp2_elvis_lhs == null) {
-	        var tmp1_elvis_lhs = err;
-	        $reject(tmp1_elvis_lhs == null ? newThrowable() : tmp1_elvis_lhs);
+	        var tmp1_safe_receiver = err instanceof VonageError ? err : null;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(new VonageErrorJS(tmp1_safe_receiver));
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp4_elvis_lhs = tmp_0;
+	      if (tmp4_elvis_lhs == null) {
+	        var tmp3_elvis_lhs = err;
+	        $reject(tmp3_elvis_lhs == null ? newThrowable() : tmp3_elvis_lhs);
 	      } else {
 	        Unit_getInstance();
 	      }
@@ -63230,22 +63088,22 @@ function requireClientsdkClientcore () {
 	    return _this__u8e3s4 == null ? null : equals(_this__u8e3s4, undefined) ? null : _this__u8e3s4;
 	  }
 	  function createVonageLoggerJS$1($name, $minLogLevel, $topics, $onLog) {
-	    this.p3n_1 = $onLog;
-	    this.m3n_1 = $name;
-	    this.n3n_1 = $minLogLevel;
-	    this.o3n_1 = $topics;
+	    this.v3j_1 = $onLog;
+	    this.s3j_1 = $name;
+	    this.t3j_1 = $minLogLevel;
+	    this.u3j_1 = $topics;
 	  }
 	  protoOf(createVonageLoggerJS$1).mc = function () {
-	    return this.m3n_1;
+	    return this.s3j_1;
 	  };
 	  protoOf(createVonageLoggerJS$1).c34 = function () {
-	    return this.n3n_1;
+	    return this.t3j_1;
 	  };
 	  protoOf(createVonageLoggerJS$1).u33 = function () {
-	    return this.o3n_1;
+	    return this.u3j_1;
 	  };
 	  protoOf(createVonageLoggerJS$1).onLog = function (logLevel, topic, message) {
-	    this.p3n_1(logLevel, topic, message);
+	    this.v3j_1(logLevel, topic, message);
 	  };
 	  defineProp(protoOf(createVonageLoggerJS$1), 'name', function () {
 	    return this.mc();
@@ -63447,11 +63305,39 @@ function requireClientsdkClientcore () {
 	  defineProp(protoOf(HangupReasonJS), 'ordinal', protoOf(HangupReasonJS).nc, VOID);
 	  function IVoiceClientJS$serverCall$lambda$lambda($resolve, $reject) {
 	    return function (err, callId) {
-	      if (!(callId == null)) {
-	        $resolve(callId);
+	      var tmp0_safe_receiver = callId;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $resolve(tmp0_safe_receiver);
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err instanceof VonageError ? err : null;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(new VonageErrorJS(tmp1_safe_receiver));
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp4_elvis_lhs = tmp_0;
+	      if (tmp4_elvis_lhs == null) {
+	        var tmp3_elvis_lhs = err;
+	        $reject(tmp3_elvis_lhs == null ? newThrowable() : tmp3_elvis_lhs);
 	      } else {
-	        var tmp0_elvis_lhs = err;
-	        $reject(tmp0_elvis_lhs == null ? newThrowable('') : tmp0_elvis_lhs);
+	        Unit_getInstance();
 	      }
 	      return Unit_getInstance();
 	    };
@@ -63465,10 +63351,38 @@ function requireClientsdkClientcore () {
 	  }
 	  function IVoiceClientJS$reconnectCall$lambda$lambda($reject, $resolve) {
 	    return function (err) {
-	      if (!(err == null)) {
-	        $reject(err instanceof Error ? err : THROW_CCE());
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
 	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
 	      }
 	      return Unit_getInstance();
 	    };
@@ -63482,11 +63396,39 @@ function requireClientsdkClientcore () {
 	  }
 	  function IVoiceClientJS$getLeg$lambda$lambda($resolve, $reject) {
 	    return function (err, leg) {
-	      if (!(leg == null)) {
-	        $resolve(new LegJS(leg));
+	      var tmp0_safe_receiver = leg;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $resolve(new LegJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err instanceof VonageError ? err : null;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(new VonageErrorJS(tmp1_safe_receiver));
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp4_elvis_lhs = tmp_0;
+	      if (tmp4_elvis_lhs == null) {
+	        var tmp3_elvis_lhs = err;
+	        $reject(tmp3_elvis_lhs == null ? newThrowable() : tmp3_elvis_lhs);
 	      } else {
-	        var tmp0_elvis_lhs = err;
-	        $reject(tmp0_elvis_lhs == null ? newThrowable('') : tmp0_elvis_lhs);
+	        Unit_getInstance();
 	      }
 	      return Unit_getInstance();
 	    };
@@ -63499,11 +63441,39 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function IVoiceClientJS$answer$lambda$lambda($reject, $resolve) {
-	    return function (it) {
-	      if (!(it == null)) {
-	        $reject(it instanceof Error ? it : THROW_CCE());
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
 	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
 	      }
 	      return Unit_getInstance();
 	    };
@@ -63516,11 +63486,39 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function IVoiceClientJS$reject$lambda$lambda($reject, $resolve) {
-	    return function (it) {
-	      if (!(it == null)) {
-	        $reject(it instanceof Error ? it : THROW_CCE());
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
 	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
 	      }
 	      return Unit_getInstance();
 	    };
@@ -63532,13 +63530,40 @@ function requireClientsdkClientcore () {
 	      return Unit_getInstance();
 	    };
 	  }
-	  function IVoiceClientJS$hangup$lambda$lambda($resolve, $reject) {
-	    return function (it) {
-	      var tmp0_subject = it;
-	      if (tmp0_subject == null) {
+	  function IVoiceClientJS$hangup$lambda$lambda($reject, $resolve) {
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
 	      } else {
-	        $reject(it instanceof Error ? it : THROW_CCE());
+	        Unit_getInstance();
 	      }
 	      return Unit_getInstance();
 	    };
@@ -63546,16 +63571,44 @@ function requireClientsdkClientcore () {
 	  function IVoiceClientJS$hangup$lambda(this$0, $callId, $reasonText, $reasonCode) {
 	    return function (resolve, reject) {
 	      var tmp = this$0.core;
-	      tmp.c18($callId, $reasonText, $reasonCode, IVoiceClientJS$hangup$lambda$lambda(resolve, reject));
+	      tmp.c18($callId, $reasonText, $reasonCode, IVoiceClientJS$hangup$lambda$lambda(reject, resolve));
 	      return Unit_getInstance();
 	    };
 	  }
 	  function IVoiceClientJS$say$lambda$lambda($reject, $resolve) {
-	    return function (it) {
-	      if (!(it == null)) {
-	        $reject(it instanceof Error ? it : THROW_CCE());
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
 	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
 	      }
 	      return Unit_getInstance();
 	    };
@@ -63579,11 +63632,39 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function IVoiceClientJS$mute$lambda$lambda($reject, $resolve) {
-	    return function (it) {
-	      if (!(it == null)) {
-	        $reject(it instanceof Error ? it : THROW_CCE());
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
 	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
 	      }
 	      return Unit_getInstance();
 	    };
@@ -63596,11 +63677,40 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function IVoiceClientJS$unmute$lambda$lambda($reject, $resolve) {
-	    return function (it) {
-	      if (!(it == null))
-	        $reject(it);
-	      else
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
+	      }
 	      return Unit_getInstance();
 	    };
 	  }
@@ -63612,11 +63722,40 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function IVoiceClientJS$enableEarmuff$lambda$lambda($reject, $resolve) {
-	    return function (it) {
-	      if (!(it == null))
-	        $reject(it);
-	      else
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
+	      }
 	      return Unit_getInstance();
 	    };
 	  }
@@ -63628,11 +63767,40 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function IVoiceClientJS$disableEarmuff$lambda$lambda($reject, $resolve) {
-	    return function (it) {
-	      if (!(it == null))
-	        $reject(it);
-	      else
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
+	      }
 	      return Unit_getInstance();
 	    };
 	  }
@@ -63644,11 +63812,40 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function IVoiceClientJS$sendDTMF$lambda$lambda($reject, $resolve) {
-	    return function (it) {
-	      if (!(it == null))
-	        $reject(it);
-	      else
+	    return function (err) {
+	      var tmp0_safe_receiver = err instanceof VonageError ? err : null;
+	      var tmp;
+	      if (tmp0_safe_receiver == null) {
+	        tmp = null;
+	      } else {
+	        // Inline function 'kotlin.let' call
+	        // Inline function 'kotlin.contracts.contract' call
+	        $reject(new VonageErrorJS(tmp0_safe_receiver));
+	        tmp = Unit_getInstance();
+	      }
+	      var tmp2_elvis_lhs = tmp;
+	      var tmp_0;
+	      if (tmp2_elvis_lhs == null) {
+	        var tmp1_safe_receiver = err;
+	        var tmp_1;
+	        if (tmp1_safe_receiver == null) {
+	          tmp_1 = null;
+	        } else {
+	          // Inline function 'kotlin.let' call
+	          // Inline function 'kotlin.contracts.contract' call
+	          $reject(tmp1_safe_receiver);
+	          tmp_1 = Unit_getInstance();
+	        }
+	        tmp_0 = tmp_1;
+	      } else {
+	        tmp_0 = tmp2_elvis_lhs;
+	      }
+	      var tmp3_elvis_lhs = tmp_0;
+	      if (tmp3_elvis_lhs == null) {
 	        $resolve(null);
+	      } else {
+	        Unit_getInstance();
+	      }
 	      return Unit_getInstance();
 	    };
 	  }
@@ -63677,13 +63874,13 @@ function requireClientsdkClientcore () {
 	  protoOf(VoiceInviteFromInfoJS).s2 = function () {
 	    return this.type;
 	  };
-	  protoOf(VoiceInviteFromInfoJS).w3n = function (id, type) {
+	  protoOf(VoiceInviteFromInfoJS).c3k = function (id, type) {
 	    return new VoiceInviteFromInfoJS(id, type);
 	  };
 	  protoOf(VoiceInviteFromInfoJS).copy = function (id, type, $super) {
 	    id = id === VOID ? this.id : id;
 	    type = type === VOID ? this.type : type;
-	    return this.w3n(id, type);
+	    return this.c3k(id, type);
 	  };
 	  protoOf(VoiceInviteFromInfoJS).toString = function () {
 	    return 'VoiceInviteFromInfoJS(id=' + this.id + ', type=' + this.type + ')';
@@ -63797,41 +63994,41 @@ function requireClientsdkClientcore () {
 	    cause = cause === VOID ? null : cause;
 	    extendThrowable(this);
 	    captureStack(this, HttpClientErrorJS);
-	    this.x3n_1 = message;
-	    this.y3n_1 = cause;
+	    this.d3k_1 = message;
+	    this.e3k_1 = cause;
 	  }
 	  protoOf(HttpClientErrorJS).i5 = function () {
-	    return this.x3n_1;
+	    return this.d3k_1;
 	  };
 	  protoOf(HttpClientErrorJS).j5 = function () {
-	    return this.y3n_1;
+	    return this.e3k_1;
 	  };
-	  protoOf(HttpClientErrorJS).z3n = function () {
-	    var tmp0_elvis_lhs = this.x3n_1;
+	  protoOf(HttpClientErrorJS).f3k = function () {
+	    var tmp0_elvis_lhs = this.d3k_1;
 	    var tmp = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-	    var tmp_0 = this.y3n_1;
+	    var tmp_0 = this.e3k_1;
 	    return new HTTPClientError(tmp, tmp_0 instanceof Exception ? tmp_0 : null);
 	  };
 	  protoOf(HttpClientErrorJS).r2 = function () {
-	    return this.x3n_1;
+	    return this.d3k_1;
 	  };
 	  protoOf(HttpClientErrorJS).s2 = function () {
-	    return this.y3n_1;
+	    return this.e3k_1;
 	  };
-	  protoOf(HttpClientErrorJS).a3o = function (message, cause) {
+	  protoOf(HttpClientErrorJS).g3k = function (message, cause) {
 	    return new HttpClientErrorJS(message, cause);
 	  };
 	  protoOf(HttpClientErrorJS).copy = function (message, cause, $super) {
-	    message = message === VOID ? this.x3n_1 : message;
-	    cause = cause === VOID ? this.y3n_1 : cause;
-	    return this.a3o(message, cause);
+	    message = message === VOID ? this.d3k_1 : message;
+	    cause = cause === VOID ? this.e3k_1 : cause;
+	    return this.g3k(message, cause);
 	  };
 	  protoOf(HttpClientErrorJS).toString = function () {
-	    return 'HttpClientErrorJS(message=' + this.x3n_1 + ', cause=' + this.y3n_1 + ')';
+	    return 'HttpClientErrorJS(message=' + this.d3k_1 + ', cause=' + this.e3k_1 + ')';
 	  };
 	  protoOf(HttpClientErrorJS).hashCode = function () {
-	    var result = this.x3n_1 == null ? 0 : getStringHashCode(this.x3n_1);
-	    result = imul(result, 31) + (this.y3n_1 == null ? 0 : hashCode(this.y3n_1)) | 0;
+	    var result = this.d3k_1 == null ? 0 : getStringHashCode(this.d3k_1);
+	    result = imul(result, 31) + (this.e3k_1 == null ? 0 : hashCode(this.e3k_1)) | 0;
 	    return result;
 	  };
 	  protoOf(HttpClientErrorJS).equals = function (other) {
@@ -63840,9 +64037,9 @@ function requireClientsdkClientcore () {
 	    if (!(other instanceof HttpClientErrorJS))
 	      return false;
 	    var tmp0_other_with_cast = other instanceof HttpClientErrorJS ? other : THROW_CCE();
-	    if (!(this.x3n_1 == tmp0_other_with_cast.x3n_1))
+	    if (!(this.d3k_1 == tmp0_other_with_cast.d3k_1))
 	      return false;
-	    if (!equals(this.y3n_1, tmp0_other_with_cast.y3n_1))
+	    if (!equals(this.e3k_1, tmp0_other_with_cast.e3k_1))
 	      return false;
 	    return true;
 	  };
@@ -63852,13 +64049,13 @@ function requireClientsdkClientcore () {
 	  defineProp(protoOf(HttpClientErrorJS), 'cause', function () {
 	    return this.j5();
 	  }, VOID);
-	  defineProp(protoOf(HttpClientErrorJS), 'coreError', protoOf(HttpClientErrorJS).z3n, VOID);
+	  defineProp(protoOf(HttpClientErrorJS), 'coreError', protoOf(HttpClientErrorJS).f3k, VOID);
 	  function HttpClientResponseJS(statusCode, body) {
 	    body = body === VOID ? null : body;
 	    this.statusCode = statusCode;
 	    this.body = body;
 	  }
-	  protoOf(HttpClientResponseJS).b3o = function () {
+	  protoOf(HttpClientResponseJS).h3k = function () {
 	    return this.statusCode;
 	  };
 	  protoOf(HttpClientResponseJS).b3f = function () {
@@ -63870,13 +64067,13 @@ function requireClientsdkClientcore () {
 	  protoOf(HttpClientResponseJS).s2 = function () {
 	    return this.body;
 	  };
-	  protoOf(HttpClientResponseJS).c3o = function (statusCode, body) {
+	  protoOf(HttpClientResponseJS).i3k = function (statusCode, body) {
 	    return new HttpClientResponseJS(statusCode, body);
 	  };
 	  protoOf(HttpClientResponseJS).copy = function (statusCode, body, $super) {
 	    statusCode = statusCode === VOID ? this.statusCode : statusCode;
 	    body = body === VOID ? this.body : body;
-	    return this.c3o(statusCode, body);
+	    return this.i3k(statusCode, body);
 	  };
 	  protoOf(HttpClientResponseJS).toString = function () {
 	    return 'HttpClientResponseJS(statusCode=' + this.statusCode + ', body=' + this.body + ')';
@@ -63979,31 +64176,31 @@ function requireClientsdkClientcore () {
 	    this.packet_cnt = packet_cnt;
 	    this.packet_loss_perc = packet_loss_perc;
 	  }
-	  protoOf(RTCQualityJS).f3o = function () {
+	  protoOf(RTCQualityJS).l3k = function () {
 	    return this.mos_score;
 	  };
-	  protoOf(RTCQualityJS).g3o = function () {
+	  protoOf(RTCQualityJS).m3k = function () {
 	    return this.quality_percentage;
 	  };
-	  protoOf(RTCQualityJS).h3o = function () {
+	  protoOf(RTCQualityJS).n3k = function () {
 	    return this.jitter_min_var;
 	  };
-	  protoOf(RTCQualityJS).i3o = function () {
+	  protoOf(RTCQualityJS).o3k = function () {
 	    return this.jitter_max_var;
 	  };
-	  protoOf(RTCQualityJS).j3o = function () {
+	  protoOf(RTCQualityJS).p3k = function () {
 	    return this.jitter_loss_rate;
 	  };
-	  protoOf(RTCQualityJS).k3o = function () {
+	  protoOf(RTCQualityJS).q3k = function () {
 	    return this.jitter_burst_rate;
 	  };
-	  protoOf(RTCQualityJS).l3o = function () {
+	  protoOf(RTCQualityJS).r3k = function () {
 	    return this.flaw_total;
 	  };
-	  protoOf(RTCQualityJS).m3o = function () {
+	  protoOf(RTCQualityJS).s3k = function () {
 	    return this.packet_cnt;
 	  };
-	  protoOf(RTCQualityJS).n3o = function () {
+	  protoOf(RTCQualityJS).t3k = function () {
 	    return this.packet_loss_perc;
 	  };
 	  protoOf(RTCQualityJS).r2 = function () {
@@ -64012,28 +64209,28 @@ function requireClientsdkClientcore () {
 	  protoOf(RTCQualityJS).s2 = function () {
 	    return this.quality_percentage;
 	  };
-	  protoOf(RTCQualityJS).o3o = function () {
+	  protoOf(RTCQualityJS).u3k = function () {
 	    return this.jitter_min_var;
 	  };
-	  protoOf(RTCQualityJS).p3o = function () {
+	  protoOf(RTCQualityJS).v3k = function () {
 	    return this.jitter_max_var;
 	  };
-	  protoOf(RTCQualityJS).q3o = function () {
+	  protoOf(RTCQualityJS).w3k = function () {
 	    return this.jitter_loss_rate;
 	  };
-	  protoOf(RTCQualityJS).r3o = function () {
+	  protoOf(RTCQualityJS).x3k = function () {
 	    return this.jitter_burst_rate;
 	  };
-	  protoOf(RTCQualityJS).s3o = function () {
+	  protoOf(RTCQualityJS).y3k = function () {
 	    return this.flaw_total;
 	  };
-	  protoOf(RTCQualityJS).t3o = function () {
+	  protoOf(RTCQualityJS).z3k = function () {
 	    return this.packet_cnt;
 	  };
-	  protoOf(RTCQualityJS).u3o = function () {
+	  protoOf(RTCQualityJS).a3l = function () {
 	    return this.packet_loss_perc;
 	  };
-	  protoOf(RTCQualityJS).v3o = function (mos_score, quality_percentage, jitter_min_var, jitter_max_var, jitter_loss_rate, jitter_burst_rate, flaw_total, packet_cnt, packet_loss_perc) {
+	  protoOf(RTCQualityJS).b3l = function (mos_score, quality_percentage, jitter_min_var, jitter_max_var, jitter_loss_rate, jitter_burst_rate, flaw_total, packet_cnt, packet_loss_perc) {
 	    return new RTCQualityJS(mos_score, quality_percentage, jitter_min_var, jitter_max_var, jitter_loss_rate, jitter_burst_rate, flaw_total, packet_cnt, packet_loss_perc);
 	  };
 	  protoOf(RTCQualityJS).copy = function (mos_score, quality_percentage, jitter_min_var, jitter_max_var, jitter_loss_rate, jitter_burst_rate, flaw_total, packet_cnt, packet_loss_perc, $super) {
@@ -64046,7 +64243,7 @@ function requireClientsdkClientcore () {
 	    flaw_total = flaw_total === VOID ? this.flaw_total : flaw_total;
 	    packet_cnt = packet_cnt === VOID ? this.packet_cnt : packet_cnt;
 	    packet_loss_perc = packet_loss_perc === VOID ? this.packet_loss_perc : packet_loss_perc;
-	    return this.v3o(mos_score, quality_percentage, jitter_min_var, jitter_max_var, jitter_loss_rate, jitter_burst_rate, flaw_total, packet_cnt, packet_loss_perc);
+	    return this.b3l(mos_score, quality_percentage, jitter_min_var, jitter_max_var, jitter_loss_rate, jitter_burst_rate, flaw_total, packet_cnt, packet_loss_perc);
 	  };
 	  protoOf(RTCQualityJS).toString = function () {
 	    return 'RTCQualityJS(mos_score=' + this.mos_score + ', quality_percentage=' + this.quality_percentage + ', jitter_min_var=' + this.jitter_min_var + ', jitter_max_var=' + this.jitter_max_var + ', jitter_loss_rate=' + this.jitter_loss_rate + ', jitter_burst_rate=' + this.jitter_burst_rate + ', flaw_total=' + this.flaw_total + ', packet_cnt=' + this.packet_cnt + ', packet_loss_perc=' + this.packet_loss_perc + ')';
@@ -64113,34 +64310,34 @@ function requireClientsdkClientcore () {
 	    this.audioRtt = audioRtt;
 	    this.audioSentJitter = audioSentJitter;
 	  }
-	  protoOf(RTCStatsJS).w3o = function () {
+	  protoOf(RTCStatsJS).c3l = function () {
 	    return this.audioRecvPackets;
 	  };
-	  protoOf(RTCStatsJS).x3o = function () {
+	  protoOf(RTCStatsJS).d3l = function () {
 	    return this.audioRecvPacketsLost;
 	  };
-	  protoOf(RTCStatsJS).y3o = function () {
+	  protoOf(RTCStatsJS).e3l = function () {
 	    return this.audioRecvBytes;
 	  };
-	  protoOf(RTCStatsJS).z3o = function () {
+	  protoOf(RTCStatsJS).f3l = function () {
 	    return this.audioRecvJitter;
 	  };
-	  protoOf(RTCStatsJS).a3p = function () {
+	  protoOf(RTCStatsJS).g3l = function () {
 	    return this.audioSentPackets;
 	  };
-	  protoOf(RTCStatsJS).b3p = function () {
+	  protoOf(RTCStatsJS).h3l = function () {
 	    return this.audioSentBytes;
 	  };
-	  protoOf(RTCStatsJS).c3p = function () {
+	  protoOf(RTCStatsJS).i3l = function () {
 	    return this.audioSentPacketsLost;
 	  };
-	  protoOf(RTCStatsJS).d3p = function () {
+	  protoOf(RTCStatsJS).j3l = function () {
 	    return this.audioRtt;
 	  };
-	  protoOf(RTCStatsJS).e3p = function () {
+	  protoOf(RTCStatsJS).k3l = function () {
 	    return this.audioSentJitter;
 	  };
-	  protoOf(RTCStatsJS).f3p = function () {
+	  protoOf(RTCStatsJS).l3l = function () {
 	    return new RTCStats(numberToLong(this.audioRecvPackets), numberToInt(this.audioRecvPacketsLost), numberToLong(this.audioRecvBytes), numberToDouble(this.audioRecvJitter), numberToLong(this.audioSentPackets), numberToLong(this.audioSentBytes), numberToInt(this.audioSentPacketsLost), numberToDouble(this.audioRtt), numberToDouble(this.audioSentJitter));
 	  };
 	  protoOf(RTCStatsJS).r2 = function () {
@@ -64149,28 +64346,28 @@ function requireClientsdkClientcore () {
 	  protoOf(RTCStatsJS).s2 = function () {
 	    return this.audioRecvPacketsLost;
 	  };
-	  protoOf(RTCStatsJS).o3o = function () {
+	  protoOf(RTCStatsJS).u3k = function () {
 	    return this.audioRecvBytes;
 	  };
-	  protoOf(RTCStatsJS).p3o = function () {
+	  protoOf(RTCStatsJS).v3k = function () {
 	    return this.audioRecvJitter;
 	  };
-	  protoOf(RTCStatsJS).q3o = function () {
+	  protoOf(RTCStatsJS).w3k = function () {
 	    return this.audioSentPackets;
 	  };
-	  protoOf(RTCStatsJS).r3o = function () {
+	  protoOf(RTCStatsJS).x3k = function () {
 	    return this.audioSentBytes;
 	  };
-	  protoOf(RTCStatsJS).s3o = function () {
+	  protoOf(RTCStatsJS).y3k = function () {
 	    return this.audioSentPacketsLost;
 	  };
-	  protoOf(RTCStatsJS).t3o = function () {
+	  protoOf(RTCStatsJS).z3k = function () {
 	    return this.audioRtt;
 	  };
-	  protoOf(RTCStatsJS).u3o = function () {
+	  protoOf(RTCStatsJS).a3l = function () {
 	    return this.audioSentJitter;
 	  };
-	  protoOf(RTCStatsJS).g3p = function (audioRecvPackets, audioRecvPacketsLost, audioRecvBytes, audioRecvJitter, audioSentPackets, audioSentBytes, audioSentPacketsLost, audioRtt, audioSentJitter) {
+	  protoOf(RTCStatsJS).m3l = function (audioRecvPackets, audioRecvPacketsLost, audioRecvBytes, audioRecvJitter, audioSentPackets, audioSentBytes, audioSentPacketsLost, audioRtt, audioSentJitter) {
 	    return new RTCStatsJS(audioRecvPackets, audioRecvPacketsLost, audioRecvBytes, audioRecvJitter, audioSentPackets, audioSentBytes, audioSentPacketsLost, audioRtt, audioSentJitter);
 	  };
 	  protoOf(RTCStatsJS).copy = function (audioRecvPackets, audioRecvPacketsLost, audioRecvBytes, audioRecvJitter, audioSentPackets, audioSentBytes, audioSentPacketsLost, audioRtt, audioSentJitter, $super) {
@@ -64183,7 +64380,7 @@ function requireClientsdkClientcore () {
 	    audioSentPacketsLost = audioSentPacketsLost === VOID ? this.audioSentPacketsLost : audioSentPacketsLost;
 	    audioRtt = audioRtt === VOID ? this.audioRtt : audioRtt;
 	    audioSentJitter = audioSentJitter === VOID ? this.audioSentJitter : audioSentJitter;
-	    return this.g3p(audioRecvPackets, audioRecvPacketsLost, audioRecvBytes, audioRecvJitter, audioSentPackets, audioSentBytes, audioSentPacketsLost, audioRtt, audioSentJitter);
+	    return this.m3l(audioRecvPackets, audioRecvPacketsLost, audioRecvBytes, audioRecvJitter, audioSentPackets, audioSentBytes, audioSentPacketsLost, audioRtt, audioSentJitter);
 	  };
 	  protoOf(RTCStatsJS).toString = function () {
 	    return 'RTCStatsJS(audioRecvPackets=' + toString(this.audioRecvPackets) + ', audioRecvPacketsLost=' + toString(this.audioRecvPacketsLost) + ', audioRecvBytes=' + toString(this.audioRecvBytes) + ', audioRecvJitter=' + toString(this.audioRecvJitter) + ', audioSentPackets=' + toString(this.audioSentPackets) + ', audioSentBytes=' + toString(this.audioSentBytes) + ', audioSentPacketsLost=' + toString(this.audioSentPacketsLost) + ', audioRtt=' + toString(this.audioRtt) + ', audioSentJitter=' + toString(this.audioSentJitter) + ')';
@@ -64288,7 +64485,7 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function HttpClientJSAdapter$1($js) {
-	    this.h3p_1 = $js;
+	    this.n3l_1 = $js;
 	  }
 	  protoOf(HttpClientJSAdapter$1).t35 = function (verb, url, headers, body, callback) {
 	    var tmp = verb.toString();
@@ -64296,7 +64493,7 @@ function requireClientsdkClientcore () {
 	    // Inline function 'kotlin.contracts.contract' call
 	    // Inline function 'vonage.<no name provided>.request.<anonymous>' call
 	    var tmp_0 = fromMap(JSON, headers);
-	    this.h3p_1.request(tmp, url, tmp_0, body, HttpClientJSAdapter$o$request$lambda(callback));
+	    this.n3l_1.request(tmp, url, tmp_0, body, HttpClientJSAdapter$o$request$lambda(callback));
 	  };
 	  function SocketClientJSAdapter$o$emit$lambda($callback) {
 	    return function (err, response) {
@@ -64319,11 +64516,11 @@ function requireClientsdkClientcore () {
 	    };
 	  }
 	  function SocketClientJSAdapter$adapter$1($js) {
-	    this.j3p_1 = $js;
-	    this.i3p_1 = null;
+	    this.p3l_1 = $js;
+	    this.o3l_1 = null;
 	  }
 	  protoOf(SocketClientJSAdapter$adapter$1).c36 = function (_set____db54di) {
-	    this.i3p_1 = _set____db54di;
+	    this.o3l_1 = _set____db54di;
 	  };
 	  protoOf(SocketClientJSAdapter$adapter$1).w35 = function (type, msg, callback) {
 	    var tmp;
@@ -64336,28 +64533,28 @@ function requireClientsdkClientcore () {
 	      tmp = fromMap(JSON, msg);
 	    }
 	    var tmp_0 = tmp;
-	    this.j3p_1.emit(type, tmp_0, SocketClientJSAdapter$o$emit$lambda(callback));
+	    this.p3l_1.emit(type, tmp_0, SocketClientJSAdapter$o$emit$lambda(callback));
 	  };
 	  protoOf(SocketClientJSAdapter$adapter$1).x35 = function (host, path, reconnectionAttempts, reconnectionDelay, randomizationFactor, token, sessionId, query) {
-	    this.j3p_1.connect(host, path, reconnectionAttempts, reconnectionDelay, randomizationFactor, token, sessionId, query);
+	    this.p3l_1.connect(host, path, reconnectionAttempts, reconnectionDelay, randomizationFactor, token, sessionId, query);
 	  };
 	  protoOf(SocketClientJSAdapter$adapter$1).y35 = function () {
-	    this.j3p_1.disconnect();
+	    this.p3l_1.disconnect();
 	  };
 	  protoOf(SocketClientJSAdapter$adapter$1).z35 = function (sessionId, token) {
-	    this.j3p_1.setConnectParamsSocketConfig(sessionId, token);
+	    this.p3l_1.setConnectParamsSocketConfig(sessionId, token);
 	  };
 	  protoOf(SocketClientJSAdapter$adapter$1).a36 = function (sessionId) {
-	    this.j3p_1.setSocketSessionId(sessionId);
+	    this.p3l_1.setSocketSessionId(sessionId);
 	  };
 	  protoOf(SocketClientJSAdapter$adapter$1).b36 = function (milliseconds, callback) {
-	    this.j3p_1.startVerifyResponseTimer(milliseconds, callback);
+	    this.p3l_1.startVerifyResponseTimer(milliseconds, callback);
 	  };
 	  function SocketClientJSAdapter$1($adapter) {
-	    this.k3p_1 = $adapter;
+	    this.q3l_1 = $adapter;
 	  }
 	  protoOf(SocketClientJSAdapter$1).didReceiveNewSocketEvent = function (body) {
-	    var tmp0_safe_receiver = this.k3p_1.i3p_1;
+	    var tmp0_safe_receiver = this.q3l_1.o3l_1;
 	    if (tmp0_safe_receiver == null)
 	      ;
 	    else {
@@ -64385,35 +64582,35 @@ function requireClientsdkClientcore () {
 	    else {
 	      switch (reason) {
 	        case 'NXMCORE_REASON_SERVER_DISCONNECTED':
-	          var tmp1_safe_receiver_0 = this.k3p_1.i3p_1;
+	          var tmp1_safe_receiver_0 = this.q3l_1.o3l_1;
 	          if (tmp1_safe_receiver_0 == null) ; else {
 	            tmp1_safe_receiver_0.g39(tmp1_safe_receiver, SocketConnectionFailedReason_ServerDisconnected_getInstance(), timestamp, retryNumber);
 	            Unit_getInstance();
 	          }
 	          break;
 	        case 'NXMCORE_REASON_CLIENT_DISCONNECTED':
-	          var tmp2_safe_receiver = this.k3p_1.i3p_1;
+	          var tmp2_safe_receiver = this.q3l_1.o3l_1;
 	          if (tmp2_safe_receiver == null) ; else {
 	            tmp2_safe_receiver.g39(tmp1_safe_receiver, SocketConnectionFailedReason_ClientDisconnected_getInstance(), timestamp, retryNumber);
 	            Unit_getInstance();
 	          }
 	          break;
 	        case 'NXMCORE_CLIENT_NETWORK_ERROR':
-	          var tmp3_safe_receiver = this.k3p_1.i3p_1;
+	          var tmp3_safe_receiver = this.q3l_1.o3l_1;
 	          if (tmp3_safe_receiver == null) ; else {
 	            tmp3_safe_receiver.g39(tmp1_safe_receiver, SocketConnectionFailedReason_ClientNetworkError_getInstance(), timestamp, retryNumber);
 	            Unit_getInstance();
 	          }
 	          break;
 	        case 'NXMCORE_REASON_PING_TIMEOUT':
-	          var tmp4_safe_receiver = this.k3p_1.i3p_1;
+	          var tmp4_safe_receiver = this.q3l_1.o3l_1;
 	          if (tmp4_safe_receiver == null) ; else {
 	            tmp4_safe_receiver.g39(tmp1_safe_receiver, SocketConnectionFailedReason_PingTimeout_getInstance(), timestamp, retryNumber);
 	            Unit_getInstance();
 	          }
 	          break;
 	        default:
-	          var tmp5_safe_receiver = this.k3p_1.i3p_1;
+	          var tmp5_safe_receiver = this.q3l_1.o3l_1;
 	          if (tmp5_safe_receiver == null) ; else {
 	            tmp5_safe_receiver.g39(tmp1_safe_receiver, null, timestamp, retryNumber);
 	            Unit_getInstance();
@@ -64423,52 +64620,52 @@ function requireClientsdkClientcore () {
 	    }
 	  };
 	  function MediaClientJSAdapter$adapter$1($js) {
-	    this.m3p_1 = $js;
-	    this.l3p_1 = null;
+	    this.s3l_1 = $js;
+	    this.r3l_1 = null;
 	  }
 	  protoOf(MediaClientJSAdapter$adapter$1).m36 = function (_set____db54di) {
-	    this.l3p_1 = _set____db54di;
+	    this.r3l_1 = _set____db54di;
 	  };
 	  protoOf(MediaClientJSAdapter$adapter$1).f36 = function (closure) {
-	    this.m3p_1.enableMediaOutbound(closure);
+	    this.s3l_1.enableMediaOutbound(closure);
 	  };
-	  protoOf(MediaClientJSAdapter$adapter$1).n3p = function (closure, offerSDP, rtcId) {
-	    this.m3p_1.enableMediaInbound(closure, offerSDP, rtcId);
+	  protoOf(MediaClientJSAdapter$adapter$1).t3l = function (closure, offerSDP, rtcId) {
+	    this.s3l_1.enableMediaInbound(closure, offerSDP, rtcId);
 	  };
 	  protoOf(MediaClientJSAdapter$adapter$1).g36 = function (closure, offerSDP, rtcId) {
-	    return this.n3p(closure, offerSDP, rtcId);
+	    return this.t3l(closure, offerSDP, rtcId);
 	  };
 	  protoOf(MediaClientJSAdapter$adapter$1).h36 = function (id, sdp) {
-	    this.m3p_1.processAnswer(id, sdp);
+	    this.s3l_1.processAnswer(id, sdp);
 	  };
 	  protoOf(MediaClientJSAdapter$adapter$1).i36 = function (id) {
-	    this.m3p_1.disableMedia(id);
+	    this.s3l_1.disableMedia(id);
 	  };
 	  protoOf(MediaClientJSAdapter$adapter$1).j36 = function (id) {
-	    this.m3p_1.mute(id);
+	    this.s3l_1.mute(id);
 	  };
 	  protoOf(MediaClientJSAdapter$adapter$1).k36 = function (id) {
-	    this.m3p_1.unmute(id);
+	    this.s3l_1.unmute(id);
 	  };
 	  protoOf(MediaClientJSAdapter$adapter$1).l36 = function (interval, mediaId) {
-	    this.m3p_1.enableRtcStatsCollection(interval, mediaId);
+	    this.s3l_1.enableRtcStatsCollection(interval, mediaId);
 	  };
 	  function MediaClientJSAdapter$1($adapter) {
-	    this.o3p_1 = $adapter;
+	    this.u3l_1 = $adapter;
 	  }
 	  protoOf(MediaClientJSAdapter$1).onRtcStats = function (rtcStats, legId) {
-	    var tmp0_safe_receiver = this.o3p_1.l3p_1;
+	    var tmp0_safe_receiver = this.u3l_1.r3l_1;
 	    if (tmp0_safe_receiver == null)
 	      ;
 	    else {
-	      tmp0_safe_receiver.c39(rtcStats.f3p(), legId);
+	      tmp0_safe_receiver.c39(rtcStats.l3l(), legId);
 	    }
 	  };
 	  protoOf(MediaClientJSAdapter$1).onConnectionChange = function (id, status) {
 	    switch (status) {
 	      case 'new':
 	      case 'checking':
-	        var tmp1_safe_receiver = this.o3p_1.l3p_1;
+	        var tmp1_safe_receiver = this.u3l_1.r3l_1;
 	        if (tmp1_safe_receiver == null)
 	          ;
 	        else {
@@ -64477,7 +64674,7 @@ function requireClientsdkClientcore () {
 
 	        break;
 	      case 'connecting':
-	        var tmp2_safe_receiver = this.o3p_1.l3p_1;
+	        var tmp2_safe_receiver = this.u3l_1.r3l_1;
 	        if (tmp2_safe_receiver == null)
 	          ;
 	        else {
@@ -64486,7 +64683,7 @@ function requireClientsdkClientcore () {
 
 	        break;
 	      case 'connected':
-	        var tmp3_safe_receiver = this.o3p_1.l3p_1;
+	        var tmp3_safe_receiver = this.u3l_1.r3l_1;
 	        if (tmp3_safe_receiver == null)
 	          ;
 	        else {
@@ -64495,7 +64692,7 @@ function requireClientsdkClientcore () {
 
 	        break;
 	      case 'disconnected':
-	        var tmp4_safe_receiver = this.o3p_1.l3p_1;
+	        var tmp4_safe_receiver = this.u3l_1.r3l_1;
 	        if (tmp4_safe_receiver == null)
 	          ;
 	        else {
@@ -64504,7 +64701,7 @@ function requireClientsdkClientcore () {
 
 	        break;
 	      case 'closed':
-	        var tmp5_safe_receiver = this.o3p_1.l3p_1;
+	        var tmp5_safe_receiver = this.u3l_1.r3l_1;
 	        if (tmp5_safe_receiver == null)
 	          ;
 	        else {
@@ -64513,7 +64710,7 @@ function requireClientsdkClientcore () {
 
 	        break;
 	      case 'failed':
-	        var tmp6_safe_receiver = this.o3p_1.l3p_1;
+	        var tmp6_safe_receiver = this.u3l_1.r3l_1;
 	        if (tmp6_safe_receiver == null)
 	          ;
 	        else {
@@ -64522,7 +64719,7 @@ function requireClientsdkClientcore () {
 
 	        break;
 	      default:
-	        var tmp7_safe_receiver = this.o3p_1.l3p_1;
+	        var tmp7_safe_receiver = this.u3l_1.r3l_1;
 	        if (tmp7_safe_receiver == null)
 	          ;
 	        else {
@@ -64747,12 +64944,12 @@ function requireClientsdkClientcore () {
 	  protoOf(Some).r2 = function () {
 	    return this.value;
 	  };
-	  protoOf(Some).p3p = function (value) {
+	  protoOf(Some).v3l = function (value) {
 	    return new Some(value);
 	  };
 	  protoOf(Some).copy = function (value, $super) {
 	    value = value === VOID ? this.value : value;
-	    return this.p3p(value);
+	    return this.v3l(value);
 	  };
 	  protoOf(Some).toString = function () {
 	    return 'Some(value=' + this.value + ')';
@@ -64994,24 +65191,24 @@ function requireClientsdkClientcore () {
 	    $vonage.EventDeleteConversationEventJS = EventDeleteConversationEventJS;
 	    var $vonage = _.vonage || (_.vonage = {});
 	    $vonage.MessageTextEventJS = MessageTextEventJS;
-	    $vonage.MessageTextEventJS.Body = Body;
+	    $vonage.MessageTextEventJS.MessageTextEventBody = MessageTextEventBody;
 	    $vonage.MessageCustomEventJS = MessageCustomEventJS;
-	    $vonage.MessageCustomEventJS.Body = Body_0;
+	    $vonage.MessageCustomEventJS.MessageCustomEventBody = MessageCustomEventBody;
 	    $vonage.MessageAudioEventJS = MessageAudioEventJS;
-	    $vonage.MessageAudioEventJS.Body = Body_1;
+	    $vonage.MessageAudioEventJS.MessageAudioEventBody = MessageAudioEventBody;
 	    $vonage.MessageVideoEventJS = MessageVideoEventJS;
-	    $vonage.MessageVideoEventJS.Body = Body_2;
+	    $vonage.MessageVideoEventJS.MessageVideoEventBody = MessageVideoEventBody;
 	    $vonage.MessageImageEventJS = MessageImageEventJS;
-	    $vonage.MessageImageEventJS.Body = Body_3;
+	    $vonage.MessageImageEventJS.MessageImageEventBody = MessageImageEventBody;
 	    $vonage.MessageFileEventJS = MessageFileEventJS;
-	    $vonage.MessageFileEventJS.Body = Body_4;
+	    $vonage.MessageFileEventJS.MessageFileEventBody = MessageFileEventBody;
 	    $vonage.MessageVCardEventJS = MessageVCardEventJS;
-	    $vonage.MessageVCardEventJS.Body = Body_5;
+	    $vonage.MessageVCardEventJS.MessageVCardEventBody = MessageVCardEventBody;
 	    $vonage.MessageLocationEventJS = MessageLocationEventJS;
-	    $vonage.MessageLocationEventJS.Body = Body_6;
+	    $vonage.MessageLocationEventJS.MessageLocationEventBody = MessageLocationEventBody;
 	    $vonage.MessageLocationEventJS.Location = Location_0;
 	    $vonage.MessageTemplateEventJS = MessageTemplateEventJS;
-	    $vonage.MessageTemplateEventJS.Body = Body_7;
+	    $vonage.MessageTemplateEventJS.MessageTemplateEventBody = MessageTemplateEventBody;
 	    $vonage.MessageTemplateEventJS.TemplateObject = TemplateObject_0;
 	    $vonage.MessageTemplateEventJS.WhatsappObject = WhatsappObject_0;
 	    var $vonage = _.vonage || (_.vonage = {});
@@ -76848,18 +77045,21 @@ class SocketClient {
     }
 }
 
+/**
+ * A group of Topics that a {@link VonageLogger} can subscribe to
+ */
 const Topics = clientsdkClientcore_jsExports.vonage.Topics;
 clientsdkClientcore_jsExports.vonage.TopicJS;
 const LoggingLevel = clientsdkClientcore_jsExports.vonage.LoggingLevelJS;
 /**
- * @deprecated Use {@link ClientInitConfig.loggingLevel} instead.
+ * @deprecated Use {@link ClientInitConfigObject.loggingLevel} instead.
  * @param level - The logging level to set.
  */
 const setDefaultLoggingLevel = (level) => {
     clientsdkClientcore_jsExports.vonage.setDefaultLoggingLevel(level instanceof LoggingLevel ? level : LoggingLevel[level]);
 };
 /**
- * @deprecated Use {@link ClientInitConfig.loggingLevel} instead.
+ * @deprecated Use {@link ClientInitConfigObject.loggingLevel} instead.
  * @param level - The logging level to set.
  */
 const setVonageClientLoggingLevel = setDefaultLoggingLevel;
@@ -76878,15 +77078,6 @@ const createVonageLogger = (name, onLog, minLogLevel, topics) => clientsdkClient
         : undefined, topics === null || topics === void 0 ? void 0 : topics.map((topic) => (topic instanceof Topics ? topic : Topics[topic])), (level, topic, message) => onLog(level, topic, message));
 
 const ConfigRegion = clientsdkClientcore_jsExports.vonage.CoreClientConfigRegionJS;
-/**
- * Represents the configuration object for the client.
- *
- * The `ClientConfig` class provides a convenient way to configure the client by specifying various properties.
- * These properties control different aspects of the client's behavior, such as API URLs, media reoffer, and WebSocket settings.
- *
- * @example
- * [[include:snippet_setClientConfig.txt]]
- */
 class ClientConfig extends clientsdkClientcore_jsExports.vonage.CoreClientConfigJS {
     /**
      * Constructs a new instance of the class.
@@ -76934,15 +77125,16 @@ const convertInitConfig = (config) => {
             : null });
 };
 
-const ChannelType = clientsdkClientcore_jsExports.vonage.ChannelTypeJS;
-const PresentingOrder = clientsdkClientcore_jsExports.vonage.PresentingOrderJS;
-const OrderBy = clientsdkClientcore_jsExports.vonage.OrderByJS;
+const ChannelType = clientsdkClientcore_jsExports.vonage.ChannelTypeJS;
 
 const VonageError = clientsdkClientcore_jsExports.vonage.VonageErrorJS;
 const VonageErrorType = clientsdkClientcore_jsExports.vonage.VonageErrorTypeJS;
 const CSErrorCodes = clientsdkClientcore_jsExports.vonage.CSErrorCodesJS;
 const SessionErrorCodes = clientsdkClientcore_jsExports.vonage.SessionErrorCodesJS;
 
+const PresentingOrder = clientsdkClientcore_jsExports.vonage.PresentingOrderJS;
+const OrderBy = clientsdkClientcore_jsExports.vonage.OrderByJS;
+
 const Option = clientsdkClientcore_jsExports.vonage.utils.OptionJS;
 const mapOption = (value) => {
     if (value == null)
@@ -76951,7 +77143,15 @@ const mapOption = (value) => {
         return new Option.None();
     return new Option.Some(value);
 };
+/**
+ * @param value The wrapped value
+ * @returns An {@link Option.Some}
+ */
 const some = (value) => new Option.Some(value);
+/**
+ *
+ * @returns An {@link Option.None}
+ */
 const none = () => new Option.None();
 
 const CancelReason = clientsdkClientcore_jsExports.vonage.CancelReasonJS;
@@ -77061,8 +77261,8 @@ class VonageClient extends clientsdkClientcore_jsExports.vonage.CombinedClientJS
      * @param callback - the callback to register for the event
      * @returns a symbol that can be used to unregister the callback
      * @remarks
-     * Besure to store the symbol returned by this method so you can unregister the callback later.
-     * We recommend deregistering callbacks when you no longer need them. See {@link off}.
+     * Be sure to store the symbol returned by this method so you can unregister the callback later.
+     * We recommend unregistering callbacks when you no longer need them. See {@link off}.
      */
     on(event, callback) {
         const callbackSymbol = Symbol(event);
@@ -77414,7 +77614,7 @@ class VonageClient extends clientsdkClientcore_jsExports.vonage.CombinedClientJS
      * @group Chat
      * @beta
      * @param id - the Conversation's id
-     * @param name - the namne of the user to invite
+     * @param name - the name of the user to invite
      * @returns the `memberId` of the member
      */
     inviteToConversation(id, name) {
@@ -77592,7 +77792,7 @@ class VonageClient extends clientsdkClientcore_jsExports.vonage.CombinedClientJS
      * Send a template message to a Conversation.
      *
      * @example
-     * [[include: snippet_SendMessageTemplateEvent.txt]]
+     * [[include: snippet_SendTemplateMessage.txt]]
      *
      * @group Chat
      * @beta
@@ -77641,7 +77841,7 @@ class VonageClient extends clientsdkClientcore_jsExports.vonage.CombinedClientJS
      * @group Chat
      * @beta
      * @param id - the Conversation's id
-     * @param type - the type of the custom event. Type must start with `custom:<...>`
+     * @param evenType - the type of the custom event. Type must start with `custom:<...>`
      * @param customData - the body of the event
      * @returns the `timestamp` of the message
      */