Skip to content

Commit 6bcd65a

Browse files
authored
fix(cli): Websocket error condition (#265)
Errors are returned in the `@status` field not the `@error` field.
1 parent 9b3ee88 commit 6bcd65a

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

apps/cli/fixtures/standalone/auth/client/lib/src/functions.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ class CelestFunctionsAuthenticatedLib {
302302
final $channel = celest.eventClient
303303
.connect(celest.baseUri.resolve('/authenticated-lib/stream-hello'));
304304
return $channel.stream.map(($event) {
305-
if ($event is Map<String, Object?> && $event.containsKey('@error')) {
305+
if ($event is Map<String, Object?> && $event.containsKey('@status')) {
306306
_throwError(body: $event);
307307
}
308308
return ($event as String);
@@ -590,7 +590,7 @@ class CelestFunctionsLib {
590590
final $channel = celest.eventClient
591591
.connect(celest.baseUri.resolve('/lib/stream-hello-authenticated'));
592592
return $channel.stream.map(($event) {
593-
if ($event is Map<String, Object?> && $event.containsKey('@error')) {
593+
if ($event is Map<String, Object?> && $event.containsKey('@status')) {
594594
_throwError(body: $event);
595595
}
596596
return ($event as String);
@@ -627,7 +627,7 @@ class CelestFunctionsLib {
627627
final $channel = celest.eventClient
628628
.connect(celest.baseUri.resolve('/lib/stream-hello-public'));
629629
return $channel.stream.map(($event) {
630-
if ($event is Map<String, Object?> && $event.containsKey('@error')) {
630+
if ($event is Map<String, Object?> && $event.containsKey('@status')) {
631631
_throwError(body: $event);
632632
}
633633
return ($event as String);
@@ -664,7 +664,7 @@ class CelestFunctionsLib {
664664
final $channel =
665665
celest.eventClient.connect(celest.baseUri.resolve('/lib/stream-hello'));
666666
return $channel.stream.map(($event) {
667-
if ($event is Map<String, Object?> && $event.containsKey('@error')) {
667+
if ($event is Map<String, Object?> && $event.containsKey('@status')) {
668668
_throwError(body: $event);
669669
}
670670
return ($event as String);
@@ -952,7 +952,7 @@ class CelestFunctionsPublicLib {
952952
final $channel = celest.eventClient
953953
.connect(celest.baseUri.resolve('/public-lib/stream-hello'));
954954
return $channel.stream.map(($event) {
955-
if ($event is Map<String, Object?> && $event.containsKey('@error')) {
955+
if ($event is Map<String, Object?> && $event.containsKey('@status')) {
956956
_throwError(body: $event);
957957
}
958958
return ($event as String);

apps/cli/fixtures/standalone/streaming/client/lib/src/functions.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ class CelestFunctionsServerSide {
282282
.connect(celest.baseUri.resolve('/server-side/hello'));
283283
$channel.sink.add({r'names': names});
284284
return $channel.stream.map(($event) {
285-
if ($event is Map<String, Object?> && $event.containsKey('@error')) {
285+
if ($event is Map<String, Object?> && $event.containsKey('@status')) {
286286
_throwError(body: $event);
287287
}
288288
return ($event as String);
@@ -298,7 +298,7 @@ class CelestFunctionsServerSide {
298298
.resolve('/server-side/stock-ticker')
299299
.replace(queryParameters: {r'symbol': symbol}));
300300
return $channel.stream.map(($event) {
301-
if ($event is Map<String, Object?> && $event.containsKey('@error')) {
301+
if ($event is Map<String, Object?> && $event.containsKey('@status')) {
302302
_throwError(body: $event);
303303
}
304304
return _$celest.Serializers.instance
@@ -314,7 +314,7 @@ class CelestFunctionsServerSide {
314314
final $channel = celest.eventClient
315315
.connect(celest.baseUri.resolve('/server-side/json-values'));
316316
return $channel.stream.map(($event) {
317-
if ($event is Map<String, Object?> && $event.containsKey('@error')) {
317+
if ($event is Map<String, Object?> && $event.containsKey('@status')) {
318318
_throwError(body: $event);
319319
}
320320
return _$celest.Serializers.instance.deserialize<_$celest.JsonValue>(

apps/cli/lib/src/codegen/client/categories/client_functions_generator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ final class ClientFunctionsGenerator {
152152
..requiredParameters.add(Parameter((p) => p.name = r'$event'))
153153
..body = Block.of([
154154
const Code(r'''
155-
if ($event is Map<String, Object?> && $event.containsKey('@error')) {
155+
if ($event is Map<String, Object?> && $event.containsKey('@status')) {
156156
_throwError(body: $event);
157157
}'''),
158158
returnedBody,

0 commit comments

Comments
 (0)