github-mirrorer/quake-kube
1
0
Fork 1
mirror of https://github.com/Octops/quake-kube.git synced 2026-07-16 08:14:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for running with https frontend (#20)

Browse Source 
* use browser protocol

* Update zz_generated.static.go

* set host args with proper port

* Update zz_generated.static.go

* use proper protocol for the websocket
This commit is contained in:
Chris Campbell
2020-11-22 09:34:26 -07:00
committed by GitHub
parent 83d0260c6f
commit b64c44e6ac
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -135,7 +135,7 @@
localStorage.setItem("playerName", inputPlayerName.value); localStorage.setItem("playerName", inputPlayerName.value);
} }
host = document.location.host host = document.location.host
if (!host.includes(":")) { host = host + ":80" } if (!host.includes(":")) { host = host + (window.location.protocol == 'https:' ? ":443" : ":80") }
var args = ['+set', 'fs_cdn', host, '+connect', host]; var args = ['+set', 'fs_cdn', host, '+connect', host];
args.push.apply(args, ['+set', 'cl_allowDownload', '1']) args.push.apply(args, ['+set', 'cl_allowDownload', '1'])
args.push.apply(args, ['+set', 'cl_timeout', '15']) args.push.apply(args, ['+set', 'cl_timeout', '15'])

8
public/ioquake3.js vendored
View File

@ -15225,7 +15225,7 @@ function copyTempDouble(ptr) {
//var root = SYSC.GetCDN(); //var root = SYSC.GetCDN();
var root = Pointer_stringify(_Cvar_VariableString(allocate(intArrayFromString('fs_cdn'), 'i8', ALLOC_STACK))); var root = Pointer_stringify(_Cvar_VariableString(allocate(intArrayFromString('fs_cdn'), 'i8', ALLOC_STACK)));
var name = asset.name.replace(/(.+\/|)(.+?)$/, '$1' + asset.checksum + '-$2'); var name = asset.name.replace(/(.+\/|)(.+?)$/, '$1' + asset.checksum + '-$2');
var url = 'http://' + root + '/assets/' + name; var url = document.location.protocol + '//' + root + '/assets/' + name;
SYS.DoXHR(url, { SYS.DoXHR(url, {
dataType: 'arraybuffer', dataType: 'arraybuffer',
@ -15274,9 +15274,9 @@ function copyTempDouble(ptr) {
var fs_cdn = Pointer_stringify(_Cvar_VariableString(allocate(intArrayFromString('fs_cdn'), 'i8', ALLOC_STACK))); var fs_cdn = Pointer_stringify(_Cvar_VariableString(allocate(intArrayFromString('fs_cdn'), 'i8', ALLOC_STACK)));
var fs_game = Pointer_stringify(_Cvar_VariableString(allocate(intArrayFromString('fs_game'), 'i8', ALLOC_STACK))); var fs_game = Pointer_stringify(_Cvar_VariableString(allocate(intArrayFromString('fs_game'), 'i8', ALLOC_STACK)));
var com_basegame = Pointer_stringify(_Cvar_VariableString(allocate(intArrayFromString('com_basegame'), 'i8', ALLOC_STACK))); var com_basegame = Pointer_stringify(_Cvar_VariableString(allocate(intArrayFromString('com_basegame'), 'i8', ALLOC_STACK)));
var url = 'http://' + fs_cdn + '/assets/manifest.json'; var url = document.location.protocol + '//' + fs_cdn + '/assets/manifest.json';
SYS.DoXHR('http://' + fs_cdn + '/info', { SYS.DoXHR(document.location.protocol + '//' + fs_cdn + '/info', {
dataType: 'json', dataType: 'json',
onload: function (err, info) { onload: function (err, info) {
var mapname = info["mapname"]; var mapname = info["mapname"];
@ -16601,7 +16601,7 @@ function copyTempDouble(ptr) {
} else { } else {
// create the actual websocket object and connect // create the actual websocket object and connect
try { try {
var url = 'ws://' + addr + ':' + port; var url = (window.location.protocol == 'https:' ? "wss://" : "ws://") + addr + ':' + port;
// the node ws library API is slightly different than the browser's // the node ws library API is slightly different than the browser's
var opts = ENVIRONMENT_IS_NODE ? {headers: {'websocket-protocol': ['binary']}} : ['binary']; var opts = ENVIRONMENT_IS_NODE ? {headers: {'websocket-protocol': ['binary']}} : ['binary'];
// If node we use the ws library. // If node we use the ws library.

20
public/zz_generated.static.go
View File

File diff suppressed because one or more lines are too long