icedream
/
uplink
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement way too many changes to properly document for now.

burst
Icedream 2018-04-10 17:51:03 +02:00
parent cefdc1b3f9
commit 65b480d903
Signed by: icedream
GPG Key ID: C1D30A06E6490C14
12 changed files with 351 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/pubsub/pubsubreader.go
View File

@ -13,6 +13,13 @@ type PubSubReader struct {
closed bool
}
func NewPubSubReader(ps *cskrpubsub.PubSub, topic string) *PubSubReader {
return &PubSubReader{
pubsub: ps,
channel: ps.Sub(topic),
}
}
func (r *PubSubReader) Read(p []byte) (n int, err error) {
if r.closed {
err = io.EOF

24
app/pubsub/pubsubwriter.go
View File

@ -7,14 +7,23 @@ import (
)
type PubSubWriter struct {
*cskrpubsub.PubSub
topic string
closed bool
PubSub *cskrpubsub.PubSub
topic string
fullControl bool
closed bool
}
func NewPubSubWriter() *PubSubWriter {
pipe := new(PubSubWriter)
pipe.PubSub = cskrpubsub.New(1)
pipe.fullControl = true
return pipe
}
func NewPubSubWriterForTopic(pubsub *cskrpubsub.PubSub, topic string) *PubSubWriter {
pipe := new(PubSubWriter)
pipe.PubSub = pubsub
pipe.topic = topic
return pipe
}
@ -23,7 +32,7 @@ func (pipe *PubSubWriter) Write(p []byte) (n int, err error) {
err = io.EOF
return
}
pipe.PubSub.Pub(p, "")
pipe.PubSub.Pub(p, pipe.topic)
n = len(p)
return
}
@ -33,8 +42,11 @@ func (pipe *PubSubWriter) Close() (err error) {
err = io.EOF
return
}
pipe.PubSub.Shutdown()
pipe.closed = true
pipe.PubSub.Close(pipe.topic)
if pipe.fullControl {
pipe.PubSub.Shutdown()
pipe.closed = true
}
return
}

78
app/streams/metadata.go Normal file
View File

@ -0,0 +1,78 @@
package streams
import (
"errors"
"fmt"
"math"
"strings"
)
func quote(text string) string {
text = strings.Replace(text, "\\", "\\\\", -1)
text = strings.Replace(text, "'", "\\'", -1)
text = "'" + text + "'"
return text
}
func unquote(text string) string {
if strings.HasPrefix(text, "'") && strings.HasSuffix(text, "'") {
text = text[1 : len(text)-2]
text = strings.Replace(text, "\\'", "'", -1)
text = strings.Replace(text, "\\\\", "\\", -1)
}
return text
}
type Metadata map[string]string
func DecodeMetadataFromBytes(b []byte) {
// TODO
}
func decodeMetadataItem(text string, metadata *map[string]string) (err error) {
parts := strings.SplitN(text, "=", 2)
if len(parts) < 2 {
err = errors.New("expected key=value but only got key")
return
}
parts[1] = unquote(parts[1])
(*metadata)[parts[0]] = parts[1]
return
}
func DecodeMetadata(source string) (meta Metadata, err error) {
// name='value'; name='value';name='value';
meta = make(Metadata)
// TODO
return
}
func (meta Metadata) String() string {
return string(meta.Bytes())
}
func (meta Metadata) Bytes() (buf []byte) {
mstr := ""
if meta != nil {
for key, value := range meta {
mstr += fmt.Sprintf("%s=%s;", key, quote(value))
}
}
if len(mstr) > 16*256-1 {
mstr = mstr[0 : 16*256]
}
lengthDiv := int(math.Ceil(float64(len(mstr)) / 16))
lengthByte := byte(lengthDiv)
buf = make([]byte, lengthDiv*16+1)
buf[0] = lengthByte
copy(buf[1:], []byte(mstr))
return
}

82
app/streams/metadata_extractor.go Normal file
View File

