mirror of
https://github.com/jwdeveloper/TikTokLiveJava.git
synced 2026-02-27 08:49:40 -05:00
Clarify Priority calling order
Altered pre-connection logic to make reason settable Optionally cancel connection if recorder is used and fails to find record url!
This commit is contained in:
@@ -23,11 +23,12 @@
|
|||||||
package io.github.jwdeveloper.tiktok.annotations;
|
package io.github.jwdeveloper.tiktok.annotations;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HIGHEST 1
|
ORDER -
|
||||||
* HIGH 2
|
* HIGHEST 1st,
|
||||||
* NORMAL 3
|
* HIGH 2nd,
|
||||||
* LOW 4
|
* NORMAL 3rd,
|
||||||
* LOWEST 5
|
* LOW 4th,
|
||||||
|
* LOWEST 5th
|
||||||
*/
|
*/
|
||||||
public enum Priority {
|
public enum Priority {
|
||||||
LOWEST(2), LOW(1), NORMAL(0), HIGH(-1), HIGHEST(-2);
|
LOWEST(2), LOW(1), NORMAL(0), HIGH(-1), HIGHEST(-2);
|
||||||
|
|||||||
@@ -35,9 +35,15 @@ public class TikTokPreConnectionEvent extends TikTokLiveClientEvent
|
|||||||
private final LiveUserData.Response userData;
|
private final LiveUserData.Response userData;
|
||||||
private final LiveData.Response roomData;
|
private final LiveData.Response roomData;
|
||||||
@Setter boolean cancelConnection = false;
|
@Setter boolean cancelConnection = false;
|
||||||
|
@Setter String reason = "TikTokPreConnectionEvent cancelled connection!";
|
||||||
|
|
||||||
public TikTokPreConnectionEvent(LiveUserData.Response userData, LiveData.Response liveData) {
|
public TikTokPreConnectionEvent(LiveUserData.Response userData, LiveData.Response liveData) {
|
||||||
this.userData = userData;
|
this.userData = userData;
|
||||||
this.roomData = liveData;
|
this.roomData = liveData;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setCancelConnection(boolean cancelConnection, String reason) {
|
||||||
|
this.cancelConnection = cancelConnection;
|
||||||
|
this.reason = reason;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2023-2024 jwdeveloper jacekwoln@gmail.com
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
* a copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be
|
||||||
|
* included in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package io.github.jwdeveloper.tiktok.exceptions;
|
||||||
|
|
||||||
|
import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class TikTokLivePreConnectionException extends TikTokLiveException
|
||||||
|
{
|
||||||
|
private final TikTokPreConnectionEvent preconnectEvent;
|
||||||
|
|
||||||
|
public TikTokLivePreConnectionException(TikTokPreConnectionEvent preconnectEvent) {
|
||||||
|
super(preconnectEvent.getReason());
|
||||||
|
this.preconnectEvent = preconnectEvent;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -140,7 +140,7 @@ public class TikTokLiveClient implements LiveClient
|
|||||||
var preconnectEvent = new TikTokPreConnectionEvent(userData, liveData);
|
var preconnectEvent = new TikTokPreConnectionEvent(userData, liveData);
|
||||||
tikTokEventHandler.publish(this, preconnectEvent);
|
tikTokEventHandler.publish(this, preconnectEvent);
|
||||||
if (preconnectEvent.isCancelConnection())
|
if (preconnectEvent.isCancelConnection())
|
||||||
throw new TikTokLiveException("TikTokPreConnectionEvent cancelled connection!");
|
throw new TikTokLivePreConnectionException(preconnectEvent);
|
||||||
|
|
||||||
if (clientSettings.isFetchGifts())
|
if (clientSettings.isFetchGifts())
|
||||||
giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts());
|
giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts());
|
||||||
|
|||||||
@@ -63,12 +63,14 @@ public class RecorderListener implements LiveRecorder {
|
|||||||
|
|
||||||
liveClient.getLogger().info("Searching for live download url");
|
liveClient.getLogger().info("Searching for live download url");
|
||||||
downloadData = settings.getPrepareDownloadData() != null ?
|
downloadData = settings.getPrepareDownloadData() != null ?
|
||||||
settings.getPrepareDownloadData().apply(json) :
|
settings.getPrepareDownloadData().apply(json) :
|
||||||
mapToDownloadData(json);
|
mapToDownloadData(json);
|
||||||
|
|
||||||
if (downloadData.getDownloadLiveUrl().isEmpty())
|
if (downloadData.getDownloadLiveUrl().isEmpty()) {
|
||||||
liveClient.getLogger().warning("Unable to find download live url!");
|
liveClient.getLogger().warning("Unable to find download live url!");
|
||||||
else
|
if (settings.isCancelConnectionIfNotFound())
|
||||||
|
event.setCancelConnection(true, "Unable to find download live url!");
|
||||||
|
} else
|
||||||
liveClient.getLogger().info("Live download url found!");
|
liveClient.getLogger().info("Live download url found!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,10 @@ public class RecorderSettings {
|
|||||||
private File outputFile;
|
private File outputFile;
|
||||||
private Function<String,DownloadData> prepareDownloadData;
|
private Function<String,DownloadData> prepareDownloadData;
|
||||||
private boolean stopOnDisconnect = true;
|
private boolean stopOnDisconnect = true;
|
||||||
|
/**
|
||||||
|
True to Cancel connection to live if the download url is not found
|
||||||
|
*/
|
||||||
|
private boolean cancelConnectionIfNotFound = false;
|
||||||
|
|
||||||
public static RecorderSettings DEFAULT() {
|
public static RecorderSettings DEFAULT() {
|
||||||
return new RecorderSettings();
|
return new RecorderSettings();
|
||||||
|
|||||||
Reference in New Issue
Block a user