Added --ip flag for 'twitch event websocket start'

Author: Xemdo

cmd/events.go

@@ -45,6 +45,8 @@ var (
 	clientId            string
 	version             string
 	websocketClient     string
+	websocketServerIP   string
+	websocketServerPort int
 )
 
 // websocketCmd-specific flags
@@ -173,7 +175,8 @@ func init() {
 
 	// websocket flags
 	/// flags for start-server
-	websocketCmd.Flags().IntVarP(&port, "port", "p", 8080, "Defines the port that the mock EventSub websocket server will run on.")
+	websocketCmd.Flags().StringVar(&websocketServerIP, "ip", "127.0.0.1", "Defines the ip that the mock EventSub websocket server will bind to.")
+	websocketCmd.Flags().IntVarP(&websocketServerPort, "port", "p", 8080, "Defines the port that the mock EventSub websocket server will run on.")
 	websocketCmd.Flags().BoolVar(&wsDebug, "debug", false, "Set on/off for debug messages for the EventSub WebSocket server.")
 	websocketCmd.Flags().BoolVarP(&wsStrict, "require-subscription", "S", false, "Requires subscriptions for all events, and activates 10 second subscription requirement.")
 
@@ -332,7 +335,7 @@ func websocketCmdRun(cmd *cobra.Command, args []string) {
 
 	if args[0] == "start-server" || args[0] == "start" {
 		log.Printf("`Ctrl + C` to exit mock WebSocket servers.")
-		mock_server.StartWebsocketServer(wsDebug, port, wsStrict)
+		mock_server.StartWebsocketServer(wsDebug, websocketServerIP, websocketServerPort, wsStrict)
 	} else {
 		// Forward all other commands via RPC
 		websocket.ForwardWebsocketCommand(args[0], websocket.WebsocketCommandParameters{

internal/events/websocket/mock_server/manager.go

@@ -24,18 +24,20 @@ type ServerManager struct {
 	serverList       *util.List[WebSocketServer]
 	reconnectTesting bool
 	primaryServer    string
+	ip               string
 	port             int
 	debugEnabled     bool
 	strictMode       bool
 }
 
 var serverManager *ServerManager
 
-func StartWebsocketServer(enableDebug bool, port int, strictMode bool) {
+func StartWebsocketServer(enableDebug bool, ip string, port int, strictMode bool) {
 	serverManager = &ServerManager{
 		serverList: &util.List[WebSocketServer]{
 			Elements: make(map[string]*WebSocketServer),
 		},
+		ip:               ip,
 		port:             port,
 		reconnectTesting: false,
 		strictMode:       strictMode,
@@ -75,7 +77,7 @@ func StartWebsocketServer(enableDebug bool, port int, strictMode bool) {
 	// Start HTTP server
 	go func() {
 		// Listen to port
-		listen, err := net.Listen("tcp", fmt.Sprintf(":%v", port))
+		listen, err := net.Listen("tcp", fmt.Sprintf("%v:%v", ip, port))
 		if err != nil {
 			log.Fatalf("Cannot start HTTP server: %v", err)
 			return
@@ -86,14 +88,14 @@ func StartWebsocketServer(enableDebug bool, port int, strictMode bool) {
 		lightYellow := color.New(color.FgHiYellow).SprintFunc()
 		yellow := color.New(color.FgYellow).SprintFunc()
 
-		log.Printf(lightBlue("Started WebSocket server on 127.0.0.1:%v"), port)
+		log.Printf(lightBlue("Started WebSocket server on %v:%v"), ip, port)
 		if serverManager.strictMode {
 			log.Printf(lightBlue("--require-subscription enabled. Clients will have 10 seconds to subscribe before being disconnected."))
 		}
 
 		fmt.Println()
 
-		log.Printf(yellow("Simulate subscribing to events at: http://127.0.0.1:%v/eventsub/subscriptions"), port)
+		log.Printf(yellow("Simulate subscribing to events at: http://%v:%v/eventsub/subscriptions"), ip, port)
 		log.Printf(yellow("POST, GET, and DELETE are supported"))
 		log.Printf(yellow("For more info: https://dev.twitch.tv/docs/cli/websocket-event-command/#simulate-subscribing-to-mock-eventsub"))
 
@@ -107,7 +109,7 @@ func StartWebsocketServer(enableDebug bool, port int, strictMode bool) {
 		log.Printf(lightGreen("For further usage information, please see our official documentation:\nhttps://dev.twitch.tv/docs/cli/websocket-event-command/"))
 		fmt.Println()
 
-		log.Printf(lightBlue("Connect to the WebSocket server at: ")+"ws://127.0.0.1:%v/ws", port)
+		log.Printf(lightBlue("Connect to the WebSocket server at: ")+"ws://%v:%v/ws", ip, port)
 
 		// Serve HTTP server
 		if err := http.Serve(listen, m); err != nil {
@@ -136,7 +138,7 @@ func StartWebsocketServer(enableDebug bool, port int, strictMode bool) {
 func wsPageHandler(w http.ResponseWriter, r *http.Request) {
 	server, ok := serverManager.serverList.Get(serverManager.primaryServer)
 	if !ok {
-		log.Printf("Failed to find primary server [%v] when new client was accessing ws://127.0.0.1:%v/ws -- Aborting...", serverManager.primaryServer, serverManager.port)
+		log.Printf("Failed to find primary server [%v] when new client was accessing ws://%v:%v/ws -- Aborting...", serverManager.primaryServer, serverManager.ip, serverManager.port)
 		return
 	}
 

internal/events/websocket/mock_server/rpc_handler.go

@@ -215,7 +215,7 @@ func RPCSubscriptionHandler(args rpc.RPCArgs) rpc.RPCResponse {
 		return rpc.RPCResponse{
 			ResponseCode: COMMAND_RESPONSE_MISSING_FLAG,
 			DetailedInfo: "Command \"subscription\" requires flags --status, --subscription, and --session" +
-				fmt.Sprintf("\nThe flag --subscription must be the ID of the subscription made at http://localhost:%v/eventsub/subscriptions", serverManager.port) +
+				fmt.Sprintf("\nThe flag --subscription must be the ID of the subscription made at http://%v:%v/eventsub/subscriptions", serverManager.ip, serverManager.port) +
 				"\nThe flag --status must be one of the non-webhook status options defined here:" +
 				"\nhttps://dev.twitch.tv/docs/api/reference/#get-eventsub-subscriptions" +
 				"\n\nExample: twitch event websocket subscription --status=user_removed --subscription=82a855-fae8-93bff0",