Kieran/zap-stream-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resume stream

Browse Source
This commit is contained in:
Kieran
2023-08-22 20:04:25 +01:00
parent 5a2bd21cec
commit 092804f023
5 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NostrStreamer/Services/StreamManager/IStreamManager.cs
View File

@ -80,4 +80,10 @@ public interface IStreamManager
/// </summary>
/// <returns></returns>
Task<List<UserStreamRecording>> GetRecordings();
/// <summary>
/// Return the last added recording segment
/// </summary>
/// <returns></returns>
Task<UserStreamRecording?> GetLatestRecordingSegment();
}

8
NostrStreamer/Services/StreamManager/NostrStreamManager.cs
View File

@ -142,6 +142,14 @@ public class NostrStreamManager : IStreamManager
.ToListAsync();
}
public async Task<UserStreamRecording?> GetLatestRecordingSegment()
{
return await _context.Db.Recordings.AsNoTracking()
.Where(a => a.UserStreamId == _context.UserStream.Id)
.OrderByDescending(a => a.Timestamp)
.FirstOrDefaultAsync();
}
public async Task UpdateViewers()
{
if (_context.UserStream.State is not UserStreamState.Live) return;

29
NostrStreamer/Services/StreamManager/StreamManagerFactory.cs
View File

@ -37,11 +37,6 @@ public class StreamManagerFactory
if (ep == default) throw new Exception("No endpoint found");
if (await _db.Streams.CountAsync(a => a.State == UserStreamState.Live && a.PubKey == user.PubKey) != 0)
{
throw new Exception("Cannot start a new stream when already live");
}
if (user.Balance <= 0)
{
throw new LowBalanceException("Cannot start stream with empty balance");
@ -52,7 +47,10 @@ public class StreamManagerFactory
throw new Exception("TOS not accepted");
}
var stream = new UserStream
var existingLive = await _db.Streams
.SingleOrDefaultAsync(a => a.State == UserStreamState.Live && a.PubKey == user.PubKey);
var stream = existingLive ?? new UserStream
{
EndpointId = ep.Id,
PubKey = user.PubKey,
@ -62,10 +60,21 @@ public class StreamManagerFactory
ForwardClientId = info.ClientId
};
var ev = _eventBuilder.CreateStreamEvent(user, stream);
stream.Event = JsonConvert.SerializeObject(ev, NostrSerializer.Settings);
_db.Streams.Add(stream);
await _db.SaveChangesAsync();
// add new stream
if (existingLive == default)
{
var ev = _eventBuilder.CreateStreamEvent(user, stream);
stream.Event = JsonConvert.SerializeObject(ev, NostrSerializer.Settings);
_db.Streams.Add(stream);
await _db.SaveChangesAsync();
}
else
{
// resume stream, update edge forward info
existingLive.EdgeIp = info.EdgeIp;
existingLive.ForwardClientId = info.ClientId;
await _db.SaveChangesAsync();
}
var ctx = new StreamManagerContext
{