diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 570794013..5c78858c4 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -59,20 +59,38 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { - var request = new StreamAccessRequest() { Qualifier = qualifier }; - var response = await send(method_id, request); - if (!response.success) { - observer.OnError(new ApiException(response.error_message)); - return Disposable.Empty; + while (true) { + var response = await check_stream_access(method_id, qualifier); + if (response.success) { + if (response.value.Authorized) { + // success. Break loop and subscribe + break; + } + else { + // Not authorized. return empty stream + observer.OnCompleted(); + return Disposable.Empty; + } + } + else { + // Wait for stream to fire once before trying again + var tcs = new TaskCompletionSource(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + tcs.SetResult(true); + }; + await tcs.Task; + } } - else if (!response.value.Authorized) { - observer.OnError(new UnauthorizedAccessException()); - return Disposable.Empty; - } - return SubscribeNative(method, qualifier, parser, converter, observer); + + // Authorized. Stream events + return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; } + private Task> check_stream_access(int method_id, string qualifier) { + var request = new StreamAccessRequest() { Qualifier = qualifier }; + return send(method_id, request); + } private unsafe IDisposable SubscribeNative(string method, string qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { bool first_update = true; diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index 291adfe00..8682986b4 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -93,7 +93,7 @@ namespace bts { var ctx = new ServiceContext(); var s = ctx.locate(); - var d = s.subscribei_admin_data("quack").Subscribe(Console.WriteLine); + var d = s.subscribei_admin_data().Subscribe(Console.WriteLine); //var resp = s.get_admin_data(new VoidMessage()); //Console.WriteLine("{0}", resp);