diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 17f414c11..7d6a5d46f 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,3 +1,10 @@ +## 24.4.0+1 + +### Bug Fixes: + +- Fix issue where DDS would fail to initialize if DWDS already had existing + clients. + ## 24.4.0 - Added support for breakpoint registering on a hot reload with the DDC library bundle format using PausePostRequests. @@ -42,6 +49,7 @@ libraries instead of assuming it exists in the global `window`. ## 24.3.5 + - Allow clients to specify the `packageConfigPath` in `LoadStrategy` class and associated providers. ## 24.3.4 @@ -126,7 +134,7 @@ ## 23.1.1 -- Loosen `package:vm_service` constraints to allow `>=13.0.0 <15.0.0`. - [#2329](https://github.com/dart-lang/webdev/pull/2329) +- Loosen `package:vm_service` constraints to allow `>=13.0.0 <15.0.0`. - [#2329](https://github.com/dart-lang/webdev/pull/2329) ## 23.1.0 diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js index e85ffd662..47282509a 100644 --- a/dwds/lib/src/injected/client.js +++ b/dwds/lib/src/injected/client.js @@ -1,4 +1,4 @@ -// Generated by dart2js (, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.9.0-152.0.dev. +// Generated by dart2js (, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.10.0-118.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -388,6 +388,22 @@ return J.UnknownJavaScriptObject.prototype; return receiver; }, + getInterceptor$x(receiver) { + if (receiver == null) + return receiver; + if (typeof receiver != "object") { + if (typeof receiver == "function") + return J.JavaScriptFunction.prototype; + if (typeof receiver == "symbol") + return J.JavaScriptSymbol.prototype; + if (typeof receiver == "bigint") + return J.JavaScriptBigInt.prototype; + return receiver; + } + if (receiver instanceof A.Object) + return receiver; + return J.getNativeInterceptor(receiver); + }, set$length$asx(receiver, value) { return J.getInterceptor$asx(receiver).set$length(receiver, value); }, @@ -438,6 +454,9 @@ allMatches$2$s(receiver, a0, a1) { return J.getInterceptor$s(receiver).allMatches$2(receiver, a0, a1); }, + asUint8List$2$x(receiver, a0, a1) { + return J.getInterceptor$x(receiver).asUint8List$2(receiver, a0, a1); + }, cast$1$0$ax(receiver, $T1) { return J.getInterceptor$ax(receiver).cast$1$0(receiver, $T1); }, @@ -1366,7 +1385,7 @@ return new A.NullThrownFromJavaScriptException(ex); if (ex instanceof A.ExceptionAndStackTrace) { t1 = ex.dartException; - return A.saveStackTrace(ex, t1 == null ? type$.Object._as(t1) : t1); + return A.saveStackTrace(ex, t1 == null ? A._asObject(t1) : t1); } if (typeof ex !== "object") return ex; @@ -2211,6 +2230,9 @@ this._name = t0; this.__late_helper$_value = null; }, + _checkLength($length) { + return $length; + }, _ensureNativeList(list) { var t1, result, i; if (type$.JSIndexable_dynamic._is(list)) @@ -2251,8 +2273,13 @@ }, NativeByteBuffer: function NativeByteBuffer() { }, + NativeArrayBuffer: function NativeArrayBuffer() { + }, NativeTypedData: function NativeTypedData() { }, + _UnmodifiableNativeByteBufferView: function _UnmodifiableNativeByteBufferView(t0) { + this.__native_typed_data$_data = t0; + }, NativeByteData: function NativeByteData() { }, NativeTypedArray: function NativeTypedArray() { @@ -2551,9 +2578,8 @@ return testRti._is(object); }, _specializedIsTest(testRti) { - var kind, simpleIsFn, $name, predicate, t2, - t1 = type$.Object; - if (testRti === t1) + var kind, simpleIsFn, $name, predicate, t1; + if (testRti === type$.Object) return A._isObject; if (A.isTopType(testRti)) return A._isTop; @@ -2579,8 +2605,8 @@ } } else if (kind === 10) { predicate = A.createRecordTypePredicate(testRti._primary, testRti._rest); - t2 = predicate == null ? A._isNever : predicate; - return t2 == null ? t1._as(t2) : t2; + t1 = predicate == null ? A._isNever : predicate; + return t1 == null ? A._asObject(t1) : t1; } return A._generalIsTestImplementation; }, @@ -2616,6 +2642,8 @@ asFn = A._asNumQ; else if (testRti === type$.nullable_double) asFn = A._asDoubleQ; + else if (testRti === type$.nullable_JSObject) + asFn = A._asJSObjectQ; } else if (testRti === type$.int) asFn = A._asInt; else if (testRti === type$.String) @@ -2626,6 +2654,8 @@ asFn = A._asNum; else if (testRti === type$.double) asFn = A._asDouble; + else if (testRti === type$.JSObject) + asFn = A._asJSObject; testRti._as = asFn; return testRti._as(object); }, @@ -2675,6 +2705,16 @@ return true; return false; }, + _isJSObjectStandalone(object) { + if (typeof object == "object") { + if (object instanceof A.Object) + return type$.JSObject._is(object); + return true; + } + if (typeof object == "function") + return true; + return false; + }, _generalAsCheckImplementation(object) { var testRti = this; if (object == null) { @@ -2804,6 +2844,18 @@ return object; throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "String?"), new Error()); }, + _asJSObject(object) { + if (A._isJSObjectStandalone(object)) + return object; + throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "JSObject"), new Error()); + }, + _asJSObjectQ(object) { + if (object == null) + return object; + if (A._isJSObjectStandalone(object)) + return object; + throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "JSObject?"), new Error()); + }, _rtiArrayToString(array, genericContext) { var s, sep, i; for (s = "", sep = "", i = 0; i < array.length; ++i, sep = ", ") @@ -3845,6 +3897,78 @@ }($function, 1); return $.Zone__current.registerBinaryCallback$3$1(new A._wrapJsFunctionForAsync_closure($protected), type$.void, type$.int, type$.dynamic); }, + _asyncStarHelper(object, bodyFunctionOrErrorCode, controller) { + var t1, t2, t3, + _s10_ = "controller"; + if (bodyFunctionOrErrorCode === 0) { + t1 = controller.cancelationFuture; + if (t1 != null) + t1._completeWithValue$1(null); + else { + t1 = controller.___AsyncStarStreamController_controller_A; + t1 === $ && A.throwLateFieldNI(_s10_); + t1.close$0(); + } + return; + } else if (bodyFunctionOrErrorCode === 1) { + t1 = controller.cancelationFuture; + if (t1 != null) { + t2 = A.unwrapException(object); + t3 = A.getTraceFromException(object); + t1._completeErrorObject$1(new A.AsyncError(t2, t3)); + } else { + t1 = A.unwrapException(object); + t2 = A.getTraceFromException(object); + t3 = controller.___AsyncStarStreamController_controller_A; + t3 === $ && A.throwLateFieldNI(_s10_); + t3.addError$2(t1, t2); + controller.___AsyncStarStreamController_controller_A.close$0(); + } + return; + } + type$.void_Function_int_dynamic._as(bodyFunctionOrErrorCode); + if (object instanceof A._IterationMarker) { + if (controller.cancelationFuture != null) { + bodyFunctionOrErrorCode.call$2(2, null); + return; + } + t1 = object.state; + if (t1 === 0) { + t1 = object.value; + t2 = controller.___AsyncStarStreamController_controller_A; + t2 === $ && A.throwLateFieldNI(_s10_); + t2.add$1(0, controller.$ti._precomputed1._as(t1)); + A.scheduleMicrotask(new A._asyncStarHelper_closure(controller, bodyFunctionOrErrorCode)); + return; + } else if (t1 === 1) { + t1 = controller.$ti._eval$1("Stream<1>")._as(type$.Stream_dynamic._as(object.value)); + t2 = controller.___AsyncStarStreamController_controller_A; + t2 === $ && A.throwLateFieldNI(_s10_); + t2.addStream$2$cancelOnError(t1, false).then$1$1(new A._asyncStarHelper_closure0(controller, bodyFunctionOrErrorCode), type$.Null); + return; + } + } + A._awaitOnObject(object, bodyFunctionOrErrorCode); + }, + _streamOfController(controller) { + var t1 = controller.___AsyncStarStreamController_controller_A; + t1 === $ && A.throwLateFieldNI("controller"); + return new A._ControllerStream(t1, A._instanceType(t1)._eval$1("_ControllerStream<1>")); + }, + _AsyncStarStreamController$(body, $T) { + var t1 = new A._AsyncStarStreamController($T._eval$1("_AsyncStarStreamController<0>")); + t1._AsyncStarStreamController$1(body, $T); + return t1; + }, + _makeAsyncStarStreamController(body, $T) { + return A._AsyncStarStreamController$(body, $T); + }, + _IterationMarker_yieldStar(values) { + return new A._IterationMarker(values, 1); + }, + _IterationMarker_yieldSingle(value) { + return new A._IterationMarker(value, 0); + }, AsyncError_defaultStackTrace(error) { var stackTrace; if (type$.Error._is(error)) { @@ -4144,21 +4268,12 @@ t1 = $.Zone__current; t1.scheduleMicrotask$1(t1.bindCallbackGuarded$1(callback)); }, - Stream_Stream$value(value, $T) { - var _null = null, - t1 = $T._eval$1("_AsyncStreamController<0>"), - t2 = new A._AsyncStreamController(_null, _null, _null, _null, t1); - t2._add$1(value); - t2._closeUnchecked$0(); - return new A._ControllerStream(t2, t1._eval$1("_ControllerStream<1>")); - }, StreamIterator_StreamIterator(stream, $T) { A.checkNotNullable(stream, "stream", type$.Object); return new A._StreamIterator($T._eval$1("_StreamIterator<0>")); }, - StreamController_StreamController(onCancel, onListen, sync, $T) { - var _null = null; - return sync ? new A._SyncStreamController(onListen, _null, _null, onCancel, $T._eval$1("_SyncStreamController<0>")) : new A._AsyncStreamController(onListen, _null, _null, onCancel, $T._eval$1("_AsyncStreamController<0>")); + StreamController_StreamController(onCancel, onListen, onResume, sync, $T) { + return sync ? new A._SyncStreamController(onListen, null, onResume, onCancel, $T._eval$1("_SyncStreamController<0>")) : new A._AsyncStreamController(onListen, null, onResume, onCancel, $T._eval$1("_AsyncStreamController<0>")); }, _runGuarded(notificationHandler) { var e, s, exception; @@ -4172,6 +4287,9 @@ $.Zone__current.handleUncaughtError$2(e, s); } }, + _AddStreamState_makeErrorHandler(controller) { + return new A._AddStreamState_makeErrorHandler_closure(controller); + }, _BufferingStreamSubscription__registerDataHandler(zone, handleData, $T) { var t1 = handleData == null ? A.async___nullDataHandler$closure() : handleData; return zone.registerUnaryCallback$2$1(t1, type$.void, $T); @@ -4188,7 +4306,7 @@ _nullDataHandler(value) { }, _nullErrorHandler(error, stackTrace) { - type$.Object._as(error); + A._asObject(error); type$.StackTrace._as(stackTrace); $.Zone__current.handleUncaughtError$2(error, stackTrace); }, @@ -4254,14 +4372,14 @@ $.Zone__current = old; } }, - _rootRunBinary($self, $parent, zone, f, arg1, arg2, $R, T1, T2) { + _rootRunBinary($self, $parent, zone, f, arg1, arg2, $R, $T1, $T2) { var old, t1; type$.nullable_Zone._as($self); type$.nullable_ZoneDelegate._as($parent); type$.Zone._as(zone); - $R._eval$1("@<0>")._bind$1(T1)._bind$1(T2)._eval$1("1(2,3)")._as(f); - T1._as(arg1); - T2._as(arg2); + $R._eval$1("@<0>")._bind$1($T1)._bind$1($T2)._eval$1("1(2,3)")._as(f); + $T1._as(arg1); + $T2._as(arg2); t1 = $.Zone__current; if (t1 === zone) return f.call$2(arg1, arg2); @@ -4280,8 +4398,8 @@ _rootRegisterUnaryCallback($self, $parent, zone, f, $R, $T) { return $R._eval$1("@<0>")._bind$1($T)._eval$1("1(2)")._as(f); }, - _rootRegisterBinaryCallback($self, $parent, zone, f, $R, T1, T2) { - return $R._eval$1("@<0>")._bind$1(T1)._bind$1(T2)._eval$1("1(2,3)")._as(f); + _rootRegisterBinaryCallback($self, $parent, zone, f, $R, $T1, $T2) { + return $R._eval$1("@<0>")._bind$1($T1)._bind$1($T2)._eval$1("1(2,3)")._as(f); }, _rootErrorCallback($self, $parent, zone, error, stackTrace) { type$.nullable_StackTrace._as(stackTrace); @@ -4391,6 +4509,45 @@ _wrapJsFunctionForAsync_closure: function _wrapJsFunctionForAsync_closure(t0) { this.$protected = t0; }, + _asyncStarHelper_closure: function _asyncStarHelper_closure(t0, t1) { + this.controller = t0; + this.bodyFunction = t1; + }, + _asyncStarHelper_closure0: function _asyncStarHelper_closure0(t0, t1) { + this.controller = t0; + this.bodyFunction = t1; + }, + _AsyncStarStreamController: function _AsyncStarStreamController(t0) { + var _ = this; + _.___AsyncStarStreamController_controller_A = $; + _.isSuspended = false; + _.cancelationFuture = null; + _.$ti = t0; + }, + _AsyncStarStreamController__resumeBody: function _AsyncStarStreamController__resumeBody(t0) { + this.body = t0; + }, + _AsyncStarStreamController__resumeBody_closure: function _AsyncStarStreamController__resumeBody_closure(t0) { + this.body = t0; + }, + _AsyncStarStreamController_closure0: function _AsyncStarStreamController_closure0(t0) { + this._resumeBody = t0; + }, + _AsyncStarStreamController_closure1: function _AsyncStarStreamController_closure1(t0, t1) { + this.$this = t0; + this._resumeBody = t1; + }, + _AsyncStarStreamController_closure: function _AsyncStarStreamController_closure(t0, t1) { + this.$this = t0; + this.body = t1; + }, + _AsyncStarStreamController__closure: function _AsyncStarStreamController__closure(t0) { + this.body = t0; + }, + _IterationMarker: function _IterationMarker(t0, t1) { + this.value = t0; + this.state = t1; + }, AsyncError: function AsyncError(t0, t1) { this.error = t0; this.stackTrace = t1; @@ -4560,6 +4717,21 @@ this._async$_target = t0; this.$ti = t1; }, + _AddStreamState: function _AddStreamState() { + }, + _AddStreamState_makeErrorHandler_closure: function _AddStreamState_makeErrorHandler_closure(t0) { + this.controller = t0; + }, + _AddStreamState_cancel_closure: function _AddStreamState_cancel_closure(t0) { + this.$this = t0; + }, + _StreamControllerAddStreamState: function _StreamControllerAddStreamState(t0, t1, t2, t3) { + var _ = this; + _._varData = t0; + _.addStreamFuture = t1; + _.addSubscription = t2; + _.$ti = t3; + }, _BufferingStreamSubscription: function _BufferingStreamSubscription() { }, _BufferingStreamSubscription_asFuture_closure: function _BufferingStreamSubscription_asFuture_closure(t0, t1) { @@ -4953,7 +5125,7 @@ }, _LinkedHashSetCell: function _LinkedHashSetCell(t0) { this._element = t0; - this._collection$_previous = this._collection$_next = null; + this._collection$_next = null; }, _LinkedHashSetIterator: function _LinkedHashSetIterator(t0, t1, t2) { var _ = this; @@ -5927,7 +6099,7 @@ Error__throw(error, stackTrace) { error = A.initializeExceptionWrapper(error, new Error()); if (error == null) - error = type$.Object._as(error); + error = A._asObject(error); error.stack = stackTrace.toString$0(0); throw error; }, @@ -6276,8 +6448,8 @@ B.JSArray_methods.add$1(parts, penultimateString); B.JSArray_methods.add$1(parts, ultimateString); }, - Map_castFrom(source, $K, $V, K2, V2) { - return new A.CastMap(source, $K._eval$1("@<0>")._bind$1($V)._bind$1(K2)._bind$1(V2)._eval$1("CastMap<1,2,3,4>")); + Map_castFrom(source, $K, $V, $K2, $V2) { + return new A.CastMap(source, $K._eval$1("@<0>")._bind$1($V)._bind$1($K2)._bind$1($V2)._eval$1("CastMap<1,2,3,4>")); }, Object_hash(object1, object2, object3, object4) { var t1; @@ -7521,24 +7693,24 @@ _.___Uri_hashCode_FI = _.___Uri_pathSegments_FI = _.___Uri__text_FI = $; }, JSAnyUtilityExtension_instanceOfString(_this, constructorName) { - var parts, $constructor, t1, t2, _i, t3; + var parts, $constructor, t1, _i, t2; if (constructorName.length === 0) return false; parts = constructorName.split("."); $constructor = init.G; - for (t1 = parts.length, t2 = type$.nullable_JSObject, _i = 0; _i < t1; ++_i, $constructor = t3) { - t3 = $constructor[parts[_i]]; - t2._as(t3); - if (t3 == null) + for (t1 = parts.length, _i = 0; _i < t1; ++_i, $constructor = t2) { + t2 = $constructor[parts[_i]]; + A._asJSObjectQ(t2); + if (t2 == null) return false; } return _this instanceof type$.JavaScriptFunction._as($constructor); }, FutureOfJSAnyToJSPromise_get_toJS(_this, $T) { - return type$.JSObject._as(new init.G.Promise(A._functionToJS2(new A.FutureOfJSAnyToJSPromise_get_toJS_closure(_this)))); + return A._asJSObject(new init.G.Promise(A._functionToJS2(new A.FutureOfJSAnyToJSPromise_get_toJS_closure(_this)))); }, FutureOfVoidToJSPromise_get_toJS(_this) { - return type$.JSObject._as(new init.G.Promise(A._functionToJS2(new A.FutureOfVoidToJSPromise_get_toJS_closure(_this)))); + return A._asJSObject(new init.G.Promise(A._functionToJS2(new A.FutureOfVoidToJSPromise_get_toJS_closure(_this)))); }, FutureOfJSAnyToJSPromise_get_toJS_closure: function FutureOfJSAnyToJSPromise_get_toJS_closure(t0) { this._this = t0; @@ -7612,6 +7784,17 @@ return callback.call$1(arg1); return callback.call$0(); }, + _callDartFunctionFast3(callback, arg1, arg2, arg3, $length) { + type$.Function._as(callback); + A._asInt($length); + if ($length >= 3) + return callback.call$3(arg1, arg2, arg3); + if ($length === 2) + return callback.call$2(arg1, arg2); + if ($length === 1) + return callback.call$1(arg1); + return callback.call$0(); + }, _noJsifyRequired(o) { return o == null || A._isBool(o) || typeof o == "number" || typeof o == "string" || type$.Int8List._is(o) || type$.Uint8List._is(o) || type$.Uint8ClampedList._is(o) || type$.Int16List._is(o) || type$.Uint16List._is(o) || type$.Int32List._is(o) || type$.Uint32List._is(o) || type$.Float32List._is(o) || type$.Float64List._is(o) || type$.ByteBuffer._is(o) || type$.ByteData._is(o); }, @@ -7680,11 +7863,11 @@ A.checkTypeBound($T, type$.num, "T", "max"); return Math.max($T._as(a), $T._as(b)); }, - Random_Random(seed) { - return B.C__JSRandom; - }, _JSRandom: function _JSRandom() { }, + _JSSecureRandom: function _JSSecureRandom(t0) { + this._math$_buffer = t0; + }, AsyncMemoizer: function AsyncMemoizer(t0, t1) { this._async_memoizer$_completer = t0; this.$ti = t1; @@ -8697,6 +8880,10 @@ this.iterator = t1; this.$ti = t2; }, + RequestAbortedException: function RequestAbortedException(t0, t1) { + this.message = t0; + this.uri = t1; + }, BaseClient: function BaseClient() { }, BaseRequest: function BaseRequest() { @@ -8707,39 +8894,162 @@ }, BaseResponse: function BaseResponse() { }, - _extension_0_get_responseHeaders(_this) { - var _i, header, splitIdx, key, value, - t1 = type$.String, - headers = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1), - headersList = A._asString(_this.getAllResponseHeaders()).split("\r\n"); - for (t1 = headersList.length, _i = 0; _i < t1; ++_i) { - header = headersList[_i]; - if (header.length === 0) - continue; - splitIdx = B.JSString_methods.indexOf$1(header, ": "); - if (splitIdx === -1) - continue; - key = B.JSString_methods.substring$2(header, 0, splitIdx).toLowerCase(); - value = B.JSString_methods.substring$1(header, splitIdx + 2); - if (headers.containsKey$1(key)) - headers.$indexSet(0, key, A.S(headers.$index(0, key)) + ", " + value); - else - headers.$indexSet(0, key, value); + _rethrowAsClientException(e, st, request) { + var t1, message; + if (type$.JSObject._is(e)) + t1 = A._asString(e.name) === "AbortError"; + else + t1 = false; + if (t1) + A.Error_throwWithStackTrace(new A.RequestAbortedException("Request aborted by `abortTrigger`", request.url), st); + if (!(e instanceof A.ClientException)) { + message = J.toString$0$(e); + if (B.JSString_methods.startsWith$1(message, "TypeError: ")) + message = B.JSString_methods.substring$1(message, 11); + e = new A.ClientException(message, request.url); } - return headers; + A.Error_throwWithStackTrace(e, st); + }, + _readBody(request, response) { + return A._readBody$body(request, response); + }, + _readBody$body(request, response) { + var $async$_readBody = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { + switch ($async$errorCode) { + case 2: + $async$next = $async$nextWhenCanceled; + $async$goto = $async$next.pop(); + break; + case 1: + $async$errorStack.push($async$result); + $async$goto = $async$handler; + } + while (true) + switch ($async$goto) { + case 0: + // Function start + _box_0 = {}; + t1 = A._asJSObjectQ(response.body); + bodyStreamReader = t1 == null ? null : A._asJSObject(t1.getReader()); + if (bodyStreamReader == null) { + // goto return + $async$goto = 1; + break; + } + isDone = false; + _box_0.isError = false; + $async$handler = 4; + t1 = type$.NativeUint8List, t2 = type$.JSObject; + case 7: + // for condition + // trivial condition + $async$goto = 9; + return A._asyncStarHelper(A.promiseToFuture(A._asJSObject(bodyStreamReader.read()), t2), $async$_readBody, $async$controller); + case 9: + // returning from await. + chunk = $async$result; + if (A._asBool(chunk.done)) { + isDone = true; + // goto after for + $async$goto = 8; + break; + } + t3 = chunk.value; + t3.toString; + $async$goto = 10; + $async$nextWhenCanceled = [1, 5]; + return A._asyncStarHelper(A._IterationMarker_yieldSingle(t1._as(t3)), $async$_readBody, $async$controller); + case 10: + // after yield + // goto for condition + $async$goto = 7; + break; + case 8: + // after for + $async$next.push(6); + // goto finally + $async$goto = 5; + break; + case 4: + // catch + $async$handler = 3; + $async$exception = $async$errorStack.pop(); + e = A.unwrapException($async$exception); + st = A.getTraceFromException($async$exception); + _box_0.isError = true; + A._rethrowAsClientException(e, st, request); + $async$next.push(6); + // goto finally + $async$goto = 5; + break; + case 3: + // uncaught + $async$next = [2]; + case 5: + // finally + $async$handler = 2; + $async$goto = !isDone ? 11 : 12; + break; + case 11: + // then + $async$handler = 14; + $async$goto = 17; + return A._asyncStarHelper(A.promiseToFuture(A._asJSObject(bodyStreamReader.cancel()), type$.nullable_Object).catchError$2$test(new A._readBody_closure(), new A._readBody_closure0(_box_0)), $async$_readBody, $async$controller); + case 17: + // returning from await. + $async$handler = 2; + // goto after finally + $async$goto = 16; + break; + case 14: + // catch + $async$handler = 13; + $async$exception1 = $async$errorStack.pop(); + e0 = A.unwrapException($async$exception1); + st0 = A.getTraceFromException($async$exception1); + if (!_box_0.isError) + A._rethrowAsClientException(e0, st0, request); + // goto after finally + $async$goto = 16; + break; + case 13: + // uncaught + // goto rethrow + $async$goto = 2; + break; + case 16: + // after finally + case 12: + // join + // goto the next finally handler + $async$goto = $async$next.pop(); + break; + case 6: + // after finally + case 1: + // return + return A._asyncStarHelper(null, 0, $async$controller); + case 2: + // rethrow + return A._asyncStarHelper($async$errorStack.at(-1), 1, $async$controller); + } + }); + var $async$goto = 0, + $async$controller = A._makeAsyncStarStreamController($async$_readBody, type$.List_int), + $async$nextWhenCanceled, $async$handler = 2, $async$errorStack = [], $async$next = [], isDone, chunk, e, st, e0, st0, t2, t3, exception, _box_0, t1, bodyStreamReader, $async$exception, $async$exception1; + return A._streamOfController($async$controller); }, BrowserClient: function BrowserClient(t0) { - this._xhrs = t0; this.withCredentials = false; + this._openRequestAbortControllers = t0; }, - BrowserClient_send_closure: function BrowserClient_send_closure(t0, t1, t2) { - this.xhr = t0; - this.completer = t1; - this.request = t2; + BrowserClient_send_closure: function BrowserClient_send_closure(t0) { + this.headers = t0; }, - BrowserClient_send_closure0: function BrowserClient_send_closure0(t0, t1) { - this.completer = t0; - this.request = t1; + _readBody_closure: function _readBody_closure() { + }, + _readBody_closure0: function _readBody_closure0(t0) { + this._box_0 = t0; }, ByteStream: function ByteStream(t0) { this._stream = t0; @@ -8747,6 +9057,9 @@ ByteStream_toBytes_closure: function ByteStream_toBytes_closure(t0) { this.completer = t0; }, + ClientException$(message, uri) { + return new A.ClientException(message, uri); + }, ClientException: function ClientException(t0, t1) { this.message = t0; this.uri = t1; @@ -9325,11 +9638,11 @@ SseClient$(serverUrl, debugKey) { var t3, t4, t5, _null = null, t1 = type$.String, - t2 = A.StreamController_StreamController(_null, _null, false, t1); - t1 = A.StreamController_StreamController(_null, _null, false, t1); + t2 = A.StreamController_StreamController(_null, _null, _null, false, t1); + t1 = A.StreamController_StreamController(_null, _null, _null, false, t1); t3 = A.Logger_Logger("SseClient"); t4 = $.Zone__current; - t5 = A.generateUuidV4(); + t5 = A.generateId(); t1 = new A.SseClient(debugKey + "-" + t5, t2, t1, t3, new A._AsyncCompleter(new A._Future(t4, type$._Future_void), type$._AsyncCompleter_void)); t1.SseClient$2$debugKey(serverUrl, debugKey); return t1; @@ -9363,21 +9676,6 @@ this.$this = t1; this.message = t2; }, - generateUuidV4() { - var t1 = new A.generateUuidV4_printDigits(), - t2 = new A.generateUuidV4_bitsDigits(t1, new A.generateUuidV4_generateBits(B.C__JSRandom)), - t3 = B.C__JSRandom.nextInt$1(4); - return A.S(t2.call$2(16, 4)) + A.S(t2.call$2(16, 4)) + "-" + A.S(t2.call$2(16, 4)) + "-4" + A.S(t2.call$2(12, 3)) + "-" + A.S(t1.call$2(8 + t3, 1)) + A.S(t2.call$2(12, 3)) + "-" + A.S(t2.call$2(16, 4)) + A.S(t2.call$2(16, 4)) + A.S(t2.call$2(16, 4)); - }, - generateUuidV4_generateBits: function generateUuidV4_generateBits(t0) { - this.random = t0; - }, - generateUuidV4_printDigits: function generateUuidV4_printDigits() { - }, - generateUuidV4_bitsDigits: function generateUuidV4_bitsDigits(t0, t1) { - this.printDigits = t0; - this.generateBits = t1; - }, GuaranteeChannel$(innerStream, innerSink, allowSinkErrors, $T) { var t2, t1 = {}; t1.innerStream = innerStream; @@ -9432,8 +9730,7 @@ }, RNG: function RNG() { }, - MathRNG: function MathRNG(t0) { - this._rnd = t0; + CryptoRNG: function CryptoRNG() { }, UuidV1: function UuidV1(t0) { this.goptions = t0; @@ -9485,7 +9782,7 @@ BrowserWebSocket_connect(url, protocols) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.BrowserWebSocket), - $async$returnValue, t1, t2, t3, t4, webSocket, browserSocket, webSocketConnected; + $async$returnValue, t1, t2, t3, webSocket, browserSocket, webSocketConnected; var $async$BrowserWebSocket_connect = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -9500,23 +9797,21 @@ t3 = url.toString$0(0); t1 = t1.Array; t1 = type$.JSArray_nullable_Object._as(new t1()); - t4 = type$.JSObject; - webSocket = t4._as(new t2(t3, t1)); + webSocket = A._asJSObject(new t2(t3, t1)); webSocket.binaryType = "arraybuffer"; - browserSocket = new A.BrowserWebSocket(webSocket, A.StreamController_StreamController(null, null, false, type$.WebSocketEvent)); + browserSocket = new A.BrowserWebSocket(webSocket, A.StreamController_StreamController(null, null, null, false, type$.WebSocketEvent)); t1 = new A._Future($.Zone__current, type$._Future_BrowserWebSocket); webSocketConnected = new A._AsyncCompleter(t1, type$._AsyncCompleter_BrowserWebSocket); if (A._asInt(webSocket.readyState) === 1) webSocketConnected.complete$1(browserSocket); - else if (A._asInt(webSocket.readyState) === 2 || A._asInt(webSocket.readyState) === 3) { - A._asInt(webSocket.readyState); - webSocketConnected.completeError$1(new A.WebSocketException()); - } else + else if (A._asInt(webSocket.readyState) === 2 || A._asInt(webSocket.readyState) === 3) + webSocketConnected.completeError$1(new A.WebSocketException("Unexpected WebSocket state: " + A._asInt(webSocket.readyState) + ", expected CONNECTING (0) or OPEN (1)")); + else new A._EventStream(webSocket, "open", false, type$._EventStream_JSObject).get$first(0).then$1$1(new A.BrowserWebSocket_connect_closure(webSocketConnected, browserSocket), type$.void); t2 = type$._EventStream_JSObject; t3 = type$.void; new A._EventStream(webSocket, "error", false, t2).get$first(0).then$1$1(new A.BrowserWebSocket_connect_closure0(webSocketConnected, browserSocket), t3); - A._EventStreamSubscription$(webSocket, "message", type$.nullable_void_Function_JSObject._as(new A.BrowserWebSocket_connect_closure1(browserSocket)), false, t4); + A._EventStreamSubscription$(webSocket, "message", type$.nullable_void_Function_JSObject._as(new A.BrowserWebSocket_connect_closure1(browserSocket)), false, type$.JSObject); new A._EventStream(webSocket, "close", false, t2).get$first(0).then$1$1(new A.BrowserWebSocket_connect_closure2(webSocketConnected, browserSocket), t3); $async$returnValue = t1; // goto return @@ -9549,7 +9844,7 @@ this.browserSocket = t1; }, WebSocketConnectionClosed$() { - return new A.WebSocketConnectionClosed(); + return new A.WebSocketConnectionClosed("Connection Closed"); }, WebSocketEvent: function WebSocketEvent() { }, @@ -9563,17 +9858,19 @@ this.code = t0; this.reason = t1; }, - WebSocketException: function WebSocketException() { + WebSocketException: function WebSocketException(t0) { + this.message = t0; }, - WebSocketConnectionClosed: function WebSocketConnectionClosed() { + WebSocketConnectionClosed: function WebSocketConnectionClosed(t0) { + this.message = t0; }, AdapterWebSocketChannel$(webSocket) { var _null = null, t1 = $.Zone__current, t2 = new A.StreamChannelController(type$.StreamChannelController_nullable_Object), t3 = type$.nullable_Object, - localToForeignController = A.StreamController_StreamController(_null, _null, true, t3), - foreignToLocalController = A.StreamController_StreamController(_null, _null, true, t3), + localToForeignController = A.StreamController_StreamController(_null, _null, _null, true, t3), + foreignToLocalController = A.StreamController_StreamController(_null, _null, _null, true, t3), t4 = A._instanceType(foreignToLocalController), t5 = A._instanceType(localToForeignController); t2.__StreamChannelController__local_F = A.GuaranteeChannel$(new A._ControllerStream(foreignToLocalController, t4._eval$1("_ControllerStream<1>")), new A._StreamSinkWrapper(localToForeignController, t5._eval$1("_StreamSinkWrapper<1>")), true, t3); @@ -9634,7 +9931,7 @@ }, _launchCommunicationWithDebugExtension() { var t1, t2; - type$.JSObject._as(init.G.window).addEventListener("message", A._functionToJS1(A.client___handleAuthRequest$closure())); + A._asJSObject(init.G.window).addEventListener("message", A._functionToJS1(A.client___handleAuthRequest$closure())); t1 = $.$get$serializers(); t2 = new A.DebugInfoBuilder(); type$.nullable_void_Function_DebugInfoBuilder._as(new A._launchCommunicationWithDebugExtension_closure()).call$1(t2); @@ -9642,13 +9939,12 @@ }, _dispatchEvent(message, detail) { var t1 = init.G, - t2 = type$.JSObject, - $event = t2._as(new t1.CustomEvent(message, {detail: detail})); - A._asBool(t2._as(t1.document).dispatchEvent($event)); + $event = A._asJSObject(new t1.CustomEvent(message, {detail: detail})); + A._asBool(A._asJSObject(t1.document).dispatchEvent($event)); }, _handleAuthRequest($event) { var t1, - data = type$.JSObject._as($event).data; + data = A._asJSObject($event).data; if (!(typeof data === "string")) return; if (A._asString(data) !== "dart-auth-request") @@ -9670,14 +9966,14 @@ switch ($async$goto) { case 0: // Function start - client = new A.BrowserClient(A.LinkedHashSet_LinkedHashSet$_empty(type$.JSObject)); + client = new A.BrowserClient(A._setArrayType([], type$.JSArray_JSObject)); client.withCredentials = true; $async$goto = 3; return A._asyncAwait(client._sendUnstreamed$3("GET", A.Uri_parse(authUrl), null), $async$_authenticateUser); case 3: // returning from await. response = $async$result; - $async$returnValue = B.JSString_methods.contains$1(A.encodingForCharset(A._contentTypeForHeaders(response.headers).parameters._collection$_map.$index(0, "charset")).decode$1(response.bodyBytes), "Dart Debug Authentication Success!"); + $async$returnValue = B.JSString_methods.contains$1(A.encodingForContentTypeHeader(A._contentTypeForHeaders(response.headers)).decode$1(response.bodyBytes), "Dart Debug Authentication Success!"); // goto return $async$goto = 1; break; @@ -9755,8 +10051,7 @@ return path; }, _isChromium() { - var t1 = type$.JSObject; - return B.JSString_methods.contains$1(A._asString(t1._as(t1._as(init.G.window).navigator).vendor), "Google"); + return B.JSString_methods.contains$1(A._asString(A._asJSObject(A._asJSObject(init.G.window).navigator).vendor), "Google"); }, _authUrl() { var authUrl, @@ -9850,7 +10145,7 @@ case 2: // then $async$goto = 4; - return A._asyncAwait(A.promiseToFuture(type$.JSObject._as(_this.invokeExtension("ext.flutter.disassemble", "{}")), type$.String), $async$_Debugger_maybeInvokeFlutterDisassemble); + return A._asyncAwait(A.promiseToFuture(A._asJSObject(_this.invokeExtension("ext.flutter.disassemble", "{}")), type$.String), $async$_Debugger_maybeInvokeFlutterDisassemble); case 4: // returning from await. case 3: @@ -9902,7 +10197,7 @@ case 2: // then $async$goto = 4; - return A._asyncAwait(A.promiseToFuture(type$.JSObject._as(_this.invokeExtension("ext.flutter.disassemble", "{}")), type$.String), $async$SdkDeveloperExtension_maybeInvokeFlutterDisassemble); + return A._asyncAwait(A.promiseToFuture(A._asJSObject(_this.invokeExtension("ext.flutter.disassemble", "{}")), type$.String), $async$SdkDeveloperExtension_maybeInvokeFlutterDisassemble); case 4: // returning from await. case 3: @@ -9968,15 +10263,14 @@ this.stackTrace = t1; }, _findNonce() { - var t2, i, element, t3, nonceValue, - t1 = type$.JSObject, - elements = t1._as(t1._as(t1._as(init.G.window).document).querySelectorAll("script")); - for (t2 = type$.nullable_JSObject, i = 0; i < A._asInt(elements.length); ++i) { - element = t2._as(elements.item(i)); - t3 = element == null ? t1._as(element) : element; - nonceValue = A._asString(t3.nonce); - t3 = $.$get$_noncePattern(); - if (t3._nativeRegExp.test(nonceValue)) + var i, element, t1, nonceValue, + elements = A._asJSObject(A._asJSObject(A._asJSObject(init.G.window).document).querySelectorAll("script")); + for (i = 0; i < A._asInt(elements.length); ++i) { + element = A._asJSObjectQ(elements.item(i)); + t1 = element == null ? A._asJSObject(element) : element; + nonceValue = A._asString(t1.nonce); + t1 = $.$get$_noncePattern(); + if (t1._nativeRegExp.test(nonceValue)) return nonceValue; } return null; @@ -9985,7 +10279,7 @@ var t1, t2, scriptElement = $.$get$_createScript().call$0(); scriptElement.innerHTML = "window.$dartRunMain();"; - t1 = type$.nullable_JSObject._as(type$.JSObject._as(init.G.document).body); + t1 = A._asJSObjectQ(A._asJSObject(init.G.document).body); t1.toString; t2 = A.jsify(scriptElement); t2.toString; @@ -10054,18 +10348,24 @@ else return 255; }, - encodingForCharset(charset) { - var t1; - if (charset == null) - return B.C_Latin1Codec; - t1 = A.Encoding_getByName(charset); - return t1 == null ? B.C_Latin1Codec : t1; + encodingForContentTypeHeader(contentTypeHeader) { + var t1, + charset = contentTypeHeader.parameters._collection$_map.$index(0, "charset"); + if (contentTypeHeader.type === "application" && contentTypeHeader.subtype === "json" && charset == null) + return B.C_Utf8Codec; + if (charset != null) { + t1 = A.Encoding_getByName(charset); + if (t1 == null) + t1 = B.C_Latin1Codec; + } else + t1 = B.C_Latin1Codec; + return t1; }, toUint8List(input) { return input; }, toByteStream(stream) { - return stream; + return new A.ByteStream(stream); }, wrapFormatException($name, value, body, $T) { var error, error0, t1, exception; @@ -10202,6 +10502,16 @@ index = B.JSString_methods.indexOf$2(context, text, index + 1); } return null; + }, + generateId() { + var i, + chars = A.List_List$filled(6, 0, false, type$.int), + bits = B.C__JSRandom.nextInt$1(4294967296); + for (i = 0; i < 6; ++i) { + B.JSArray_methods.$indexSet(chars, i, string$.ABCDEF.charCodeAt(bits & 63)); + bits = bits >>> 6; + } + return A.String_String$fromCharCodes(chars, 0, null); } }, B = {}; @@ -10335,6 +10645,16 @@ throw A.wrapException(A.diagnoseIndexError(receiver, -1)); return receiver.pop(); }, + remove$1(receiver, element) { + var i; + receiver.$flags & 1 && A.throwUnsupportedOperation(receiver, "remove", 1); + for (i = 0; i < receiver.length; ++i) + if (J.$eq$(receiver[i], element)) { + receiver.splice(i, 1); + return true; + } + return false; + }, _removeWhere$2(receiver, test, removeMatching) { var retained, end, i, element, t1; A._arrayInstanceType(receiver)._eval$1("bool(1)")._as(test); @@ -10806,9 +11126,6 @@ throw A.wrapException(A.argumentErrorValue(other)); return other > 31 ? 0 : receiver << other >>> 0; }, - _shlPositive$1(receiver, other) { - return other > 31 ? 0 : receiver << other >>> 0; - }, $shr(receiver, other) { var t1; if (other < 0) @@ -11127,8 +11444,8 @@ } }; A.CastMap.prototype = { - cast$2$0(_, RK, RV) { - return new A.CastMap(this.__internal$_source, this.$ti._eval$1("@<1,2>")._bind$1(RK)._bind$1(RV)._eval$1("CastMap<1,2,3,4>")); + cast$2$0(_, $RK, $RV) { + return new A.CastMap(this.__internal$_source, this.$ti._eval$1("@<1,2>")._bind$1($RK)._bind$1($RV)._eval$1("CastMap<1,2,3,4>")); }, containsKey$1(key) { return this.__internal$_source.containsKey$1(key); @@ -11668,9 +11985,9 @@ }; A.__CastListBase__CastIterableBase_ListMixin.prototype = {}; A.ConstantMap.prototype = { - cast$2$0(_, RK, RV) { + cast$2$0(_, $RK, $RV) { var t1 = A._instanceType(this); - return A.Map_castFrom(this, t1._precomputed1, t1._rest[1], RK, RV); + return A.Map_castFrom(this, t1._precomputed1, t1._rest[1], $RK, $RV); }, get$isEmpty(_) { return this.get$length(this) === 0; @@ -11684,9 +12001,9 @@ t1._rest[1]._as(value); A.ConstantMap__throwUnmodifiable(); }, - map$2$1(_, transform, K2, V2) { - var result = A.LinkedHashMap_LinkedHashMap$_empty(K2, V2); - this.forEach$1(0, new A.ConstantMap_map_closure(this, A._instanceType(this)._bind$1(K2)._bind$1(V2)._eval$1("MapEntry<1,2>(3,4)")._as(transform), result)); + map$2$1(_, transform, $K2, $V2) { + var result = A.LinkedHashMap_LinkedHashMap$_empty($K2, $V2); + this.forEach$1(0, new A.ConstantMap_map_closure(this, A._instanceType(this)._bind$1($K2)._bind$1($V2)._eval$1("MapEntry<1,2>(3,4)")._as(transform), result)); return result; }, map$1(_, transform) { @@ -12050,7 +12367,7 @@ if (index < 0) return null; cell = bucket.splice(index, 1)[0]; - _this.__js_helper$_unlinkCell$1(cell); + _this._unlinkCell$1(cell); if (bucket.length === 0) delete rest[hash]; return cell.hashMapCellValue; @@ -12085,7 +12402,7 @@ cell = table[key]; if (cell == null) return null; - this.__js_helper$_unlinkCell$1(cell); + this._unlinkCell$1(cell); delete table[key]; return cell.hashMapCellValue; }, @@ -12108,7 +12425,7 @@ _this._modified$0(); return cell; }, - __js_helper$_unlinkCell$1(cell) { + _unlinkCell$1(cell) { var _this = this, previous = cell._previous, next = cell._next; @@ -12283,19 +12600,19 @@ call$1(o) { return this.getTag(o); }, - $signature: 4 + $signature: 6 }; A.initHooks_closure0.prototype = { call$2(o, tag) { return this.getUnknownTag(o, tag); }, - $signature: 83 + $signature: 91 }; A.initHooks_closure1.prototype = { call$1(tag) { return this.prototypeForTag(A._asString(tag)); }, - $signature: 90 + $signature: 92 }; A._Record.prototype = {}; A.JSSyntaxRegExp.prototype = { @@ -12337,7 +12654,7 @@ var match, regexp = this.get$_nativeGlobalVersion(); if (regexp == null) - regexp = type$.Object._as(regexp); + regexp = A._asObject(regexp); regexp.lastIndex = start; match = regexp.exec(string); if (match == null) @@ -12348,7 +12665,7 @@ var match, regexp = this.get$_nativeAnchoredVersion(); if (regexp == null) - regexp = type$.Object._as(regexp); + regexp = A._asObject(regexp); regexp.lastIndex = start; match = regexp.exec(string); if (match == null) @@ -12514,11 +12831,21 @@ get$runtimeType(receiver) { return B.Type_ByteBuffer_rqD; }, + asUint8List$2(receiver, offsetInBytes, $length) { + return $length == null ? new Uint8Array(receiver, offsetInBytes) : new Uint8Array(receiver, offsetInBytes, $length); + }, $isTrustedGetRuntimeType: 1, $isNativeByteBuffer: 1, $isByteBuffer: 1 }; + A.NativeArrayBuffer.prototype = {$isNativeArrayBuffer: 1}; A.NativeTypedData.prototype = { + get$buffer(receiver) { + if (((receiver.$flags | 0) & 2) !== 0) + return new A._UnmodifiableNativeByteBufferView(receiver.buffer); + else + return receiver.buffer; + }, _invalidPosition$3(receiver, position, $length, $name) { var t1 = A.RangeError$range(position, 0, $length, $name, null); throw A.wrapException(t1); @@ -12528,6 +12855,14 @@ this._invalidPosition$3(receiver, position, $length, $name); } }; + A._UnmodifiableNativeByteBufferView.prototype = { + asUint8List$2(_, offsetInBytes, $length) { + var result = A.NativeUint8List_NativeUint8List$view(this.__native_typed_data$_data, offsetInBytes, $length); + result.$flags = 3; + return result; + }, + $isByteBuffer: 1 + }; A.NativeByteData.prototype = { get$runtimeType(receiver) { return B.Type_ByteData_9dB; @@ -12781,7 +13116,7 @@ t1.storedCallback = null; f.call$0(); }, - $signature: 6 + $signature: 4 }; A._AsyncRun__initializeScheduleImmediate_closure.prototype = { call$1(callback) { @@ -12791,7 +13126,7 @@ t2 = this.span; t1.firstChild ? t1.removeChild(t2) : t1.appendChild(t2); }, - $signature: 63 + $signature: 85 }; A._AsyncRun__scheduleImmediateJsOverride_internalCallback.prototype = { call$0() { @@ -12897,21 +13232,106 @@ call$2(error, stackTrace) { this.bodyFunction.call$2(1, new A.ExceptionAndStackTrace(error, type$.StackTrace._as(stackTrace))); }, - $signature: 53 + $signature: 65 }; A._wrapJsFunctionForAsync_closure.prototype = { call$2(errorCode, result) { this.$protected(A._asInt(errorCode), result); }, - $signature: 37 + $signature: 52 }; - A.AsyncError.prototype = { - toString$0(_) { - return A.S(this.error); + A._asyncStarHelper_closure.prototype = { + call$0() { + var t3, + t1 = this.controller, + t2 = t1.___AsyncStarStreamController_controller_A; + t2 === $ && A.throwLateFieldNI("controller"); + t3 = t2._state; + if ((t3 & 1) !== 0 ? (t2.get$_subscription()._state & 4) !== 0 : (t3 & 2) === 0) { + t1.isSuspended = true; + return; + } + t1 = t1.cancelationFuture != null ? 2 : 0; + this.bodyFunction.call$2(t1, null); }, - $isError: 1, - get$stackTrace() { - return this.stackTrace; + $signature: 0 + }; + A._asyncStarHelper_closure0.prototype = { + call$1(__wc0_formal) { + var errorCode = this.controller.cancelationFuture != null ? 2 : 0; + this.bodyFunction.call$2(errorCode, null); + }, + $signature: 4 + }; + A._AsyncStarStreamController.prototype = { + _AsyncStarStreamController$1(body, $T) { + var _this = this, + t1 = new A._AsyncStarStreamController__resumeBody(body); + _this.___AsyncStarStreamController_controller_A = _this.$ti._eval$1("StreamController<1>")._as(A.StreamController_StreamController(new A._AsyncStarStreamController_closure(_this, body), new A._AsyncStarStreamController_closure0(t1), new A._AsyncStarStreamController_closure1(_this, t1), false, $T)); + } + }; + A._AsyncStarStreamController__resumeBody.prototype = { + call$0() { + A.scheduleMicrotask(new A._AsyncStarStreamController__resumeBody_closure(this.body)); + }, + $signature: 1 + }; + A._AsyncStarStreamController__resumeBody_closure.prototype = { + call$0() { + this.body.call$2(0, null); + }, + $signature: 0 + }; + A._AsyncStarStreamController_closure0.prototype = { + call$0() { + this._resumeBody.call$0(); + }, + $signature: 0 + }; + A._AsyncStarStreamController_closure1.prototype = { + call$0() { + var t1 = this.$this; + if (t1.isSuspended) { + t1.isSuspended = false; + this._resumeBody.call$0(); + } + }, + $signature: 0 + }; + A._AsyncStarStreamController_closure.prototype = { + call$0() { + var t1 = this.$this, + t2 = t1.___AsyncStarStreamController_controller_A; + t2 === $ && A.throwLateFieldNI("controller"); + if ((t2._state & 4) === 0) { + t1.cancelationFuture = new A._Future($.Zone__current, type$._Future_dynamic); + if (t1.isSuspended) { + t1.isSuspended = false; + A.scheduleMicrotask(new A._AsyncStarStreamController__closure(this.body)); + } + return t1.cancelationFuture; + } + }, + $signature: 38 + }; + A._AsyncStarStreamController__closure.prototype = { + call$0() { + this.body.call$2(2, null); + }, + $signature: 0 + }; + A._IterationMarker.prototype = { + toString$0(_) { + return "IterationMarker(" + this.state + ", " + A.S(this.value) + ")"; + } + }; + A.AsyncError.prototype = { + toString$0(_) { + return A.S(this.error); + }, + $isError: 1, + get$stackTrace() { + return this.stackTrace; } }; A.Future_Future$microtask_closure.prototype = { @@ -12939,7 +13359,7 @@ A.TimeoutException.prototype = {}; A._Completer.prototype = { completeError$2(error, stackTrace) { - type$.Object._as(error); + A._asObject(error); type$.nullable_StackTrace._as(stackTrace); if ((this.future._state & 30) !== 0) throw A.wrapException(A.StateError$("Future already completed")); @@ -13042,15 +13462,24 @@ this._addListener$1(new A._FutureListener(result, 19, f, onError, t1._eval$1("@<1>")._bind$1($E)._eval$1("_FutureListener<1,2>"))); return result; }, - catchError$1(onError) { - var t1 = this.$ti, - t2 = $.Zone__current, - result = new A._Future(t2, t1); - if (t2 !== B.C__RootZone) + catchError$2$test(onError, test) { + var t1, t2, result; + type$.nullable_bool_Function_Object._as(test); + t1 = this.$ti; + t2 = $.Zone__current; + result = new A._Future(t2, t1); + if (t2 !== B.C__RootZone) { onError = A._registerErrorHandler(onError, t2); - this._addListener$1(new A._FutureListener(result, 2, null, onError, t1._eval$1("_FutureListener<1,1>"))); + if (test != null) + test = t2.registerUnaryCallback$2$1(test, type$.bool, type$.Object); + } + t2 = test == null ? 2 : 6; + this._addListener$1(new A._FutureListener(result, t2, test, onError, t1._eval$1("_FutureListener<1,1>"))); return result; }, + catchError$1(onError) { + return this.catchError$2$test(onError, null); + }, whenComplete$1(action) { var t1, t2, result; type$.dynamic_Function._as(action); @@ -13171,7 +13600,7 @@ A._Future__propagateToListeners(this, listeners); }, _completeError$2(error, stackTrace) { - type$.Object._as(error); + A._asObject(error); type$.StackTrace._as(stackTrace); this._completeErrorObject$1(new A.AsyncError(error, stackTrace)); }, @@ -13293,11 +13722,11 @@ call$1(__wc0_formal) { this.joinedResult._completeWithResultOf$1(this.originalSource); }, - $signature: 6 + $signature: 4 }; A._Future__propagateToListeners_handleWhenCompleteCallback_closure0.prototype = { call$2(e, s) { - type$.Object._as(e); + A._asObject(e); type$.StackTrace._as(s); this.joinedResult._completeErrorObject$1(new A.AsyncError(e, s)); }, @@ -13393,7 +13822,7 @@ A._Future_timeout_closure1.prototype = { call$2(e, s) { var t1; - type$.Object._as(e); + A._asObject(e); type$.StackTrace._as(s); t1 = this._box_0; if (t1.timer.get$isActive()) { @@ -13475,10 +13904,10 @@ if ((_this._state & 8) === 0) return A._instanceType(_this)._eval$1("_PendingEvents<1>?")._as(_this._varData); t1 = A._instanceType(_this); - return t1._eval$1("_PendingEvents<1>?")._as(t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData).get$_varData()); + return t1._eval$1("_PendingEvents<1>?")._as(t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData)._varData); }, _ensurePendingEvents$0() { - var events, t1, _this = this; + var events, t1, state, _this = this; if ((_this._state & 8) === 0) { events = _this._varData; if (events == null) @@ -13486,13 +13915,16 @@ return A._instanceType(_this)._eval$1("_PendingEvents<1>")._as(events); } t1 = A._instanceType(_this); - events = t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData).get$_varData(); + state = t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData); + events = state._varData; + if (events == null) + events = state._varData = new A._PendingEvents(t1._eval$1("_PendingEvents<1>")); return t1._eval$1("_PendingEvents<1>")._as(events); }, get$_subscription() { var varData = this._varData; if ((this._state & 8) !== 0) - varData = type$._StreamControllerAddStreamState_nullable_Object._as(varData).get$_varData(); + varData = type$._StreamControllerAddStreamState_nullable_Object._as(varData)._varData; return A._instanceType(this)._eval$1("_ControllerSubscription<1>")._as(varData); }, _badEventState$0() { @@ -13500,6 +13932,31 @@ return new A.StateError("Cannot add event after closing"); return new A.StateError("Cannot add event while adding a stream"); }, + addStream$2$cancelOnError(source, cancelOnError) { + var t2, t3, t4, t5, t6, _this = this, + t1 = A._instanceType(_this); + t1._eval$1("Stream<1>")._as(source); + t2 = _this._state; + if (t2 >= 4) + throw A.wrapException(_this._badEventState$0()); + if ((t2 & 2) !== 0) { + t1 = new A._Future($.Zone__current, type$._Future_dynamic); + t1._asyncComplete$1(null); + return t1; + } + t2 = _this._varData; + t3 = cancelOnError === true; + t4 = new A._Future($.Zone__current, type$._Future_dynamic); + t5 = t1._eval$1("~(1)")._as(_this.get$_add()); + t6 = t3 ? A._AddStreamState_makeErrorHandler(_this) : _this.get$_addError(); + t6 = source.listen$4$cancelOnError$onDone$onError(t5, t3, _this.get$_close(), t6); + t3 = _this._state; + if ((t3 & 1) !== 0 ? (_this.get$_subscription()._state & 4) !== 0 : (t3 & 2) === 0) + t6.pause$0(); + _this._varData = new A._StreamControllerAddStreamState(t2, t4, t6, t1._eval$1("_StreamControllerAddStreamState<1>")); + _this._state |= 8; + return t4; + }, _ensureDoneFuture$0() { var t1 = this._doneFuture; if (t1 == null) @@ -13514,19 +13971,13 @@ _this._add$1(value); }, addError$2(error, stackTrace) { - var _0_0, t1, _this = this; - type$.Object._as(error); + var _0_0; + A._asObject(error); type$.nullable_StackTrace._as(stackTrace); - if (_this._state >= 4) - throw A.wrapException(_this._badEventState$0()); + if (this._state >= 4) + throw A.wrapException(this._badEventState$0()); _0_0 = A._interceptUserError(error, stackTrace); - error = _0_0.error; - stackTrace = _0_0.stackTrace; - t1 = _this._state; - if ((t1 & 1) !== 0) - _this._sendError$2(error, stackTrace); - else if ((t1 & 3) === 0) - _this._ensurePendingEvents$0().add$1(0, new A._DelayedError(error, stackTrace)); + this._addError$2(_0_0.error, _0_0.stackTrace); }, addError$1(error) { return this.addError$2(error, null); @@ -13558,6 +14009,23 @@ else if ((t2 & 3) === 0) _this._ensurePendingEvents$0().add$1(0, new A._DelayedData(value, t1._eval$1("_DelayedData<1>"))); }, + _addError$2(error, stackTrace) { + var t1; + A._asObject(error); + type$.StackTrace._as(stackTrace); + t1 = this._state; + if ((t1 & 1) !== 0) + this._sendError$2(error, stackTrace); + else if ((t1 & 3) === 0) + this._ensurePendingEvents$0().add$1(0, new A._DelayedError(error, stackTrace)); + }, + _close$0() { + var _this = this, + addState = A._instanceType(_this)._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData); + _this._varData = addState._varData; + _this._state &= 4294967287; + addState.addStreamFuture._asyncComplete$1(null); + }, _subscribe$4(onData, onError, onDone, cancelOnError) { var t2, t3, t4, t5, t6, t7, subscription, pendingEvents, addState, _this = this, t1 = A._instanceType(_this); @@ -13575,8 +14043,8 @@ pendingEvents = _this.get$_pendingEvents(); if (((_this._state |= 1) & 8) !== 0) { addState = t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData); - addState.set$_varData(subscription); - addState.resume$0(); + addState._varData = subscription; + addState.addSubscription.resume$0(); } else _this._varData = subscription; subscription._setPendingEvents$1(pendingEvents); @@ -13603,7 +14071,7 @@ e = A.unwrapException(exception); s = A.getTraceFromException(exception); result0 = new A._Future($.Zone__current, type$._Future_void); - t1 = type$.Object._as(e); + t1 = A._asObject(e); t2 = type$.StackTrace._as(s); result0._asyncCompleteErrorObject$1(new A.AsyncError(t1, t2)); result = result0; @@ -13685,7 +14153,7 @@ t2 = A._instanceType(t1); t2._eval$1("StreamSubscription<1>")._as(this); if ((t1._state & 8) !== 0) - t2._eval$1("_StreamControllerAddStreamState<1>")._as(t1._varData).pause$0(); + t2._eval$1("_StreamControllerAddStreamState<1>")._as(t1._varData).addSubscription.pause$0(); A._runGuarded(t1.onPause); }, _onResume$0() { @@ -13693,7 +14161,7 @@ t2 = A._instanceType(t1); t2._eval$1("StreamSubscription<1>")._as(this); if ((t1._state & 8) !== 0) - t2._eval$1("_StreamControllerAddStreamState<1>")._as(t1._varData).resume$0(); + t2._eval$1("_StreamControllerAddStreamState<1>")._as(t1._varData).addSubscription.resume$0(); A._runGuarded(t1.onResume); } }; @@ -13703,6 +14171,27 @@ }, $isStreamSink: 1 }; + A._AddStreamState.prototype = { + cancel$0() { + var cancel = this.addSubscription.cancel$0(); + return cancel.whenComplete$1(new A._AddStreamState_cancel_closure(this)); + } + }; + A._AddStreamState_makeErrorHandler_closure.prototype = { + call$2(e, s) { + var t1 = this.controller; + t1._addError$2(A._asObject(e), type$.StackTrace._as(s)); + t1._close$0(); + }, + $signature: 5 + }; + A._AddStreamState_cancel_closure.prototype = { + call$0() { + this.$this.addStreamFuture._asyncComplete$1(null); + }, + $signature: 1 + }; + A._StreamControllerAddStreamState.prototype = {}; A._BufferingStreamSubscription.prototype = { _setPendingEvents$1(pendingEvents) { var _this = this; @@ -13940,7 +14429,7 @@ A._BufferingStreamSubscription_asFuture_closure0.prototype = { call$2(error, stackTrace) { var cancelFuture, t1; - type$.Object._as(error); + A._asObject(error); type$.StackTrace._as(stackTrace); cancelFuture = this.$this.cancel$0(); t1 = this.result; @@ -14208,7 +14697,7 @@ _handleError$2(error, stackTrace) { var t1; type$.StackTrace._as(stackTrace); - t1 = error == null ? type$.Object._as(error) : error; + t1 = error == null ? A._asObject(error) : error; this._stream.$ti._eval$1("_EventSink<2>")._as(this)._addError$2(t1, stackTrace); }, _handleDone$0() { @@ -14292,7 +14781,7 @@ } catch (exception) { e = A.unwrapException(exception); s = A.getTraceFromException(exception); - this._processUncaughtError$3(this, type$.Object._as(e), type$.StackTrace._as(s)); + this._processUncaughtError$3(this, A._asObject(e), type$.StackTrace._as(s)); } }, runUnaryGuarded$1$2(f, arg, $T) { @@ -14304,20 +14793,20 @@ } catch (exception) { e = A.unwrapException(exception); s = A.getTraceFromException(exception); - this._processUncaughtError$3(this, type$.Object._as(e), type$.StackTrace._as(s)); + this._processUncaughtError$3(this, A._asObject(e), type$.StackTrace._as(s)); } }, - runBinaryGuarded$2$3(f, arg1, arg2, T1, T2) { + runBinaryGuarded$2$3(f, arg1, arg2, $T1, $T2) { var e, s, exception; - T1._eval$1("@<0>")._bind$1(T2)._eval$1("~(1,2)")._as(f); - T1._as(arg1); - T2._as(arg2); + $T1._eval$1("@<0>")._bind$1($T2)._eval$1("~(1,2)")._as(f); + $T1._as(arg1); + $T2._as(arg2); try { - this.runBinary$3$3(f, arg1, arg2, type$.void, T1, T2); + this.runBinary$3$3(f, arg1, arg2, type$.void, $T1, $T2); } catch (exception) { e = A.unwrapException(exception); s = A.getTraceFromException(exception); - this._processUncaughtError$3(this, type$.Object._as(e), type$.StackTrace._as(s)); + this._processUncaughtError$3(this, A._asObject(e), type$.StackTrace._as(s)); } }, bindCallback$1$1(f, $R) { @@ -14355,14 +14844,14 @@ t1 = implementation.zone; return implementation.$function.call$2$5(t1, t1.get$_parentDelegate(), this, f, arg, $R, $T); }, - runBinary$3$3(f, arg1, arg2, $R, T1, T2) { + runBinary$3$3(f, arg1, arg2, $R, $T1, $T2) { var implementation, t1; - $R._eval$1("@<0>")._bind$1(T1)._bind$1(T2)._eval$1("1(2,3)")._as(f); - T1._as(arg1); - T2._as(arg2); + $R._eval$1("@<0>")._bind$1($T1)._bind$1($T2)._eval$1("1(2,3)")._as(f); + $T1._as(arg1); + $T2._as(arg2); implementation = this._runBinary; t1 = implementation.zone; - return implementation.$function.call$3$6(t1, t1.get$_parentDelegate(), this, f, arg1, arg2, $R, T1, T2); + return implementation.$function.call$3$6(t1, t1.get$_parentDelegate(), this, f, arg1, arg2, $R, $T1, $T2); }, registerCallback$1$1(callback, $R) { var implementation, t1; @@ -14378,12 +14867,12 @@ t1 = implementation.zone; return implementation.$function.call$2$4(t1, t1.get$_parentDelegate(), this, callback, $R, $T); }, - registerBinaryCallback$3$1(callback, $R, T1, T2) { + registerBinaryCallback$3$1(callback, $R, $T1, $T2) { var implementation, t1; - $R._eval$1("@<0>")._bind$1(T1)._bind$1(T2)._eval$1("1(2,3)")._as(callback); + $R._eval$1("@<0>")._bind$1($T1)._bind$1($T2)._eval$1("1(2,3)")._as(callback); implementation = this._registerBinaryCallback; t1 = implementation.zone; - return implementation.$function.call$3$4(t1, t1.get$_parentDelegate(), this, callback, $R, T1, T2); + return implementation.$function.call$3$4(t1, t1.get$_parentDelegate(), this, callback, $R, $T1, $T2); }, errorCallback$2(error, stackTrace) { var implementation = this._errorCallback, @@ -14565,7 +15054,7 @@ } catch (exception) { e = A.unwrapException(exception); s = A.getTraceFromException(exception); - A._rootHandleError(type$.Object._as(e), type$.StackTrace._as(s)); + A._rootHandleError(A._asObject(e), type$.StackTrace._as(s)); } }, runUnaryGuarded$1$2(f, arg, $T) { @@ -14581,24 +15070,24 @@ } catch (exception) { e = A.unwrapException(exception); s = A.getTraceFromException(exception); - A._rootHandleError(type$.Object._as(e), type$.StackTrace._as(s)); + A._rootHandleError(A._asObject(e), type$.StackTrace._as(s)); } }, - runBinaryGuarded$2$3(f, arg1, arg2, T1, T2) { + runBinaryGuarded$2$3(f, arg1, arg2, $T1, $T2) { var e, s, exception; - T1._eval$1("@<0>")._bind$1(T2)._eval$1("~(1,2)")._as(f); - T1._as(arg1); - T2._as(arg2); + $T1._eval$1("@<0>")._bind$1($T2)._eval$1("~(1,2)")._as(f); + $T1._as(arg1); + $T2._as(arg2); try { if (B.C__RootZone === $.Zone__current) { f.call$2(arg1, arg2); return; } - A._rootRunBinary(null, null, this, f, arg1, arg2, type$.void, T1, T2); + A._rootRunBinary(null, null, this, f, arg1, arg2, type$.void, $T1, $T2); } catch (exception) { e = A.unwrapException(exception); s = A.getTraceFromException(exception); - A._rootHandleError(type$.Object._as(e), type$.StackTrace._as(s)); + A._rootHandleError(A._asObject(e), type$.StackTrace._as(s)); } }, bindCallback$1$1(f, $R) { @@ -14632,13 +15121,13 @@ return f.call$1(arg); return A._rootRunUnary(null, null, this, f, arg, $R, $T); }, - runBinary$3$3(f, arg1, arg2, $R, T1, T2) { - $R._eval$1("@<0>")._bind$1(T1)._bind$1(T2)._eval$1("1(2,3)")._as(f); - T1._as(arg1); - T2._as(arg2); + runBinary$3$3(f, arg1, arg2, $R, $T1, $T2) { + $R._eval$1("@<0>")._bind$1($T1)._bind$1($T2)._eval$1("1(2,3)")._as(f); + $T1._as(arg1); + $T2._as(arg2); if ($.Zone__current === B.C__RootZone) return f.call$2(arg1, arg2); - return A._rootRunBinary(null, null, this, f, arg1, arg2, $R, T1, T2); + return A._rootRunBinary(null, null, this, f, arg1, arg2, $R, $T1, $T2); }, registerCallback$1$1(f, $R) { return $R._eval$1("0()")._as(f); @@ -14646,8 +15135,8 @@ registerUnaryCallback$2$1(f, $R, $T) { return $R._eval$1("@<0>")._bind$1($T)._eval$1("1(2)")._as(f); }, - registerBinaryCallback$3$1(f, $R, T1, T2) { - return $R._eval$1("@<0>")._bind$1(T1)._bind$1(T2)._eval$1("1(2,3)")._as(f); + registerBinaryCallback$3$1(f, $R, $T1, $T2) { + return $R._eval$1("@<0>")._bind$1($T1)._bind$1($T2)._eval$1("1(2,3)")._as(f); }, errorCallback$2(error, stackTrace) { return null; @@ -14709,10 +15198,10 @@ if (e === error) t2._processUncaughtError$3(zone, error, stackTrace); else - t2._processUncaughtError$3(zone, type$.Object._as(e), t1._as(s)); + t2._processUncaughtError$3(zone, A._asObject(e), t1._as(s)); } }, - $signature: 66 + $signature: 68 }; A._HashMap.prototype = { get$length(_) { @@ -15271,26 +15760,6 @@ } return true; }, - remove$1(_, object) { - var t1 = this._remove$1(object); - return t1; - }, - _remove$1(object) { - var hash, bucket, index, cell, _this = this, - rest = _this._collection$_rest; - if (rest == null) - return false; - hash = _this._computeHashCode$1(object); - bucket = rest[hash]; - index = _this._findBucketIndex$2(bucket, object); - if (index < 0) - return false; - cell = bucket.splice(index, 1)[0]; - if (0 === bucket.length) - delete rest[hash]; - _this._unlinkCell$1(cell); - return true; - }, _collection$_addHashTableEntry$2(table, element) { A._instanceType(this)._precomputed1._as(element); if (type$.nullable__LinkedHashSetCell._as(table[element]) != null) @@ -15298,39 +15767,17 @@ table[element] = this._collection$_newLinkedCell$1(element); return true; }, - _collection$_modified$0() { - this._collection$_modifications = this._collection$_modifications + 1 & 1073741823; - }, _collection$_newLinkedCell$1(element) { - var t1, _this = this, + var _this = this, cell = new A._LinkedHashSetCell(A._instanceType(_this)._precomputed1._as(element)); if (_this._collection$_first == null) _this._collection$_first = _this._collection$_last = cell; - else { - t1 = _this._collection$_last; - t1.toString; - cell._collection$_previous = t1; - _this._collection$_last = t1._collection$_next = cell; - } + else + _this._collection$_last = _this._collection$_last._collection$_next = cell; ++_this._collection$_length; - _this._collection$_modified$0(); + _this._collection$_modifications = _this._collection$_modifications + 1 & 1073741823; return cell; }, - _unlinkCell$1(cell) { - var _this = this, - previous = cell._collection$_previous, - next = cell._collection$_next; - if (previous == null) - _this._collection$_first = next; - else - previous._collection$_next = next; - if (next == null) - _this._collection$_last = previous; - else - next._collection$_previous = previous; - --_this._collection$_length; - _this._collection$_modified$0(); - }, _computeHashCode$1(element) { return J.get$hashCode$(element) & 1073741823; }, @@ -15383,7 +15830,7 @@ call$2(k, v) { this.result.$indexSet(0, this.K._as(k), this.V._as(v)); }, - $signature: 23 + $signature: 24 }; A.ListBase.prototype = { get$iterator(receiver) { @@ -15515,9 +15962,9 @@ $isList: 1 }; A.MapBase.prototype = { - cast$2$0(_, RK, RV) { + cast$2$0(_, $RK, $RV) { var t1 = A._instanceType(this); - return A.Map_castFrom(this, t1._eval$1("MapBase.K"), t1._eval$1("MapBase.V"), RK, RV); + return A.Map_castFrom(this, t1._eval$1("MapBase.K"), t1._eval$1("MapBase.V"), $RK, $RV); }, forEach$1(_, action) { var t2, key, t3, @@ -15529,11 +15976,11 @@ action.call$2(key, t3 == null ? t1._as(t3) : t3); } }, - map$2$1(_, transform, K2, V2) { + map$2$1(_, transform, $K2, $V2) { var result, t2, key, t3, entry, t1 = A._instanceType(this); - t1._bind$1(K2)._bind$1(V2)._eval$1("MapEntry<1,2>(MapBase.K,MapBase.V)")._as(transform); - result = A.LinkedHashMap_LinkedHashMap$_empty(K2, V2); + t1._bind$1($K2)._bind$1($V2)._eval$1("MapEntry<1,2>(MapBase.K,MapBase.V)")._as(transform); + result = A.LinkedHashMap_LinkedHashMap$_empty($K2, $V2); for (t2 = this.get$keys(), t2 = t2.get$iterator(t2), t1 = t1._eval$1("MapBase.V"); t2.moveNext$0();) { key = t2.get$current(); t3 = this.$index(0, key); @@ -15575,7 +16022,7 @@ t2 = A.S(v); t1._contents += t2; }, - $signature: 24 + $signature: 25 }; A._UnmodifiableMapMixin.prototype = { $indexSet(_, key, value) { @@ -15586,8 +16033,8 @@ } }; A.MapView.prototype = { - cast$2$0(_, RK, RV) { - return this._collection$_map.cast$2$0(0, RK, RV); + cast$2$0(_, $RK, $RV) { + return this._collection$_map.cast$2$0(0, $RK, $RV); }, $index(_, key) { return this._collection$_map.$index(0, key); @@ -15616,8 +16063,8 @@ toString$0(_) { return this._collection$_map.toString$0(0); }, - map$2$1(_, transform, K2, V2) { - return this._collection$_map.map$2$1(0, A._instanceType(this)._bind$1(K2)._bind$1(V2)._eval$1("MapEntry<1,2>(3,4)")._as(transform), K2, V2); + map$2$1(_, transform, $K2, $V2) { + return this._collection$_map.map$2$1(0, A._instanceType(this)._bind$1($K2)._bind$1($V2)._eval$1("MapEntry<1,2>(3,4)")._as(transform), $K2, $V2); }, map$1(_, transform) { var t1 = type$.dynamic; @@ -15626,8 +16073,8 @@ $isMap: 1 }; A.UnmodifiableMapView.prototype = { - cast$2$0(_, RK, RV) { - return new A.UnmodifiableMapView(this._collection$_map.cast$2$0(0, RK, RV), RK._eval$1("@<0>")._bind$1(RV)._eval$1("UnmodifiableMapView<1,2>")); + cast$2$0(_, $RK, $RV) { + return new A.UnmodifiableMapView(this._collection$_map.cast$2$0(0, $RK, $RV), $RK._eval$1("@<0>")._bind$1($RV)._eval$1("UnmodifiableMapView<1,2>")); } }; A.ListQueue.prototype = { @@ -16226,7 +16673,7 @@ } return null; }, - $signature: 25 + $signature: 26 }; A._Utf8Decoder__decoderNonfatal_closure.prototype = { call$0() { @@ -16238,7 +16685,7 @@ } return null; }, - $signature: 25 + $signature: 26 }; A.AsciiCodec.prototype = { encode$1(source) { @@ -16741,7 +17188,7 @@ B.JSArray_methods.$indexSet(t1, t2.i++, key); B.JSArray_methods.$indexSet(t1, t2.i++, value); }, - $signature: 24 + $signature: 25 }; A._JsonStringStringifier.prototype = { get$_partialResult() { @@ -17020,7 +17467,7 @@ break; default: t3 = A.Primitives_stringFromCharCode(_65533); - buffer._contents = (buffer._contents += t3) + A.Primitives_stringFromCharCode(_65533); + buffer._contents = (buffer._contents += t3) + t3; break; } else { @@ -17423,7 +17870,7 @@ hash = hash + ((hash & 524287) << 10) & 536870911; return hash ^ hash >>> 6; }, - $signature: 26 + $signature: 27 }; A._BigIntImpl_hashCode_finish.prototype = { call$1(hash) { @@ -17431,7 +17878,7 @@ hash ^= hash >>> 11; return hash + ((hash & 16383) << 15) & 536870911; }, - $signature: 27 + $signature: 63 }; A.DateTime.prototype = { $eq(_, other) { @@ -17849,13 +18296,13 @@ call$2(msg, position) { throw A.wrapException(A.FormatException$("Illegal IPv4 address, " + msg, this.host, position)); }, - $signature: 61 + $signature: 58 }; A.Uri_parseIPv6Address_error.prototype = { call$2(msg, position) { throw A.wrapException(A.FormatException$("Illegal IPv6 address, " + msg, this.host, position)); }, - $signature: 56 + $signature: 54 }; A.Uri_parseIPv6Address_parseHex.prototype = { call$2(start, end) { @@ -17867,7 +18314,7 @@ this.error.call$2("each part must be in the range of `0x0..0xFFFF`", start); return value; }, - $signature: 26 + $signature: 27 }; A._Uri.prototype = { get$_text() { @@ -17897,7 +18344,6 @@ t2 = _this._fragment; if (t2 != null) t1 = t1 + "#" + t2; - value !== $ && A.throwLateFieldADI("_text"); value = _this.___Uri__text_FI = t1.charCodeAt(0) == 0 ? t1 : t1; } return value; @@ -18494,7 +18940,7 @@ var t1 = type$.JavaScriptFunction; this._this.then$1$2$onError(new A.FutureOfJSAnyToJSPromise_get_toJS__closure(t1._as(resolve)), new A.FutureOfJSAnyToJSPromise_get_toJS__closure0(t1._as(reject)), type$.nullable_Object); }, - $signature: 29 + $signature: 30 }; A.FutureOfJSAnyToJSPromise_get_toJS__closure.prototype = { call$1(value) { @@ -18507,7 +18953,7 @@ A.FutureOfJSAnyToJSPromise_get_toJS__closure0.prototype = { call$2(error, stackTrace) { var wrapper, box, t1; - type$.Object._as(error); + A._asObject(error); type$.StackTrace._as(stackTrace); wrapper = A.JSFunctionUnsafeUtilExtension_callAsConstructor(type$.JavaScriptFunction._as(init.G.Error), string$.Dart_e, type$.JSObject); if (type$.JavaScriptObject._is(error)) @@ -18520,26 +18966,26 @@ t1.call(t1, wrapper); return wrapper; }, - $signature: 52 + $signature: 43 }; A.FutureOfVoidToJSPromise_get_toJS_closure.prototype = { call$2(resolve, reject) { var t1 = type$.JavaScriptFunction; this._this.then$1$2$onError(new A.FutureOfVoidToJSPromise_get_toJS__closure(t1._as(resolve)), new A.FutureOfVoidToJSPromise_get_toJS__closure0(t1._as(reject)), type$.nullable_Object); }, - $signature: 29 + $signature: 30 }; A.FutureOfVoidToJSPromise_get_toJS__closure.prototype = { call$1(__wc0_formal) { var t1 = this.resolve; return t1.call(t1); }, - $signature: 50 + $signature: 40 }; A.FutureOfVoidToJSPromise_get_toJS__closure0.prototype = { call$2(error, stackTrace) { var wrapper, box, t1; - type$.Object._as(error); + A._asObject(error); type$.StackTrace._as(stackTrace); wrapper = A.JSFunctionUnsafeUtilExtension_callAsConstructor(type$.JavaScriptFunction._as(init.G.Error), string$.Dart_e, type$.JSObject); if (type$.JavaScriptObject._is(error)) @@ -18654,10 +19100,44 @@ A._JSRandom.prototype = { nextInt$1(max) { if (max <= 0 || max > 4294967296) - throw A.wrapException(A.RangeError$("max must be in range 0 < max \u2264 2^32, was " + max)); + throw A.wrapException(A.RangeError$(string$.max_mu + max)); return Math.random() * max >>> 0; + } + }; + A._JSSecureRandom.prototype = { + _JSSecureRandom$0() { + var $crypto = self.crypto; + if ($crypto != null) + if ($crypto.getRandomValues != null) + return; + throw A.wrapException(A.UnsupportedError$("No source of cryptographically secure random numbers available.")); }, - $isRandom: 1 + nextInt$1(max) { + var byteCount, t1, start, randomLimit, t2, t3, random, result; + if (max <= 0 || max > 4294967296) + throw A.wrapException(A.RangeError$(string$.max_mu + max)); + if (max > 255) + if (max > 65535) + byteCount = max > 16777215 ? 4 : 3; + else + byteCount = 2; + else + byteCount = 1; + t1 = this._math$_buffer; + t1.$flags & 2 && A.throwUnsupportedOperation(t1, 11); + t1.setUint32(0, 0, false); + start = 4 - byteCount; + randomLimit = A._asInt(Math.pow(256, byteCount)); + for (t2 = max - 1, t3 = (max & t2) >>> 0 === 0; true;) { + crypto.getRandomValues(J.asUint8List$2$x(B.NativeByteData_methods.get$buffer(t1), start, byteCount)); + random = t1.getUint32(0, false); + if (t3) + return (random & t2) >>> 0; + result = random % max; + if (random - result + max < randomLimit) + return result; + } + } }; A.AsyncMemoizer.prototype = {}; A.DelegatingStreamSink.prototype = { @@ -18762,7 +19242,7 @@ }; A.StreamQueue__ensureListening_closure1.prototype = { call$2(error, stackTrace) { - type$.Object._as(error); + A._asObject(error); type$.StackTrace._as(stackTrace); this.$this._addResult$1(new A.ErrorResult(error, stackTrace)); }, @@ -18820,7 +19300,7 @@ call$2(h, i) { return A._combine(A._asInt(h), J.get$hashCode$(i)); }, - $signature: 46 + $signature: 39 }; A.BuiltList.prototype = { toBuilder$0() { @@ -19030,7 +19510,7 @@ call$1(k) { return this.multimap.$index(0, k); }, - $signature: 4 + $signature: 6 }; A.BuiltListMultimap_hashCode_closure.prototype = { call$1(key) { @@ -19187,7 +19667,7 @@ call$1(k) { return this.multimap.$index(0, k); }, - $signature: 4 + $signature: 6 }; A.BuiltMap.prototype = { toBuilder$0() { @@ -19254,7 +19734,7 @@ call$1(k) { return this.map.$index(0, k); }, - $signature: 4 + $signature: 6 }; A.BuiltMap_hashCode_closure.prototype = { call$1(key) { @@ -19372,7 +19852,7 @@ var t1 = this.$this.$ti; this.replacement.$indexSet(0, t1._precomputed1._as(key), t1._rest[1]._as(value)); }, - $signature: 23 + $signature: 24 }; A.BuiltSet.prototype = { get$hashCode(_) { @@ -19736,7 +20216,7 @@ call$1(k) { return this.multimap.$index(0, k); }, - $signature: 4 + $signature: 6 }; A.EnumClass.prototype = { toString$0(_) { @@ -19751,7 +20231,7 @@ $._indentingBuiltValueToStringHelperIndent = $._indentingBuiltValueToStringHelperIndent + 2; return new A.IndentingBuiltValueToStringHelper(t1); }, - $signature: 42 + $signature: 36 }; A.IndentingBuiltValueToStringHelper.prototype = { add$2(_, field, value) { @@ -19759,8 +20239,7 @@ if (value != null) { t1 = this._result; t1.toString; - t2 = B.JSString_methods.$mul(" ", $._indentingBuiltValueToStringHelperIndent); - t2 = (t1._contents += t2) + field; + t2 = (t1._contents += B.JSString_methods.$mul(" ", $._indentingBuiltValueToStringHelperIndent)) + field; t1._contents = t2; t1._contents = t2 + "="; t2 = A.S(value); @@ -19773,9 +20252,8 @@ $._indentingBuiltValueToStringHelperIndent = t1; t2 = this._result; t2.toString; - t1 = B.JSString_methods.$mul(" ", t1); - t2._contents = (t2._contents += t1) + "}"; - stringResult = J.toString$0$(this._result); + t2._contents = (t2._contents += B.JSString_methods.$mul(" ", t1)) + "}"; + stringResult = t2.toString$0(0); this._result = null; return stringResult; } @@ -19884,34 +20362,34 @@ call$0() { return A.ListBuilder_ListBuilder(B.List_empty0, type$.Object); }, - $signature: 39 + $signature: 33 }; A.Serializers_Serializers_closure0.prototype = { call$0() { var t1 = type$.Object; return A.ListMultimapBuilder_ListMultimapBuilder(t1, t1); }, - $signature: 38 + $signature: 34 }; A.Serializers_Serializers_closure1.prototype = { call$0() { var t1 = type$.Object; return A.MapBuilder_MapBuilder(t1, t1); }, - $signature: 36 + $signature: 35 }; A.Serializers_Serializers_closure2.prototype = { call$0() { return A.SetBuilder_SetBuilder(type$.Object); }, - $signature: 35 + $signature: 108 }; A.Serializers_Serializers_closure3.prototype = { call$0() { var t1 = type$.Object; return A.SetMultimapBuilder_SetMultimapBuilder(t1, t1); }, - $signature: 89 + $signature: 37 }; A.FullType.prototype = { $eq(_, other) { @@ -20160,7 +20638,7 @@ if (builderFactory == null) this._throwMissingBuilderFactory$1(fullType); t1 = builderFactory.call$0(); - return t1 == null ? type$.Object._as(t1) : t1; + return t1 == null ? A._asObject(t1) : t1; }, _throwMissingBuilderFactory$1(fullType) { throw A.wrapException(A.StateError$("No builder factory for " + fullType.toString$0(0) + ". Fix by adding one, see SerializersBuilder.addBuilderFactory.")); @@ -21214,8 +21692,8 @@ addAll$1(_, other) { this.$ti._eval$1("Map")._as(other).forEach$1(0, new A.CanonicalizedMap_addAll_closure(this)); }, - cast$2$0(_, K2, V2) { - return this._base.cast$2$0(0, K2, V2); + cast$2$0(_, $K2, $V2) { + return this._base.cast$2$0(0, $K2, $V2); }, containsKey$1(key) { var _this = this; @@ -21238,8 +21716,8 @@ get$length(_) { return this._base.__js_helper$_length; }, - map$2$1(_, transform, K2, V2) { - return this._base.map$2$1(0, new A.CanonicalizedMap_map_closure(this, this.$ti._bind$1(K2)._bind$1(V2)._eval$1("MapEntry<1,2>(CanonicalizedMap.K,CanonicalizedMap.V)")._as(transform), K2, V2), K2, V2); + map$2$1(_, transform, $K2, $V2) { + return this._base.map$2$1(0, new A.CanonicalizedMap_map_closure(this, this.$ti._bind$1($K2)._bind$1($V2)._eval$1("MapEntry<1,2>(CanonicalizedMap.K,CanonicalizedMap.V)")._as(transform), $K2, $V2), $K2, $V2); }, map$1(_, transform) { var t1 = type$.dynamic; @@ -21651,7 +22129,6 @@ }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { var t1, t2, value, $$v, _$result, - _s11_ = "BuildResult", result = new A.BuildResultBuilder(), iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized)); for (t1 = type$.BuildStatus; iterator.moveNext$0();) { @@ -21675,13 +22152,7 @@ } } _$result = result._build_result$_$v; - if (_$result == null) { - t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_build_result$_$this()._status, _s11_, "status", t1); - _$result = new A._$BuildResult(t2); - A.BuiltValueNullFieldError_checkNotNull(t2, _s11_, "status", t1); - } - A.ArgumentError_checkNotNull(_$result, "other", type$.BuildResult); - return result._build_result$_$v = _$result; + return result._build_result$_$v = _$result == null ? new A._$BuildResult(A.BuiltValueNullFieldError_checkNotNull(result.get$_build_result$_$this()._status, "BuildResult", "status", t1)) : _$result; }, deserialize$2(serializers, serialized) { return this.deserialize$3$specifiedType(serializers, serialized, B.FullType_null_List_empty_false); @@ -21812,22 +22283,13 @@ return _this; }, _connect_request$_build$0() { - var t1, t2, t3, t4, _this = this, + var t1, _this = this, _s14_ = "ConnectRequest", - _s10_ = "instanceId", - _s14_0 = "entrypointPath", _$result = _this._connect_request$_$v; if (_$result == null) { t1 = type$.String; - t2 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_connect_request$_$this()._connect_request$_appId, _s14_, "appId", t1); - t3 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_connect_request$_$this()._instanceId, _s14_, _s10_, t1); - t4 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_connect_request$_$this()._entrypointPath, _s14_, _s14_0, t1); - _$result = new A._$ConnectRequest(t2, t3, t4); - A.BuiltValueNullFieldError_checkNotNull(t2, _s14_, "appId", t1); - A.BuiltValueNullFieldError_checkNotNull(t3, _s14_, _s10_, t1); - A.BuiltValueNullFieldError_checkNotNull(t4, _s14_, _s14_0, t1); - } - A.ArgumentError_checkNotNull(_$result, "other", type$.ConnectRequest); + _$result = new A._$ConnectRequest(A.BuiltValueNullFieldError_checkNotNull(_this.get$_connect_request$_$this()._connect_request$_appId, _s14_, "appId", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_connect_request$_$this()._instanceId, _s14_, "instanceId", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_connect_request$_$this()._entrypointPath, _s14_, "entrypointPath", t1)); + } return _this._connect_request$_$v = _$result; } }; @@ -21992,23 +22454,13 @@ return _this; }, _debug_event$_build$0() { - var t1, t2, t3, t4, t5, _this = this, + var t1, _this = this, _s10_ = "DebugEvent", - _s9_ = "eventData", - _s9_0 = "timestamp", _$result = _this._debug_event$_$v; if (_$result == null) { t1 = type$.String; - t2 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._debug_event$_kind, _s10_, "kind", t1); - t3 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._eventData, _s10_, _s9_, t1); - t4 = type$.int; - t5 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._timestamp, _s10_, _s9_0, t4); - _$result = new A._$DebugEvent(t2, t3, t5); - A.BuiltValueNullFieldError_checkNotNull(t2, _s10_, "kind", t1); - A.BuiltValueNullFieldError_checkNotNull(t3, _s10_, _s9_, t1); - A.BuiltValueNullFieldError_checkNotNull(t5, _s10_, _s9_0, t4); - } - A.ArgumentError_checkNotNull(_$result, "other", type$.DebugEvent); + _$result = new A._$DebugEvent(A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._debug_event$_kind, _s10_, "kind", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._eventData, _s10_, "eventData", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._timestamp, _s10_, "timestamp", type$.int)); + } return _this._debug_event$_$v = _$result; } }; @@ -22053,17 +22505,10 @@ return _this; }, _debug_event$_build$0() { - var _$failedField, e, _$result0, t1, exception, t2, _this = this, - _s18_ = "BatchedDebugEvents", - _$result = null; + var _$failedField, e, _$result0, exception, t1, _this = this, _$result = null; try { _$result0 = _this._debug_event$_$v; - if (_$result0 == null) { - t1 = _this.get$events().build$0(); - _$result0 = new A._$BatchedDebugEvents(t1); - A.BuiltValueNullFieldError_checkNotNull(t1, _s18_, "events", type$.BuiltList_DebugEvent); - } - _$result = _$result0; + _$result = _$result0 == null ? new A._$BatchedDebugEvents(_this.get$events().build$0()) : _$result0; } catch (exception) { _$failedField = A._Cell$named("_$failedField"); try { @@ -22071,15 +22516,12 @@ _this.get$events().build$0(); } catch (exception) { e = A.unwrapException(exception); - t1 = A.BuiltValueNestedFieldError$(_s18_, _$failedField.readLocal$0(), J.toString$0$(e)); + t1 = A.BuiltValueNestedFieldError$("BatchedDebugEvents", _$failedField.readLocal$0(), J.toString$0$(e)); throw A.wrapException(t1); } throw exception; } - t1 = type$.BatchedDebugEvents; - t2 = t1._as(_$result); - A.ArgumentError_checkNotNull(t2, "other", t1); - _this._debug_event$_$v = t2; + _this._debug_event$_$v = type$.BatchedDebugEvents._as(_$result); return _$result; }, set$_events(_events) { @@ -22299,10 +22741,7 @@ _build$0() { var _this = this, _$result = _this._$v; - if (_$result == null) - _$result = new A._$DebugInfo(_this.get$_$this()._appEntrypointPath, _this.get$_$this()._appId, _this.get$_$this()._appInstanceId, _this.get$_$this()._appOrigin, _this.get$_$this()._appUrl, _this.get$_$this()._authUrl, _this.get$_$this()._dwdsVersion, _this.get$_$this()._extensionUrl, _this.get$_$this()._isInternalBuild, _this.get$_$this()._isFlutterApp, _this.get$_$this()._workspaceName, _this.get$_$this()._tabUrl, _this.get$_$this()._tabId); - A.ArgumentError_checkNotNull(_$result, "other", type$.DebugInfo); - return _this._$v = _$result; + return _this._$v = _$result == null ? new A._$DebugInfo(_this.get$_$this()._appEntrypointPath, _this.get$_$this()._appId, _this.get$_$this()._appInstanceId, _this.get$_$this()._appOrigin, _this.get$_$this()._appUrl, _this.get$_$this()._authUrl, _this.get$_$this()._dwdsVersion, _this.get$_$this()._extensionUrl, _this.get$_$this()._isInternalBuild, _this.get$_$this()._isFlutterApp, _this.get$_$this()._workspaceName, _this.get$_$this()._tabUrl, _this.get$_$this()._tabId) : _$result; } }; A.DevToolsRequest.prototype = {}; @@ -22408,8 +22847,7 @@ return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var t1, value, _$result, t2, t3, - _s15_ = "promptExtension", + var t1, value, _$result, _s16_ = "DevToolsResponse", result = new A.DevToolsResponseBuilder(), iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized)); @@ -22441,13 +22879,8 @@ _$result = result._devtools_request$_$v; if (_$result == null) { t1 = type$.bool; - t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_devtools_request$_$this()._success, _s16_, "success", t1); - t3 = A.BuiltValueNullFieldError_checkNotNull(result.get$_devtools_request$_$this()._promptExtension, _s16_, _s15_, t1); - _$result = new A._$DevToolsResponse(t2, t3, result.get$_devtools_request$_$this()._error); - A.BuiltValueNullFieldError_checkNotNull(t2, _s16_, "success", t1); - A.BuiltValueNullFieldError_checkNotNull(t3, _s16_, _s15_, t1); + _$result = new A._$DevToolsResponse(A.BuiltValueNullFieldError_checkNotNull(result.get$_devtools_request$_$this()._success, _s16_, "success", t1), A.BuiltValueNullFieldError_checkNotNull(result.get$_devtools_request$_$this()._promptExtension, _s16_, "promptExtension", t1), result.get$_devtools_request$_$this()._error); } - A.ArgumentError_checkNotNull(_$result, "other", type$.DevToolsResponse); return result._devtools_request$_$v = _$result; }, deserialize$2(serializers, serialized) { @@ -22504,19 +22937,13 @@ return _this; }, _devtools_request$_build$0() { - var t1, t2, t3, _this = this, + var t1, _this = this, _s15_ = "DevToolsRequest", - _s10_ = "instanceId", _$result = _this._devtools_request$_$v; if (_$result == null) { t1 = type$.String; - t2 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._devtools_request$_appId, _s15_, "appId", t1); - t3 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._devtools_request$_instanceId, _s15_, _s10_, t1); - _$result = new A._$DevToolsRequest(t2, t3, _this.get$_devtools_request$_$this()._contextId, _this.get$_devtools_request$_$this()._devtools_request$_tabUrl, _this.get$_devtools_request$_$this()._uriOnly, _this.get$_devtools_request$_$this()._devtools_request$_client); - A.BuiltValueNullFieldError_checkNotNull(t2, _s15_, "appId", t1); - A.BuiltValueNullFieldError_checkNotNull(t3, _s15_, _s10_, t1); + _$result = new A._$DevToolsRequest(A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._devtools_request$_appId, _s15_, "appId", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._devtools_request$_instanceId, _s15_, "instanceId", t1), _this.get$_devtools_request$_$this()._contextId, _this.get$_devtools_request$_$this()._devtools_request$_tabUrl, _this.get$_devtools_request$_$this()._uriOnly, _this.get$_devtools_request$_$this()._devtools_request$_client); } - A.ArgumentError_checkNotNull(_$result, "other", type$.DevToolsRequest); return _this._devtools_request$_$v = _$result; } }; @@ -22567,8 +22994,7 @@ return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var t1, value, $$v, _$result, t2, t3, - _s10_ = "stackTrace", + var t1, value, $$v, _$result, _s13_ = "ErrorResponse", result = new A.ErrorResponseBuilder(), iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized)); @@ -22608,13 +23034,8 @@ _$result = result._error_response$_$v; if (_$result == null) { t1 = type$.String; - t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_error_response$_$this()._error_response$_error, _s13_, "error", t1); - t3 = A.BuiltValueNullFieldError_checkNotNull(result.get$_error_response$_$this()._error_response$_stackTrace, _s13_, _s10_, t1); - _$result = new A._$ErrorResponse(t2, t3); - A.BuiltValueNullFieldError_checkNotNull(t2, _s13_, "error", t1); - A.BuiltValueNullFieldError_checkNotNull(t3, _s13_, _s10_, t1); + _$result = new A._$ErrorResponse(A.BuiltValueNullFieldError_checkNotNull(result.get$_error_response$_$this()._error_response$_error, _s13_, "error", t1), A.BuiltValueNullFieldError_checkNotNull(result.get$_error_response$_$this()._error_response$_stackTrace, _s13_, "stackTrace", t1)); } - A.ArgumentError_checkNotNull(_$result, "other", type$.ErrorResponse); return result._error_response$_$v = _$result; }, deserialize$2(serializers, serialized) { @@ -22680,7 +23101,7 @@ return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var t1, value, _$result, t2, t3, t4, + var t1, value, _$result, _s16_ = "ExtensionRequest", result = new A.ExtensionRequestBuilder(), iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized)); @@ -22710,17 +23131,7 @@ } } _$result = result._extension_request$_$v; - if (_$result == null) { - t1 = type$.int; - t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._id, _s16_, "id", t1); - t3 = type$.String; - t4 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._command, _s16_, "command", t3); - _$result = new A._$ExtensionRequest(t2, t4, result.get$_extension_request$_$this()._commandParams); - A.BuiltValueNullFieldError_checkNotNull(t2, _s16_, "id", t1); - A.BuiltValueNullFieldError_checkNotNull(t4, _s16_, "command", t3); - } - A.ArgumentError_checkNotNull(_$result, "other", type$.ExtensionRequest); - return result._extension_request$_$v = _$result; + return result._extension_request$_$v = _$result == null ? new A._$ExtensionRequest(A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._id, _s16_, "id", type$.int), A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._command, _s16_, "command", type$.String), result.get$_extension_request$_$this()._commandParams) : _$result; }, deserialize$2(serializers, serialized) { return this.deserialize$3$specifiedType(serializers, serialized, B.FullType_null_List_empty_false); @@ -22750,7 +23161,7 @@ return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var t1, value, _$result, t2, t3, t4, t5, t6, + var t1, value, _$result, _s17_ = "ExtensionResponse", result = new A.ExtensionResponseBuilder(), iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized)); @@ -22786,20 +23197,7 @@ } } _$result = result._extension_request$_$v; - if (_$result == null) { - t1 = type$.int; - t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._id, _s17_, "id", t1); - t3 = type$.bool; - t4 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._extension_request$_success, _s17_, "success", t3); - t5 = type$.String; - t6 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._extension_request$_result, _s17_, "result", t5); - _$result = new A._$ExtensionResponse(t2, t4, t6, result.get$_extension_request$_$this()._extension_request$_error); - A.BuiltValueNullFieldError_checkNotNull(t2, _s17_, "id", t1); - A.BuiltValueNullFieldError_checkNotNull(t4, _s17_, "success", t3); - A.BuiltValueNullFieldError_checkNotNull(t6, _s17_, "result", t5); - } - A.ArgumentError_checkNotNull(_$result, "other", type$.ExtensionResponse); - return result._extension_request$_$v = _$result; + return result._extension_request$_$v = _$result == null ? new A._$ExtensionResponse(A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._id, _s17_, "id", type$.int), A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._extension_request$_success, _s17_, "success", type$.bool), A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._extension_request$_result, _s17_, "result", type$.String), result.get$_extension_request$_$this()._extension_request$_error) : _$result; }, deserialize$2(serializers, serialized) { return this.deserialize$3$specifiedType(serializers, serialized, B.FullType_null_List_empty_false); @@ -22822,7 +23220,7 @@ return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var t1, value, $$v, _$result, t2, t3, + var t1, value, $$v, _$result, _s14_ = "ExtensionEvent", result = new A.ExtensionEventBuilder(), iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized)); @@ -22862,13 +23260,8 @@ _$result = result._extension_request$_$v; if (_$result == null) { t1 = type$.String; - t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._params, _s14_, "params", t1); - t3 = A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._extension_request$_method, _s14_, "method", t1); - _$result = new A._$ExtensionEvent(t2, t3); - A.BuiltValueNullFieldError_checkNotNull(t2, _s14_, "params", t1); - A.BuiltValueNullFieldError_checkNotNull(t3, _s14_, "method", t1); + _$result = new A._$ExtensionEvent(A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._params, _s14_, "params", t1), A.BuiltValueNullFieldError_checkNotNull(result.get$_extension_request$_$this()._extension_request$_method, _s14_, "method", t1)); } - A.ArgumentError_checkNotNull(_$result, "other", type$.ExtensionEvent); return result._extension_request$_$v = _$result; }, deserialize$2(serializers, serialized) { @@ -23104,17 +23497,10 @@ return t1; }, _extension_request$_build$0() { - var _$failedField, e, _$result0, t1, exception, t2, _this = this, - _s13_ = "BatchedEvents", - _$result = null; + var _$failedField, e, _$result0, exception, t1, _this = this, _$result = null; try { _$result0 = _this._extension_request$_$v; - if (_$result0 == null) { - t1 = _this.get$events().build$0(); - _$result0 = new A._$BatchedEvents(t1); - A.BuiltValueNullFieldError_checkNotNull(t1, _s13_, "events", type$.BuiltList_ExtensionEvent); - } - _$result = _$result0; + _$result = _$result0 == null ? new A._$BatchedEvents(_this.get$events().build$0()) : _$result0; } catch (exception) { _$failedField = A._Cell$named("_$failedField"); try { @@ -23122,15 +23508,12 @@ _this.get$events().build$0(); } catch (exception) { e = A.unwrapException(exception); - t1 = A.BuiltValueNestedFieldError$(_s13_, _$failedField.readLocal$0(), J.toString$0$(e)); + t1 = A.BuiltValueNestedFieldError$("BatchedEvents", _$failedField.readLocal$0(), J.toString$0$(e)); throw A.wrapException(t1); } throw exception; } - t1 = type$.BatchedEvents; - t2 = t1._as(_$result); - A.ArgumentError_checkNotNull(t2, "other", t1); - _this._extension_request$_$v = t2; + _this._extension_request$_$v = type$.BatchedEvents._as(_$result); return _$result; }, set$_extension_request$_events(_events) { @@ -23146,8 +23529,7 @@ return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var t1, value, $$v, _$result, t2, - _s16_ = "HotReloadRequest", + var t1, value, $$v, _$result, result = new A.HotReloadRequestBuilder(), iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized)); for (; iterator.moveNext$0();) { @@ -23171,14 +23553,7 @@ } } _$result = result._hot_reload_request$_$v; - if (_$result == null) { - t1 = type$.String; - t2 = A.BuiltValueNullFieldError_checkNotNull(result.get$_hot_reload_request$_$this()._hot_reload_request$_id, _s16_, "id", t1); - _$result = new A._$HotReloadRequest(t2); - A.BuiltValueNullFieldError_checkNotNull(t2, _s16_, "id", t1); - } - A.ArgumentError_checkNotNull(_$result, "other", type$.HotReloadRequest); - return result._hot_reload_request$_$v = _$result; + return result._hot_reload_request$_$v = _$result == null ? new A._$HotReloadRequest(A.BuiltValueNullFieldError_checkNotNull(result.get$_hot_reload_request$_$this()._hot_reload_request$_id, "HotReloadRequest", "id", type$.String)) : _$result; }, deserialize$2(serializers, serialized) { return this.deserialize$3$specifiedType(serializers, serialized, B.FullType_null_List_empty_false); @@ -23326,20 +23701,10 @@ return _this; }, _hot_reload_response$_build$0() { - var t1, t2, t3, t4, _this = this, + var _this = this, _s17_ = "HotReloadResponse", _$result = _this._hot_reload_response$_$v; - if (_$result == null) { - t1 = type$.String; - t2 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_hot_reload_response$_$this()._hot_reload_response$_id, _s17_, "id", t1); - t3 = type$.bool; - t4 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_hot_reload_response$_$this()._hot_reload_response$_success, _s17_, "success", t3); - _$result = new A._$HotReloadResponse(t2, t4, _this.get$_hot_reload_response$_$this()._errorMessage); - A.BuiltValueNullFieldError_checkNotNull(t2, _s17_, "id", t1); - A.BuiltValueNullFieldError_checkNotNull(t4, _s17_, "success", t3); - } - A.ArgumentError_checkNotNull(_$result, "other", type$.HotReloadResponse); - return _this._hot_reload_response$_$v = _$result; + return _this._hot_reload_response$_$v = _$result == null ? new A._$HotReloadResponse(A.BuiltValueNullFieldError_checkNotNull(_this.get$_hot_reload_response$_$this()._hot_reload_response$_id, _s17_, "id", type$.String), A.BuiltValueNullFieldError_checkNotNull(_this.get$_hot_reload_response$_$this()._hot_reload_response$_success, _s17_, "success", type$.bool), _this.get$_hot_reload_response$_$this()._errorMessage) : _$result; } }; A.IsolateExit.prototype = {}; @@ -23410,10 +23775,7 @@ A.IsolateExitBuilder.prototype = { _isolate_events$_build$0() { var _$result = this._isolate_events$_$v; - if (_$result == null) - _$result = new A._$IsolateExit(); - A.ArgumentError_checkNotNull(_$result, "other", type$.IsolateExit); - return this._isolate_events$_$v = _$result; + return this._isolate_events$_$v = _$result == null ? new A._$IsolateExit() : _$result; } }; A._$IsolateStart.prototype = { @@ -23434,10 +23796,7 @@ A.IsolateStartBuilder.prototype = { _isolate_events$_build$0() { var _$result = this._isolate_events$_$v; - if (_$result == null) - _$result = new A._$IsolateStart(); - A.ArgumentError_checkNotNull(_$result, "other", type$.IsolateStart); - return this._isolate_events$_$v = _$result; + return this._isolate_events$_$v = _$result == null ? new A._$IsolateStart() : _$result; } }; A.RegisterEvent.prototype = {}; @@ -23531,22 +23890,10 @@ return _this; }, _register_event$_build$0() { - var t1, t2, t3, t4, _this = this, + var _this = this, _s13_ = "RegisterEvent", - _s9_ = "eventData", - _s9_0 = "timestamp", _$result = _this._register_event$_$v; - if (_$result == null) { - t1 = type$.String; - t2 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_register_event$_$this()._register_event$_eventData, _s13_, _s9_, t1); - t3 = type$.int; - t4 = A.BuiltValueNullFieldError_checkNotNull(_this.get$_register_event$_$this()._register_event$_timestamp, _s13_, _s9_0, t3); - _$result = new A._$RegisterEvent(t2, t4); - A.BuiltValueNullFieldError_checkNotNull(t2, _s13_, _s9_, t1); - A.BuiltValueNullFieldError_checkNotNull(t4, _s13_, _s9_0, t3); - } - A.ArgumentError_checkNotNull(_$result, "other", type$.RegisterEvent); - return _this._register_event$_$v = _$result; + return _this._register_event$_$v = _$result == null ? new A._$RegisterEvent(A.BuiltValueNullFieldError_checkNotNull(_this.get$_register_event$_$this()._register_event$_eventData, _s13_, "eventData", type$.String), A.BuiltValueNullFieldError_checkNotNull(_this.get$_register_event$_$this()._register_event$_timestamp, _s13_, "timestamp", type$.int)) : _$result; } }; A.RunRequest.prototype = {}; @@ -23559,11 +23906,8 @@ return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var _$result; type$.Iterable_nullable_Object._as(serialized); - _$result = new A._$RunRequest(); - A.ArgumentError_checkNotNull(_$result, "other", type$.RunRequest); - return _$result; + return new A._$RunRequest(); }, deserialize$2(serializers, serialized) { return this.deserialize$3$specifiedType(serializers, serialized, B.FullType_null_List_empty_false); @@ -23596,19 +23940,19 @@ call$0() { return A.ListBuilder_ListBuilder(B.List_empty0, type$.DebugEvent); }, - $signature: 40 + $signature: 41 }; A._$serializers_closure0.prototype = { call$0() { return A.ListBuilder_ListBuilder(B.List_empty0, type$.ExtensionEvent); }, - $signature: 41 + $signature: 42 }; A.BatchedStreamController.prototype = { _batchAndSendEvents$0() { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.void), - $async$self = this, t2, t3, t4, t5, t6, t7, t8, lastSendTime0, lastEvent, duration, t1, buffer, lastSendTime, $async$temp1, $async$temp2; + $async$self = this, t2, t3, t4, t5, t6, t7, t8, now, lastEvent, duration, t1, buffer, lastSendTime, $async$temp1, $async$temp2; var $async$_batchAndSendEvents$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -23620,7 +23964,7 @@ t1 = $async$self.$ti; buffer = A._setArrayType([], t1._eval$1("JSArray<1>")); lastSendTime = Date.now(); - t2 = $async$self._batchDelayMilliseconds, t3 = $async$self._outputController, t4 = A._instanceType(t3), t1 = t1._precomputed1, t5 = t4._precomputed1, t4 = t4._eval$1("_DelayedData<1>"); + t2 = $async$self._batchDelayMilliseconds, t3 = $async$self._outputController, t4 = A._instanceType(t3), t1 = t1._precomputed1, t5 = t4._eval$1("_DelayedData<1>"); case 2: // for condition $async$goto = 4; @@ -23654,11 +23998,11 @@ $async$temp1.add$1($async$temp2, $async$result); case 6: // join - lastSendTime0 = Date.now(); - if (lastSendTime0 > lastSendTime + t2) { + now = Date.now(); + if (now > lastSendTime + t2) { if (buffer.length !== 0) { t6 = A.List_List$_of(buffer, t1); - t5._as(t6); + t4._precomputed1._as(t6); t7 = t3._state; if (t7 >= 4) A.throwExpression(t3._badEventState$0()); @@ -23666,7 +24010,7 @@ t3._sendData$1(t6); else if ((t7 & 3) === 0) { t7 = t3._ensurePendingEvents$0(); - t6 = new A._DelayedData(t6, t4); + t6 = new A._DelayedData(t6, t5); lastEvent = t7.lastPendingEvent; if (lastEvent == null) t7.firstPendingEvent = t7.lastPendingEvent = t6; @@ -23677,7 +24021,7 @@ } B.JSArray_methods.clear$0(buffer); } - lastSendTime = lastSendTime0; + lastSendTime = now; } // goto for condition $async$goto = 2; @@ -23686,7 +24030,7 @@ // after for if (buffer.length !== 0) { t1 = A.List_List$_of(buffer, t1); - t3.add$1(0, t5._as(t1)); + t3.add$1(0, t4._precomputed1._as(t1)); } $async$self._completer.complete$1(true); // implicit return @@ -23710,13 +24054,13 @@ call$0() { return true; }, - $signature: 34 + $signature: 32 }; A.BatchedStreamController__hasEventDuring_closure.prototype = { call$0() { return false; }, - $signature: 34 + $signature: 32 }; A.SocketClient.prototype = {}; A.SseSocketClient.prototype = { @@ -23739,7 +24083,6 @@ t2 === $ && A.throwLateFieldNI("_foreign"); t2 = t2.__GuaranteeChannel__sink_F; t2 === $ && A.throwLateFieldNI("_sink"); - value !== $ && A.throwLateFieldADI("sink"); value = t1.__AdapterWebSocketChannel_sink_FI = new A._WebSocketSink(t1, t2); } return value; @@ -23758,14 +24101,14 @@ call$1(o) { return J.toString$0$(o); }, - $signature: 43 + $signature: 44 }; A.safeUnawaited_closure.prototype = { call$2(error, stackTrace) { type$.StackTrace._as(stackTrace); return $.$get$_logger().log$4(B.Level_WARNING_900, "Error in unawaited Future:", error, stackTrace); }, - $signature: 21 + $signature: 22 }; A.Int32.prototype = { _toInt$1(val) { @@ -23889,6 +24232,7 @@ $isComparable: 1 }; A._StackState.prototype = {}; + A.RequestAbortedException.prototype = {}; A.BaseClient.prototype = { _sendUnstreamed$3(method, url, headers) { var $async$goto = 0, @@ -23934,26 +24278,34 @@ call$2(key1, key2) { return A._asString(key1).toLowerCase() === A._asString(key2).toLowerCase(); }, - $signature: 44 + $signature: 45 }; A.BaseRequest_closure0.prototype = { call$1(key) { return B.JSString_methods.get$hashCode(A._asString(key).toLowerCase()); }, - $signature: 45 + $signature: 46 }; A.BaseResponse.prototype = { BaseResponse$7$contentLength$headers$isRedirect$persistentConnection$reasonPhrase$request(statusCode, contentLength, headers, isRedirect, persistentConnection, reasonPhrase, request) { var t1 = this.statusCode; if (t1 < 100) throw A.wrapException(A.ArgumentError$("Invalid status code " + t1 + ".", null)); + else { + t1 = this.contentLength; + if (t1 != null && t1 < 0) + throw A.wrapException(A.ArgumentError$("Invalid content length " + A.S(t1) + ".", null)); + } } }; A.BrowserClient.prototype = { send$1(request) { + return this.send$body$BrowserClient(request); + }, + send$body$BrowserClient(request) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.StreamedResponse), - $async$returnValue, $async$handler = 2, $async$errorStack = [], $async$next = [], $async$self = this, xhr, completer, bytes, t1, t2, header, t3; + $async$returnValue, $async$handler = 2, $async$errorStack = [], $async$next = [], $async$self = this, bodyBytes, _0_0, _0_2, _0_2_isSet, abortTrigger, t1, _1_0, contentLength, header, response, contentLengthHeader, contentLength0, headers, e, st, t4, t5, _this, t6, t7, t8, t9, result, exception, t2, abortController, t3, $async$exception; var $async$send$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) { $async$errorStack.push($async$result); @@ -23963,55 +24315,109 @@ switch ($async$goto) { case 0: // Function start + t2 = init.G; + abortController = A._asJSObject(new t2.AbortController()); + t3 = $async$self._openRequestAbortControllers; + B.JSArray_methods.add$1(t3, abortController); request.super$BaseRequest$finalize(); + t4 = type$._AsyncStreamController_List_int; + t5 = new A._AsyncStreamController(null, null, null, null, t4); + t5._add$1(request._bodyBytes); + t5._closeUnchecked$0(); $async$goto = 3; - return A._asyncAwait(new A.ByteStream(A.Stream_Stream$value(request._bodyBytes, type$.List_int)).toBytes$0(), $async$send$1); + return A._asyncAwait(new A.ByteStream(new A._ControllerStream(t5, t4._eval$1("_ControllerStream<1>"))).toBytes$0(), $async$send$1); case 3: // returning from await. - bytes = $async$result; - xhr = type$.JSObject._as(new init.G.XMLHttpRequest()); - t1 = $async$self._xhrs; - t1.add$1(0, xhr); - t2 = xhr; - t2.open(request.method, request.url.toString$0(0), true); - t2.responseType = "arraybuffer"; - t2.withCredentials = $async$self.withCredentials; - for (t2 = request.headers, t2 = new A.LinkedHashMapEntriesIterable(t2, A._instanceType(t2)._eval$1("LinkedHashMapEntriesIterable<1,2>")).get$iterator(0); t2.moveNext$0();) { - header = t2.__js_helper$_current; - xhr.setRequestHeader(header.key, header.value); + bodyBytes = $async$result; + $async$handler = 5; + _0_0 = request; + _0_2 = null; + _0_2_isSet = false; + abortTrigger = null; + t4 = request.url; + _this = t4.toString$0(0); + t5 = !J.get$isEmpty$asx(bodyBytes) ? bodyBytes : null; + t6 = $async$self.withCredentials ? "include" : "same-origin"; + t7 = type$.String; + t1 = A.LinkedHashMap_LinkedHashMap$_empty(t7, type$.Object); + _1_0 = request._bodyBytes.length; + contentLength = null; + if (_1_0 != null) { + contentLength = _1_0; + J.$indexSet$ax(t1, "content-length", contentLength); } - completer = new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_StreamedResponse), type$._AsyncCompleter_StreamedResponse); - t2 = type$._EventStream_JSObject; - t3 = type$.void; - new A._EventStream(xhr, "load", false, t2).get$first(0).then$1$1(new A.BrowserClient_send_closure(xhr, completer, request), t3); - new A._EventStream(xhr, "error", false, t2).get$first(0).then$1$1(new A.BrowserClient_send_closure0(completer, request), t3); - xhr.send(bytes); - $async$handler = 4; - $async$goto = 7; - return A._asyncAwait(completer.future, $async$send$1); - case 7: + for (t8 = request.headers, t8 = new A.LinkedHashMapEntriesIterable(t8, A._instanceType(t8)._eval$1("LinkedHashMapEntriesIterable<1,2>")).get$iterator(0); t8.moveNext$0();) { + t9 = t8.__js_helper$_current; + t9.toString; + header = t9; + J.$indexSet$ax(t1, header.key, header.value); + } + t1 = A.jsify(t1); + t1.toString; + A._asJSObject(t1); + t8 = A._asJSObject(abortController.signal); + $async$goto = 8; + return A._asyncAwait(A.promiseToFuture(A._asJSObject(t2.fetch(_this, {method: request.method, headers: t1, body: t5, credentials: t6, redirect: "follow", signal: t8})), type$.JSObject), $async$send$1); + case 8: // returning from await. - t2 = $async$result; - $async$returnValue = t2; + response = $async$result; + contentLengthHeader = A._asStringQ(A._asJSObject(response.headers).get("content-length")); + contentLength0 = contentLengthHeader != null ? A.Primitives_parseInt(contentLengthHeader, null) : null; + if (contentLength0 == null && contentLengthHeader != null) { + t1 = A.ClientException$("Invalid content-length header [" + contentLengthHeader + "].", t4); + throw A.wrapException(t1); + } + headers = A.LinkedHashMap_LinkedHashMap$_empty(t7, t7); + t1 = A._asJSObject(response.headers); + t2 = new A.BrowserClient_send_closure(headers); + if (typeof t2 == "function") + A.throwExpression(A.ArgumentError$("Attempting to rewrap a JS function.", null)); + result = function(_call, f) { + return function(arg1, arg2, arg3) { + return _call(f, arg1, arg2, arg3, arguments.length); + }; + }(A._callDartFunctionFast3, t2); + result[$.$get$DART_CLOSURE_PROPERTY_NAME()] = t2; + t1.forEach(result); + t1 = A._readBody(request, response); + t2 = A._asInt(response.status); + t4 = headers; + t5 = contentLength0; + A.Uri_parse(A._asString(response.url)); + t6 = A._asString(response.statusText); + t1 = new A.StreamedResponseV2(A.toByteStream(t1), request, t2, t6, t5, t4, false, true); + t1.BaseResponse$7$contentLength$headers$isRedirect$persistentConnection$reasonPhrase$request(t2, t5, t4, false, true, t6, request); + $async$returnValue = t1; $async$next = [1]; // goto finally - $async$goto = 5; + $async$goto = 6; break; - $async$next.push(6); + $async$next.push(7); // goto finally - $async$goto = 5; + $async$goto = 6; + break; + case 5: + // catch + $async$handler = 4; + $async$exception = $async$errorStack.pop(); + e = A.unwrapException($async$exception); + st = A.getTraceFromException($async$exception); + A._rethrowAsClientException(e, st, request); + $async$next.push(7); + // goto finally + $async$goto = 6; break; case 4: // uncaught $async$next = [2]; - case 5: + case 6: // finally $async$handler = 2; - t1.remove$1(0, xhr); + B.JSArray_methods.remove$1(t3, abortController); // goto the next finally handler $async$goto = $async$next.pop(); break; - case 6: + case 7: // after finally case 1: // return @@ -24025,42 +24431,27 @@ } }; A.BrowserClient_send_closure.prototype = { + call$3(value, header, _) { + A._asString(value); + this.headers.$indexSet(0, A._asString(header).toLowerCase(), value); + }, + call$2(value, header) { + return this.call$3(value, header, null); + }, + $signature: 47 + }; + A._readBody_closure.prototype = { call$1(_) { - var t1, _0_0, t2, body, responseUrl, t3, t4, t5, t6, _this = this; - type$.JSObject._as(_); - t1 = _this.xhr; - _0_0 = A._extension_0_get_responseHeaders(t1).$index(0, "content-length"); - t2 = false; - if (_0_0 != null) { - t2 = $.$get$_digitRegex(); - t2 = !t2._nativeRegExp.test(_0_0); - } - if (t2) { - _this.completer.completeError$1(new A.ClientException("Invalid content-length header [" + _0_0 + "].", _this.request.url)); - return; - } - body = A.NativeUint8List_NativeUint8List$view(type$.NativeByteBuffer._as(t1.response), 0, null); - responseUrl = A._asString(t1.responseURL); - if (responseUrl.length !== 0) - A.Uri_parse(responseUrl); - t2 = A.Stream_Stream$value(body, type$.List_int); - t3 = A._asInt(t1.status); - t4 = body.length; - t5 = _this.request; - t6 = A._extension_0_get_responseHeaders(t1); - t1 = A._asString(t1.statusText); - t2 = new A.StreamedResponseV2(A.toByteStream(new A.ByteStream(t2)), t5, t3, t1, t4, t6, false, true); - t2.BaseResponse$7$contentLength$headers$isRedirect$persistentConnection$reasonPhrase$request(t3, t4, t6, false, true, t1, t5); - _this.completer.complete$1(t2); + return null; }, - $signature: 8 + $signature: 4 }; - A.BrowserClient_send_closure0.prototype = { + A._readBody_closure0.prototype = { call$1(_) { - type$.JSObject._as(_); - this.completer.completeError$2(new A.ClientException("XMLHttpRequest error.", this.request.url), A.StackTrace_current()); + A._asObject(_); + return this._box_0.isError; }, - $signature: 8 + $signature: 48 }; A.ByteStream.prototype = { toBytes$0() { @@ -24075,7 +24466,7 @@ call$1(bytes) { return this.completer.complete$1(new Uint8Array(A._ensureNativeList(type$.List_int._as(bytes)))); }, - $signature: 47 + $signature: 49 }; A.ClientException.prototype = { toString$0(_) { @@ -24163,7 +24554,7 @@ scanner.expectDone$0(); return A.MediaType$(t4, t5, parameters); }, - $signature: 48 + $signature: 50 }; A.MediaType_toString_closure.prototype = { call$2(attribute, value) { @@ -24182,13 +24573,13 @@ } else t1._contents = t3 + value; }, - $signature: 49 + $signature: 51 }; A.MediaType_toString__closure.prototype = { call$1(match) { return "\\" + A.S(match.$index(0, 0)); }, - $signature: 32 + $signature: 31 }; A.expectQuotedString_closure.prototype = { call$1(match) { @@ -24196,7 +24587,7 @@ t1.toString; return t1; }, - $signature: 32 + $signature: 31 }; A.Level.prototype = { $eq(_, other) { @@ -24244,7 +24635,7 @@ var record, _this = this, t1 = logLevel.value; if (t1 >= _this.get$level().value) { - if (stackTrace == null && t1 >= 2000) { + if ((stackTrace == null || stackTrace === B._StringStackTrace_OdL) && t1 >= 2000) { A.StackTrace_current(); if (error == null) logLevel.toString$0(0); @@ -24285,7 +24676,7 @@ $parent._children.$indexSet(0, thisName, t1); return t1; }, - $signature: 51 + $signature: 53 }; A.Context.prototype = { absolute$15(part1, part2, part3, part4, part5, part6, part7, part8, part9, part10, part11, part12, part13, part14, part15) { @@ -24361,7 +24752,7 @@ return parsed.toString$0(0); }, _needsNormalization$1(path) { - var t2, i, start, previous, t3, previousPrevious, codeUnit, t4, + var t2, i, start, previous, previousPrevious, codeUnit, t3, t1 = this.style, root = t1.rootLength$1(path); if (root !== 0) { @@ -24378,20 +24769,20 @@ start = 0; previous = null; } - for (t2 = new A.CodeUnits(path).__internal$_string, t3 = t2.length, i = start, previousPrevious = null; i < t3; ++i, previousPrevious = previous, previous = codeUnit) { + for (t2 = path.length, i = start, previousPrevious = null; i < t2; ++i, previousPrevious = previous, previous = codeUnit) { if (!(i >= 0)) - return A.ioore(t2, i); - codeUnit = t2.charCodeAt(i); + return A.ioore(path, i); + codeUnit = path.charCodeAt(i); if (t1.isSeparator$1(codeUnit)) { if (t1 === $.$get$Style_windows() && codeUnit === 47) return true; if (previous != null && t1.isSeparator$1(previous)) return true; if (previous === 46) - t4 = previousPrevious == null || previousPrevious === 46 || t1.isSeparator$1(previousPrevious); + t3 = previousPrevious == null || previousPrevious === 46 || t1.isSeparator$1(previousPrevious); else - t4 = false; - if (t4) + t3 = false; + if (t3) return true; } } @@ -24519,20 +24910,20 @@ call$1(part) { return A._asString(part) !== ""; }, - $signature: 31 + $signature: 29 }; A.Context_split_closure.prototype = { call$1(part) { return A._asString(part).length !== 0; }, - $signature: 31 + $signature: 29 }; A._validateArgList_closure.prototype = { call$1(arg) { A._asStringQ(arg); return arg == null ? "null" : '"' + arg + '"'; }, - $signature: 106 + $signature: 55 }; A.InternalStyle.prototype = { getRoot$1(path) { @@ -24986,11 +25377,11 @@ var t1 = this.$this; t1._onReleaseCompleters.removeFirst$0().complete$1(new A.PoolResource(t1)); }, - $signature: 6 + $signature: 4 }; A.Pool__runOnRelease_closure0.prototype = { call$2(error, stackTrace) { - type$.Object._as(error); + A._asObject(error); type$.StackTrace._as(stackTrace); this.$this._onReleaseCompleters.removeFirst$0().completeError$2(error, stackTrace); }, @@ -25363,10 +25754,9 @@ t4 = t1.__internal$_current; if (t4 == null) t4 = t2._as(t4); - if (t4 === 9) { - t4 = B.JSString_methods.$mul(" ", 4); - t3._contents += t4; - } else { + if (t4 === 9) + t3._contents += B.JSString_methods.$mul(" ", 4); + else { t4 = A.Primitives_stringFromCharCode(t4); t3._contents += t4; } @@ -25427,7 +25817,7 @@ call$0() { return this.color; }, - $signature: 54 + $signature: 56 }; A.Highlighter$__closure.prototype = { call$1(line) { @@ -25435,7 +25825,7 @@ t2 = A._arrayInstanceType(t1); return new A.WhereIterable(t1, t2._eval$1("bool(1)")._as(new A.Highlighter$___closure()), t2._eval$1("WhereIterable<1>")).get$length(0); }, - $signature: 55 + $signature: 57 }; A.Highlighter$___closure.prototype = { call$1(highlight) { @@ -25448,21 +25838,21 @@ call$1(line) { return type$._Line._as(line).url; }, - $signature: 57 + $signature: 59 }; A.Highlighter__collateLines_closure.prototype = { call$1(highlight) { var t1 = type$._Highlight._as(highlight).span.get$sourceUrl(); return t1 == null ? new A.Object() : t1; }, - $signature: 58 + $signature: 60 }; A.Highlighter__collateLines_closure0.prototype = { call$2(highlight1, highlight2) { var t1 = type$._Highlight; return t1._as(highlight1).span.compareTo$1(0, t1._as(highlight2).span); }, - $signature: 59 + $signature: 61 }; A.Highlighter__collateLines_closure1.prototype = { call$1(entry) { @@ -25505,7 +25895,7 @@ } return lines; }, - $signature: 60 + $signature: 62 }; A.Highlighter__collateLines__closure.prototype = { call$1(highlight) { @@ -25522,9 +25912,7 @@ }; A.Highlighter__writeFileStart_closure.prototype = { call$0() { - var t1 = this.$this._buffer, - t2 = B.JSString_methods.$mul("\u2500", 2) + ">"; - t1._contents += t2; + this.$this._buffer._contents += B.JSString_methods.$mul("\u2500", 2) + ">"; return null; }, $signature: 0 @@ -25614,10 +26002,9 @@ tabsBefore = t1._countTabs$1(B.JSString_methods.substring$2(t4, 0, startColumn)); tabsInside = t1._countTabs$1(B.JSString_methods.substring$2(t4, startColumn, endColumn)); startColumn += tabsBefore * 3; - t4 = B.JSString_methods.$mul(" ", startColumn); - t2._contents += t4; - t4 = B.JSString_methods.$mul("^", Math.max(endColumn + (tabsBefore + tabsInside) * 3 - startColumn, 1)); - return (t2._contents += t4).length - t3.length; + t4 = (t2._contents += B.JSString_methods.$mul(" ", startColumn)) + B.JSString_methods.$mul("^", Math.max(endColumn + (tabsBefore + tabsInside) * 3 - startColumn, 1)); + t2._contents = t4; + return t4.length - t3.length; }, $signature: 28 }; @@ -25633,10 +26020,9 @@ t1 = _this.$this, t2 = t1._buffer, t3 = t2._contents; - if (_this.coversWholeLine) { - t1 = B.JSString_methods.$mul("\u2500", 3); - t2._contents += t1; - } else + if (_this.coversWholeLine) + t2._contents = t3 + B.JSString_methods.$mul("\u2500", 3); + else t1._writeArrow$3$beginning(_this.line, Math.max(_this.highlight.span.get$end().get$column() - 1, 0), false); return t2._contents.length - t3.length; }, @@ -25676,7 +26062,7 @@ } return A._Highlight__normalizeEndOfLine(A._Highlight__normalizeTrailingNewline(A._Highlight__normalizeNewlines(newSpan))); }, - $signature: 62 + $signature: 64 }; A._Line.prototype = { toString$0(_) { @@ -25866,13 +26252,13 @@ var t2, _this = this, t1 = serverUrl + "?sseClientId=" + _this._clientId; _this.__SseClient__serverUrl_A = t1; - t2 = type$.JSObject; - t1 = t2._as(new init.G.EventSource(t1, {withCredentials: true})); + t1 = A._asJSObject(new init.G.EventSource(t1, {withCredentials: true})); _this.__SseClient__eventSource_A = t1; new A._EventStream(t1, "open", false, type$._EventStream_JSObject).get$first(0).whenComplete$1(new A.SseClient_closure(_this)); _this.__SseClient__eventSource_A.addEventListener("message", A._functionToJS1(_this.get$_onIncomingMessage())); _this.__SseClient__eventSource_A.addEventListener("control", A._functionToJS1(_this.get$_onIncomingControlMessage())); t1 = type$.nullable_void_Function_JSObject; + t2 = type$.JSObject; A._EventStreamSubscription$(_this.__SseClient__eventSource_A, "open", t1._as(new A.SseClient_closure0(_this)), false, t2); A._EventStreamSubscription$(_this.__SseClient__eventSource_A, "error", t1._as(new A.SseClient_closure1(_this)), false, t2); }, @@ -25897,14 +26283,14 @@ t1.completeError$1(error); }, _onIncomingControlMessage$1(message) { - var data = type$.JSObject._as(message).data; + var data = A._asJSObject(message).data; if (J.$eq$(A.dartify(data), "close")) this.close$0(); else throw A.wrapException(A.UnsupportedError$("[" + this._clientId + '] Illegal Control Message "' + A.S(data) + '"')); }, _onIncomingMessage$1(message) { - this._incomingController.add$1(0, A._asString(B.C_JsonCodec.decode$2$reviver(A._asString(type$.JSObject._as(message).data), null))); + this._incomingController.add$1(0, A._asString(B.C_JsonCodec.decode$2$reviver(A._asString(A._asJSObject(message).data), null))); }, _onOutgoingDone$0() { this.close$0(); @@ -26008,9 +26394,8 @@ if (t1 == null) t1 = null; t1 = {method: "POST", body: t1, credentials: "include"}; - t2 = type$.JSObject; $async$goto = 6; - return A._asyncAwait(A.promiseToFuture(t2._as(t2._as(init.G.window).fetch(url, t1)), t2), $async$call$0); + return A._asyncAwait(A.promiseToFuture(A._asJSObject(A._asJSObject(init.G.window).fetch(url, t1)), type$.JSObject), $async$call$0); case 6: // returning from await. $async$handler = 1; @@ -26045,34 +26430,16 @@ }); return A._asyncStartSync($async$call$0, $async$completer); }, - $signature: 65 - }; - A.generateUuidV4_generateBits.prototype = { - call$1(bitCount) { - return this.random.nextInt$1(B.JSInt_methods._shlPositive$1(1, bitCount)); - }, - $signature: 27 - }; - A.generateUuidV4_printDigits.prototype = { - call$2(value, count) { - return B.JSString_methods.padLeft$2(B.JSInt_methods.toRadixString$1(value, 16), count, "0"); - }, - $signature: 22 - }; - A.generateUuidV4_bitsDigits.prototype = { - call$2(bitCount, digitCount) { - return this.printDigits.call$2(this.generateBits.call$1(bitCount), digitCount); - }, - $signature: 22 + $signature: 67 }; A.GuaranteeChannel.prototype = { GuaranteeChannel$3$allowSinkErrors(innerSink, allowSinkErrors, _box_0, $T) { var _this = this, t1 = _this.$ti, - t2 = t1._eval$1("_GuaranteeSink<1>")._as(new A._GuaranteeSink(innerSink, _this, new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_dynamic), type$._AsyncCompleter_dynamic), allowSinkErrors, $T._eval$1("_GuaranteeSink<0>"))); + t2 = t1._eval$1("_GuaranteeSink<1>")._as(new A._GuaranteeSink(innerSink, _this, new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_void), type$._AsyncCompleter_void), allowSinkErrors, $T._eval$1("_GuaranteeSink<0>"))); _this.__GuaranteeChannel__sink_F !== $ && A.throwLateFieldAI("_sink"); _this.__GuaranteeChannel__sink_F = t2; - t1 = t1._eval$1("StreamController<1>")._as(A.StreamController_StreamController(null, new A.GuaranteeChannel_closure(_box_0, _this, $T), true, $T)); + t1 = t1._eval$1("StreamController<1>")._as(A.StreamController_StreamController(null, new A.GuaranteeChannel_closure(_box_0, _this, $T), null, true, $T)); _this.__GuaranteeChannel__streamController_F !== $ && A.throwLateFieldAI("_streamController"); _this.__GuaranteeChannel__streamController_F = t1; }, @@ -26167,7 +26534,7 @@ A._GuaranteeSink__addError_closure.prototype = { call$1(_) { }, - $signature: 6 + $signature: 4 }; A.StreamChannelController.prototype = {}; A.StreamChannelMixin.prototype = {$isStreamChannel: 1}; @@ -26242,30 +26609,30 @@ } }; A.RNG.prototype = {}; - A.MathRNG.prototype = { + A.CryptoRNG.prototype = { _generateInternal$0() { - var t1, i, k, t2, t3, + var i, k, t1, t2, b = new Uint8Array(16); - for (t1 = this._rnd, i = 0; i < 16; i += 4) { - k = t1.nextInt$1(B.JSNumber_methods.toInt$0(Math.pow(2, 32))); + for (i = 0; i < 16; i += 4) { + k = $.$get$CryptoRNG__secureRandom().nextInt$1(B.JSNumber_methods.toInt$0(Math.pow(2, 32))); if (!(i < 16)) return A.ioore(b, i); b[i] = k; - t2 = i + 1; - t3 = B.JSInt_methods._shrOtherPositive$1(k, 8); - if (!(t2 < 16)) - return A.ioore(b, t2); - b[t2] = t3; - t3 = i + 2; - t2 = B.JSInt_methods._shrOtherPositive$1(k, 16); - if (!(t3 < 16)) - return A.ioore(b, t3); - b[t3] = t2; - t2 = i + 3; - t3 = B.JSInt_methods._shrOtherPositive$1(k, 24); + t1 = i + 1; + t2 = B.JSInt_methods._shrOtherPositive$1(k, 8); + if (!(t1 < 16)) + return A.ioore(b, t1); + b[t1] = t2; + t2 = i + 2; + t1 = B.JSInt_methods._shrOtherPositive$1(k, 16); if (!(t2 < 16)) return A.ioore(b, t2); - b[t2] = t3; + b[t2] = t1; + t1 = i + 3; + t2 = B.JSInt_methods._shrOtherPositive$1(k, 24); + if (!(t1 < 16)) + return A.ioore(b, t1); + b[t1] = t2; } return b; } @@ -26448,13 +26815,13 @@ }; A._EventStreamSubscription_closure.prototype = { call$1(e) { - return this.onData.call$1(type$.JSObject._as(e)); + return this.onData.call$1(A._asJSObject(e)); }, $signature: 2 }; A._EventStreamSubscription_onData_closure.prototype = { call$1(e) { - return this.handleData.call$1(type$.JSObject._as(e)); + return this.handleData.call$1(A._asJSObject(e)); }, $signature: 2 }; @@ -26500,22 +26867,22 @@ }; A.BrowserWebSocket_connect_closure.prototype = { call$1(_) { - type$.JSObject._as(_); + A._asJSObject(_); this.webSocketConnected.complete$1(this.browserSocket); }, - $signature: 8 + $signature: 14 }; A.BrowserWebSocket_connect_closure0.prototype = { call$1(e) { var t1; - type$.JSObject._as(e); + A._asJSObject(e); t1 = this.webSocketConnected; if ((t1.future._state & 30) === 0) - t1.completeError$1(new A.WebSocketException()); + t1.completeError$1(new A.WebSocketException("Failed to connect WebSocket")); else this.browserSocket._browser_web_socket$_closed$2(1006, "error"); }, - $signature: 8 + $signature: 14 }; A.BrowserWebSocket_connect_closure1.prototype = { call$1(e) { @@ -26528,8 +26895,8 @@ data = A._Cell$named("data"); if (typeof t2 === "string") data.__late_helper$_value = new A.TextDataReceived(A._asString(t2)); - else if (typeof t2 === "object" && A.JSAnyUtilityExtension_instanceOfString(type$.JSObject._as(t2), "ArrayBuffer")) - data.__late_helper$_value = new A.BinaryDataReceived(A.NativeUint8List_NativeUint8List$view(type$.NativeByteBuffer._as(t2), 0, null)); + else if (typeof t2 === "object" && A.JSAnyUtilityExtension_instanceOfString(A._asJSObject(t2), "ArrayBuffer")) + data.__late_helper$_value = new A.BinaryDataReceived(A.NativeUint8List_NativeUint8List$view(type$.NativeArrayBuffer._as(t2), 0, null)); else throw A.wrapException(A.StateError$("unexpected message type: " + J.get$runtimeType$(t2).toString$0(0))); t1.add$1(0, data._readLocal$0()); @@ -26539,13 +26906,13 @@ A.BrowserWebSocket_connect_closure2.prototype = { call$1($event) { var t1; - type$.JSObject._as($event); + A._asJSObject($event); t1 = this.webSocketConnected; if ((t1.future._state & 30) === 0) t1.complete$1(this.browserSocket); this.browserSocket._browser_web_socket$_closed$2(A._asInt($event.code), A._asString($event.reason)); }, - $signature: 8 + $signature: 14 }; A.WebSocketEvent.prototype = {}; A.TextDataReceived.prototype = { @@ -26594,8 +26961,25 @@ return "CloseReceived(" + this.code + ", " + this.reason + ")"; } }; - A.WebSocketException.prototype = {$isException: 1}; - A.WebSocketConnectionClosed.prototype = {}; + A.WebSocketException.prototype = { + toString$0(_) { + var t1 = this.message; + if (t1.length === 0) + return "WebSocketException"; + else + return "WebSocketException: " + t1; + }, + $isException: 1 + }; + A.WebSocketConnectionClosed.prototype = { + toString$0(_) { + var t1 = this.message; + if (t1.length === 0) + return "WebSocketConnectionClosed"; + else + return "WebSocketConnectionClosed: " + t1; + } + }; A.AdapterWebSocketChannel.prototype = { AdapterWebSocketChannel$1(webSocket) { webSocket.then$1$2$onError(new A.AdapterWebSocketChannel_closure(this), new A.AdapterWebSocketChannel_closure0(this), type$.Null); @@ -26617,7 +27001,7 @@ A._asString(webSocket._webSocket.protocol); t2._readyCompleter.complete$0(); }, - $signature: 67 + $signature: 69 }; A.AdapterWebSocketChannel__closure.prototype = { call$1($event) { @@ -26653,7 +27037,7 @@ } } }, - $signature: 68 + $signature: 70 }; A.AdapterWebSocketChannel__closure0.prototype = { call$1(obj) { @@ -26699,7 +27083,7 @@ throw exception; } }, - $signature: 9 + $signature: 8 }; A.AdapterWebSocketChannel__closure1.prototype = { call$0() { @@ -26755,7 +27139,7 @@ A.AdapterWebSocketChannel_closure0.prototype = { call$1(e) { var error, t1, t2; - type$.Object._as(e); + A._asObject(e); error = e instanceof A.TimeoutException ? e : new A.WebSocketChannelException(J.toString$0$(e)); t1 = this.$this; t1._readyCompleter.completeError$1(error); @@ -26768,7 +27152,7 @@ t1 === $ && A.throwLateFieldNI("_sink"); t1.close$0(); }, - $signature: 69 + $signature: 71 }; A._WebSocketSink.prototype = {$isWebSocketSink: 1}; A.WebSocketChannelException.prototype = { @@ -26784,7 +27168,7 @@ $call$body$main_closure() { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.void), - uri, t2, fixedPath, fixedUri, client, _0_0, t3, manager, t4, t5, t6, debugEventController, t7, _box_0, t1; + uri, fixedPath, fixedUri, client, _0_0, t2, manager, t3, t4, t5, debugEventController, t6, _box_0, t1; var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -26797,10 +27181,9 @@ if (A._asStringQ(t1.$dartAppInstanceId) == null) t1.$dartAppInstanceId = new A.UuidV1(null).generate$1$options(null); uri = A.Uri_parse(A._asString(t1.$dwdsDevHandlerPath)); - t2 = type$.JSObject; - if (A._asString(t2._as(t2._as(t1.window).location).protocol) === "https:" && uri.get$scheme() === "http" && uri.get$host() !== "localhost") + if (A._asString(A._asJSObject(A._asJSObject(t1.window).location).protocol) === "https:" && uri.get$scheme() === "http" && uri.get$host() !== "localhost") uri = uri.replace$1$scheme("https"); - else if (A._asString(t2._as(t2._as(t1.window).location).protocol) === "wss:" && uri.get$scheme() === "ws" && uri.get$host() !== "localhost") + else if (A._asString(A._asJSObject(A._asJSObject(t1.window).location).protocol) === "wss:" && uri.get$scheme() === "ws" && uri.get$host() !== "localhost") uri = uri.replace$1$scheme("wss"); fixedPath = uri.toString$0(0); fixedUri = A.Uri_parse(fixedPath); @@ -26814,50 +27197,50 @@ return A._asyncAwait(A.RequireRestarter_create(), $async$call$0); case 5: // returning from await. - t3 = $async$result; + t2 = $async$result; // goto break $label0$0 $async$goto = 2; break; case 4: // join if ("ddc-library-bundle" === _0_0) { - t3 = new A.DdcLibraryBundleRestarter(); + t2 = new A.DdcLibraryBundleRestarter(); // goto break $label0$0 $async$goto = 2; break; } if ("ddc" === _0_0 || "legacy" === _0_0) { - t3 = new A.DdcRestarter(); + t2 = new A.DdcRestarter(); // goto break $label0$0 $async$goto = 2; break; } - t3 = A.throwExpression(A.StateError$("Unknown module strategy: " + A.S(A.getProperty(A.staticInteropGlobalContext(), "$dartModuleStrategy", type$.String)))); + t2 = A.throwExpression(A.StateError$("Unknown module strategy: " + A.S(A.getProperty(A.staticInteropGlobalContext(), "$dartModuleStrategy", type$.String)))); case 2: // break $label0$0 - manager = new A.ReloadingManager(client, t3); + manager = new A.ReloadingManager(client, t2); t1.$dartHotReloadStartDwds = A._functionToJS0(new A.main__closure(manager)); t1.$dartHotReloadEndDwds = A._functionToJS0(new A.main__closure0(manager)); _box_0.readyToRunMainCompleter = null; t1.$dartHotRestartDwds = A._functionToJS2(new A.main__closure1(_box_0, manager)); t1.$dartReadyToRunMain = A._functionToJS0(new A.main__closure2(_box_0)); - t3 = $.Zone__current; - t4 = Math.max(100, 1); - t5 = A.StreamController_StreamController(null, null, false, type$.DebugEvent); - t6 = A.StreamController_StreamController(null, null, false, type$.List_DebugEvent); - debugEventController = new A.BatchedStreamController(t4, 1000, t5, t6, new A._AsyncCompleter(new A._Future(t3, type$._Future_bool), type$._AsyncCompleter_bool), type$.BatchedStreamController_DebugEvent); - t3 = A.List_List$filled(A.QueueList__computeInitialCapacity(null), null, false, type$.nullable_Result_DebugEvent); - t4 = A.ListQueue$(type$._EventRequest_dynamic); - t7 = type$.StreamQueue_DebugEvent; - debugEventController.__BatchedStreamController__inputQueue_A = t7._as(new A.StreamQueue(new A._ControllerStream(t5, A._instanceType(t5)._eval$1("_ControllerStream<1>")), new A.QueueList(t3, 0, 0, type$.QueueList_Result_DebugEvent), t4, t7)); + t2 = $.Zone__current; + t3 = Math.max(100, 1); + t4 = A.StreamController_StreamController(null, null, null, false, type$.DebugEvent); + t5 = A.StreamController_StreamController(null, null, null, false, type$.List_DebugEvent); + debugEventController = new A.BatchedStreamController(t3, 1000, t4, t5, new A._AsyncCompleter(new A._Future(t2, type$._Future_bool), type$._AsyncCompleter_bool), type$.BatchedStreamController_DebugEvent); + t2 = A.List_List$filled(A.QueueList__computeInitialCapacity(null), null, false, type$.nullable_Result_DebugEvent); + t3 = A.ListQueue$(type$._EventRequest_dynamic); + t6 = type$.StreamQueue_DebugEvent; + debugEventController.__BatchedStreamController__inputQueue_A = t6._as(new A.StreamQueue(new A._ControllerStream(t4, A._instanceType(t4)._eval$1("_ControllerStream<1>")), new A.QueueList(t2, 0, 0, type$.QueueList_Result_DebugEvent), t3, t6)); A.safeUnawaited(debugEventController._batchAndSendEvents$0()); - new A._ControllerStream(t6, A._instanceType(t6)._eval$1("_ControllerStream<1>")).listen$1(new A.main__closure3(client)); + new A._ControllerStream(t5, A._instanceType(t5)._eval$1("_ControllerStream<1>")).listen$1(new A.main__closure3(client)); t1.$emitDebugEvent = A._functionToJS2(new A.main__closure4(debugEventController)); t1.$emitRegisterEvent = A._functionToJS1(new A.main__closure5(client)); t1.$launchDevTools = A._functionToJS0(new A.main__closure6(client)); client.get$stream().listen$2$onError(new A.main__closure7(manager, client), new A.main__closure8()); if (A._asBool(t1.$dwdsEnableDevToolsLaunch)) - A._EventStreamSubscription$(t2._as(t1.window), "keydown", type$.nullable_void_Function_JSObject._as(new A.main__closure9()), false, t2); + A._EventStreamSubscription$(A._asJSObject(t1.window), "keydown", type$.nullable_void_Function_JSObject._as(new A.main__closure9()), false, type$.JSObject); if (A._asString(t1.$dartModuleStrategy) !== "ddc-library-bundle") if (A._isChromium()) A._sendConnectRequest(client.get$sink()); @@ -26905,7 +27288,7 @@ call$1(runId) { return this.call$2(runId, null); }, - $signature: 71 + $signature: 73 }; A.main__closure2.prototype = { call$0() { @@ -26932,7 +27315,7 @@ A._trySendEvent(t1, B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(t3._debug_event$_build$0()), null), type$.dynamic); } }, - $signature: 72 + $signature: 74 }; A.main___closure2.prototype = { call$1(b) { @@ -26941,7 +27324,7 @@ b.get$_debug_event$_$this().set$_events(t1); return t1; }, - $signature: 73 + $signature: 75 }; A.main__closure4.prototype = { call$2(kind, eventData) { @@ -26955,7 +27338,7 @@ A._trySendEvent(new A._StreamSinkWrapper(t1, A._instanceType(t1)._eval$1("_StreamSinkWrapper<1>")), t2._debug_event$_build$0(), type$.DebugEvent); } }, - $signature: 74 + $signature: 76 }; A.main___closure1.prototype = { call$1(b) { @@ -26965,7 +27348,7 @@ b.get$_debug_event$_$this()._eventData = this.eventData; return b; }, - $signature: 75 + $signature: 77 }; A.main__closure5.prototype = { call$1(eventData) { @@ -26977,7 +27360,7 @@ type$.nullable_void_Function_RegisterEventBuilder._as(new A.main___closure0(eventData)).call$1(t3); A._trySendEvent(t1, B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(t3._register_event$_build$0()), null), type$.dynamic); }, - $signature: 76 + $signature: 78 }; A.main___closure0.prototype = { call$1(b) { @@ -26986,13 +27369,13 @@ b.get$_register_event$_$this()._register_event$_eventData = this.eventData; return b; }, - $signature: 77 + $signature: 79 }; A.main__closure6.prototype = { call$0() { var t1, t2, t3; if (!A._isChromium()) { - type$.JSObject._as(init.G.window).alert("Dart DevTools is only supported on Chromium based browsers."); + A._asJSObject(init.G.window).alert("Dart DevTools is only supported on Chromium based browsers."); return; } t1 = this.client.get$sink(); @@ -27012,7 +27395,7 @@ b.get$_devtools_request$_$this()._devtools_request$_instanceId = t1; return b; }, - $signature: 78 + $signature: 80 }; A.main__closure7.prototype = { call$1(serialized) { @@ -27021,7 +27404,7 @@ $call$body$main__closure(serialized) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.void), - $async$self = this, t1, t2, $alert, t3, $event; + $async$self = this, t1, $alert, t2, $event; var $async$call$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -27039,8 +27422,7 @@ break; case 5: // then - t2 = type$.JSObject; - t2._as(t2._as(t1.window).location).reload(); + A._asJSObject(A._asJSObject(t1.window).location).reload(); // goto join $async$goto = 6; break; @@ -27089,13 +27471,12 @@ // then if (!$event.success) { $alert = "DevTools failed to open with:\n" + A.S($event.error); - t1 = $event.promptExtension && A._asBool(type$.JSObject._as(init.G.window).confirm($alert)); + t1 = $event.promptExtension && A._asBool(A._asJSObject(init.G.window).confirm($alert)); t2 = init.G; - t3 = type$.JSObject; if (t1) - type$.nullable_JSObject._as(t3._as(t2.window).open("https://dart.dev/to/web-debug-extension", "_blank")); + A._asJSObjectQ(A._asJSObject(t2.window).open("https://dart.dev/to/web-debug-extension", "_blank")); else - t3._as(t2.window).alert($alert); + A._asJSObject(t2.window).alert($alert); } // goto join $async$goto = 17; @@ -27116,7 +27497,7 @@ break; case 22: // then - type$.JSObject._as(init.G.window).reportError("Error from backend:\n\nError: " + $event.error + "\n\nStack Trace:\n" + $event.stackTrace); + A._asJSObject(init.G.window).reportError("Error from backend:\n\nError: " + $event.error + "\n\nStack Trace:\n" + $event.stackTrace); // goto join $async$goto = 23; break; @@ -27146,12 +27527,12 @@ }); return A._asyncStartSync($async$call$1, $async$completer); }, - $signature: 79 + $signature: 81 }; A.main__closure8.prototype = { call$1(error) { }, - $signature: 6 + $signature: 4 }; A.main__closure9.prototype = { call$1(e) { @@ -27166,11 +27547,11 @@ }; A.main_closure0.prototype = { call$2(error, stackTrace) { - type$.Object._as(error); + A._asObject(error); type$.StackTrace._as(stackTrace); A.print("Unhandled error detected in the injected client.js script.\n\nYou can disable this script in webdev by passing --no-injected-client if it\nis preventing your app from loading, but note that this will also prevent\nall debugging and hot reload/restart functionality from working.\n\nThe original error is below, please file an issue at\nhttps://github.com/dart-lang/webdev/issues/new and attach this output:\n\n" + A.S(error) + "\n" + stackTrace.toString$0(0) + "\n"); }, - $signature: 14 + $signature: 9 }; A._sendConnectRequest_closure.prototype = { call$1(b) { @@ -27183,11 +27564,11 @@ b.get$_connect_request$_$this()._entrypointPath = t1; return b; }, - $signature: 80 + $signature: 82 }; A._launchCommunicationWithDebugExtension_closure.prototype = { call$1(b) { - var t3, t4, + var t3, t1 = init.G, t2 = A._asString(t1.$dartEntrypointPath); b.get$_$this()._appEntrypointPath = t2; @@ -27196,10 +27577,9 @@ b.get$_$this()._appId = t3; t3 = A._asStringQ(t1.$dartAppInstanceId); b.get$_$this()._appInstanceId = t3; - t3 = type$.JSObject; - t4 = A._asString(t3._as(t3._as(t1.window).location).origin); - b.get$_$this()._appOrigin = t4; - t3 = A._asString(t3._as(t3._as(t1.window).location).href); + t3 = A._asString(A._asJSObject(A._asJSObject(t1.window).location).origin); + b.get$_$this()._appOrigin = t3; + t3 = A._asString(A._asJSObject(A._asJSObject(t1.window).location).href); b.get$_$this()._appUrl = t3; t3 = A._authUrl(); b.get$_$this()._authUrl = t3; @@ -27213,13 +27593,13 @@ b.get$_$this()._workspaceName = t1; return b; }, - $signature: 81 + $signature: 83 }; A._handleAuthRequest_closure.prototype = { call$1(isAuthenticated) { return A._dispatchEvent("dart-auth-response", "" + A._asBool(isAuthenticated)); }, - $signature: 82 + $signature: 84 }; A._sendResponse_closure.prototype = { call$1(b) { @@ -27263,7 +27643,7 @@ restart$2$readyToRunMain$runId(readyToRunMain, runId) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.bool), - $async$returnValue, $async$self = this, mainHandler, t1, t2; + $async$returnValue, $async$self = this, mainHandler, t1; var $async$restart$2$readyToRunMain$runId = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -27272,15 +27652,14 @@ case 0: // Function start t1 = init.G; - t2 = type$.JSObject; $async$goto = 3; - return A._asyncAwait(A._Debugger_maybeInvokeFlutterDisassemble(t2._as(t2._as(t1.dartDevEmbedder).debugger)), $async$restart$2$readyToRunMain$runId); + return A._asyncAwait(A._Debugger_maybeInvokeFlutterDisassemble(A._asJSObject(A._asJSObject(t1.dartDevEmbedder).debugger)), $async$restart$2$readyToRunMain$runId); case 3: // returning from await. mainHandler = A._functionToJS1(new A.DdcLibraryBundleRestarter_restart_closure($async$self, readyToRunMain)); - t2._as(t2._as(t1.dartDevEmbedder).config).capturedMainHandler = mainHandler; + A._asJSObject(A._asJSObject(t1.dartDevEmbedder).config).capturedMainHandler = mainHandler; $async$goto = 4; - return A._asyncAwait(A.promiseToFuture(t2._as(t2._as(t1.dartDevEmbedder).hotRestart()), type$.nullable_Object), $async$restart$2$readyToRunMain$runId); + return A._asyncAwait(A.promiseToFuture(A._asJSObject(A._asJSObject(t1.dartDevEmbedder).hotRestart()), type$.nullable_Object), $async$restart$2$readyToRunMain$runId); case 4: // returning from await. $async$returnValue = true; @@ -27297,7 +27676,7 @@ hotReloadStart$1(hotReloadSourcesPath) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.JSObject), - $async$returnValue, $async$self = this, t4, srcModuleLibraries, filesToLoad, _this, librariesToReload, t5, t6, srcModuleLibraryCast, module, libraries, t7, t1, t2, t3, xhr, $async$temp1, $async$temp2, $async$temp3; + $async$returnValue, $async$self = this, t3, srcModuleLibraries, filesToLoad, _this, librariesToReload, t4, t5, srcModuleLibraryCast, module, libraries, t6, t1, t2, xhr, $async$temp1, $async$temp2, $async$temp3; var $async$hotReloadStart$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -27307,15 +27686,14 @@ // Function start t1 = new A._Future($.Zone__current, type$._Future_String); t2 = init.G; - t3 = type$.JSObject; - xhr = t3._as(new t2.XMLHttpRequest()); + xhr = A._asJSObject(new t2.XMLHttpRequest()); xhr.withCredentials = true; xhr.onreadystatechange = A._functionToJS0(new A.DdcLibraryBundleRestarter_hotReloadStart_closure(xhr, new A._AsyncCompleter(t1, type$._AsyncCompleter_String))); xhr.open("GET", hotReloadSourcesPath, true); xhr.send(); - t4 = type$.List_dynamic; + t3 = type$.List_dynamic; $async$temp1 = J; - $async$temp2 = t4; + $async$temp2 = t3; $async$temp3 = B.C_JsonCodec; $async$goto = 3; return A._asyncAwait(t1, $async$hotReloadStart$1); @@ -27326,18 +27704,18 @@ filesToLoad = t1._as(new t2.Array()); _this = {}; librariesToReload = t1._as(new t2.Array()); - for (t1 = srcModuleLibraries.get$iterator(srcModuleLibraries), t5 = type$.String, t6 = type$.Object; t1.moveNext$0();) { - srcModuleLibraryCast = t1.get$current().cast$2$0(0, t5, t6); + for (t1 = srcModuleLibraries.get$iterator(srcModuleLibraries), t4 = type$.String, t5 = type$.Object; t1.moveNext$0();) { + srcModuleLibraryCast = t1.get$current().cast$2$0(0, t4, t5); filesToLoad.push(A._asString(srcModuleLibraryCast.$index(0, "src"))); module = A._asString(srcModuleLibraryCast.$index(0, "module")); - libraries = J.cast$1$0$ax(t4._as(srcModuleLibraryCast.$index(0, "libraries")), t5); + libraries = J.cast$1$0$ax(t3._as(srcModuleLibraryCast.$index(0, "libraries")), t4); _this[module] = A.jsify(libraries); - for (t7 = libraries.get$iterator(libraries); t7.moveNext$0();) - librariesToReload.push(t7.get$current()); + for (t6 = libraries.get$iterator(libraries); t6.moveNext$0();) + librariesToReload.push(t6.get$current()); } - t3._as(t3._as(t2.dartDevEmbedder).config).capturedHotReloadEndHandler = A._functionToJS1(new A.DdcLibraryBundleRestarter_hotReloadStart_closure0($async$self)); + A._asJSObject(A._asJSObject(t2.dartDevEmbedder).config).capturedHotReloadEndHandler = A._functionToJS1(new A.DdcLibraryBundleRestarter_hotReloadStart_closure0($async$self)); $async$goto = 4; - return A._asyncAwait(A.promiseToFuture(t3._as(t3._as(t2.dartDevEmbedder).hotReload(filesToLoad, librariesToReload)), type$.nullable_Object), $async$hotReloadStart$1); + return A._asyncAwait(A.promiseToFuture(A._asJSObject(A._asJSObject(t2.dartDevEmbedder).hotReload(filesToLoad, librariesToReload)), type$.nullable_Object), $async$hotReloadStart$1); case 4: // returning from await. $async$returnValue = _this; @@ -27354,7 +27732,7 @@ hotReloadEnd$0() { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.void), - $async$self = this, t1; + $async$self = this; var $async$hotReloadEnd$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -27363,8 +27741,7 @@ case 0: // Function start $async$self._capturedHotReloadEndCallback.call(); - t1 = type$.JSObject; - t1._as(t1._as(init.G.dartDevEmbedder).config).capturedHotReloadEndHandler = null; + A._asJSObject(A._asJSObject(init.G.dartDevEmbedder).config).capturedHotReloadEndHandler = null; $async$self._capturedHotReloadEndCallback = null; // implicit return return A._asyncReturn(null, $async$completer); @@ -27376,13 +27753,11 @@ }; A.DdcLibraryBundleRestarter_restart_closure.prototype = { call$1(runMain) { - var t1; type$.JavaScriptFunction._as(runMain); - t1 = type$.JSObject; - t1._as(t1._as(init.G.dartDevEmbedder).config).capturedMainHandler = null; + A._asJSObject(A._asJSObject(init.G.dartDevEmbedder).config).capturedMainHandler = null; A.safeUnawaited(this.$this._runMainWhenReady$2(this.readyToRunMain, runMain)); }, - $signature: 20 + $signature: 21 }; A.DdcLibraryBundleRestarter_hotReloadStart_closure.prototype = { call$0() { @@ -27396,7 +27771,7 @@ call$1(hotReloadEndCallback) { this.$this._capturedHotReloadEndCallback = type$.JavaScriptFunction._as(hotReloadEndCallback); }, - $signature: 20 + $signature: 21 }; A.DdcRestarter.prototype = { restart$2$readyToRunMain$runId(readyToRunMain, runId) { @@ -27415,8 +27790,7 @@ t3 = readyToRunMain == null ? null : A.FutureOfVoidToJSPromise_get_toJS(readyToRunMain); t2.reload(runId, t3); t3 = new A._Future($.Zone__current, type$._Future_bool); - t2 = type$.JSObject; - $async$returnValue = t3.then$1$1(new A.DdcRestarter_restart_closure(A._EventStreamSubscription$(t2._as(t1.window), "message", type$.nullable_void_Function_JSObject._as(new A.DdcRestarter_restart_closure0(new A._AsyncCompleter(t3, type$._AsyncCompleter_bool))), false, t2)), type$.bool); + $async$returnValue = t3.then$1$1(new A.DdcRestarter_restart_closure(A._EventStreamSubscription$(A._asJSObject(t1.window), "message", type$.nullable_void_Function_JSObject._as(new A.DdcRestarter_restart_closure0(new A._AsyncCompleter(t3, type$._AsyncCompleter_bool))), false, type$.JSObject)), type$.bool); // goto return $async$goto = 1; break; @@ -27450,7 +27824,7 @@ this.sub.cancel$0(); return value; }, - $signature: 84 + $signature: 86 }; A.ReloadingManager.prototype = { hotRestart$2$readyToRunMain$runId(readyToRunMain, runId) { @@ -27530,7 +27904,7 @@ restart$2$readyToRunMain$runId(readyToRunMain, runId) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.bool), - $async$returnValue, $async$self = this, newDigests, modulesToLoad, t3, t4, t5, t6, t7, line, toZone, t8, result, t1, t2; + $async$returnValue, $async$self = this, newDigests, modulesToLoad, t3, t4, t5, t6, line, toZone, t7, result, t1, t2; var $async$restart$2$readyToRunMain$runId = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -27550,31 +27924,31 @@ // returning from await. newDigests = $async$result; modulesToLoad = A._setArrayType([], type$.JSArray_String); - for (t3 = newDigests.get$keys(), t3 = t3.get$iterator(t3), t4 = $.RequireRestarter____lastKnownDigests._name, t5 = type$.JSObject; t3.moveNext$0();) { - t6 = t3.get$current(); - t7 = $.RequireRestarter____lastKnownDigests.__late_helper$_value; - if (t7 === $.RequireRestarter____lastKnownDigests) + for (t3 = newDigests.get$keys(), t3 = t3.get$iterator(t3), t4 = $.RequireRestarter____lastKnownDigests._name; t3.moveNext$0();) { + t5 = t3.get$current(); + t6 = $.RequireRestarter____lastKnownDigests.__late_helper$_value; + if (t6 === $.RequireRestarter____lastKnownDigests) A.throwExpression(A.LateError$fieldNI(t4)); - if (!t7.containsKey$1(t6)) { - line = "Error during script reloading, refreshing the page. \nUnable to find an existing digest for module: " + t6 + "."; + if (!t6.containsKey$1(t5)) { + line = "Error during script reloading, refreshing the page. \nUnable to find an existing digest for module: " + t5 + "."; toZone = $.printToZone; if (toZone == null) A.printString(line); else toZone.call$1(line); - t5._as(t5._as(t1.window).location).reload(); + A._asJSObject(A._asJSObject(t1.window).location).reload(); } else { - t7 = $.RequireRestarter____lastKnownDigests.__late_helper$_value; - if (t7 === $.RequireRestarter____lastKnownDigests) + t6 = $.RequireRestarter____lastKnownDigests.__late_helper$_value; + if (t6 === $.RequireRestarter____lastKnownDigests) A.throwExpression(A.LateError$fieldNI(t4)); - if (t7.$index(0, t6) != newDigests.$index(0, t6)) { - t7 = $.RequireRestarter____lastKnownDigests.__late_helper$_value; - if (t7 === $.RequireRestarter____lastKnownDigests) + if (t6.$index(0, t5) != newDigests.$index(0, t5)) { + t6 = $.RequireRestarter____lastKnownDigests.__late_helper$_value; + if (t6 === $.RequireRestarter____lastKnownDigests) A.throwExpression(A.LateError$fieldNI(t4)); - t8 = newDigests.$index(0, t6); - t8.toString; - t7.$indexSet(0, t6, t8); - B.JSArray_methods.add$1(modulesToLoad, t6); + t7 = newDigests.$index(0, t5); + t7.toString; + t6.$indexSet(0, t5, t7); + B.JSArray_methods.add$1(modulesToLoad, t5); } } } @@ -27654,12 +28028,12 @@ case 0: // Function start $async$goto = 3; - return A._asyncAwait(new A.BrowserClient(A.LinkedHashSet_LinkedHashSet$_empty(type$.JSObject))._sendUnstreamed$3("GET", A.Uri_parse(A._asString(type$.JavaScriptObject._as(init.G.$requireLoader).digestsPath)), null), $async$_getDigests$0); + return A._asyncAwait(new A.BrowserClient(A._setArrayType([], type$.JSArray_JSObject))._sendUnstreamed$3("GET", A.Uri_parse(A._asString(type$.JavaScriptObject._as(init.G.$requireLoader).digestsPath)), null), $async$_getDigests$0); case 3: // returning from await. response = $async$result; t1 = type$.String; - $async$returnValue = type$.Map_dynamic_dynamic._as(B.C_JsonCodec.decode$2$reviver(A.encodingForCharset(A._contentTypeForHeaders(response.headers).parameters._collection$_map.$index(0, "charset")).decode$1(response.bodyBytes), null)).cast$2$0(0, t1, t1); + $async$returnValue = type$.Map_dynamic_dynamic._as(B.C_JsonCodec.decode$2$reviver(A.encodingForContentTypeHeader(A._contentTypeForHeaders(response.headers)).decode$1(response.bodyBytes), null)).cast$2$0(0, t1, t1); // goto return $async$goto = 1; break; @@ -27844,8 +28218,7 @@ if (t2 instanceof A.HotReloadFailedException) { e = t2; A.print("Error during script reloading. Firing full page reload. " + A.S(e)); - t2 = type$.JSObject; - t2._as(t2._as(t1.window).location).reload(); + A._asJSObject(A._asJSObject(t1.window).location).reload(); $async$self._running.complete$1(false); } else throw $async$exception; @@ -27886,7 +28259,7 @@ t2 = type$.JavaScriptObject; t2 = t2._as(t2._as(t1.$requireLoader).moduleParentsGraph); t3 = type$.String; - stronglyConnectedComponents = A.stronglyConnectedComponents(A.JSArrayExtension_toDartIterable(type$.JSArray_nullable_Object._as(t1.Array.from(type$.JSObject._as(t2.keys()))), t3), this.get$_moduleParents(), t3); + stronglyConnectedComponents = A.stronglyConnectedComponents(A.JSArrayExtension_toDartIterable(type$.JSArray_nullable_Object._as(t1.Array.from(A._asJSObject(t2.keys()))), t3), this.get$_moduleParents(), t3); t3 = this._moduleOrdering; if (t3._collection$_length > 0) { t3._strings = t3._nums = t3._collection$_rest = t3._keys = null; @@ -27900,7 +28273,7 @@ }; A.RequireRestarter__reload_closure.prototype = { call$0() { - var t1 = type$.JSObject._as(this.dart.getModuleLibraries(this._box_0.previousModuleId)); + var t1 = A._asJSObject(this.dart.getModuleLibraries(this._box_0.previousModuleId)); t1 = A.JSArrayExtension_toDartIterable(type$.JSArray_nullable_Object._as(init.G.Object.values(t1)), type$.nullable_Object).get$first(0); t1.toString; type$.JavaScriptObject._as(t1).main(); @@ -27917,7 +28290,7 @@ call$1(e) { this.completer.completeError$2(new A.HotReloadFailedException(A._asString(type$.JavaScriptObject._as(e).message)), this.stackTrace); }, - $signature: 87 + $signature: 89 }; A._createScript_closure.prototype = { call$0() { @@ -27926,19 +28299,17 @@ return new A._createScript__closure(); return new A._createScript__closure0(nonce); }, - $signature: 88 + $signature: 90 }; A._createScript__closure.prototype = { call$0() { - var t1 = type$.JSObject; - return t1._as(t1._as(init.G.document).createElement("script")); + return A._asJSObject(A._asJSObject(init.G.document).createElement("script")); }, $signature: 10 }; A._createScript__closure0.prototype = { call$0() { - var t1 = type$.JSObject, - scriptElement = t1._as(t1._as(init.G.document).createElement("script")); + var scriptElement = A._asJSObject(A._asJSObject(init.G.document).createElement("script")); scriptElement.setAttribute("nonce", this.nonce); return scriptElement; }, @@ -27989,48 +28360,51 @@ _instance = hunkHelpers.installInstanceTearOff, _instance_2_u = hunkHelpers._instance_2u, _instance_1_i = hunkHelpers._instance_1i, - _instance_0_u = hunkHelpers._instance_0u, - _instance_1_u = hunkHelpers._instance_1u; - _static_2(J, "_interceptors_JSArray__compareAny$closure", "JSArray__compareAny", 30); + _instance_1_u = hunkHelpers._instance_1u, + _instance_0_u = hunkHelpers._instance_0u; + _static_2(J, "_interceptors_JSArray__compareAny$closure", "JSArray__compareAny", 20); _static_1(A, "async__AsyncRun__scheduleImmediateJsOverride$closure", "_AsyncRun__scheduleImmediateJsOverride", 16); _static_1(A, "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", "_AsyncRun__scheduleImmediateWithSetImmediate", 16); _static_1(A, "async__AsyncRun__scheduleImmediateWithTimer$closure", "_AsyncRun__scheduleImmediateWithTimer", 16); _static_0(A, "async___startMicrotaskLoop$closure", "_startMicrotaskLoop", 0); _static_1(A, "async___nullDataHandler$closure", "_nullDataHandler", 7); - _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 14); + _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 9); _static_0(A, "async___nullDoneHandler$closure", "_nullDoneHandler", 0); - _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 91, 0); + _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 93, 0); _static(A, "async___rootRun$closure", 4, null, ["call$1$4", "call$4"], ["_rootRun", function($self, $parent, zone, f) { return A._rootRun($self, $parent, zone, f, type$.dynamic); - }], 92, 0); + }], 94, 0); _static(A, "async___rootRunUnary$closure", 5, null, ["call$2$5", "call$5"], ["_rootRunUnary", function($self, $parent, zone, f, arg) { var t1 = type$.dynamic; return A._rootRunUnary($self, $parent, zone, f, arg, t1, t1); - }], 93, 0); - _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6"], ["_rootRunBinary"], 94, 0); + }], 95, 0); + _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6"], ["_rootRunBinary"], 96, 0); _static(A, "async___rootRegisterCallback$closure", 4, null, ["call$1$4", "call$4"], ["_rootRegisterCallback", function($self, $parent, zone, f) { return A._rootRegisterCallback($self, $parent, zone, f, type$.dynamic); - }], 95, 0); + }], 97, 0); _static(A, "async___rootRegisterUnaryCallback$closure", 4, null, ["call$2$4", "call$4"], ["_rootRegisterUnaryCallback", function($self, $parent, zone, f) { var t1 = type$.dynamic; return A._rootRegisterUnaryCallback($self, $parent, zone, f, t1, t1); - }], 96, 0); + }], 98, 0); _static(A, "async___rootRegisterBinaryCallback$closure", 4, null, ["call$3$4", "call$4"], ["_rootRegisterBinaryCallback", function($self, $parent, zone, f) { var t1 = type$.dynamic; return A._rootRegisterBinaryCallback($self, $parent, zone, f, t1, t1, t1); - }], 97, 0); - _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 98, 0); - _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 99, 0); - _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 100, 0); - _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 101, 0); - _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 102, 0); - _static_1(A, "async___printToZone$closure", "_printToZone", 103); - _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 104, 0); - _instance(A._Completer.prototype, "get$completeError", 0, 1, null, ["call$2", "call$1"], ["completeError$2", "completeError$1"], 33, 0, 0); - _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 14); + }], 99, 0); + _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 100, 0); + _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 101, 0); + _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 102, 0); + _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 103, 0); + _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 104, 0); + _static_1(A, "async___printToZone$closure", "_printToZone", 105); + _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 106, 0); + _instance(A._Completer.prototype, "get$completeError", 0, 1, null, ["call$2", "call$1"], ["completeError$2", "completeError$1"], 23, 0, 0); + _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 9); var _; - _instance_1_i(_ = A._StreamController.prototype, "get$add", "add$1", 9); - _instance(_, "get$addError", 0, 1, null, ["call$2", "call$1"], ["addError$2", "addError$1"], 33, 0, 0); + _instance_1_i(_ = A._StreamController.prototype, "get$add", "add$1", 8); + _instance(_, "get$addError", 0, 1, null, ["call$2", "call$1"], ["addError$2", "addError$1"], 23, 0, 0); + _instance_1_u(_, "get$_add", "_add$1", 8); + _instance_2_u(_, "get$_addError", "_addError$2", 9); + _instance_0_u(_, "get$_close", "_close$0", 0); _instance_0_u(_ = A._ControllerSubscription.prototype, "get$_onPause", "_onPause$0", 0); _instance_0_u(_, "get$_onResume", "_onResume$0", 0); _instance_0_u(_ = A._BufferingStreamSubscription.prototype, "get$_onPause", "_onPause$0", 0); @@ -28038,42 +28412,42 @@ _instance_0_u(A._DoneStreamSubscription.prototype, "get$_onMicrotask", "_onMicrotask$0", 0); _instance_0_u(_ = A._ForwardingStreamSubscription.prototype, "get$_onPause", "_onPause$0", 0); _instance_0_u(_, "get$_onResume", "_onResume$0", 0); - _instance_1_u(_, "get$_handleData", "_handleData$1", 9); - _instance_2_u(_, "get$_handleError", "_handleError$2", 21); + _instance_1_u(_, "get$_handleData", "_handleData$1", 8); + _instance_2_u(_, "get$_handleError", "_handleError$2", 22); _instance_0_u(_, "get$_handleDone", "_handleDone$0", 0); _static_2(A, "collection___defaultEquals$closure", "_defaultEquals0", 18); _static_1(A, "collection___defaultHashCode$closure", "_defaultHashCode", 17); - _static_2(A, "collection_ListBase__compareAny$closure", "ListBase__compareAny", 30); - _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 4); - _instance_1_i(_ = A._ByteCallbackSink.prototype, "get$add", "add$1", 9); + _static_2(A, "collection_ListBase__compareAny$closure", "ListBase__compareAny", 20); + _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 6); + _instance_1_i(_ = A._ByteCallbackSink.prototype, "get$add", "add$1", 8); _instance_0_u(_, "get$close", "close$0", 0); _static_1(A, "core__identityHashCode$closure", "identityHashCode", 17); _static_2(A, "core__identical$closure", "identical", 18); _static_1(A, "core_Uri_decodeComponent$closure", "Uri_decodeComponent", 13); _static(A, "math__max$closure", 2, null, ["call$1$2", "call$2"], ["max", function(a, b) { return A.max(a, b, type$.num); - }], 105, 0); + }], 107, 0); _instance_2_u(_ = A.DeepCollectionEquality.prototype, "get$equals", "equals$2", 18); _instance_1_u(_, "get$hash", "hash$1", 17); _instance_1_u(_, "get$isValidKey", "isValidKey$1", 12); _static(A, "hot_reload_response_HotReloadResponse___new_tearOff$closure", 0, null, ["call$1", "call$0"], ["HotReloadResponse___new_tearOff", function() { return A.HotReloadResponse___new_tearOff(null); - }], 70, 0); + }], 72, 0); _static_1(A, "case_insensitive_map_CaseInsensitiveMap__canonicalizer$closure", "CaseInsensitiveMap__canonicalizer", 13); _instance_1_u(_ = A.SseClient.prototype, "get$_onIncomingControlMessage", "_onIncomingControlMessage$1", 2); _instance_1_u(_, "get$_onIncomingMessage", "_onIncomingMessage$1", 2); _instance_0_u(_, "get$_onOutgoingDone", "_onOutgoingDone$0", 0); - _instance_1_u(_, "get$_onOutgoingMessage", "_onOutgoingMessage$1", 64); + _instance_1_u(_, "get$_onOutgoingMessage", "_onOutgoingMessage$1", 66); _static_1(A, "client___handleAuthRequest$closure", "_handleAuthRequest", 2); - _instance_1_u(_ = A.RequireRestarter.prototype, "get$_moduleParents", "_moduleParents$1", 85); - _instance_2_u(_, "get$_moduleTopologicalCompare", "_moduleTopologicalCompare$2", 86); + _instance_1_u(_ = A.RequireRestarter.prototype, "get$_moduleParents", "_moduleParents$1", 87); + _instance_2_u(_, "get$_moduleTopologicalCompare", "_moduleTopologicalCompare$2", 88); })(); (function inheritance() { var _mixin = hunkHelpers.mixin, _inherit = hunkHelpers.inherit, _inheritMany = hunkHelpers.inheritMany; _inherit(A.Object, null); - _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, A.SafeToStringHook, J.ArrayIterator, A.Iterable, A.CastIterator, A.Closure, A.MapBase, A.Error, A.ListBase, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.EmptyIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.LinkedHashMapValueIterator, A.LinkedHashMapEntryIterator, A._Record, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A._Cell, A.Rti, A._FunctionParameters, A._Type, A._TimerImpl, A._AsyncAwaitCompleter, A.AsyncError, A.TimeoutException, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A.Stream, A._StreamController, A._SyncStreamControllerDispatch, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._DoneStreamSubscription, A._StreamIterator, A._ZoneFunction, A._ZoneSpecification, A._ZoneDelegate, A._Zone, A._HashMapKeyIterator, A.SetBase, A._HashSetIterator, A._LinkedHashSetCell, A._LinkedHashSetIterator, A._UnmodifiableMapMixin, A.MapView, A._ListQueueIterator, A._SplayTreeNode, A._SplayTree, A._SplayTreeIterator, A.Codec, A.Converter, A._Base64Encoder, A._Base64Decoder, A.ByteConversionSink, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A._BigIntImpl, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.IntegerDivisionByZeroException, A.MapEntry, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A._JSRandom, A.AsyncMemoizer, A.DelegatingStreamSink, A.ErrorResult, A.ValueResult, A.StreamQueue, A._NextRequest, A._HasNextRequest, A.BuiltList, A.ListBuilder, A.BuiltListMultimap, A.ListMultimapBuilder, A.BuiltMap, A.MapBuilder, A.BuiltSet, A.SetBuilder, A.BuiltSetMultimap, A.SetMultimapBuilder, A.EnumClass, A.IndentingBuiltValueToStringHelper, A.JsonObject, A.FullType, A.BigIntSerializer, A.BoolSerializer, A.BuiltJsonSerializers, A.BuiltJsonSerializersBuilder, A.BuiltListMultimapSerializer, A.BuiltListSerializer, A.BuiltMapSerializer, A.BuiltSetMultimapSerializer, A.BuiltSetSerializer, A.DateTimeSerializer, A.DoubleSerializer, A.DurationSerializer, A.Int32Serializer, A.Int64Serializer, A.IntSerializer, A.JsonObjectSerializer, A.ListSerializer, A.MapSerializer, A.NullSerializer, A.NumSerializer, A.RegExpSerializer, A.SetSerializer, A.StringSerializer, A.Uint8ListSerializer, A.UriSerializer, A.CanonicalizedMap, A.DefaultEquality, A.IterableEquality, A.ListEquality, A._UnorderedEquality, A._MapEntry, A.MapEquality, A.DeepCollectionEquality, A._QueueList_Object_ListMixin, A.BuildResult, A._$BuildStatusSerializer, A._$BuildResultSerializer, A.BuildResultBuilder, A.ConnectRequest, A._$ConnectRequestSerializer, A.ConnectRequestBuilder, A.DebugEvent, A.BatchedDebugEvents, A._$DebugEventSerializer, A._$BatchedDebugEventsSerializer, A.DebugEventBuilder, A.BatchedDebugEventsBuilder, A.DebugInfo, A._$DebugInfoSerializer, A.DebugInfoBuilder, A.DevToolsRequest, A.DevToolsResponse, A._$DevToolsRequestSerializer, A._$DevToolsResponseSerializer, A.DevToolsRequestBuilder, A.DevToolsResponseBuilder, A.ErrorResponse, A._$ErrorResponseSerializer, A.ErrorResponseBuilder, A.ExtensionRequest, A.ExtensionResponse, A.ExtensionEvent, A.BatchedEvents, A._$ExtensionRequestSerializer, A._$ExtensionResponseSerializer, A._$ExtensionEventSerializer, A._$BatchedEventsSerializer, A.ExtensionRequestBuilder, A.ExtensionResponseBuilder, A.ExtensionEventBuilder, A.BatchedEventsBuilder, A.HotReloadRequest, A._$HotReloadRequestSerializer, A.HotReloadRequestBuilder, A.HotReloadResponse, A._$HotReloadResponseSerializer, A.HotReloadResponseBuilder, A.IsolateExit, A.IsolateStart, A._$IsolateExitSerializer, A._$IsolateStartSerializer, A.IsolateExitBuilder, A.IsolateStartBuilder, A.RegisterEvent, A._$RegisterEventSerializer, A.RegisterEventBuilder, A.RunRequest, A._$RunRequestSerializer, A.BatchedStreamController, A.SocketClient, A.Int32, A.Int64, A._StackState, A.BaseClient, A.BaseRequest, A.BaseResponse, A.ClientException, A.MediaType, A.Level, A.LogRecord, A.Logger, A.Context, A.Style, A.ParsedPath, A.PathException, A.Pool, A.PoolResource, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.SourceSpanException, A.StreamChannelMixin, A._GuaranteeSink, A.StreamChannelController, A.StringScanner, A.RNG, A.UuidV1, A.EventStreamProvider, A._EventStreamSubscription, A.BrowserWebSocket, A.WebSocketEvent, A.WebSocketException, A.WebSocketChannelException, A.DdcLibraryBundleRestarter, A.DdcRestarter, A.ReloadingManager, A.HotReloadFailedException, A.RequireRestarter]); + _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, A.SafeToStringHook, J.ArrayIterator, A.Iterable, A.CastIterator, A.Closure, A.MapBase, A.Error, A.ListBase, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.EmptyIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.LinkedHashMapValueIterator, A.LinkedHashMapEntryIterator, A._Record, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A._Cell, A._UnmodifiableNativeByteBufferView, A.Rti, A._FunctionParameters, A._Type, A._TimerImpl, A._AsyncAwaitCompleter, A._AsyncStarStreamController, A._IterationMarker, A.AsyncError, A.TimeoutException, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A.Stream, A._StreamController, A._SyncStreamControllerDispatch, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._AddStreamState, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._DoneStreamSubscription, A._StreamIterator, A._ZoneFunction, A._ZoneSpecification, A._ZoneDelegate, A._Zone, A._HashMapKeyIterator, A.SetBase, A._HashSetIterator, A._LinkedHashSetCell, A._LinkedHashSetIterator, A._UnmodifiableMapMixin, A.MapView, A._ListQueueIterator, A._SplayTreeNode, A._SplayTree, A._SplayTreeIterator, A.Codec, A.Converter, A._Base64Encoder, A._Base64Decoder, A.ByteConversionSink, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A._BigIntImpl, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.IntegerDivisionByZeroException, A.MapEntry, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A._JSRandom, A._JSSecureRandom, A.AsyncMemoizer, A.DelegatingStreamSink, A.ErrorResult, A.ValueResult, A.StreamQueue, A._NextRequest, A._HasNextRequest, A.BuiltList, A.ListBuilder, A.BuiltListMultimap, A.ListMultimapBuilder, A.BuiltMap, A.MapBuilder, A.BuiltSet, A.SetBuilder, A.BuiltSetMultimap, A.SetMultimapBuilder, A.EnumClass, A.IndentingBuiltValueToStringHelper, A.JsonObject, A.FullType, A.BigIntSerializer, A.BoolSerializer, A.BuiltJsonSerializers, A.BuiltJsonSerializersBuilder, A.BuiltListMultimapSerializer, A.BuiltListSerializer, A.BuiltMapSerializer, A.BuiltSetMultimapSerializer, A.BuiltSetSerializer, A.DateTimeSerializer, A.DoubleSerializer, A.DurationSerializer, A.Int32Serializer, A.Int64Serializer, A.IntSerializer, A.JsonObjectSerializer, A.ListSerializer, A.MapSerializer, A.NullSerializer, A.NumSerializer, A.RegExpSerializer, A.SetSerializer, A.StringSerializer, A.Uint8ListSerializer, A.UriSerializer, A.CanonicalizedMap, A.DefaultEquality, A.IterableEquality, A.ListEquality, A._UnorderedEquality, A._MapEntry, A.MapEquality, A.DeepCollectionEquality, A._QueueList_Object_ListMixin, A.BuildResult, A._$BuildStatusSerializer, A._$BuildResultSerializer, A.BuildResultBuilder, A.ConnectRequest, A._$ConnectRequestSerializer, A.ConnectRequestBuilder, A.DebugEvent, A.BatchedDebugEvents, A._$DebugEventSerializer, A._$BatchedDebugEventsSerializer, A.DebugEventBuilder, A.BatchedDebugEventsBuilder, A.DebugInfo, A._$DebugInfoSerializer, A.DebugInfoBuilder, A.DevToolsRequest, A.DevToolsResponse, A._$DevToolsRequestSerializer, A._$DevToolsResponseSerializer, A.DevToolsRequestBuilder, A.DevToolsResponseBuilder, A.ErrorResponse, A._$ErrorResponseSerializer, A.ErrorResponseBuilder, A.ExtensionRequest, A.ExtensionResponse, A.ExtensionEvent, A.BatchedEvents, A._$ExtensionRequestSerializer, A._$ExtensionResponseSerializer, A._$ExtensionEventSerializer, A._$BatchedEventsSerializer, A.ExtensionRequestBuilder, A.ExtensionResponseBuilder, A.ExtensionEventBuilder, A.BatchedEventsBuilder, A.HotReloadRequest, A._$HotReloadRequestSerializer, A.HotReloadRequestBuilder, A.HotReloadResponse, A._$HotReloadResponseSerializer, A.HotReloadResponseBuilder, A.IsolateExit, A.IsolateStart, A._$IsolateExitSerializer, A._$IsolateStartSerializer, A.IsolateExitBuilder, A.IsolateStartBuilder, A.RegisterEvent, A._$RegisterEventSerializer, A.RegisterEventBuilder, A.RunRequest, A._$RunRequestSerializer, A.BatchedStreamController, A.SocketClient, A.Int32, A.Int64, A._StackState, A.ClientException, A.BaseClient, A.BaseRequest, A.BaseResponse, A.MediaType, A.Level, A.LogRecord, A.Logger, A.Context, A.Style, A.ParsedPath, A.PathException, A.Pool, A.PoolResource, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.SourceSpanException, A.StreamChannelMixin, A._GuaranteeSink, A.StreamChannelController, A.StringScanner, A.RNG, A.UuidV1, A.EventStreamProvider, A._EventStreamSubscription, A.BrowserWebSocket, A.WebSocketEvent, A.WebSocketException, A.WebSocketChannelException, A.DdcLibraryBundleRestarter, A.DdcRestarter, A.ReloadingManager, A.HotReloadFailedException, A.RequireRestarter]); _inheritMany(J.Interceptor, [J.JSBool, J.JSNull, J.JavaScriptObject, J.JavaScriptBigInt, J.JavaScriptSymbol, J.JSNumber, J.JSString]); _inheritMany(J.JavaScriptObject, [J.LegacyJavaScriptObject, J.JSArray, A.NativeByteBuffer, A.NativeTypedData]); _inheritMany(J.LegacyJavaScriptObject, [J.PlainJavaScriptObject, J.UnknownJavaScriptObject, J.JavaScriptFunction]); @@ -28084,14 +28458,14 @@ _inheritMany(A._CastIterableBase, [A.CastIterable, A.__CastListBase__CastIterableBase_ListMixin]); _inherit(A._EfficientLengthCastIterable, A.CastIterable); _inherit(A._CastListBase, A.__CastListBase__CastIterableBase_ListMixin); - _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._CustomHashMap_closure, A._LinkedCustomHashMap_closure, A._BigIntImpl_hashCode_finish, A._Uri__makePath_closure, A.FutureOfJSAnyToJSPromise_get_toJS__closure, A.FutureOfVoidToJSPromise_get_toJS__closure, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.StreamQueue__ensureListening_closure, A.BuiltListMultimap_BuiltListMultimap_closure, A.BuiltListMultimap_hashCode_closure, A.ListMultimapBuilder_replace_closure, A.BuiltMap_BuiltMap_closure, A.BuiltMap_hashCode_closure, A.BuiltSet_hashCode_closure, A.BuiltSetMultimap_hashCode_closure, A.SetMultimapBuilder_replace_closure, A.newBuiltValueToStringHelper_closure, A.BuiltListMultimapSerializer_serialize_closure, A.BuiltListMultimapSerializer_deserialize_closure, A.BuiltListSerializer_serialize_closure, A.BuiltListSerializer_deserialize_closure, A.BuiltSetMultimapSerializer_serialize_closure, A.BuiltSetMultimapSerializer_deserialize_closure, A.BuiltSetSerializer_serialize_closure, A.BuiltSetSerializer_deserialize_closure, A.ListSerializer_serialize_closure, A.SetSerializer_serialize_closure, A.CanonicalizedMap_keys_closure, A.WebSocketClient_stream_closure, A.BaseRequest_closure0, A.BrowserClient_send_closure, A.BrowserClient_send_closure0, A.ByteStream_toBytes_closure, A.MediaType_toString__closure, A.expectQuotedString_closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.Pool__runOnRelease_closure, A.Highlighter$__closure, A.Highlighter$___closure, A.Highlighter$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.SseClient_closure0, A.SseClient_closure1, A.generateUuidV4_generateBits, A._GuaranteeSink__addError_closure, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure, A.BrowserWebSocket_connect_closure, A.BrowserWebSocket_connect_closure0, A.BrowserWebSocket_connect_closure1, A.BrowserWebSocket_connect_closure2, A.AdapterWebSocketChannel_closure, A.AdapterWebSocketChannel__closure, A.AdapterWebSocketChannel__closure0, A.AdapterWebSocketChannel_closure0, A.main__closure1, A.main__closure3, A.main___closure2, A.main___closure1, A.main__closure5, A.main___closure0, A.main___closure, A.main__closure7, A.main__closure8, A.main__closure9, A._sendConnectRequest_closure, A._launchCommunicationWithDebugExtension_closure, A._handleAuthRequest_closure, A._sendResponse_closure, A.DdcLibraryBundleRestarter_restart_closure, A.DdcLibraryBundleRestarter_hotReloadStart_closure0, A.DdcRestarter_restart_closure0, A.DdcRestarter_restart_closure, A.RequireRestarter__reloadModule_closure0, A.JSArrayExtension_toDartIterable_closure]); - _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.ConstantMap_map_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure0, A._Future_timeout_closure1, A._BufferingStreamSubscription_asFuture_closure0, A.LinkedHashMap_LinkedHashMap$from_closure, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A._BigIntImpl_hashCode_combine, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A.FutureOfJSAnyToJSPromise_get_toJS_closure, A.FutureOfJSAnyToJSPromise_get_toJS__closure0, A.FutureOfVoidToJSPromise_get_toJS_closure, A.FutureOfVoidToJSPromise_get_toJS__closure0, A.StreamQueue__ensureListening_closure1, A.hashObjects_closure, A.MapBuilder_replace_closure, A.CanonicalizedMap_addAll_closure, A.CanonicalizedMap_forEach_closure, A.CanonicalizedMap_map_closure, A.safeUnawaited_closure, A.BaseRequest_closure, A.MediaType_toString_closure, A.Pool__runOnRelease_closure0, A.Highlighter__collateLines_closure0, A.generateUuidV4_printDigits, A.generateUuidV4_bitsDigits, A.main__closure4, A.main_closure0]); + _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._asyncStarHelper_closure0, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._CustomHashMap_closure, A._LinkedCustomHashMap_closure, A._BigIntImpl_hashCode_finish, A._Uri__makePath_closure, A.FutureOfJSAnyToJSPromise_get_toJS__closure, A.FutureOfVoidToJSPromise_get_toJS__closure, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.StreamQueue__ensureListening_closure, A.BuiltListMultimap_BuiltListMultimap_closure, A.BuiltListMultimap_hashCode_closure, A.ListMultimapBuilder_replace_closure, A.BuiltMap_BuiltMap_closure, A.BuiltMap_hashCode_closure, A.BuiltSet_hashCode_closure, A.BuiltSetMultimap_hashCode_closure, A.SetMultimapBuilder_replace_closure, A.newBuiltValueToStringHelper_closure, A.BuiltListMultimapSerializer_serialize_closure, A.BuiltListMultimapSerializer_deserialize_closure, A.BuiltListSerializer_serialize_closure, A.BuiltListSerializer_deserialize_closure, A.BuiltSetMultimapSerializer_serialize_closure, A.BuiltSetMultimapSerializer_deserialize_closure, A.BuiltSetSerializer_serialize_closure, A.BuiltSetSerializer_deserialize_closure, A.ListSerializer_serialize_closure, A.SetSerializer_serialize_closure, A.CanonicalizedMap_keys_closure, A.WebSocketClient_stream_closure, A.BaseRequest_closure0, A.BrowserClient_send_closure, A._readBody_closure, A._readBody_closure0, A.ByteStream_toBytes_closure, A.MediaType_toString__closure, A.expectQuotedString_closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.Pool__runOnRelease_closure, A.Highlighter$__closure, A.Highlighter$___closure, A.Highlighter$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.SseClient_closure0, A.SseClient_closure1, A._GuaranteeSink__addError_closure, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure, A.BrowserWebSocket_connect_closure, A.BrowserWebSocket_connect_closure0, A.BrowserWebSocket_connect_closure1, A.BrowserWebSocket_connect_closure2, A.AdapterWebSocketChannel_closure, A.AdapterWebSocketChannel__closure, A.AdapterWebSocketChannel__closure0, A.AdapterWebSocketChannel_closure0, A.main__closure1, A.main__closure3, A.main___closure2, A.main___closure1, A.main__closure5, A.main___closure0, A.main___closure, A.main__closure7, A.main__closure8, A.main__closure9, A._sendConnectRequest_closure, A._launchCommunicationWithDebugExtension_closure, A._handleAuthRequest_closure, A._sendResponse_closure, A.DdcLibraryBundleRestarter_restart_closure, A.DdcLibraryBundleRestarter_hotReloadStart_closure0, A.DdcRestarter_restart_closure0, A.DdcRestarter_restart_closure, A.RequireRestarter__reloadModule_closure0, A.JSArrayExtension_toDartIterable_closure]); + _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.ConstantMap_map_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure0, A._Future_timeout_closure1, A._AddStreamState_makeErrorHandler_closure, A._BufferingStreamSubscription_asFuture_closure0, A.LinkedHashMap_LinkedHashMap$from_closure, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A._BigIntImpl_hashCode_combine, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A.FutureOfJSAnyToJSPromise_get_toJS_closure, A.FutureOfJSAnyToJSPromise_get_toJS__closure0, A.FutureOfVoidToJSPromise_get_toJS_closure, A.FutureOfVoidToJSPromise_get_toJS__closure0, A.StreamQueue__ensureListening_closure1, A.hashObjects_closure, A.MapBuilder_replace_closure, A.CanonicalizedMap_addAll_closure, A.CanonicalizedMap_forEach_closure, A.CanonicalizedMap_map_closure, A.safeUnawaited_closure, A.BaseRequest_closure, A.MediaType_toString_closure, A.Pool__runOnRelease_closure0, A.Highlighter__collateLines_closure0, A.main__closure4, A.main_closure0]); _inherit(A.CastList, A._CastListBase); _inheritMany(A.MapBase, [A.CastMap, A.JsLinkedHashMap, A._HashMap, A._JsonMap]); _inheritMany(A.Error, [A.LateError, A.TypeError, A.JsNoSuchMethodError, A.UnknownJsTypeError, A.RuntimeError, A._Error, A.JsonUnsupportedObjectError, A.AssertionError, A.ArgumentError, A.UnsupportedError, A.UnimplementedError, A.StateError, A.ConcurrentModificationError, A.BuiltValueNullFieldError, A.BuiltValueNestedFieldError, A.DeserializationError]); _inherit(A.UnmodifiableListBase, A.ListBase); _inheritMany(A.UnmodifiableListBase, [A.CodeUnits, A.UnmodifiableListView]); - _inheritMany(A.Closure0Args, [A.nullFuture_closure, A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A._TimerImpl$periodic_closure, A.Future_Future$microtask_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainCoreFuture_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteErrorObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A._Future_timeout_closure, A.Stream_length_closure0, A.Stream_first_closure, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._BufferingStreamSubscription_asFuture_closure, A._BufferingStreamSubscription_asFuture__closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._cancelAndValue_closure, A._CustomZone_bindCallback_closure, A._CustomZone_bindCallbackGuarded_closure, A._rootHandleError_closure, A._RootZone_bindCallback_closure, A._RootZone_bindCallbackGuarded_closure, A._Utf8Decoder__decoder_closure, A._Utf8Decoder__decoderNonfatal_closure, A.StreamQueue__ensureListening_closure0, A.Serializers_Serializers_closure, A.Serializers_Serializers_closure0, A.Serializers_Serializers_closure1, A.Serializers_Serializers_closure2, A.Serializers_Serializers_closure3, A._$serializers_closure, A._$serializers_closure0, A.BatchedStreamController__hasEventOrTimeOut_closure, A.BatchedStreamController__hasEventDuring_closure, A.MediaType_MediaType$parse_closure, A.Logger_Logger_closure, A.Highlighter_closure, A.Highlighter__writeFileStart_closure, A.Highlighter__writeMultilineHighlights_closure, A.Highlighter__writeMultilineHighlights_closure0, A.Highlighter__writeMultilineHighlights_closure1, A.Highlighter__writeMultilineHighlights_closure2, A.Highlighter__writeMultilineHighlights__closure, A.Highlighter__writeMultilineHighlights__closure0, A.Highlighter__writeHighlightedText_closure, A.Highlighter__writeIndicator_closure, A.Highlighter__writeIndicator_closure0, A.Highlighter__writeIndicator_closure1, A.Highlighter__writeSidebar_closure, A._Highlight_closure, A.SseClient_closure, A.SseClient__closure, A.SseClient__onOutgoingMessage_closure, A.GuaranteeChannel_closure, A.GuaranteeChannel__closure, A.AdapterWebSocketChannel__closure1, A.main_closure, A.main__closure, A.main__closure0, A.main__closure2, A.main__closure6, A.DdcLibraryBundleRestarter_hotReloadStart_closure, A.RequireRestarter__reload_closure, A.RequireRestarter__reloadModule_closure, A._createScript_closure, A._createScript__closure, A._createScript__closure0, A.runMain_closure]); + _inheritMany(A.Closure0Args, [A.nullFuture_closure, A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A._TimerImpl$periodic_closure, A._asyncStarHelper_closure, A._AsyncStarStreamController__resumeBody, A._AsyncStarStreamController__resumeBody_closure, A._AsyncStarStreamController_closure0, A._AsyncStarStreamController_closure1, A._AsyncStarStreamController_closure, A._AsyncStarStreamController__closure, A.Future_Future$microtask_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainCoreFuture_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteErrorObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A._Future_timeout_closure, A.Stream_length_closure0, A.Stream_first_closure, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._AddStreamState_cancel_closure, A._BufferingStreamSubscription_asFuture_closure, A._BufferingStreamSubscription_asFuture__closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._cancelAndValue_closure, A._CustomZone_bindCallback_closure, A._CustomZone_bindCallbackGuarded_closure, A._rootHandleError_closure, A._RootZone_bindCallback_closure, A._RootZone_bindCallbackGuarded_closure, A._Utf8Decoder__decoder_closure, A._Utf8Decoder__decoderNonfatal_closure, A.StreamQueue__ensureListening_closure0, A.Serializers_Serializers_closure, A.Serializers_Serializers_closure0, A.Serializers_Serializers_closure1, A.Serializers_Serializers_closure2, A.Serializers_Serializers_closure3, A._$serializers_closure, A._$serializers_closure0, A.BatchedStreamController__hasEventOrTimeOut_closure, A.BatchedStreamController__hasEventDuring_closure, A.MediaType_MediaType$parse_closure, A.Logger_Logger_closure, A.Highlighter_closure, A.Highlighter__writeFileStart_closure, A.Highlighter__writeMultilineHighlights_closure, A.Highlighter__writeMultilineHighlights_closure0, A.Highlighter__writeMultilineHighlights_closure1, A.Highlighter__writeMultilineHighlights_closure2, A.Highlighter__writeMultilineHighlights__closure, A.Highlighter__writeMultilineHighlights__closure0, A.Highlighter__writeHighlightedText_closure, A.Highlighter__writeIndicator_closure, A.Highlighter__writeIndicator_closure0, A.Highlighter__writeIndicator_closure1, A.Highlighter__writeSidebar_closure, A._Highlight_closure, A.SseClient_closure, A.SseClient__closure, A.SseClient__onOutgoingMessage_closure, A.GuaranteeChannel_closure, A.GuaranteeChannel__closure, A.AdapterWebSocketChannel__closure1, A.main_closure, A.main__closure, A.main__closure0, A.main__closure2, A.main__closure6, A.DdcLibraryBundleRestarter_hotReloadStart_closure, A.RequireRestarter__reload_closure, A.RequireRestarter__reloadModule_closure, A._createScript_closure, A._createScript__closure, A._createScript__closure0, A.runMain_closure]); _inheritMany(A.EfficientLengthIterable, [A.ListIterable, A.EmptyIterable, A.LinkedHashMapKeysIterable, A.LinkedHashMapValuesIterable, A.LinkedHashMapEntriesIterable, A._HashMapKeyIterable]); _inheritMany(A.ListIterable, [A.SubListIterable, A.MappedListIterable, A.ReversedListIterable, A.ListQueue, A._JsonMapKeyIterable]); _inherit(A.EfficientLengthMappedIterable, A.MappedIterable); @@ -28102,6 +28476,7 @@ _inherit(A.NullError, A.TypeError); _inheritMany(A.TearOffClosure, [A.StaticClosure, A.BoundClosure]); _inheritMany(A.JsLinkedHashMap, [A.JsIdentityLinkedHashMap, A._LinkedCustomHashMap]); + _inherit(A.NativeArrayBuffer, A.NativeByteBuffer); _inheritMany(A.NativeTypedData, [A.NativeByteData, A.NativeTypedArray]); _inheritMany(A.NativeTypedArray, [A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin, A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin]); _inherit(A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin_FixedLengthListMixin, A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin); @@ -28116,6 +28491,7 @@ _inheritMany(A._StreamController, [A._AsyncStreamController, A._SyncStreamController]); _inherit(A._ControllerStream, A._StreamImpl); _inheritMany(A._BufferingStreamSubscription, [A._ControllerSubscription, A._ForwardingStreamSubscription]); + _inherit(A._StreamControllerAddStreamState, A._AddStreamState); _inheritMany(A._DelayedEvent, [A._DelayedData, A._DelayedError]); _inherit(A._MapStream, A._ForwardingStream); _inheritMany(A._Zone, [A._CustomZone, A._RootZone]); @@ -28168,6 +28544,7 @@ _inherit(A._$RegisterEvent, A.RegisterEvent); _inherit(A._$RunRequest, A.RunRequest); _inheritMany(A.SocketClient, [A.SseSocketClient, A.WebSocketClient]); + _inherit(A.RequestAbortedException, A.ClientException); _inherit(A.BrowserClient, A.BaseClient); _inherit(A.ByteStream, A.StreamView); _inherit(A.Request, A.BaseRequest); @@ -28182,7 +28559,7 @@ _inherit(A.SourceSpanWithContext, A.SourceSpanBase); _inheritMany(A.StreamChannelMixin, [A.SseClient, A.GuaranteeChannel, A.AdapterWebSocketChannel]); _inherit(A.StringScannerException, A.SourceSpanFormatException); - _inherit(A.MathRNG, A.RNG); + _inherit(A.CryptoRNG, A.RNG); _inheritMany(A.WebSocketEvent, [A.TextDataReceived, A.BinaryDataReceived, A.CloseReceived]); _inherit(A.WebSocketConnectionClosed, A.WebSocketException); _inherit(A._WebSocketSink, A.DelegatingStreamSink); @@ -28202,15 +28579,15 @@ var init = { G: typeof self != "undefined" ? self : globalThis, typeUniverse: {eC: new Map(), tR: {}, eT: {}, tPV: {}, sEA: []}, - mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List", Object: "Object", Map: "Map"}, + mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List", Object: "Object", Map: "Map", JSObject: "JSObject"}, mangledNames: {}, - types: ["~()", "Null()", "~(JSObject)", "Object?(@)", "@(@)", "Null(Object,StackTrace)", "Null(@)", "~(@)", "Null(JSObject)", "~(Object?)", "JSObject()", "Object?(Object?)", "bool(Object?)", "String(String)", "~(Object,StackTrace)", "bool(_Highlight)", "~(~())", "int(Object?)", "bool(Object?,Object?)", "Future<~>()", "Null(JavaScriptFunction)", "~(@,StackTrace)", "String(int,int)", "~(@,@)", "~(Object?,Object?)", "@()", "int(int,int)", "int(int)", "int()", "Null(JavaScriptFunction,JavaScriptFunction)", "int(@,@)", "bool(String)", "String(Match)", "~(Object[StackTrace?])", "bool()", "SetBuilder()", "MapBuilder()", "~(int,@)", "ListMultimapBuilder()", "ListBuilder()", "ListBuilder()", "ListBuilder()", "IndentingBuiltValueToStringHelper(String)", "String(@)", "bool(String,String)", "int(String)", "int(int,@)", "~(List)", "MediaType()", "~(String,String)", "Object?(~)", "Logger()", "JSObject(Object,StackTrace)", "Null(@,StackTrace)", "String?()", "int(_Line)", "~(String,int?)", "Object(_Line)", "Object(_Highlight)", "int(_Highlight,_Highlight)", "List<_Line>(MapEntry>)", "~(String,int)", "SourceSpanWithContext()", "Null(~())", "~(String?)", "Future()", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "Null(WebSocket)", "~(WebSocketEvent)", "Null(Object)", "HotReloadResponse([~(HotReloadResponseBuilder)])", "JSObject(String[bool?])", "~(List)", "ListBuilder(BatchedDebugEventsBuilder)", "Null(String,String)", "DebugEventBuilder(DebugEventBuilder)", "Null(String)", "RegisterEventBuilder(RegisterEventBuilder)", "DevToolsRequestBuilder(DevToolsRequestBuilder)", "Future<~>(String)", "ConnectRequestBuilder(ConnectRequestBuilder)", "DebugInfoBuilder(DebugInfoBuilder)", "~(bool)", "@(@,String)", "bool(bool)", "List(String)", "int(String,String)", "Null(JavaScriptObject)", "JSObject()()", "SetMultimapBuilder()", "@(String)", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)", "0^()(Zone,ZoneDelegate,Zone,0^())", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "~(String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map?)", "0^(0^,0^)", "String(String?)"], + types: ["~()", "Null()", "~(JSObject)", "Object?(@)", "Null(@)", "Null(Object,StackTrace)", "@(@)", "~(@)", "~(Object?)", "~(Object,StackTrace)", "JSObject()", "Object?(Object?)", "bool(Object?)", "String(String)", "Null(JSObject)", "bool(_Highlight)", "~(~())", "int(Object?)", "bool(Object?,Object?)", "Future<~>()", "int(@,@)", "Null(JavaScriptFunction)", "~(@,StackTrace)", "~(Object[StackTrace?])", "~(@,@)", "~(Object?,Object?)", "@()", "int(int,int)", "int()", "bool(String)", "Null(JavaScriptFunction,JavaScriptFunction)", "String(Match)", "bool()", "ListBuilder()", "ListMultimapBuilder()", "MapBuilder()", "IndentingBuiltValueToStringHelper(String)", "SetMultimapBuilder()", "_Future<@>?()", "int(int,@)", "Object?(~)", "ListBuilder()", "ListBuilder()", "JSObject(Object,StackTrace)", "String(@)", "bool(String,String)", "int(String)", "Null(String,String[Object?])", "bool(Object)", "~(List)", "MediaType()", "~(String,String)", "~(int,@)", "Logger()", "~(String,int?)", "String(String?)", "String?()", "int(_Line)", "~(String,int)", "Object(_Line)", "Object(_Highlight)", "int(_Highlight,_Highlight)", "List<_Line>(MapEntry>)", "int(int)", "SourceSpanWithContext()", "Null(@,StackTrace)", "~(String?)", "Future()", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "Null(WebSocket)", "~(WebSocketEvent)", "Null(Object)", "HotReloadResponse([~(HotReloadResponseBuilder)])", "JSObject(String[bool?])", "~(List)", "ListBuilder(BatchedDebugEventsBuilder)", "Null(String,String)", "DebugEventBuilder(DebugEventBuilder)", "Null(String)", "RegisterEventBuilder(RegisterEventBuilder)", "DevToolsRequestBuilder(DevToolsRequestBuilder)", "Future<~>(String)", "ConnectRequestBuilder(ConnectRequestBuilder)", "DebugInfoBuilder(DebugInfoBuilder)", "~(bool)", "Null(~())", "bool(bool)", "List(String)", "int(String,String)", "Null(JavaScriptObject)", "JSObject()()", "@(@,String)", "@(String)", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)", "0^()(Zone,ZoneDelegate,Zone,0^())", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "~(String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map?)", "0^(0^,0^)", "SetBuilder()"], interceptorsByTag: null, leafTags: null, arrayRti: Symbol("$ti"), rttc: {} }; - A._Universe_addRules(init.typeUniverse, JSON.parse('{"JavaScriptFunction":"LegacyJavaScriptObject","PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptObject":{"JSObject":[]},"JSArray":{"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"],"JSIndexable":["1"],"Iterable.E":"1"},"JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"JavaScriptObject":[],"JSObject":[]},"JSArraySafeToStringHook":{"SafeToStringHook":[]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"],"JSIndexable":["1"],"Iterable.E":"1"},"ArrayIterator":{"Iterator":["1"]},"JSNumber":{"double":[],"num":[],"Comparable":["num"]},"JSInt":{"double":[],"int":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSNumNotInt":{"double":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSString":{"String":[],"Comparable":["String"],"Pattern":[],"JSIndexable":["@"],"TrustedGetRuntimeType":[]},"_CastIterableBase":{"Iterable":["2"]},"CastIterator":{"Iterator":["2"]},"CastIterable":{"_CastIterableBase":["1","2"],"Iterable":["2"],"Iterable.E":"2"},"_EfficientLengthCastIterable":{"CastIterable":["1","2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"_CastListBase":{"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"]},"CastList":{"_CastListBase":["1","2"],"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","Iterable.E":"2"},"CastMap":{"MapBase":["3","4"],"Map":["3","4"],"MapBase.K":"3","MapBase.V":"4"},"LateError":{"Error":[]},"CodeUnits":{"ListBase":["int"],"UnmodifiableListMixin":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"ListBase.E":"int","Iterable.E":"int","UnmodifiableListMixin.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ListIterator":{"Iterator":["1"]},"MappedIterable":{"Iterable":["2"],"Iterable.E":"2"},"EfficientLengthMappedIterable":{"MappedIterable":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MappedIterator":{"Iterator":["2"]},"MappedListIterable":{"ListIterable":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListIterable.E":"2","Iterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereIterator":{"Iterator":["1"]},"ExpandIterable":{"Iterable":["2"],"Iterable.E":"2"},"ExpandIterator":{"Iterator":["2"]},"TakeIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthTakeIterable":{"TakeIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"TakeIterator":{"Iterator":["1"]},"SkipIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthSkipIterable":{"SkipIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipIterator":{"Iterator":["1"]},"EmptyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"EmptyIterator":{"Iterator":["1"]},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterator":{"Iterator":["1"]},"UnmodifiableListBase":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ReversedListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ConstantMap":{"Map":["1","2"]},"ConstantStringMap":{"ConstantMap":["1","2"],"Map":["1","2"]},"_KeysOrValues":{"Iterable":["1"],"Iterable.E":"1"},"_KeysOrValuesOrElementsIterator":{"Iterator":["1"]},"Instantiation":{"Closure":[],"Function":[]},"Instantiation1":{"Closure":[],"Function":[]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"NullThrownFromJavaScriptException":{"Exception":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Closure":[],"Function":[]},"Closure2Args":{"Closure":[],"Function":[]},"TearOffClosure":{"Closure":[],"Function":[]},"StaticClosure":{"Closure":[],"Function":[]},"BoundClosure":{"Closure":[],"Function":[]},"RuntimeError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"LinkedHashMapKeysIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapKeyIterator":{"Iterator":["1"]},"LinkedHashMapValuesIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapValueIterator":{"Iterator":["1"]},"LinkedHashMapEntriesIterable":{"EfficientLengthIterable":["MapEntry<1,2>"],"Iterable":["MapEntry<1,2>"],"Iterable.E":"MapEntry<1,2>"},"LinkedHashMapEntryIterator":{"Iterator":["MapEntry<1,2>"]},"JsIdentityLinkedHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"JSSyntaxRegExp":{"RegExp":[],"Pattern":[]},"_MatchImplementation":{"RegExpMatch":[],"Match":[]},"_AllMatchesIterable":{"Iterable":["RegExpMatch"],"Iterable.E":"RegExpMatch"},"_AllMatchesIterator":{"Iterator":["RegExpMatch"]},"StringMatch":{"Match":[]},"_StringAllMatchesIterable":{"Iterable":["Match"],"Iterable.E":"Match"},"_StringAllMatchesIterator":{"Iterator":["Match"]},"NativeByteBuffer":{"JavaScriptObject":[],"JSObject":[],"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeTypedData":{"JavaScriptObject":[],"JSObject":[]},"NativeByteData":{"JavaScriptObject":[],"ByteData":[],"JSObject":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"],"JavaScriptObject":[],"JSObject":[],"JSIndexable":["1"]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"Float32List":[],"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double","FixedLengthListMixin.E":"double"},"NativeFloat64List":{"Float64List":[],"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double","FixedLengthListMixin.E":"double"},"NativeInt16List":{"NativeTypedArrayOfInt":[],"Int16List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeInt32List":{"NativeTypedArrayOfInt":[],"Int32List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeInt8List":{"NativeTypedArrayOfInt":[],"Int8List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint16List":{"NativeTypedArrayOfInt":[],"Uint16List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint32List":{"NativeTypedArrayOfInt":[],"Uint32List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint8ClampedList":{"NativeTypedArrayOfInt":[],"Uint8ClampedList":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint8List":{"NativeTypedArrayOfInt":[],"Uint8List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"_Type":{"Type":[]},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_TimerImpl":{"Timer":[]},"_AsyncAwaitCompleter":{"Completer":["1"]},"_Completer":{"Completer":["1"]},"_AsyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_SyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_Future":{"Future":["1"]},"StreamView":{"Stream":["1"]},"_StreamController":{"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_AsyncStreamController":{"_AsyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_SyncStreamController":{"_SyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamSinkWrapper":{"StreamSink":["1"]},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_DelayedData":{"_DelayedEvent":["1"]},"_DelayedError":{"_DelayedEvent":["@"]},"_DelayedDone":{"_DelayedEvent":["@"]},"_DoneStreamSubscription":{"StreamSubscription":["1"]},"_EmptyStream":{"Stream":["1"],"Stream.T":"1"},"_ForwardingStream":{"Stream":["2"]},"_ForwardingStreamSubscription":{"_BufferingStreamSubscription":["2"],"StreamSubscription":["2"],"_EventSink":["2"],"_EventDispatch":["2"],"_BufferingStreamSubscription.T":"2"},"_MapStream":{"_ForwardingStream":["1","2"],"Stream":["2"],"Stream.T":"2"},"_ZoneSpecification":{"ZoneSpecification":[]},"_ZoneDelegate":{"ZoneDelegate":[]},"_Zone":{"Zone":[]},"_CustomZone":{"_Zone":[],"Zone":[]},"_RootZone":{"_Zone":[],"Zone":[]},"_SplayTreeSetNode":{"_SplayTreeNode":["1","_SplayTreeSetNode<1>"],"_SplayTreeNode.K":"1","_SplayTreeNode.1":"_SplayTreeSetNode<1>"},"_HashMap":{"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_IdentityHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_CustomHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashMapKeyIterator":{"Iterator":["1"]},"_LinkedCustomHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashSetIterator":{"Iterator":["1"]},"_LinkedHashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_LinkedHashSetIterator":{"Iterator":["1"]},"UnmodifiableListView":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","Iterable.E":"1","UnmodifiableListMixin.E":"1"},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":["1","2"],"MapView":["1","2"],"_UnmodifiableMapMixin":["1","2"],"Map":["1","2"]},"ListQueue":{"Queue":["1"],"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"_ListQueueIterator":{"Iterator":["1"]},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SplayTreeIterator":{"Iterator":["3"]},"_SplayTreeKeyIterator":{"_SplayTreeIterator":["1","2","1"],"Iterator":["1"],"_SplayTreeIterator.K":"1","_SplayTreeIterator.T":"1","_SplayTreeIterator.1":"2"},"SplayTreeSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"_SplayTree":["1","_SplayTreeSetNode<1>"],"Iterable":["1"],"Iterable.E":"1","_SplayTree.1":"_SplayTreeSetNode<1>","_SplayTree.K":"1"},"Encoding":{"Codec":["String","List"]},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"String"},"AsciiCodec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"_UnicodeSubsetEncoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"AsciiEncoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"_UnicodeSubsetDecoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"AsciiDecoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Base64Codec":{"Codec":["List","String"],"Codec.S":"List"},"Base64Encoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Base64Decoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Converter":{"StreamTransformer":["1","2"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"],"Codec.S":"Object?"},"JsonEncoder":{"Converter":["Object?","String"],"StreamTransformer":["Object?","String"]},"JsonDecoder":{"Converter":["String","Object?"],"StreamTransformer":["String","Object?"]},"Latin1Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Latin1Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Latin1Decoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Utf8Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Utf8Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Utf8Decoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"BigInt":{"Comparable":["BigInt"]},"DateTime":{"Comparable":["DateTime"]},"double":{"num":[],"Comparable":["num"]},"Duration":{"Comparable":["Duration"]},"int":{"num":[],"Comparable":["num"]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"num":{"Comparable":["num"]},"RegExp":{"Pattern":[]},"RegExpMatch":{"Match":[]},"Set":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"String":{"Comparable":["String"],"Pattern":[]},"_BigIntImpl":{"BigInt":[],"Comparable":["BigInt"]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"IntegerDivisionByZeroException":{"Exception":[],"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"NullRejectionException":{"Exception":[]},"_JSRandom":{"Random":[]},"DelegatingStreamSink":{"StreamSink":["1"]},"ErrorResult":{"Result":["0&"]},"ValueResult":{"Result":["1"]},"_NextRequest":{"_EventRequest":["1"]},"_HasNextRequest":{"_EventRequest":["1"]},"BuiltList":{"Iterable":["1"]},"_BuiltList":{"BuiltList":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltListMultimap":{"BuiltListMultimap":["1","2"]},"_BuiltMap":{"BuiltMap":["1","2"]},"BuiltSet":{"Iterable":["1"]},"_BuiltSet":{"BuiltSet":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltSetMultimap":{"BuiltSetMultimap":["1","2"]},"BuiltValueNullFieldError":{"Error":[]},"BuiltValueNestedFieldError":{"Error":[]},"BoolJsonObject":{"JsonObject":[]},"ListJsonObject":{"JsonObject":[]},"MapJsonObject":{"JsonObject":[]},"NumJsonObject":{"JsonObject":[]},"StringJsonObject":{"JsonObject":[]},"DeserializationError":{"Error":[]},"BigIntSerializer":{"PrimitiveSerializer":["BigInt"],"Serializer":["BigInt"]},"BoolSerializer":{"PrimitiveSerializer":["bool"],"Serializer":["bool"]},"BuiltJsonSerializers":{"Serializers":[]},"BuiltListMultimapSerializer":{"StructuredSerializer":["BuiltListMultimap<@,@>"],"Serializer":["BuiltListMultimap<@,@>"]},"BuiltListSerializer":{"StructuredSerializer":["BuiltList<@>"],"Serializer":["BuiltList<@>"]},"BuiltMapSerializer":{"StructuredSerializer":["BuiltMap<@,@>"],"Serializer":["BuiltMap<@,@>"]},"BuiltSetMultimapSerializer":{"StructuredSerializer":["BuiltSetMultimap<@,@>"],"Serializer":["BuiltSetMultimap<@,@>"]},"BuiltSetSerializer":{"StructuredSerializer":["BuiltSet<@>"],"Serializer":["BuiltSet<@>"]},"DateTimeSerializer":{"PrimitiveSerializer":["DateTime"],"Serializer":["DateTime"]},"DoubleSerializer":{"PrimitiveSerializer":["double"],"Serializer":["double"]},"DurationSerializer":{"PrimitiveSerializer":["Duration"],"Serializer":["Duration"]},"Int32Serializer":{"PrimitiveSerializer":["Int32"],"Serializer":["Int32"]},"Int64Serializer":{"PrimitiveSerializer":["Int64"],"Serializer":["Int64"]},"IntSerializer":{"PrimitiveSerializer":["int"],"Serializer":["int"]},"JsonObjectSerializer":{"PrimitiveSerializer":["JsonObject"],"Serializer":["JsonObject"]},"ListSerializer":{"StructuredSerializer":["List<@>"],"Serializer":["List<@>"]},"MapSerializer":{"StructuredSerializer":["Map<@,@>"],"Serializer":["Map<@,@>"]},"NullSerializer":{"PrimitiveSerializer":["Null"],"Serializer":["Null"]},"NumSerializer":{"PrimitiveSerializer":["num"],"Serializer":["num"]},"RegExpSerializer":{"PrimitiveSerializer":["RegExp"],"Serializer":["RegExp"]},"SetSerializer":{"StructuredSerializer":["Set<@>"],"Serializer":["Set<@>"]},"StringSerializer":{"PrimitiveSerializer":["String"],"Serializer":["String"]},"Uint8ListSerializer":{"PrimitiveSerializer":["Uint8List"],"Serializer":["Uint8List"]},"UriSerializer":{"PrimitiveSerializer":["Uri"],"Serializer":["Uri"]},"CanonicalizedMap":{"Map":["2","3"]},"DefaultEquality":{"Equality":["1"]},"IterableEquality":{"Equality":["Iterable<1>"]},"ListEquality":{"Equality":["List<1>"]},"_UnorderedEquality":{"Equality":["2"]},"SetEquality":{"_UnorderedEquality":["1","Set<1>"],"Equality":["Set<1>"],"_UnorderedEquality.E":"1","_UnorderedEquality.T":"Set<1>"},"MapEquality":{"Equality":["Map<1,2>"]},"DeepCollectionEquality":{"Equality":["@"]},"QueueList":{"ListBase":["1"],"List":["1"],"Queue":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","QueueList.E":"1","Iterable.E":"1"},"_CastQueueList":{"QueueList":["2"],"ListBase":["2"],"List":["2"],"Queue":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","QueueList.E":"2","Iterable.E":"2"},"_$BuildStatusSerializer":{"PrimitiveSerializer":["BuildStatus"],"Serializer":["BuildStatus"]},"_$BuildResultSerializer":{"StructuredSerializer":["BuildResult"],"Serializer":["BuildResult"]},"_$BuildResult":{"BuildResult":[]},"_$ConnectRequestSerializer":{"StructuredSerializer":["ConnectRequest"],"Serializer":["ConnectRequest"]},"_$ConnectRequest":{"ConnectRequest":[]},"_$DebugEventSerializer":{"StructuredSerializer":["DebugEvent"],"Serializer":["DebugEvent"]},"_$BatchedDebugEventsSerializer":{"StructuredSerializer":["BatchedDebugEvents"],"Serializer":["BatchedDebugEvents"]},"_$DebugEvent":{"DebugEvent":[]},"_$BatchedDebugEvents":{"BatchedDebugEvents":[]},"_$DebugInfoSerializer":{"StructuredSerializer":["DebugInfo"],"Serializer":["DebugInfo"]},"_$DebugInfo":{"DebugInfo":[]},"_$DevToolsRequestSerializer":{"StructuredSerializer":["DevToolsRequest"],"Serializer":["DevToolsRequest"]},"_$DevToolsResponseSerializer":{"StructuredSerializer":["DevToolsResponse"],"Serializer":["DevToolsResponse"]},"_$DevToolsRequest":{"DevToolsRequest":[]},"_$DevToolsResponse":{"DevToolsResponse":[]},"_$ErrorResponseSerializer":{"StructuredSerializer":["ErrorResponse"],"Serializer":["ErrorResponse"]},"_$ErrorResponse":{"ErrorResponse":[]},"_$ExtensionRequestSerializer":{"StructuredSerializer":["ExtensionRequest"],"Serializer":["ExtensionRequest"]},"_$ExtensionResponseSerializer":{"StructuredSerializer":["ExtensionResponse"],"Serializer":["ExtensionResponse"]},"_$ExtensionEventSerializer":{"StructuredSerializer":["ExtensionEvent"],"Serializer":["ExtensionEvent"]},"_$BatchedEventsSerializer":{"StructuredSerializer":["BatchedEvents"],"Serializer":["BatchedEvents"]},"_$ExtensionRequest":{"ExtensionRequest":[]},"_$ExtensionResponse":{"ExtensionResponse":[]},"_$ExtensionEvent":{"ExtensionEvent":[]},"_$BatchedEvents":{"BatchedEvents":[]},"_$HotReloadRequestSerializer":{"StructuredSerializer":["HotReloadRequest"],"Serializer":["HotReloadRequest"]},"_$HotReloadRequest":{"HotReloadRequest":[]},"_$HotReloadResponseSerializer":{"StructuredSerializer":["HotReloadResponse"],"Serializer":["HotReloadResponse"]},"_$HotReloadResponse":{"HotReloadResponse":[]},"_$IsolateExitSerializer":{"StructuredSerializer":["IsolateExit"],"Serializer":["IsolateExit"]},"_$IsolateStartSerializer":{"StructuredSerializer":["IsolateStart"],"Serializer":["IsolateStart"]},"_$IsolateExit":{"IsolateExit":[]},"_$IsolateStart":{"IsolateStart":[]},"_$RegisterEventSerializer":{"StructuredSerializer":["RegisterEvent"],"Serializer":["RegisterEvent"]},"_$RegisterEvent":{"RegisterEvent":[]},"_$RunRequestSerializer":{"StructuredSerializer":["RunRequest"],"Serializer":["RunRequest"]},"_$RunRequest":{"RunRequest":[]},"SseSocketClient":{"SocketClient":[]},"WebSocketClient":{"SocketClient":[]},"Int32":{"Comparable":["Object"]},"Int64":{"Comparable":["Object"]},"ByteStream":{"StreamView":["List"],"Stream":["List"],"Stream.T":"List","StreamView.T":"List"},"ClientException":{"Exception":[]},"Request":{"BaseRequest":[]},"StreamedResponseV2":{"StreamedResponse":[]},"CaseInsensitiveMap":{"CanonicalizedMap":["String","String","1"],"Map":["String","1"],"CanonicalizedMap.K":"String","CanonicalizedMap.V":"1","CanonicalizedMap.C":"String"},"Level":{"Comparable":["Level"]},"PathException":{"Exception":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"FileLocation":{"SourceLocation":[],"Comparable":["SourceLocation"]},"_FileSpan":{"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceLocation":{"Comparable":["SourceLocation"]},"SourceLocationMixin":{"SourceLocation":[],"Comparable":["SourceLocation"]},"SourceSpan":{"Comparable":["SourceSpan"]},"SourceSpanBase":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanException":{"Exception":[]},"SourceSpanFormatException":{"FormatException":[],"Exception":[]},"SourceSpanMixin":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanWithContext":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SseClient":{"StreamChannel":["String?"]},"GuaranteeChannel":{"StreamChannel":["1"]},"_GuaranteeSink":{"StreamSink":["1"]},"StreamChannelMixin":{"StreamChannel":["1"]},"StringScannerException":{"FormatException":[],"Exception":[]},"_EventStream":{"Stream":["1"],"Stream.T":"1"},"_EventStreamSubscription":{"StreamSubscription":["1"]},"BrowserWebSocket":{"WebSocket":[]},"TextDataReceived":{"WebSocketEvent":[]},"BinaryDataReceived":{"WebSocketEvent":[]},"CloseReceived":{"WebSocketEvent":[]},"WebSocketException":{"Exception":[]},"WebSocketConnectionClosed":{"Exception":[]},"AdapterWebSocketChannel":{"WebSocketChannel":[],"StreamChannel":["@"]},"_WebSocketSink":{"WebSocketSink":[],"DelegatingStreamSink":["@"],"StreamSink":["@"],"DelegatingStreamSink.T":"@"},"WebSocketChannelException":{"Exception":[]},"DdcLibraryBundleRestarter":{"Restarter":[]},"DdcRestarter":{"Restarter":[]},"RequireRestarter":{"Restarter":[]},"HotReloadFailedException":{"Exception":[]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]}}')); + A._Universe_addRules(init.typeUniverse, JSON.parse('{"JavaScriptFunction":"LegacyJavaScriptObject","PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","NativeSharedArrayBuffer":"NativeByteBuffer","JavaScriptObject":{"JSObject":[]},"JSArray":{"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"],"JSIndexable":["1"],"Iterable.E":"1"},"JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"JavaScriptObject":[],"JSObject":[]},"JSArraySafeToStringHook":{"SafeToStringHook":[]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"],"JSIndexable":["1"],"Iterable.E":"1"},"ArrayIterator":{"Iterator":["1"]},"JSNumber":{"double":[],"num":[],"Comparable":["num"]},"JSInt":{"double":[],"int":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSNumNotInt":{"double":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSString":{"String":[],"Comparable":["String"],"Pattern":[],"JSIndexable":["@"],"TrustedGetRuntimeType":[]},"_CastIterableBase":{"Iterable":["2"]},"CastIterator":{"Iterator":["2"]},"CastIterable":{"_CastIterableBase":["1","2"],"Iterable":["2"],"Iterable.E":"2"},"_EfficientLengthCastIterable":{"CastIterable":["1","2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"_CastListBase":{"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"]},"CastList":{"_CastListBase":["1","2"],"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","Iterable.E":"2"},"CastMap":{"MapBase":["3","4"],"Map":["3","4"],"MapBase.K":"3","MapBase.V":"4"},"LateError":{"Error":[]},"CodeUnits":{"ListBase":["int"],"UnmodifiableListMixin":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"ListBase.E":"int","Iterable.E":"int","UnmodifiableListMixin.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ListIterator":{"Iterator":["1"]},"MappedIterable":{"Iterable":["2"],"Iterable.E":"2"},"EfficientLengthMappedIterable":{"MappedIterable":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MappedIterator":{"Iterator":["2"]},"MappedListIterable":{"ListIterable":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListIterable.E":"2","Iterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereIterator":{"Iterator":["1"]},"ExpandIterable":{"Iterable":["2"],"Iterable.E":"2"},"ExpandIterator":{"Iterator":["2"]},"TakeIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthTakeIterable":{"TakeIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"TakeIterator":{"Iterator":["1"]},"SkipIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthSkipIterable":{"SkipIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipIterator":{"Iterator":["1"]},"EmptyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"EmptyIterator":{"Iterator":["1"]},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterator":{"Iterator":["1"]},"UnmodifiableListBase":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ReversedListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ConstantMap":{"Map":["1","2"]},"ConstantStringMap":{"ConstantMap":["1","2"],"Map":["1","2"]},"_KeysOrValues":{"Iterable":["1"],"Iterable.E":"1"},"_KeysOrValuesOrElementsIterator":{"Iterator":["1"]},"Instantiation":{"Closure":[],"Function":[]},"Instantiation1":{"Closure":[],"Function":[]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"NullThrownFromJavaScriptException":{"Exception":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Closure":[],"Function":[]},"Closure2Args":{"Closure":[],"Function":[]},"TearOffClosure":{"Closure":[],"Function":[]},"StaticClosure":{"Closure":[],"Function":[]},"BoundClosure":{"Closure":[],"Function":[]},"RuntimeError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"LinkedHashMapKeysIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapKeyIterator":{"Iterator":["1"]},"LinkedHashMapValuesIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapValueIterator":{"Iterator":["1"]},"LinkedHashMapEntriesIterable":{"EfficientLengthIterable":["MapEntry<1,2>"],"Iterable":["MapEntry<1,2>"],"Iterable.E":"MapEntry<1,2>"},"LinkedHashMapEntryIterator":{"Iterator":["MapEntry<1,2>"]},"JsIdentityLinkedHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"JSSyntaxRegExp":{"RegExp":[],"Pattern":[]},"_MatchImplementation":{"RegExpMatch":[],"Match":[]},"_AllMatchesIterable":{"Iterable":["RegExpMatch"],"Iterable.E":"RegExpMatch"},"_AllMatchesIterator":{"Iterator":["RegExpMatch"]},"StringMatch":{"Match":[]},"_StringAllMatchesIterable":{"Iterable":["Match"],"Iterable.E":"Match"},"_StringAllMatchesIterator":{"Iterator":["Match"]},"NativeByteBuffer":{"JavaScriptObject":[],"JSObject":[],"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeArrayBuffer":{"NativeByteBuffer":[],"JavaScriptObject":[],"JSObject":[],"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeTypedData":{"JavaScriptObject":[],"JSObject":[]},"_UnmodifiableNativeByteBufferView":{"ByteBuffer":[]},"NativeByteData":{"JavaScriptObject":[],"ByteData":[],"JSObject":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"],"JavaScriptObject":[],"JSObject":[],"JSIndexable":["1"]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"Float32List":[],"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double","FixedLengthListMixin.E":"double"},"NativeFloat64List":{"Float64List":[],"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double","FixedLengthListMixin.E":"double"},"NativeInt16List":{"NativeTypedArrayOfInt":[],"Int16List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeInt32List":{"NativeTypedArrayOfInt":[],"Int32List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeInt8List":{"NativeTypedArrayOfInt":[],"Int8List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint16List":{"NativeTypedArrayOfInt":[],"Uint16List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint32List":{"NativeTypedArrayOfInt":[],"Uint32List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint8ClampedList":{"NativeTypedArrayOfInt":[],"Uint8ClampedList":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint8List":{"NativeTypedArrayOfInt":[],"Uint8List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"_Type":{"Type":[]},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_Future":{"Future":["1"]},"_TimerImpl":{"Timer":[]},"_AsyncAwaitCompleter":{"Completer":["1"]},"_Completer":{"Completer":["1"]},"_AsyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_SyncCompleter":{"_Completer":["1"],"Completer":["1"]},"StreamView":{"Stream":["1"]},"_StreamController":{"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_AsyncStreamController":{"_AsyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_SyncStreamController":{"_SyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamSinkWrapper":{"StreamSink":["1"]},"_StreamControllerAddStreamState":{"_AddStreamState":["1"]},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_DelayedData":{"_DelayedEvent":["1"]},"_DelayedError":{"_DelayedEvent":["@"]},"_DelayedDone":{"_DelayedEvent":["@"]},"_DoneStreamSubscription":{"StreamSubscription":["1"]},"_EmptyStream":{"Stream":["1"],"Stream.T":"1"},"_ForwardingStream":{"Stream":["2"]},"_ForwardingStreamSubscription":{"_BufferingStreamSubscription":["2"],"StreamSubscription":["2"],"_EventSink":["2"],"_EventDispatch":["2"],"_BufferingStreamSubscription.T":"2"},"_MapStream":{"_ForwardingStream":["1","2"],"Stream":["2"],"Stream.T":"2"},"_ZoneSpecification":{"ZoneSpecification":[]},"_ZoneDelegate":{"ZoneDelegate":[]},"_Zone":{"Zone":[]},"_CustomZone":{"_Zone":[],"Zone":[]},"_RootZone":{"_Zone":[],"Zone":[]},"_SplayTreeSetNode":{"_SplayTreeNode":["1","_SplayTreeSetNode<1>"],"_SplayTreeNode.K":"1","_SplayTreeNode.1":"_SplayTreeSetNode<1>"},"_HashMap":{"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_IdentityHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_CustomHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashMapKeyIterator":{"Iterator":["1"]},"_LinkedCustomHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashSetIterator":{"Iterator":["1"]},"_LinkedHashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_LinkedHashSetIterator":{"Iterator":["1"]},"UnmodifiableListView":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","Iterable.E":"1","UnmodifiableListMixin.E":"1"},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":["1","2"],"MapView":["1","2"],"_UnmodifiableMapMixin":["1","2"],"Map":["1","2"]},"ListQueue":{"Queue":["1"],"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"_ListQueueIterator":{"Iterator":["1"]},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SplayTreeIterator":{"Iterator":["3"]},"_SplayTreeKeyIterator":{"_SplayTreeIterator":["1","2","1"],"Iterator":["1"],"_SplayTreeIterator.K":"1","_SplayTreeIterator.T":"1","_SplayTreeIterator.1":"2"},"SplayTreeSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"_SplayTree":["1","_SplayTreeSetNode<1>"],"Iterable":["1"],"Iterable.E":"1","_SplayTree.1":"_SplayTreeSetNode<1>","_SplayTree.K":"1"},"Encoding":{"Codec":["String","List"]},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"String"},"AsciiCodec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"_UnicodeSubsetEncoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"AsciiEncoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"_UnicodeSubsetDecoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"AsciiDecoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Base64Codec":{"Codec":["List","String"],"Codec.S":"List"},"Base64Encoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Base64Decoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Converter":{"StreamTransformer":["1","2"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"],"Codec.S":"Object?"},"JsonEncoder":{"Converter":["Object?","String"],"StreamTransformer":["Object?","String"]},"JsonDecoder":{"Converter":["String","Object?"],"StreamTransformer":["String","Object?"]},"Latin1Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Latin1Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Latin1Decoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Utf8Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Utf8Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Utf8Decoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"BigInt":{"Comparable":["BigInt"]},"DateTime":{"Comparable":["DateTime"]},"double":{"num":[],"Comparable":["num"]},"Duration":{"Comparable":["Duration"]},"int":{"num":[],"Comparable":["num"]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"num":{"Comparable":["num"]},"RegExp":{"Pattern":[]},"RegExpMatch":{"Match":[]},"Set":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"String":{"Comparable":["String"],"Pattern":[]},"_BigIntImpl":{"BigInt":[],"Comparable":["BigInt"]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"IntegerDivisionByZeroException":{"Exception":[],"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"NullRejectionException":{"Exception":[]},"DelegatingStreamSink":{"StreamSink":["1"]},"ErrorResult":{"Result":["0&"]},"ValueResult":{"Result":["1"]},"_NextRequest":{"_EventRequest":["1"]},"_HasNextRequest":{"_EventRequest":["1"]},"BuiltList":{"Iterable":["1"]},"_BuiltList":{"BuiltList":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltListMultimap":{"BuiltListMultimap":["1","2"]},"_BuiltMap":{"BuiltMap":["1","2"]},"BuiltSet":{"Iterable":["1"]},"_BuiltSet":{"BuiltSet":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltSetMultimap":{"BuiltSetMultimap":["1","2"]},"BuiltValueNullFieldError":{"Error":[]},"BuiltValueNestedFieldError":{"Error":[]},"BoolJsonObject":{"JsonObject":[]},"ListJsonObject":{"JsonObject":[]},"MapJsonObject":{"JsonObject":[]},"NumJsonObject":{"JsonObject":[]},"StringJsonObject":{"JsonObject":[]},"DeserializationError":{"Error":[]},"BigIntSerializer":{"PrimitiveSerializer":["BigInt"],"Serializer":["BigInt"]},"BoolSerializer":{"PrimitiveSerializer":["bool"],"Serializer":["bool"]},"BuiltJsonSerializers":{"Serializers":[]},"BuiltListMultimapSerializer":{"StructuredSerializer":["BuiltListMultimap<@,@>"],"Serializer":["BuiltListMultimap<@,@>"]},"BuiltListSerializer":{"StructuredSerializer":["BuiltList<@>"],"Serializer":["BuiltList<@>"]},"BuiltMapSerializer":{"StructuredSerializer":["BuiltMap<@,@>"],"Serializer":["BuiltMap<@,@>"]},"BuiltSetMultimapSerializer":{"StructuredSerializer":["BuiltSetMultimap<@,@>"],"Serializer":["BuiltSetMultimap<@,@>"]},"BuiltSetSerializer":{"StructuredSerializer":["BuiltSet<@>"],"Serializer":["BuiltSet<@>"]},"DateTimeSerializer":{"PrimitiveSerializer":["DateTime"],"Serializer":["DateTime"]},"DoubleSerializer":{"PrimitiveSerializer":["double"],"Serializer":["double"]},"DurationSerializer":{"PrimitiveSerializer":["Duration"],"Serializer":["Duration"]},"Int32Serializer":{"PrimitiveSerializer":["Int32"],"Serializer":["Int32"]},"Int64Serializer":{"PrimitiveSerializer":["Int64"],"Serializer":["Int64"]},"IntSerializer":{"PrimitiveSerializer":["int"],"Serializer":["int"]},"JsonObjectSerializer":{"PrimitiveSerializer":["JsonObject"],"Serializer":["JsonObject"]},"ListSerializer":{"StructuredSerializer":["List<@>"],"Serializer":["List<@>"]},"MapSerializer":{"StructuredSerializer":["Map<@,@>"],"Serializer":["Map<@,@>"]},"NullSerializer":{"PrimitiveSerializer":["Null"],"Serializer":["Null"]},"NumSerializer":{"PrimitiveSerializer":["num"],"Serializer":["num"]},"RegExpSerializer":{"PrimitiveSerializer":["RegExp"],"Serializer":["RegExp"]},"SetSerializer":{"StructuredSerializer":["Set<@>"],"Serializer":["Set<@>"]},"StringSerializer":{"PrimitiveSerializer":["String"],"Serializer":["String"]},"Uint8ListSerializer":{"PrimitiveSerializer":["Uint8List"],"Serializer":["Uint8List"]},"UriSerializer":{"PrimitiveSerializer":["Uri"],"Serializer":["Uri"]},"CanonicalizedMap":{"Map":["2","3"]},"DefaultEquality":{"Equality":["1"]},"IterableEquality":{"Equality":["Iterable<1>"]},"ListEquality":{"Equality":["List<1>"]},"_UnorderedEquality":{"Equality":["2"]},"SetEquality":{"_UnorderedEquality":["1","Set<1>"],"Equality":["Set<1>"],"_UnorderedEquality.E":"1","_UnorderedEquality.T":"Set<1>"},"MapEquality":{"Equality":["Map<1,2>"]},"DeepCollectionEquality":{"Equality":["@"]},"QueueList":{"ListBase":["1"],"List":["1"],"Queue":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","QueueList.E":"1","Iterable.E":"1"},"_CastQueueList":{"QueueList":["2"],"ListBase":["2"],"List":["2"],"Queue":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","QueueList.E":"2","Iterable.E":"2"},"_$BuildStatusSerializer":{"PrimitiveSerializer":["BuildStatus"],"Serializer":["BuildStatus"]},"_$BuildResultSerializer":{"StructuredSerializer":["BuildResult"],"Serializer":["BuildResult"]},"_$BuildResult":{"BuildResult":[]},"_$ConnectRequestSerializer":{"StructuredSerializer":["ConnectRequest"],"Serializer":["ConnectRequest"]},"_$ConnectRequest":{"ConnectRequest":[]},"_$DebugEventSerializer":{"StructuredSerializer":["DebugEvent"],"Serializer":["DebugEvent"]},"_$BatchedDebugEventsSerializer":{"StructuredSerializer":["BatchedDebugEvents"],"Serializer":["BatchedDebugEvents"]},"_$DebugEvent":{"DebugEvent":[]},"_$BatchedDebugEvents":{"BatchedDebugEvents":[]},"_$DebugInfoSerializer":{"StructuredSerializer":["DebugInfo"],"Serializer":["DebugInfo"]},"_$DebugInfo":{"DebugInfo":[]},"_$DevToolsRequestSerializer":{"StructuredSerializer":["DevToolsRequest"],"Serializer":["DevToolsRequest"]},"_$DevToolsResponseSerializer":{"StructuredSerializer":["DevToolsResponse"],"Serializer":["DevToolsResponse"]},"_$DevToolsRequest":{"DevToolsRequest":[]},"_$DevToolsResponse":{"DevToolsResponse":[]},"_$ErrorResponseSerializer":{"StructuredSerializer":["ErrorResponse"],"Serializer":["ErrorResponse"]},"_$ErrorResponse":{"ErrorResponse":[]},"_$ExtensionRequestSerializer":{"StructuredSerializer":["ExtensionRequest"],"Serializer":["ExtensionRequest"]},"_$ExtensionResponseSerializer":{"StructuredSerializer":["ExtensionResponse"],"Serializer":["ExtensionResponse"]},"_$ExtensionEventSerializer":{"StructuredSerializer":["ExtensionEvent"],"Serializer":["ExtensionEvent"]},"_$BatchedEventsSerializer":{"StructuredSerializer":["BatchedEvents"],"Serializer":["BatchedEvents"]},"_$ExtensionRequest":{"ExtensionRequest":[]},"_$ExtensionResponse":{"ExtensionResponse":[]},"_$ExtensionEvent":{"ExtensionEvent":[]},"_$BatchedEvents":{"BatchedEvents":[]},"_$HotReloadRequestSerializer":{"StructuredSerializer":["HotReloadRequest"],"Serializer":["HotReloadRequest"]},"_$HotReloadRequest":{"HotReloadRequest":[]},"_$HotReloadResponseSerializer":{"StructuredSerializer":["HotReloadResponse"],"Serializer":["HotReloadResponse"]},"_$HotReloadResponse":{"HotReloadResponse":[]},"_$IsolateExitSerializer":{"StructuredSerializer":["IsolateExit"],"Serializer":["IsolateExit"]},"_$IsolateStartSerializer":{"StructuredSerializer":["IsolateStart"],"Serializer":["IsolateStart"]},"_$IsolateExit":{"IsolateExit":[]},"_$IsolateStart":{"IsolateStart":[]},"_$RegisterEventSerializer":{"StructuredSerializer":["RegisterEvent"],"Serializer":["RegisterEvent"]},"_$RegisterEvent":{"RegisterEvent":[]},"_$RunRequestSerializer":{"StructuredSerializer":["RunRequest"],"Serializer":["RunRequest"]},"_$RunRequest":{"RunRequest":[]},"SseSocketClient":{"SocketClient":[]},"WebSocketClient":{"SocketClient":[]},"Int32":{"Comparable":["Object"]},"Int64":{"Comparable":["Object"]},"RequestAbortedException":{"Exception":[]},"ByteStream":{"StreamView":["List"],"Stream":["List"],"Stream.T":"List","StreamView.T":"List"},"ClientException":{"Exception":[]},"Request":{"BaseRequest":[]},"StreamedResponseV2":{"StreamedResponse":[]},"CaseInsensitiveMap":{"CanonicalizedMap":["String","String","1"],"Map":["String","1"],"CanonicalizedMap.K":"String","CanonicalizedMap.V":"1","CanonicalizedMap.C":"String"},"Level":{"Comparable":["Level"]},"PathException":{"Exception":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"FileLocation":{"SourceLocation":[],"Comparable":["SourceLocation"]},"_FileSpan":{"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceLocation":{"Comparable":["SourceLocation"]},"SourceLocationMixin":{"SourceLocation":[],"Comparable":["SourceLocation"]},"SourceSpan":{"Comparable":["SourceSpan"]},"SourceSpanBase":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanException":{"Exception":[]},"SourceSpanFormatException":{"FormatException":[],"Exception":[]},"SourceSpanMixin":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanWithContext":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SseClient":{"StreamChannel":["String?"]},"GuaranteeChannel":{"StreamChannel":["1"]},"_GuaranteeSink":{"StreamSink":["1"]},"StreamChannelMixin":{"StreamChannel":["1"]},"StringScannerException":{"FormatException":[],"Exception":[]},"_EventStream":{"Stream":["1"],"Stream.T":"1"},"_EventStreamSubscription":{"StreamSubscription":["1"]},"BrowserWebSocket":{"WebSocket":[]},"TextDataReceived":{"WebSocketEvent":[]},"BinaryDataReceived":{"WebSocketEvent":[]},"CloseReceived":{"WebSocketEvent":[]},"WebSocketException":{"Exception":[]},"WebSocketConnectionClosed":{"Exception":[]},"AdapterWebSocketChannel":{"WebSocketChannel":[],"StreamChannel":["@"]},"_WebSocketSink":{"WebSocketSink":[],"DelegatingStreamSink":["@"],"StreamSink":["@"],"DelegatingStreamSink.T":"@"},"WebSocketChannelException":{"Exception":[]},"DdcLibraryBundleRestarter":{"Restarter":[]},"DdcRestarter":{"Restarter":[]},"RequireRestarter":{"Restarter":[]},"HotReloadFailedException":{"Exception":[]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]}}')); A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{"UnmodifiableListBase":1,"__CastListBase__CastIterableBase_ListMixin":2,"NativeTypedArray":1,"_DelayedEvent":1,"_SplayTreeSet__SplayTree_Iterable":1,"_SplayTreeSet__SplayTree_Iterable_SetMixin":1,"_QueueList_Object_ListMixin":1,"StreamChannelMixin":1}')); var string$ = { x00_____: "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\u03f6\x00\u0404\u03f4 \u03f4\u03f6\u01f6\u01f6\u03f6\u03fc\u01f4\u03ff\u03ff\u0584\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u05d4\u01f4\x00\u01f4\x00\u0504\u05c4\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u0400\x00\u0400\u0200\u03f7\u0200\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u0200\u0200\u0200\u03f7\x00", @@ -28223,6 +28600,7 @@ Error_: "Error handler must accept one Object or one Object and a StackTrace as arguments, and return a value of the returned future's type", Hot_reA: "Hot reload is not supported for the AMD module format.", Hot_reD: "Hot reload is not supported for the DDC module format.", + max_mu: "max must be in range 0 < max \u2264 2^32, was ", serial: "serializer must be StructuredSerializer or PrimitiveSerializer" }; var type$ = (function rtii() { @@ -28238,8 +28616,6 @@ BuildResult: findType("BuildResult"), BuildStatus: findType("BuildStatus"), BuiltListMultimap_dynamic_dynamic: findType("BuiltListMultimap<@,@>"), - BuiltList_DebugEvent: findType("BuiltList"), - BuiltList_ExtensionEvent: findType("BuiltList"), BuiltList_dynamic: findType("BuiltList<@>"), BuiltList_nullable_Object: findType("BuiltList"), BuiltMap_dynamic_dynamic: findType("BuiltMap<@,@>"), @@ -28285,6 +28661,7 @@ Iterable_int: findType("Iterable"), Iterable_nullable_Object: findType("Iterable"), JSArray_FullType: findType("JSArray"), + JSArray_JSObject: findType("JSArray"), JSArray_Object: findType("JSArray"), JSArray_String: findType("JSArray"), JSArray_Type: findType("JSArray"), @@ -28324,7 +28701,7 @@ Map_of_String_and_nullable_Object: findType("Map"), MappedListIterable_String_dynamic: findType("MappedListIterable"), MediaType: findType("MediaType"), - NativeByteBuffer: findType("NativeByteBuffer"), + NativeArrayBuffer: findType("NativeArrayBuffer"), NativeTypedArrayOfInt: findType("NativeTypedArrayOfInt"), NativeUint8List: findType("NativeUint8List"), Null: findType("Null"), @@ -28354,6 +28731,7 @@ StackTrace: findType("StackTrace"), StreamChannelController_nullable_Object: findType("StreamChannelController"), StreamQueue_DebugEvent: findType("StreamQueue"), + Stream_dynamic: findType("Stream<@>"), StreamedResponse: findType("StreamedResponse"), String: findType("String"), String_Function_Match: findType("String(Match)"), @@ -28377,19 +28755,18 @@ Zone: findType("Zone"), _AsyncCompleter_BrowserWebSocket: findType("_AsyncCompleter"), _AsyncCompleter_PoolResource: findType("_AsyncCompleter"), - _AsyncCompleter_StreamedResponse: findType("_AsyncCompleter"), _AsyncCompleter_String: findType("_AsyncCompleter"), _AsyncCompleter_Uint8List: findType("_AsyncCompleter"), _AsyncCompleter_bool: findType("_AsyncCompleter"), _AsyncCompleter_dynamic: findType("_AsyncCompleter<@>"), _AsyncCompleter_void: findType("_AsyncCompleter<~>"), + _AsyncStreamController_List_int: findType("_AsyncStreamController>"), _BigIntImpl: findType("_BigIntImpl"), _BuiltMap_dynamic_dynamic: findType("_BuiltMap<@,@>"), _EventRequest_dynamic: findType("_EventRequest<@>"), _EventStream_JSObject: findType("_EventStream"), _Future_BrowserWebSocket: findType("_Future"), _Future_PoolResource: findType("_Future"), - _Future_StreamedResponse: findType("_Future"), _Future_String: findType("_Future"), _Future_Uint8List: findType("_Future"), _Future_bool: findType("_Future"), @@ -28433,6 +28810,7 @@ nullable__Highlight: findType("_Highlight?"), nullable__LinkedHashSetCell: findType("_LinkedHashSetCell?"), nullable_bool: findType("bool?"), + nullable_bool_Function_Object: findType("bool(Object)?"), nullable_double: findType("double?"), nullable_int: findType("int?"), nullable_num: findType("num?"), @@ -28453,7 +28831,8 @@ void_Function_Object: findType("~(Object)"), void_Function_Object_StackTrace: findType("~(Object,StackTrace)"), void_Function_String_dynamic: findType("~(String,@)"), - void_Function_Timer: findType("~(Timer)") + void_Function_Timer: findType("~(Timer)"), + void_Function_int_dynamic: findType("~(int,@)") }; })(); (function constants() { @@ -28466,6 +28845,7 @@ B.JSString_methods = J.JSString.prototype; B.JavaScriptFunction_methods = J.JavaScriptFunction.prototype; B.JavaScriptObject_methods = J.JavaScriptObject.prototype; + B.NativeByteData_methods = A.NativeByteData.prototype; B.NativeUint32List_methods = A.NativeUint32List.prototype; B.NativeUint8List_methods = A.NativeUint8List.prototype; B.PlainJavaScriptObject_methods = J.PlainJavaScriptObject.prototype; @@ -28880,6 +29260,11 @@ _lazyFinal($, "_Uri__needsNoEncoding", "$get$_Uri__needsNoEncoding", () => A.RegExp_RegExp("^[\\-\\.0-9A-Z_a-z~]*$", true, false)); _lazyFinal($, "_hashSeed", "$get$_hashSeed", () => A.objectHashCode(B.Type_Object_A4p)); _lazyFinal($, "_jsBoxedDartObjectProperty", "$get$_jsBoxedDartObjectProperty", () => Symbol("jsBoxedDartObjectProperty")); + _lazyFinal($, "Random__secureRandom", "$get$Random__secureRandom", () => { + var t1 = new A._JSSecureRandom(new DataView(new ArrayBuffer(A._checkLength(8)))); + t1._JSSecureRandom$0(); + return t1; + }); _lazyFinal($, "isSoundMode", "$get$isSoundMode", () => !type$.List_int._is(A._setArrayType([], A.findType("JSArray")))); _lazy($, "newBuiltValueToStringHelper", "$get$newBuiltValueToStringHelper", () => new A.newBuiltValueToStringHelper_closure()); _lazyFinal($, "_runtimeType", "$get$_runtimeType", () => A.getRuntimeTypeOfDartObject(A.RegExp_RegExp("", true, false))); @@ -28931,11 +29316,10 @@ }); _lazyFinal($, "_logger", "$get$_logger", () => A.Logger_Logger("Utilities")); _lazyFinal($, "BaseRequest__tokenRE", "$get$BaseRequest__tokenRE", () => A.RegExp_RegExp("^[\\w!#%&'*+\\-.^`|~]+$", true, false)); - _lazyFinal($, "_digitRegex", "$get$_digitRegex", () => A.RegExp_RegExp("^\\d+$", true, false)); _lazyFinal($, "_escapedChar", "$get$_escapedChar", () => A.RegExp_RegExp('["\\x00-\\x1F\\x7F]', true, false)); _lazyFinal($, "token", "$get$token", () => A.RegExp_RegExp('[^()<>@,;:"\\\\/[\\]?={} \\t\\x00-\\x1F\\x7F]+', true, false)); _lazyFinal($, "_lws", "$get$_lws", () => A.RegExp_RegExp("(?:\\r\\n)?[ \\t]+", true, false)); - _lazyFinal($, "_quotedString", "$get$_quotedString", () => A.RegExp_RegExp('"(?:[^"\\x00-\\x1F\\x7F]|\\\\.)*"', true, false)); + _lazyFinal($, "_quotedString", "$get$_quotedString", () => A.RegExp_RegExp('"(?:[^"\\x00-\\x1F\\x7F\\\\]|\\\\.)*"', true, false)); _lazyFinal($, "_quotedPair", "$get$_quotedPair", () => A.RegExp_RegExp("\\\\(.)", true, false)); _lazyFinal($, "nonToken", "$get$nonToken", () => A.RegExp_RegExp('[()<>@,;:"\\\\/\\[\\]?={} \\t\\x00-\\x1F\\x7F]', true, false)); _lazyFinal($, "whitespace", "$get$whitespace", () => A.RegExp_RegExp("(?:" + $.$get$_lws().pattern + ")*", true, false)); @@ -28954,10 +29338,7 @@ t4 = A.Completer_Completer(type$.dynamic); return new A.Pool(t2, t3, t1, 1000, new A.AsyncMemoizer(t4, A.findType("AsyncMemoizer<@>"))); }); - _lazy($, "V1State_random", "$get$V1State_random", () => { - var t1 = A.Random_Random(null); - return new A.MathRNG(t1); - }); + _lazy($, "V1State_random", "$get$V1State_random", () => new A.CryptoRNG()); _lazyFinal($, "UuidParsing__byteToHex", "$get$UuidParsing__byteToHex", () => { var i, _list = J.JSArray_JSArray$allocateGrowable(256, type$.String); @@ -28965,6 +29346,7 @@ _list[i] = B.JSString_methods.padLeft$2(B.JSInt_methods.toRadixString$1(i, 16), 2, "0"); return _list; }); + _lazyFinal($, "CryptoRNG__secureRandom", "$get$CryptoRNG__secureRandom", () => $.$get$Random__secureRandom()); _lazyFinal($, "_noncePattern", "$get$_noncePattern", () => A.RegExp_RegExp("^[\\w+/_-]+[=]{0,2}$", true, false)); _lazyFinal($, "_createScript", "$get$_createScript", () => new A._createScript_closure().call$0()); })(); @@ -28991,8 +29373,8 @@ } init.dispatchPropertyName = init.getIsolateTag("dispatch_record"); }(); - hunkHelpers.setOrUpdateInterceptorsByTag({ArrayBuffer: A.NativeByteBuffer, ArrayBufferView: A.NativeTypedData, DataView: A.NativeByteData, Float32Array: A.NativeFloat32List, Float64Array: A.NativeFloat64List, Int16Array: A.NativeInt16List, Int32Array: A.NativeInt32List, Int8Array: A.NativeInt8List, Uint16Array: A.NativeUint16List, Uint32Array: A.NativeUint32List, Uint8ClampedArray: A.NativeUint8ClampedList, CanvasPixelArray: A.NativeUint8ClampedList, Uint8Array: A.NativeUint8List}); - hunkHelpers.setOrUpdateLeafTags({ArrayBuffer: true, ArrayBufferView: false, DataView: true, Float32Array: true, Float64Array: true, Int16Array: true, Int32Array: true, Int8Array: true, Uint16Array: true, Uint32Array: true, Uint8ClampedArray: true, CanvasPixelArray: true, Uint8Array: false}); + hunkHelpers.setOrUpdateInterceptorsByTag({SharedArrayBuffer: A.NativeByteBuffer, ArrayBuffer: A.NativeArrayBuffer, ArrayBufferView: A.NativeTypedData, DataView: A.NativeByteData, Float32Array: A.NativeFloat32List, Float64Array: A.NativeFloat64List, Int16Array: A.NativeInt16List, Int32Array: A.NativeInt32List, Int8Array: A.NativeInt8List, Uint16Array: A.NativeUint16List, Uint32Array: A.NativeUint32List, Uint8ClampedArray: A.NativeUint8ClampedList, CanvasPixelArray: A.NativeUint8ClampedList, Uint8Array: A.NativeUint8List}); + hunkHelpers.setOrUpdateLeafTags({SharedArrayBuffer: true, ArrayBuffer: true, ArrayBufferView: false, DataView: true, Float32Array: true, Float64Array: true, Int16Array: true, Int32Array: true, Int8Array: true, Uint16Array: true, Uint32Array: true, Uint8ClampedArray: true, CanvasPixelArray: true, Uint8Array: false}); A.NativeTypedArray.$nativeSuperclassTag = "ArrayBufferView"; A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin.$nativeSuperclassTag = "ArrayBufferView"; A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin_FixedLengthListMixin.$nativeSuperclassTag = "ArrayBufferView"; diff --git a/dwds/lib/src/services/chrome_proxy_service.dart b/dwds/lib/src/services/chrome_proxy_service.dart index c98bbc8ab..c06fd89b3 100644 --- a/dwds/lib/src/services/chrome_proxy_service.dart +++ b/dwds/lib/src/services/chrome_proxy_service.dart @@ -38,6 +38,38 @@ import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart'; /// Defines callbacks for sending messages to the connected client application. typedef SendClientRequest = void Function(Object request); +// This event is identical to the one sent by the VM service from +// sdk/lib/vmservice/vmservice.dart before existing VM service clients are +// disconnected. +final class DartDevelopmentServiceConnectedEvent extends Event { + DartDevelopmentServiceConnectedEvent({ + required super.timestamp, + required this.uri, + }) : message = + 'A Dart Developer Service instance has connected and this direct ' + 'connection to the VM service will now be closed. Please reconnect to ' + 'the Dart Development Service at $uri.', + super(kind: 'DartDevelopmentServiceConnected'); + + final String message; + final String uri; + + @override + Map toJson() => { + ...super.toJson(), + 'uri': uri, + 'message': message, + }; +} + +final class DisconnectNonDartDevelopmentServiceClients extends RPCError { + DisconnectNonDartDevelopmentServiceClients() + : super('_yieldControlToDDS', kErrorCode); + + // Arbitrary error code that's unlikely to be used elsewhere. + static const kErrorCode = -199328; +} + /// A proxy from the chrome debug protocol to the dart vm service protocol. class ChromeProxyService implements VmServiceInterface { final bool useWebSocket; @@ -1739,15 +1771,21 @@ class ChromeProxyService implements VmServiceInterface { @override Future yieldControlToDDS(String uri) async { - final canYield = DebugService.yieldControlToDDS(uri); + // This will throw an RPCError if there's already an existing DDS instance. + DebugService.yieldControlToDDS(uri); + + // Notify existing clients that DDS has connected and they're about to be + // disconnected. + final event = DartDevelopmentServiceConnectedEvent( + timestamp: DateTime.now().millisecondsSinceEpoch, + uri: uri, + ); + _streamNotify(EventStreams.kService, event); - if (!canYield) { - throw RPCError( - 'yieldControlToDDS', - RPCErrorKind.kFeatureDisabled.code, - 'Existing VM service clients prevent DDS from taking control.', - ); - } + // We throw since we have no other way to control what the response content + // is for this RPC. The debug service will check for this particular + // exception as a signal to close connections to all other clients. + throw DisconnectNonDartDevelopmentServiceClients(); } @override diff --git a/dwds/lib/src/services/debug_service.dart b/dwds/lib/src/services/debug_service.dart index ac90a0e17..c38ef892a 100644 --- a/dwds/lib/src/services/debug_service.dart +++ b/dwds/lib/src/services/debug_service.dart @@ -24,16 +24,87 @@ import 'package:shelf/shelf.dart' as shelf; import 'package:shelf/shelf.dart' hide Response; import 'package:shelf_web_socket/shelf_web_socket.dart'; import 'package:sse/server/sse_handler.dart'; +import 'package:stream_channel/stream_channel.dart'; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; const _kSseHandlerPath = '\$debugHandler'; bool _acceptNewConnections = true; -int _clientsConnected = 0; + +final _clientConnections = {}; +int _clientId = 0; Logger _logger = Logger('DebugService'); +void _handleConnection( + StreamChannel channel, + ChromeProxyService chromeProxyService, + ServiceExtensionRegistry serviceExtensionRegistry, { + void Function(Map)? onRequest, + void Function(Map)? onResponse, +}) { + final clientId = _clientId++; + final responseController = StreamController>(); + responseController.stream + .asyncMap((response) async { + // This error indicates a successful invocation to _yieldControlToDDS. + // We don't have a good way to access the list of connected clients + // while also being able to determine which client invoked the RPC + // without some form of client ID. + // + // We can probably do better than this, but it will likely involve some + // refactoring. + if (response case { + 'error': { + 'code': DisconnectNonDartDevelopmentServiceClients.kErrorCode, + }, + }) { + final nonDdsClients = _clientConnections.entries + .where((MapEntry e) => e.key != clientId) + .map((e) => e.value); + await Future.wait([ + for (final client in nonDdsClients) client.sink.close(), + ]); + // Remove the artificial error and return Success. + response.remove('error'); + response['result'] = Success().toJson(); + } + if (onResponse != null) onResponse(response); + channel.sink.add(jsonEncode(response)); + }) + .listen(channel.sink.add, onError: channel.sink.addError); + final inputStream = channel.stream.map((value) { + if (value is List) { + value = utf8.decode(value); + } else if (value is! String) { + throw StateError( + 'Got value with unexpected type ${value.runtimeType} from web ' + 'socket, expected a List or String.', + ); + } + final request = Map.from(jsonDecode(value)); + if (onRequest != null) onRequest(request); + return request; + }); + VmServerConnection( + inputStream, + responseController.sink, + serviceExtensionRegistry, + chromeProxyService, + ).done.whenComplete(() { + _clientConnections.remove(clientId); + if (!_acceptNewConnections && _clientConnections.isEmpty) { + // DDS has disconnected so we can allow for clients to connect directly + // to DWDS. + DebugService._ddsUri = null; + _acceptNewConnections = true; + } + }); + _clientConnections[clientId] = channel; +} + void Function(WebSocketChannel, String?) _createNewConnectionHandler( ChromeProxyService chromeProxyService, ServiceExtensionRegistry serviceExtensionRegistry, { @@ -41,40 +112,13 @@ void Function(WebSocketChannel, String?) _createNewConnectionHandler( void Function(Map)? onResponse, }) { return (webSocket, subprotocol) { - final responseController = StreamController>(); - webSocket.sink.addStream( - responseController.stream.map((response) { - if (onResponse != null) onResponse(response); - return jsonEncode(response); - }), - ); - final inputStream = webSocket.stream.map((value) { - if (value is List) { - value = utf8.decode(value); - } else if (value is! String) { - throw StateError( - 'Got value with unexpected type ${value.runtimeType} from web ' - 'socket, expected a List or String.', - ); - } - final request = Map.from(jsonDecode(value)); - if (onRequest != null) onRequest(request); - return request; - }); - ++_clientsConnected; - VmServerConnection( - inputStream, - responseController.sink, - serviceExtensionRegistry, + _handleConnection( + webSocket, chromeProxyService, - ).done.whenComplete(() { - --_clientsConnected; - if (!_acceptNewConnections && _clientsConnected == 0) { - // DDS has disconnected so we can allow for clients to connect directly - // to DWDS. - _acceptNewConnections = true; - } - }); + serviceExtensionRegistry, + onRequest: onRequest, + onResponse: onResponse, + ); }; } @@ -87,41 +131,12 @@ Future _handleSseConnections( }) async { while (await handler.connections.hasNext) { final connection = await handler.connections.next; - final responseController = StreamController>(); - final sub = responseController.stream - .map((response) { - if (onResponse != null) onResponse(response); - return jsonEncode(response); - }) - .listen(connection.sink.add); - safeUnawaited( - chromeProxyService.remoteDebugger.onClose.first.whenComplete(() { - connection.sink.close(); - sub.cancel(); - }), - ); - final inputStream = connection.stream.map((value) { - final request = jsonDecode(value) as Map; - if (onRequest != null) onRequest(request); - return request; - }); - ++_clientsConnected; - final vmServerConnection = VmServerConnection( - inputStream, - responseController.sink, - serviceExtensionRegistry, + _handleConnection( + connection, chromeProxyService, - ); - safeUnawaited( - vmServerConnection.done.whenComplete(() { - --_clientsConnected; - if (!_acceptNewConnections && _clientsConnected == 0) { - // DDS has disconnected so we can allow for clients to connect directly - // to DWDS. - _acceptNewConnections = true; - } - return sub.cancel(); - }), + serviceExtensionRegistry, + onRequest: onRequest, + onResponse: onResponse, ); } } @@ -207,15 +222,19 @@ class DebugService { return _encodedUri = encoded; } - // TODO(https://github.com/dart-lang/webdev/issues/2399): yieldControlToDDS - // should disconnect existing non-DDS clients. - static bool yieldControlToDDS(String uri) { - if (_clientsConnected > 1) { - return false; + static void yieldControlToDDS(String uri) { + if (_ddsUri != null) { + // This exception is identical to the one thrown from + // sdk/lib/vmservice/vmservice.dart + throw RPCError( + '_yieldControlToDDS', + RPCErrorKind.kFeatureDisabled.code, + 'A DDS instance is already connected at $_ddsUri.', + {'ddsUri': _ddsUri.toString()}, + ); } - _ddsUri = uri; _acceptNewConnections = false; - return true; + _ddsUri = uri; } static Future start( diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart index 2786a7b0a..be5fcd593 100644 --- a/dwds/lib/src/version.dart +++ b/dwds/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '24.4.0'; +const packageVersion = '24.4.0+1'; diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index f139974a6..e98e0f831 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -1,6 +1,6 @@ name: dwds # Every time this changes you need to run `dart run build_runner build`. -version: 24.4.0 +version: 24.4.0+1 description: >- A service that proxies between the Chrome debug protocol and the Dart VM @@ -32,6 +32,7 @@ dependencies: shelf_web_socket: '>=1.0.0 <3.0.0' source_maps: ^0.10.10 stack_trace: ^1.10.0 + stream_channel: ^2.1.2 sse: ^4.1.2 uuid: ^4.0.0 vm_service: '>=14.2.4 <16.0.0' @@ -57,7 +58,6 @@ dev_dependencies: js: '>=0.6.4 <0.8.0' pubspec_parse: ^1.2.0 puppeteer: ^3.1.1 - stream_channel: ^2.1.2 test: ^1.21.6 test_common: path: ../test_common diff --git a/dwds/test/debug_service_test.dart b/dwds/test/debug_service_test.dart index ee9c3bf1a..ae9c8db8d 100644 --- a/dwds/test/debug_service_test.dart +++ b/dwds/test/debug_service_test.dart @@ -6,13 +6,12 @@ @Timeout(Duration(minutes: 2)) library; -import 'dart:async'; -import 'dart:convert'; import 'dart:io'; import 'package:test/test.dart'; import 'package:test_common/test_sdk_configuration.dart'; import 'package:vm_service/vm_service.dart'; +import 'package:vm_service/vm_service_io.dart'; import 'fixtures/context.dart'; import 'fixtures/project.dart'; @@ -37,90 +36,64 @@ void main() { test('Refuses connections without the auth token', () async { expect( - WebSocket.connect('ws://localhost:${context.debugConnection.port}/ws'), + vmServiceConnectUri('ws://localhost:${context.debugConnection.port}/ws'), throwsA(isA()), ); }); test('Accepts connections with the auth token', () async { expect( - WebSocket.connect( + vmServiceConnectUri( '${context.debugConnection.uri}/ws', - ).then((ws) => ws.close()), + ).then((client) => client.dispose()), completes, ); }); test('Refuses additional connections when in single client mode', () async { - final ddsWs = await WebSocket.connect('${context.debugConnection.uri}/ws'); - final completer = Completer(); - ddsWs.listen((event) { - final response = json.decode(event as String); - expect(response['id'], '0'); - expect(response.containsKey('result'), isTrue); - final result = response['result'] as Map; - expect(result['type'], 'Success'); - completer.complete(); - }); - - const yieldControlToDDS = { - 'jsonrpc': '2.0', - 'id': '0', - 'method': '_yieldControlToDDS', - 'params': {'uri': 'http://localhost:123'}, - }; - ddsWs.add(json.encode(yieldControlToDDS)); - await completer.future; + final fakeDds = await vmServiceConnectUri( + '${context.debugConnection.uri}/ws', + ); + final result = await fakeDds.callMethod( + '_yieldControlToDDS', + args: {'uri': 'http://localhost:123'}, + ); + expect(result, isA()); // While DDS is connected, expect additional connections to fail. await expectLater( - WebSocket.connect('${context.debugConnection.uri}/ws'), + vmServiceConnectUri('${context.debugConnection.uri}/ws'), throwsA(isA()), ); // However, once DDS is disconnected, additional clients can connect again. - await ddsWs.close(); + await fakeDds.dispose(); expect( - WebSocket.connect( + vmServiceConnectUri( '${context.debugConnection.uri}/ws', - ).then((ws) => ws.close()), + ).then((client) => client.dispose()), completes, ); }); test('Refuses to yield to dwds if existing clients found', () async { - final ddsWs = await WebSocket.connect('${context.debugConnection.uri}/ws'); + final fakeDds = await vmServiceConnectUri( + '${context.debugConnection.uri}/ws', + ); // Connect to vm service. - final ws = await WebSocket.connect('${context.debugConnection.uri}/ws'); - - final completer = Completer>(); - ddsWs.listen((event) { - completer.complete(json.decode(event as String)); - }); - - const yieldControlToDDS = { - 'jsonrpc': '2.0', - 'id': '0', - 'method': '_yieldControlToDDS', - 'params': {'uri': 'http://localhost:123'}, - }; - - // DDS should fail to start with existing vm clients. - ddsWs.add(json.encode(yieldControlToDDS)); - - final response = await completer.future; - expect(response['id'], '0'); - expect(response.containsKey('error'), isTrue); + final client = await vmServiceConnectUri( + '${context.debugConnection.uri}/ws', + ); - final result = response['error'] as Map; - expect(result['code'], RPCErrorKind.kFeatureDisabled.code); - expect( - result['message'], - 'Existing VM service clients prevent DDS from taking control.', + final result = await fakeDds.callMethod( + '_yieldControlToDDS', + args: {'uri': 'http://localhost:123'}, ); + expect(result, isA()); - await ddsWs.close(); - await ws.close(); + // The other VM service client should be closed automatically. + await client.onDone; + await fakeDds.dispose(); }); }