[supervisor] respond PortsStatus with order

Author: mustard-mh

components/supervisor/pkg/ports/ports-config.go

@@ -25,9 +25,10 @@ type RangeConfig struct {
 
 // Configs provides access to port configurations.
 type Configs struct {
-	workspaceConfigs     map[uint32]*gitpod.PortConfig
-	instancePortConfigs  map[uint32]*gitpod.PortConfig
-	instanceRangeConfigs []*RangeConfig
+	workspaceConfigs      map[uint32]*gitpod.PortConfig
+	instancePortConfigs   map[uint32]*gitpod.PortConfig
+	instanceRangeConfigs  []*RangeConfig
+	workspaceConfigsOrder []uint32
 }
 
 // ForEach iterates over all configured ports.
@@ -124,7 +125,7 @@ func (service *ConfigService) Observe(ctx context.Context) (<-chan *Configs, <-c
 			if err != nil {
 				errorsChan <- err
 			} else {
-				current.workspaceConfigs = parseWorkspaceConfigs(info.Workspace.Config.Ports)
+				current.workspaceConfigs, current.workspaceConfigsOrder = parseWorkspaceConfigs(info.Workspace.Config.Ports)
 				updatesChan <- &Configs{workspaceConfigs: current.workspaceConfigs}
 			}
 		} else {
@@ -144,9 +145,10 @@ func (service *ConfigService) Observe(ctx context.Context) (<-chan *Configs, <-c
 					continue
 				}
 				updatesChan <- &Configs{
-					workspaceConfigs:     current.workspaceConfigs,
-					instancePortConfigs:  current.instancePortConfigs,
-					instanceRangeConfigs: current.instanceRangeConfigs,
+					workspaceConfigs:      current.workspaceConfigs,
+					instancePortConfigs:   current.instancePortConfigs,
+					instanceRangeConfigs:  current.instanceRangeConfigs,
+					workspaceConfigsOrder: current.workspaceConfigsOrder,
 				}
 			}
 		}
@@ -168,19 +170,20 @@ func (service *ConfigService) update(config *gitpod.GitpodConfig, current *Confi
 
 var portRangeRegexp = regexp.MustCompile(`^(\d+)[-:](\d+)$`)
 
-func parseWorkspaceConfigs(ports []*gitpod.PortConfig) (portConfigs map[uint32]*gitpod.PortConfig) {
+func parseWorkspaceConfigs(ports []*gitpod.PortConfig) (portConfigs map[uint32]*gitpod.PortConfig, portsOrder []uint32) {
 	if len(ports) == 0 {
-		return nil
+		return
 	}
 	portConfigs = make(map[uint32]*gitpod.PortConfig)
 	for _, config := range ports {
 		port := uint32(config.Port)
 		_, exists := portConfigs[port]
 		if !exists {
 			portConfigs[port] = config
+			portsOrder = append(portsOrder, port)
 		}
 	}
-	return portConfigs
+	return
 }
 
 func parseInstanceConfigs(ports []*gitpod.PortsItems) (portConfigs map[uint32]*gitpod.PortConfig, rangeConfigs []*RangeConfig) {

components/supervisor/pkg/ports/ports.go

@@ -739,14 +739,42 @@ func (pm *Manager) Subscribe() (*Subscription, error) {
 // Callers are expected to hold mu.
 func (pm *Manager) getStatus() []*api.PortsStatus {
 	res := make([]*api.PortsStatus, 0, len(pm.state))
+
+	stateKeys := []uint32{}
 	for port := range pm.state {
-		res = append(res, pm.getPortStatus(port))
+		stateKeys = append(stateKeys, port)
 	}
+	sort.SliceStable(stateKeys, func(i, j int) bool {
+		return stateKeys[i] < stateKeys[j]
+	})
+
+	appended := make(map[uint32]struct{})
+	appendPort := func(port uint32, ignoreIfNotServed bool) {
+		if _, ok := appended[port]; ok {
+			return
+		}
+		appended[port] = struct{}{}
+		status := pm.getPortStatus(port)
+		if status == nil || (ignoreIfNotServed && !status.Served) {
+			return
+		}
+		res = append(res, status)
+	}
+	for _, port := range pm.configs.workspaceConfigsOrder {
+		appendPort(port, false)
+	}
+	for _, port := range stateKeys {
+		appendPort(port, true)
+	}
+
 	return res
 }
 
 func (pm *Manager) getPortStatus(port uint32) *api.PortsStatus {
 	mp := pm.state[port]
+	if mp == nil {
+		return nil
+	}
 	ps := &api.PortsStatus{
 		LocalPort:   mp.LocalhostPort,
 		Served:      mp.Served,