处理崩溃
This commit is contained in:
@@ -40,7 +40,7 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
}
|
||||
|
||||
- (void)dealloc {
|
||||
[self disconnect];
|
||||
[self disconnectInternal];
|
||||
}
|
||||
|
||||
#pragma mark - Public Methods
|
||||
@@ -124,14 +124,14 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
|
||||
- (void)finish {
|
||||
NSLog(@"[DeepgramWebSocketClient] Sending CloseStream");
|
||||
[self sendJSON:@{ @"type" : @"CloseStream" }];
|
||||
[self sendJSON:@{@"type" : @"CloseStream"}];
|
||||
}
|
||||
|
||||
- (void)sendKeepAlive {
|
||||
if (!self.connected || !self.webSocketTask) {
|
||||
return;
|
||||
}
|
||||
[self sendJSON:@{ @"type" : @"KeepAlive" }];
|
||||
[self sendJSON:@{@"type" : @"KeepAlive"}];
|
||||
}
|
||||
|
||||
- (void)enableAudioSending {
|
||||
@@ -165,24 +165,24 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
[self upsertQueryItemWithName:@"model" value:self.model items:items];
|
||||
[self upsertQueryItemWithName:@"language" value:self.language items:items];
|
||||
|
||||
[self upsertQueryItemWithName:@"punctuate"
|
||||
value:(self.punctuate ? @"true" : @"false")
|
||||
items:items];
|
||||
[self
|
||||
upsertQueryItemWithName:@"punctuate"
|
||||
value:(self.punctuate ? @"true" : @"false")items:items];
|
||||
[self upsertQueryItemWithName:@"smart_format"
|
||||
value:(self.smartFormat ? @"true" : @"false")
|
||||
items:items];
|
||||
value:(self.smartFormat ? @"true" : @"false")items
|
||||
:items];
|
||||
[self upsertQueryItemWithName:@"interim_results"
|
||||
value:(self.interimResults ? @"true" : @"false")
|
||||
items:items];
|
||||
value:(self.interimResults ? @"true" : @"false")items
|
||||
:items];
|
||||
|
||||
[self upsertQueryItemWithName:@"encoding" value:self.encoding items:items];
|
||||
[self upsertQueryItemWithName:@"sample_rate"
|
||||
value:[NSString stringWithFormat:@"%.0f",
|
||||
self.sampleRate]
|
||||
items:items];
|
||||
value:[NSString
|
||||
stringWithFormat:@"%.0f", self.sampleRate]
|
||||
items:items];
|
||||
[self upsertQueryItemWithName:@"channels"
|
||||
value:[NSString stringWithFormat:@"%d", self.channels]
|
||||
items:items];
|
||||
value:[NSString stringWithFormat:@"%d", self.channels]
|
||||
items:items];
|
||||
|
||||
components.queryItems = items;
|
||||
return components.URL;
|
||||
@@ -220,9 +220,8 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
return;
|
||||
}
|
||||
|
||||
NSString *jsonString =
|
||||
[[NSString alloc] initWithData:jsonData
|
||||
encoding:NSUTF8StringEncoding];
|
||||
NSString *jsonString = [[NSString alloc] initWithData:jsonData
|
||||
encoding:NSUTF8StringEncoding];
|
||||
if (!jsonString) {
|
||||
[self reportErrorWithMessage:@"Failed to encode JSON message"];
|
||||
return;
|
||||
@@ -231,13 +230,12 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
dispatch_async(self.networkQueue, ^{
|
||||
NSURLSessionWebSocketMessage *message =
|
||||
[[NSURLSessionWebSocketMessage alloc] initWithString:jsonString];
|
||||
[self.webSocketTask
|
||||
sendMessage:message
|
||||
completionHandler:^(NSError *_Nullable error) {
|
||||
if (error) {
|
||||
[self reportError:error];
|
||||
}
|
||||
}];
|
||||
[self.webSocketTask sendMessage:message
|
||||
completionHandler:^(NSError *_Nullable error) {
|
||||
if (error) {
|
||||
[self reportError:error];
|
||||
}
|
||||
}];
|
||||
});
|
||||
}
|
||||
|
||||
@@ -307,14 +305,15 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
}
|
||||
|
||||
NSArray *alternatives = channel[@"alternatives"];
|
||||
if (![alternatives isKindOfClass:[NSArray class]] || alternatives.count == 0) {
|
||||
if (![alternatives isKindOfClass:[NSArray class]] ||
|
||||
alternatives.count == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
NSDictionary *firstAlt = alternatives.firstObject;
|
||||
NSString *transcript = firstAlt[@"transcript"] ?: @"";
|
||||
BOOL isFinal = [json[@"is_final"] boolValue] ||
|
||||
[json[@"speech_final"] boolValue];
|
||||
BOOL isFinal =
|
||||
[json[@"is_final"] boolValue] || [json[@"speech_final"] boolValue];
|
||||
|
||||
if (transcript.length == 0) {
|
||||
return;
|
||||
@@ -364,11 +363,10 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
}
|
||||
|
||||
- (void)reportErrorWithMessage:(NSString *)message {
|
||||
NSError *error = [NSError errorWithDomain:kDeepgramWebSocketClientErrorDomain
|
||||
code:-1
|
||||
userInfo:@{
|
||||
NSLocalizedDescriptionKey : message ?: @""
|
||||
}];
|
||||
NSError *error =
|
||||
[NSError errorWithDomain:kDeepgramWebSocketClientErrorDomain
|
||||
code:-1
|
||||
userInfo:@{NSLocalizedDescriptionKey : message ?: @""}];
|
||||
[self reportError:error];
|
||||
}
|
||||
|
||||
@@ -376,8 +374,8 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
self.connected = NO;
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if ([self.delegate respondsToSelector:@selector
|
||||
(deepgramClientDidDisconnect:)]) {
|
||||
if ([self.delegate
|
||||
respondsToSelector:@selector(deepgramClientDidDisconnect:)]) {
|
||||
[self.delegate deepgramClientDidDisconnect:error];
|
||||
}
|
||||
});
|
||||
@@ -391,7 +389,8 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
self.connected = YES;
|
||||
NSLog(@"[DeepgramWebSocketClient] Connected");
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if ([self.delegate respondsToSelector:@selector(deepgramClientDidConnect)]) {
|
||||
if ([self.delegate
|
||||
respondsToSelector:@selector(deepgramClientDidConnect)]) {
|
||||
[self.delegate deepgramClientDidConnect];
|
||||
}
|
||||
});
|
||||
@@ -404,8 +403,7 @@ static NSString *const kDeepgramWebSocketClientErrorDomain =
|
||||
if (!self.webSocketTask) {
|
||||
return;
|
||||
}
|
||||
NSLog(@"[DeepgramWebSocketClient] Closed with code: %ld",
|
||||
(long)closeCode);
|
||||
NSLog(@"[DeepgramWebSocketClient] Closed with code: %ld", (long)closeCode);
|
||||
[self notifyDisconnect:nil];
|
||||
[self disconnectInternal];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user