put p2 url out

.gitignore

@@ -51,3 +51,4 @@ public/assets/song_skins
 *.log
 .venv*
 app.pyc
+.vscode

Dockerfile

@@ -29,13 +29,14 @@ RUN bash -c 'virtualenv -p /usr/bin/python2 .venv2 && \
 #info
 EXPOSE 80
 # VOLUME [ "/taiko-web/public/songs" ]
-ENV TAIKO_SONGS_URL http://taiko.example.com
-ENV TAIKO_ASSETS_URL http://taiko.example.com
+ENV TAIKO_SONGS_URL http://taiko.example.com/songs/
+ENV TAIKO_ASSETS_URL http://taiko.example.com/assets/
+ENV TAIKO_MULTIPLAYER_URL wss://taiko.example.com/p2/
+ENV TAIKO_GIT_URL https://git.example.com/user/repo
 ENV TAIKO_VERSION Nanahira
 ENV TAIKO_EMAIL 78877@qq.com
 ENV TAIKO_REDIS_HOST 127.0.0.1
 ENV TAIKO_REDIS_PORT 6379
 #ENV TAIKO_REDIS_PASSWORD blank
 ENV TAIKO_REDIS_DB 0
-ENV TAIKO_GIT_URL https://git.example.com/user/
 CMD [ "/taiko-web/docker/entrypoint.sh" ]

docker/entrypoint.sh

 #!/bin/bash
 if [ -z $TAIKO_SONGS_URL ]; then 
-	export TAIKO_SONGS_URL=$TAIKO_URL
+	export TAIKO_SONGS_URL=$TAIKO_URL/songs/
 fi
 if [ -z $TAIKO_ASSETS_URL ]; then 
-	export TAIKO_ASSETS_URL=$TAIKO_URL
+	export TAIKO_ASSETS_URL=$TAIKO_URL/assets/
 fi
-echo "{\"songs_baseurl\":\"$TAIKO_SONGS_URL/songs/\",\"assets_baseurl\":\"$TAIKO_ASSETS_URL/assets/\",\"email\":\"$TAIKO_EMAIL\",\"redis_host\":\"$TAIKO_REDIS_HOST\",\"redis_port\":$TAIKO_REDIS_PORT,\"redis_password\":\"$TAIKO_REDIS_PASSWORD\",\"redis_db\":$TAIKO_REDIS_DB,\"git_url\":\"$TAIKO_GIT_URL\"}" | tee ./config.json
+echo "{\"songs_baseurl\":\"$TAIKO_SONGS_URL\",\"assets_baseurl\":\"$TAIKO_ASSETS_URL\",\"multiplayer_baseurl\":\"$TAIKO_MULTIPLAYER_URL\",\"email\":\"$TAIKO_EMAIL\",\"redis_host\":\"$TAIKO_REDIS_HOST\",\"redis_port\":$TAIKO_REDIS_PORT,\"redis_password\":\"$TAIKO_REDIS_PASSWORD\",\"redis_db\":$TAIKO_REDIS_DB,\"git_url\":\"$TAIKO_GIT_URL\"}" | tee ./config.json
 echo "{\"commit\":\"$(git log --pretty=%H -1)\",\"commit_short\":\"$(git log --pretty=%h -1)\",\"version\": \"$TAIKO_VERSION\"}" | tee ./version.json
 
 pm2-docker start ./docker/pm2-docker.json

public/src/js/p2.js

@@ -24,8 +24,13 @@ class P2Connection{
 	}
 	open(){
 		this.closed = false
-		var wsProtocol = location.protocol == "https:" ? "wss:" : "ws:"
-		this.socket = new WebSocket(wsProtocol + "//" + location.host + "/p2")
+		if (gameConfig.multiplayer_baseurl) { 
+			this.socket = new WebSocket(gameConfig.multiplayer_baseurl);
+		} else {
+			var wsProtocol = location.protocol == "https:" ? "wss:" : "ws:";
+			this.socket = new WebSocket(wsProtocol + "//" + location.host + "/p2");
+		 }
+
 		pageEvents.race(this.socket, "open", "close").then(response => {
 			if(response.type === "open"){
 				return this.openEvent()