Shikong/gb28181-docking-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

play playback 超时主动发送 bye 请求

Browse Source
This commit is contained in:
shikong 2023-10-05 13:11:45 +08:00
parent aa15ffd1a7
commit cc9f7a0e73
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gb28181-service/src/main/java/cn/skcks/docking/gb28181/service/play/PlayService.java
View File

@ -204,7 +204,7 @@ public class PlayService {
subscribe.getSipResponseSubscribe().delPublisher(subscribeKey); subscribe.getSipResponseSubscribe().delPublisher(subscribeKey);
} }
}; };
byeSubscribe(callId,3600,()->{ byeSubscribe(inviteRequestBuilder,provider,callId,3600,()->{
RedisUtil.KeyOps.delete(key); RedisUtil.KeyOps.delete(key);
}); });
subscribe.getSipResponseSubscribe().addSubscribe(subscribeKey, subscriber); subscribe.getSipResponseSubscribe().addSubscribe(subscribeKey, subscriber);
@ -313,7 +313,7 @@ public class PlayService {
subscribe.getRecordInfoSubscribe().delPublisher(subscribeKey); subscribe.getRecordInfoSubscribe().delPublisher(subscribeKey);
} }
}; };
byeSubscribe(callId,DateUtil.between(startTime,endTime,DateUnit.SECOND),()->{ byeSubscribe(inviteRequestBuilder,provider,callId,DateUtil.between(startTime,endTime,DateUnit.SECOND),()->{
RedisUtil.KeyOps.delete(key); RedisUtil.KeyOps.delete(key);
}); });
subscribe.getSipResponseSubscribe().addSubscribe(subscribeKey, subscriber); subscribe.getSipResponseSubscribe().addSubscribe(subscribeKey, subscriber);
@ -325,11 +325,12 @@ public class PlayService {
return result; return result;
} }
public void byeSubscribe(String callId, long seconds, Runnable cb){ public void byeSubscribe(InviteRequestBuilder inviteRequestBuilder,SipProvider provider, String callId, long seconds, Runnable cb){
GenericTimeoutSubscribe<SIPRequest> sipRequestSubscribe = subscribe.getSipRequestSubscribe(); GenericTimeoutSubscribe<SIPRequest> sipRequestSubscribe = subscribe.getSipRequestSubscribe();
String subscribeKey = GenericSubscribe.Helper.getKey(Request.BYE, callId); String subscribeKey = GenericSubscribe.Helper.getKey(Request.BYE, callId);
sipRequestSubscribe.addPublisher(subscribeKey,seconds + 30,TimeUnit.SECONDS); sipRequestSubscribe.addPublisher(subscribeKey,seconds + 30,TimeUnit.SECONDS);
Flow.Subscriber<SIPRequest> subscriber = new Flow.Subscriber<>(){ Flow.Subscriber<SIPRequest> subscriber = new Flow.Subscriber<>(){
SIPRequest request;
@Override @Override
public void onSubscribe(Flow.Subscription subscription) { public void onSubscribe(Flow.Subscription subscription) {
subscription.request(1); subscription.request(1);
@ -339,11 +340,7 @@ public class PlayService {
@SneakyThrows @SneakyThrows
public void onNext(SIPRequest item) { public void onNext(SIPRequest item) {
subscribe.getRecordInfoSubscribe().delPublisher(GenericSubscribe.Helper.getKey(Request.INVITE, callId)); subscribe.getRecordInfoSubscribe().delPublisher(GenericSubscribe.Helper.getKey(Request.INVITE, callId));
String transport = item.getTopmostViaHeader().getTransport(); request = item;
String hostAddress = item.getLocalAddress().getHostAddress();
Response byeResponse = InviteResponseBuilder.builder().build().createByeResponse(item, SipUtil.nanoId());
sipService.getProvider(transport,hostAddress).sendResponse(byeResponse);
cb.run();
subscribe.getRecordInfoSubscribe().complete(subscribeKey); subscribe.getRecordInfoSubscribe().complete(subscribeKey);
} }
@ -352,8 +349,17 @@ public class PlayService {
} }
@SneakyThrows
@Override @Override
public void onComplete() { public void onComplete() {
if(request != null){
Response byeResponse = InviteResponseBuilder.builder().build().createByeResponse(request, SipUtil.nanoId());
provider.sendResponse(byeResponse);
} else {
Request byeRequest = inviteRequestBuilder.createByeRequest(callId, SipRequestBuilder.getCSeq());
provider.sendRequest(byeRequest);
}
cb.run();
subscribe.getRecordInfoSubscribe().delPublisher(subscribeKey); subscribe.getRecordInfoSubscribe().delPublisher(subscribeKey);
} }
}; };