Add broadcast port, rename host_port to telnet_port

Author: rcy

gap/db/migrations/015_add_broadcast_port_to_stations.sql

@@ -0,0 +1,7 @@
+alter table stations rename column host_port to telnet_port;
+alter table stations add column broadcast_port text not null default '';
+
+---- create above / drop below ----
+
+alter table stations drop column broadcast_port;
+alter table stations rename column telnet_port to host_port;

gap/db/models.go

@@ -37,8 +37,11 @@ insert into stations(station_id, slug, user_id, active) values($1, $2, $3, $4) r
 -- name: SetStationCurrentTrack :exec
 update stations set current_track_id = $1 where station_id = $2;
 
--- name: SetStationHostPort :exec
-update stations set host_port = $1 where station_id = $2;
+-- name: SetStationTelnetPort :exec
+update stations set telnet_port = $1 where station_id = $2;
+
+-- name: SetStationBroadcastPort :exec
+update stations set broadcast_port = $1 where station_id = $2;
 
 -- name: StationCurrentTrack :one
 select tracks.* from stations join tracks on stations.current_track_id = tracks.track_id where stations.station_id = $1;

gap/db/query.sql

@@ -264,7 +264,8 @@ CREATE TABLE public.stations (
     background_image_url text DEFAULT ''::text NOT NULL,
     user_id text NOT NULL,
     is_public boolean DEFAULT false NOT NULL,
-    host_port text DEFAULT ''::text NOT NULL
+    telnet_port text DEFAULT ''::text NOT NULL,
+    broadcast_port text DEFAULT ''::text NOT NULL
 );
 
 

gap/db/query.sql.go

@@ -475,20 +475,26 @@ func (s *Server) startLiq(w http.ResponseWriter, r *http.Request) {
 			AttachStderr: true,
 			ExposedPorts: nat.PortSet{
 				"1234/tcp": struct{}{},
+				"8000/tcp": struct{}{},
 			},
 		},
 		&container.HostConfig{
 			RestartPolicy: container.RestartPolicy{
 				Name:              "always",
 				MaximumRetryCount: 0,
 			},
-			// use random port since we have multiple containers running
+			// use random host ports since we have multiple containers running
 			PortBindings: nat.PortMap{
 				"1234/tcp": []nat.PortBinding{
 					{
 						HostIP: "0.0.0.0",
 					},
 				},
+				"8000/tcp": []nat.PortBinding{
+					{
+						HostIP: "0.0.0.0",
+					},
+				},
 			},
 		},
 		&network.NetworkingConfig{
@@ -517,18 +523,29 @@ func (s *Server) startLiq(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	for containerPort, bindings := range resp.NetworkSettings.Ports {
-		fmt.Println("containerPort", containerPort)
-		if containerPort.Port() == "1234" {
+		if len(bindings) == 1 {
 			var hostPort string
-			if len(bindings) == 1 {
-				hostPort = bindings[0].HostPort
-			}
-			err := s.db.Q().SetStationHostPort(ctx, hostPort, station.StationID)
-			if err != nil {
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
+			hostPort = bindings[0].HostPort
+			fmt.Println("containerPort", containerPort, "hostPort", hostPort)
+			switch containerPort.Port() {
+			case "1234":
+				err := s.db.Q().SetStationTelnetPort(ctx, hostPort, station.StationID)
+				if err != nil {
+					http.Error(w, err.Error(), http.StatusInternalServerError)
+					return
+				}
+				fmt.Printf("station %s host port=%s\n", station.Slug, hostPort)
+			case "8000":
+				err := s.db.Q().SetStationBroadcastPort(ctx, hostPort, station.StationID)
+				if err != nil {
+					http.Error(w, err.Error(), http.StatusInternalServerError)
+					return
+				}
+				fmt.Printf("station %s host port=%s\n", station.Slug, hostPort)
 			}
-			fmt.Printf("station %s host port=%s\n", station.Slug, hostPort)
+		} else {
+			http.Error(w, "weird, len(bindings)!=1", http.StatusInternalServerError)
+			return
 		}
 	}