From c98d6fad84aab345354dd426eb5ca46491908f7d Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Wed, 18 Jan 2023 22:03:24 -0500
Subject: [PATCH] fix livekit room service in devcontainer

---
 .devcontainer/devcontainer.json       | 13 +++++++++++--
 .devcontainer/docker-compose.dev.yaml | 24 ------------------------
 server.go                             |  3 +++
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f4074e6..e022fec 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
   // "image": "mcr.microsoft.com/devcontainers/universal:2-linux"
   "dockerComposeFile": "docker-compose.dev.yaml",
   "service": "devcontainer",
-  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}"
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
   // Features to add to the dev container. More info: https://containers.dev/features.
   // "features": {},
@@ -18,7 +18,16 @@
   // "postCreateCommand": "uname -a",
 
   // Configure tool-specific properties.
-  // "customizations": {},
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "golang.go",
+        "Vue.volar",
+        "esbenp.prettier-vscode",
+        "EditorConfig.EditorConfig"
+      ]
+    }
+  }
 
   // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
   // "remoteUser": "root"
diff --git a/.devcontainer/docker-compose.dev.yaml b/.devcontainer/docker-compose.dev.yaml
index 5fee54a..cd7a603 100644
--- a/.devcontainer/docker-compose.dev.yaml
+++ b/.devcontainer/docker-compose.dev.yaml
@@ -5,16 +5,11 @@ services:
     image: "mcr.microsoft.com/devcontainers/universal:2-linux"
     volumes:
       - ../..:/workspaces:cached
-    networks:
-      - internal_network
-      - external_network
     command: sleep infinity
 
   db:
     image: mongo:6
     restart: unless-stopped
-    networks:
-      - internal_network
     # ports:
     #   - "27017:27017"
     environment:
@@ -24,9 +19,6 @@ services:
   mongo-express:
     image: mongo-express
     restart: unless-stopped
-    networks:
-      - internal_network
-      - external_network
     ports:
       - 8081:8081
     environment:
@@ -38,17 +30,12 @@ services:
     image: redis:7-alpine
     restart: unless-stopped
     command: redis-server
-    networks:
-      - internal_network
     # ports:
     #   - "6379:6379"
 
   redisinsight:
     image: redislabs/redisinsight:latest
     restart: unless-stopped
-    networks:
-      - internal_network
-      - external_network
     ports:
       - 8082:8001
 
@@ -59,9 +46,6 @@ services:
     ports:
       - "7881:7881"
       - "7882:7882/udp"
-    networks:
-      - internal_network
-      - external_network
 
   caddy:
     image: caddy:2
@@ -70,14 +54,6 @@ services:
       - "80:80"
       - "443:443"
       - "443:443/udp"
-    networks:
-      - internal_network
-      - external_network
     volumes:
       - ./Caddyfile:/etc/caddy/Caddyfile:ro
       - ./certs:/etc/caddy/certs:ro
-
-networks:
-  external_network:
-  internal_network:
-    internal: true
diff --git a/server.go b/server.go
index 47b38f3..21f2dd1 100644
--- a/server.go
+++ b/server.go
@@ -79,6 +79,9 @@ func main() {
 		Scheme: "https",
 		Host:   mainConfig.Livekit.Host,
 	}
+	if mainConfig.Environment == "development" {
+		lkURL.Scheme = "http"
+	}
 	lkRoomServiceClient = lksdk.NewRoomServiceClient(lkURL.String(), mainConfig.Livekit.APIKey, mainConfig.Livekit.APISecret)
 
 	backContext, cancel := context.WithTimeout(context.Background(), 10*time.Second)