@ -0,0 +1,82 @@
package streams
import (
"io"
pubsubutil "git.icedream.tech/icedream/uplink/app/pubsub"
"github.com/cskr/pubsub"
)
type MetadataExtractor struct {
io.Reader
MetadataInterval int
pubsub *pubsub.PubSub
blockOffset int
metadataToRead int
metadataBuf []byte
}
func NewMetadataExtractor(r io.Reader, metadataInterval int) *MetadataExtractor {
return &MetadataExtractor{
Reader: r,
MetadataInterval: metadataInterval,
}
}
func (me *MetadataExtractor) Data() io.ReadCloser {
return pubsubutil.NewPubSubReader(me.pubsub, "data")
}
func (me *MetadataExtractor) Metadata() *MetadataStream {
return &MetadataStream{
data: me.pubsub.Sub("metadata"),
me: me,
}
}
func (me *MetadataExtractor) close() {
me.pubsub.Close("metadata", "data")
me.pubsub.Shutdown()
}
func (mi *MetadataExtractor) Read(data []byte) (n int, err error) {
if mi.metadataBuf != nil && mi.metadataToRead > 0 {
n, err = mi.Reader.Read(mi.metadataBuf[len(mi.metadataBuf)-mi.metadataToRead:])
if err != nil {
return
}
mi.metadataToRead -= n
if mi.metadataToRead <= 0 {
var meta map[string]string
meta, err = decodeMetadata(string(mi.metadataBuf))
if err != nil {
return
}
me.pubsub.Pub(meta)
mi.metadataBuf = nil
}
return
}
bytesToRead := mi.MetadataInterval - mi.blockOffset
if bytesToRead > len(data) {
bytesToRead = len(data)
}
if bytesToRead > 0 {
n, err = mi.Reader.Read(data[0:bytesToRead])
if err != nil {
return
}
mi.blockOffset += n
}
if mi.blockOffset == mi.MetadataInterval {
mi.generateMetadataBuf() // will be read in on next Read call
mi.blockOffset = 0
} else if mi.blockOffset > mi.MetadataInterval {
panic("block offset higher than metadata interval, logical error")
}
return
}

27
app/streams/metadata_injector.go
View File

