Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions cmd/livekit-cli/join.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ var (
"can be used multiple times to publish multiple files. " +
"can publish from Unix or TCP socket using the format `codec://socket_name` or `codec://host:address` respectively. Valid codecs are h264, vp8, opus",
},
&cli.StringSliceFlag{
Name: "publish-user-data",
Usage: "files to publish as data to room. " +
"the file must contain protocol DataPacket encoded in JSON. " +
"can be used multiple times to publish multiple files. ",
},
&cli.Float64Flag{
Name: "fps",
Usage: "if video files are published, indicates FPS of video",
Expand All @@ -63,6 +69,20 @@ var (
Name: "exit-after-publish",
Usage: "when publishing, exit after file or stream is complete",
},
&cli.BoolFlag{
Name: "reliable",
Usage: "when publishing data, whether to use reliable delivery",
},
&cli.TimestampFlag{
Name: "user-data-start-time",
Usage: "optional start time of the user data, using the RFC3339 format with nanoseconds precision.",
Layout: time.RFC3339Nano,
},
&cli.TimestampFlag{
Name: "user-data-end-time",
Usage: "optional end time of the user data, using the RFC3339 format with nanoseconds precision.",
Layout: time.RFC3339Nano,
},
),
},
}
Expand Down Expand Up @@ -181,6 +201,14 @@ func joinRoom(c *cli.Context) error {
}
}

if c.StringSlice("publish-user-data") != nil {
for _, dataFile := range c.StringSlice("publish-user-data") {
if err = publishUserDataFromFile(room, dataFile, c.Bool("reliable"), c.Timestamp("user-data-start-time"), c.Timestamp("user-data-end-time")); err != nil {
return err
}
}
}

<-done
return nil
}
Expand Down Expand Up @@ -365,3 +393,36 @@ func publishReader(room *lksdk.Room,
}
return nil
}

func publishUserDataFromFile(room *lksdk.Room,
filename string,
reliable bool,
startTime *time.Time,
endTime *time.Time,
) error {
f, err := os.Open(filename)
if err != nil {
return err
}
defer f.Close()

buf, err := io.ReadAll(f)
if err != nil {
return err
}

dataMsg := lksdk.UserData(buf)
if startTime != nil && !startTime.IsZero() {
dataMsg.StartTime = startTime
}
if endTime != nil && !endTime.IsZero() {
dataMsg.EndTime = endTime
}

err = room.LocalParticipant.PublishDataPacket(dataMsg, lksdk.WithDataPublishReliable(reliable))
if err != nil {
return err
}

return nil
}
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
module github.com/livekit/livekit-cli

replace github.com/livekit/server-sdk-go/v2 => ../server-sdk-go

go 1.22

toolchain go1.22.2

require (
github.com/frostbyte73/core v0.0.10
github.com/go-logr/logr v1.4.1
github.com/livekit/protocol v1.15.0
github.com/livekit/protocol v1.15.1-0.20240515200202-fbcdeac2c890
github.com/livekit/server-sdk-go/v2 v2.1.3-0.20240507072004-e3121c9908be
github.com/manifoldco/promptui v0.9.0
github.com/olekukonko/tablewriter v0.0.5
Expand Down Expand Up @@ -48,7 +50,7 @@ require (
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
github.com/lithammer/shortuuid/v4 v4.0.0 // indirect
github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 // indirect
github.com/livekit/mediatransportutil v0.0.0-20240501132628-6105557bbb9a // indirect
github.com/livekit/mediatransportutil v0.0.0-20240511004033-f08cbc684b11 // indirect
github.com/livekit/psrpc v0.5.3-0.20240228172457-3724cb4adbc4 // indirect
github.com/magefile/mage v1.15.0 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
Expand Down
10 changes: 4 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,12 @@ github.com/lithammer/shortuuid/v4 v4.0.0 h1:QRbbVkfgNippHOS8PXDkti4NaWeyYfcBTHtw
github.com/lithammer/shortuuid/v4 v4.0.0/go.mod h1:Zs8puNcrvf2rV9rTH51ZLLcj7ZXqQI3lv67aw4KiB1Y=
github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkDaKb5iXdynYrzB84ErPPO4LbRASk58=
github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ=
github.com/livekit/mediatransportutil v0.0.0-20240501132628-6105557bbb9a h1:ATbv0x7G5tW2HgiouQ57csFE/G4gekl2oV1cxb2Dy24=
github.com/livekit/mediatransportutil v0.0.0-20240501132628-6105557bbb9a/go.mod h1:jwKUCmObuiEDH0iiuJHaGMXwRs3RjrB4G6qqgkr/5oE=
github.com/livekit/protocol v1.15.0 h1:JAatoWKYdFx3D0U4JBWg25ZlrY+NK26xHabFopS2Jhk=
github.com/livekit/protocol v1.15.0/go.mod h1:pnn0Dv+/0K0OFqKHX6J6SreYO1dZxl6tDuAZ1ns8L/w=
github.com/livekit/mediatransportutil v0.0.0-20240511004033-f08cbc684b11 h1:NR227C8Xo0/Q8uJMDTuEcsOybMIwRJpRFdHiDr3eOHs=
github.com/livekit/mediatransportutil v0.0.0-20240511004033-f08cbc684b11/go.mod h1:MEYWFuRwniEbshuIyL2K3cFi8km+XGlm1n5cqw6pmsU=
github.com/livekit/protocol v1.15.1-0.20240515200202-fbcdeac2c890 h1:Sx56+lv2bm3Th/txkzOcfKrNOiN1esZKK6OsrlggtEg=
github.com/livekit/protocol v1.15.1-0.20240515200202-fbcdeac2c890/go.mod h1:pnn0Dv+/0K0OFqKHX6J6SreYO1dZxl6tDuAZ1ns8L/w=
github.com/livekit/psrpc v0.5.3-0.20240228172457-3724cb4adbc4 h1:253WtQ2VGVHzIIzW9MUZj7vUDDILESU3zsEbiRdxYF0=
github.com/livekit/psrpc v0.5.3-0.20240228172457-3724cb4adbc4/go.mod h1:CQUBSPfYYAaevg1TNCc6/aYsa8DJH4jSRFdCeSZk5u0=
github.com/livekit/server-sdk-go/v2 v2.1.3-0.20240507072004-e3121c9908be h1:ZXM78NWv09vnFC17Ze1JAjK2aHtwsqBuZ3Kf2/ZXLms=
github.com/livekit/server-sdk-go/v2 v2.1.3-0.20240507072004-e3121c9908be/go.mod h1:PeVWnMjtPPkWLcRt0sv9wzsLWcKtibwFPtXKA4nOZwc=
github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
Expand Down