Merge branch 'main' into lightfinder-rewrite

Reviewed-on: #6

LightlessSyncAPI/Dto/Files/DownloadFileDto.cs

@@ -5,11 +5,12 @@ namespace LightlessSync.API.Dto.Files;
 [MessagePackObject(keyAsPropertyName: true)]
 public record DownloadFileDto : ITransferFileDto
 {
-    public bool FileExists { get; set; } = true;
+    public bool FileExists { get; set; } = true;
-    public string Hash { get; set; } = string.Empty;
+    public string Hash { get; set; } = string.Empty;
-    public string Url { get; set; } = string.Empty;
+    public string Url { get; set; } = string.Empty;
-    public long Size { get; set; } = 0;
+    public string CDNDownloadUrl { get; set; } = string.Empty;
-    public bool IsForbidden { get; set; } = false;
+    public long Size { get; set; } = 0;
-    public string ForbiddenBy { get; set; } = string.Empty;
+    public bool IsForbidden { get; set; } = false;
-    public long RawSize { get; set; } = 0;
+    public string ForbiddenBy { get; set; } = string.Empty;
+    public long RawSize { get; set; } = 0;
 }

LightlessSyncAPI/Routes/LightlessFiles.cs

@@ -13,11 +13,12 @@ public class LightlessFiles
 
     public const string ServerFiles = "/files";
     public const string ServerFiles_DeleteAll = "deleteAll";
-    public const string ServerFiles_FilesSend = "filesSend";
+    public const string ServerFiles_FilesSend = "filesSend";
-    public const string ServerFiles_GetSizes = "getFileSizes";
+    public const string ServerFiles_GetSizes = "getFileSizes";
-    public const string ServerFiles_Upload = "upload";
+    public const string ServerFiles_Upload = "upload";
-    public const string ServerFiles_UploadMunged = "uploadMunged";
+    public const string ServerFiles_UploadMunged = "uploadMunged";
-    public const string ServerFiles_DownloadServers = "downloadServers";
+    public const string ServerFiles_DownloadServers = "downloadServers";
+    public const string ServerFiles_DirectDownload = "direct";
 
     public const string Distribution = "/dist";
     public const string Distribution_Get = "get";
@@ -38,9 +39,10 @@ public class LightlessFiles
     public static Uri ServerFilesDeleteAllFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_DeleteAll);
     public static Uri ServerFilesFilesSendFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_FilesSend);
     public static Uri ServerFilesGetSizesFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_GetSizes);
-    public static Uri ServerFilesUploadFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_Upload + "/" + hash);
+    public static Uri ServerFilesUploadFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_Upload + "/" + hash);
-    public static Uri ServerFilesUploadMunged(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_UploadMunged + "/" + hash);
+    public static Uri ServerFilesUploadMunged(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_UploadMunged + "/" + hash);
-    public static Uri ServerFilesGetDownloadServersFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_DownloadServers);
+    public static Uri ServerFilesGetDownloadServersFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_DownloadServers);
+    public static Uri ServerFilesDirectDownloadFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_DirectDownload + "/" + hash);
     public static Uri DistributionGetFullPath(Uri baseUri, string hash) => new(baseUri, Distribution + "/" + Distribution_Get + "?file=" + hash);
     public static Uri SpeedtestRunFullPath(Uri baseUri) => new(baseUri, Speedtest + "/" + Speedtest_Run);
     public static Uri MainSendReadyFullPath(Uri baseUri, string uid, Guid request) => new(baseUri, Main + "/" + Main_SendReady + "/" + "?uid=" + uid + "&requestId=" + request.ToString());

LightlessSyncAPI/SignalR/ILightlessHub.cs

@@ -7,9 +7,9 @@ using LightlessSync.API.Dto.User;
 
 namespace LightlessSync.API.SignalR;
 
-public interface ILightlessHub
+public interface ILightlessHub
-{
+{
-    const int ApiVersion = 33;
+    const int ApiVersion = 34;
     const string Path = "/lightless";
 
     Task<bool> CheckClientHealth();
@@ -68,15 +68,15 @@ public interface ILightlessHub
     Task GroupUnbanUser(GroupPairDto groupPair);
     Task<int> GroupPrune(GroupDto group, int days, bool execute);
 
-    Task UserAddPair(UserDto user);
+    Task UserAddPair(UserDto user);
-    Task TryPairWithContentId(string otherCid, string myCid);
+    Task TryPairWithContentId(string otherCid);
-
+
-    Task SetBroadcastStatus(string hashedCid, bool enabled, GroupBroadcastRequestDto? groupDto = null);
+    Task SetBroadcastStatus(bool enabled, GroupBroadcastRequestDto? groupDto = null);
     Task<bool> SetGroupBroadcastStatus(GroupBroadcastRequestDto dto);
     Task<List<GroupJoinDto>> GetBroadcastedGroups(List<BroadcastStatusInfoDto> broadcastEntries);
-    Task<BroadcastStatusInfoDto?> IsUserBroadcasting(string hashedCid);
+    Task<BroadcastStatusInfoDto?> IsUserBroadcasting(string hashedCid);
-    Task<BroadcastStatusBatchDto?> AreUsersBroadcasting(List<string> hashedCids);
+    Task<BroadcastStatusBatchDto?> AreUsersBroadcasting(List<string> hashedCids);
-    Task<TimeSpan?> GetBroadcastTtl(string hashedCid);
+    Task<TimeSpan?> GetBroadcastTtl();
 
     Task UserDelete();
     Task<List<OnlineUserIdentDto>> UserGetOnlinePairs(CensusDataDto? censusDataDto);