@ -1,19 +1,9 @@
package streams
import (
"fmt"
"io"
"math"
"strings"
)
func quote(text string) string {
text = strings.Replace(text, "\\", "\\\\", -1)
text = strings.Replace(text, "'", "\\'", -1)
text = "'" + text + "'"
return text
}
type MetadataInjector struct {
io.Reader
MetadataInterval int
@ -29,23 +19,6 @@ func NewMetadataInjector(r io.Reader, metadataInterval int) *MetadataInjector {
}
}
func (mi *MetadataInjector) generateMetadataBuf() {
mstr := ""
if mi.Metadata != nil {
for key, value := range mi.Metadata {
mstr += fmt.Sprintf("%s=%s;", key, quote(value))
}
}
if len(mstr) > 16*256-1 {
mstr = mstr[0 : 16*256]
}
lengthDiv := int(math.Ceil(float64(len(mstr)) / 16))
lengthByte := byte(lengthDiv)
mi.metadataBuf = make([]byte, lengthDiv*16+1)
mi.metadataBuf[0] = lengthByte
copy(mi.metadataBuf[1:], []byte(mstr))
}
func (mi *MetadataInjector) Read(data []byte) (n int, err error) {
if mi.metadataBuf != nil && len(mi.metadataBuf) > 0 {
bytesToRead := len(data)

14
app/streams/metadata_stream.go Normal file
View File

@ -0,0 +1,14 @@
package streams
type MetadataStream struct {
me *MetadataExtractor
data chan interface{}
}
func (ms *MetadataStream) Read() map[string]string {
return (<-ms.data).(map[string]string)
}
func (ms *MetadataStream) Close() {
ms.me.pubsub.Unsub(ms.data)
}

42
plugins/icecast/input/instance.go
View File

@ -1,27 +1,41 @@
package main
import (
"git.icedream.tech/icedream/uplink/app"
"io"
"git.icedream.tech/icedream/uplink/app/authentication"
"git.icedream.tech/icedream/uplink/app/channels"
"git.icedream.tech/icedream/uplink/app/servers/http"
"github.com/gin-gonic/gin"
)
type pluginInstance struct {
server *app.Server
server *httpserver.Server
authenticator authentication.Authenticator
channelManager *channels.ChannelManager
}
func (instance *pluginInstance) SetAuthenticator(authenticator authentication.Authenticator) {
instance.authenticator = authenticator
}
func (instance *pluginInstance) SetChannelManager(channelManager *channels.ChannelManager) {
instance.channelManager = channelManager
}
func (instance *pluginInstance) SetServer(server *httpserver.Server) {
instance.server = server
router := instance.server.Router
router.POST("/:channel", func(ctx *gin.Context) {
channel := server.ChannelManager.Channel(ctx.Param("channel"))
router.PUT("/:channel", func(ctx *gin.Context) {
channel := instance.channelManager.Channel(ctx.Param("channel"))
if channel == nil {
ctx.Status(404)
return
}
if user, password, ok := ctx.Request.BasicAuth(); ok {
if !server.Authenticator.VerifyUsernameAndPassword(channel, user, password) {
if !instance.authenticator.VerifyUsernameAndPassword(channel, user, password) {
ctx.Status(401)
return
}
@ -29,22 +43,6 @@ func (instance *pluginInstance) SetServer(server *httpserver.Server) {
ctx.Status(401)
return
}
})
router.GET("/:channel", func(ctx *gin.Context) {
channel := server.ChannelManager.Channel(ctx.Param("channel"))
if channel == nil {
ctx.Status(404)
return
}
})
router.GET("/:channel/:stream", func(ctx *gin.Context) {
channel := server.ChannelManager.Channel(ctx.Param("channel"))
if channel == nil {
ctx.Status(404)
return
}
io.Copy(channel.InputStream, ctx.Request.Body)
})
}

48
plugins/icecast/output/instance.go Normal file
View File

@ -0,0 +1,48 @@
package main
import (
"io"
"git.icedream.tech/icedream/uplink/app/authentication"
"git.icedream.tech/icedream/uplink/app/channels"
"git.icedream.tech/icedream/uplink/app/servers/http"
"github.com/gin-gonic/gin"
)
type pluginInstance struct {
server *httpserver.Server
authenticator authentication.Authenticator
channelManager *channels.ChannelManager
}
func (instance *pluginInstance) SetAuthenticator(authenticator authentication.Authenticator) {
instance.authenticator = authenticator
}
func (instance *pluginInstance) SetChannelManager(channelManager *channels.ChannelManager) {
instance.channelManager = channelManager
}
func (instance *pluginInstance) SetServer(server *httpserver.Server) {
instance.server = server
router := instance.server.Router
router.PUT("/:channel", func(ctx *gin.Context) {
channel := instance.channelManager.Channel(ctx.Param("channel"))
if channel == nil {
ctx.Status(404)
return
}
if user, password, ok := ctx.Request.BasicAuth(); ok {
if !instance.authenticator.VerifyUsernameAndPassword(channel, user, password) {
ctx.Status(401)
return
}
} else {
ctx.Status(401)
return
}
io.Copy(channel.InputStream, ctx.Request.Body)
})
}

18
plugins/icecast/output/plugin.go Normal file
View File

@ -0,0 +1,18 @@
package main
import "C"
import (
"git.icedream.tech/icedream/uplink/plugins"
)
var Plugin = &plugins.Plugin{
Descriptor: plugins.PluginDescriptor{
Name: "Icecast Output",
Description: "Allows for listeners to connect to the stream via HTTP and receive respective metadata.",
},
Run: func() plugins.PluginInstance {
return &pluginInstance{}
},
}

47
plugins/test/sine/instance.go Normal file
View File

@ -0,0 +1,47 @@
package main
import (
"io"
"log"
"time"
"git.icedream.tech/icedream/uplink/app/channels"
humanize "github.com/dustin/go-humanize"
"github.com/viert/lame"
)
type pluginInstance struct {
}
func (instance *pluginInstance) SetChannelManager(channelManager *channels.ChannelManager) {
c, err := channelManager.Open("sine")
if err != nil {
log.Println("ERROR: sine channel could not be opened:", err)
log.Println("Skipping sine channel creation")
return
}
wr := lame.NewWriter(c.InputStream)
wr.Encoder.SetBitrate(192)
wr.Encoder.SetQuality(1)
wr.Encoder.SetInSamplerate(44100)
wr.Encoder.SetNumChannels(2)
wr.Encoder.InitParams()
go func() {
log.Println("Sine stream goroutine started")
sine := new(SineStream)
sine.Samplerate = 44100
sine.Frequency = 990
sine.Beep = true
sine.Timestamp = time.Now()
log.Println("Will now broadcast sine stream")
n, err := io.Copy(wr, sine)
if err != nil {
log.Fatal("Sine stream copy failed:", err)
}
log.Println("Sine stream finished, written", humanize.Bytes(uint64(n)), "bytes")
}()
}

18
plugins/test/sine/plugin.go Normal file
View File

@ -0,0 +1,18 @@
package main
import "C"
import (
"git.icedream.tech/icedream/uplink/plugins"
)
var Plugin = &plugins.Plugin{
Descriptor: plugins.PluginDescriptor{
Name: "Icecast Input",
Description: "Allows for Icecast clients to stream to the server.",
},
Run: func() plugins.PluginInstance {
return &pluginInstance{}
},
}

2
app/sources/sine_stream.go → plugins/test/sine/sine_stream.go
View File

@ -1,4 +1,4 @@
package sources
package main
import (
"bytes"