Reorganized the code, moved more things to the new part
This commit is contained in:
Sansan committed
1 parent
034ba35fbb
commit
5b640375c3
38 files changed
+213
-2028
No files matched your search
@@ -6,3 +6,4 @@ conf.yaml
|
|||||||
output.css
|
output.css
|
||||||
compose.yaml
|
compose.yaml
|
||||||
tailwindcss
|
tailwindcss
|
||||||
|
.env
|
||||||
+2
-2
@@ -5,7 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"music-server/internal/server"
|
"music-server/internal/server"
|
||||||
"music-server/pkg/conf"
|
"music-server/pkg/db"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"syscall"
|
"syscall"
|
||||||
@@ -21,7 +21,7 @@ func gracefulShutdown(apiServer *http.Server, done chan bool) {
|
|||||||
<-ctx.Done()
|
<-ctx.Done()
|
||||||
|
|
||||||
log.Println("shutting down gracefully, press Ctrl+C again to force")
|
log.Println("shutting down gracefully, press Ctrl+C again to force")
|
||||||
conf.CloseDb()
|
db.CloseDb()
|
||||||
|
|
||||||
// The context is used to inform the server it has 5 seconds to finish
|
// The context is used to inform the server it has 5 seconds to finish
|
||||||
// the request it is currently handling
|
// the request it is currently handling
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.6 KiB |
@@ -1,34 +0,0 @@
|
|||||||
[remap]
|
|
||||||
|
|
||||||
importer="texture"
|
|
||||||
type="CompressedTexture2D"
|
|
||||||
uid="uid://b6bierb3v4yoq"
|
|
||||||
path="res://.godot/imported/index.144x144.png-03ea9bc9a40782e35fa8c68f683d2623.ctex"
|
|
||||||
metadata={
|
|
||||||
"vram_texture": false
|
|
||||||
}
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://web/index.144x144.png"
|
|
||||||
dest_files=["res://.godot/imported/index.144x144.png-03ea9bc9a40782e35fa8c68f683d2623.ctex"]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
compress/mode=0
|
|
||||||
compress/high_quality=false
|
|
||||||
compress/lossy_quality=0.7
|
|
||||||
compress/hdr_compression=1
|
|
||||||
compress/normal_map=0
|
|
||||||
compress/channel_pack=0
|
|
||||||
mipmaps/generate=false
|
|
||||||
mipmaps/limit=-1
|
|
||||||
roughness/mode=0
|
|
||||||
roughness/src_normal=""
|
|
||||||
process/fix_alpha_border=true
|
|
||||||
process/premult_alpha=false
|
|
||||||
process/normal_map_invert_y=false
|
|
||||||
process/hdr_as_srgb=false
|
|
||||||
process/hdr_clamp_exposure=false
|
|
||||||
process/size_limit=0
|
|
||||||
detect_3d/compress_to=1
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
@@ -1,34 +0,0 @@
|
|||||||
[remap]
|
|
||||||
|
|
||||||
importer="texture"
|
|
||||||
type="CompressedTexture2D"
|
|
||||||
uid="uid://b0euyv6xwufjw"
|
|
||||||
path="res://.godot/imported/index.180x180.png-9c97e3aaba17027b76e6e765bcdc0add.ctex"
|
|
||||||
metadata={
|
|
||||||
"vram_texture": false
|
|
||||||
}
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://web/index.180x180.png"
|
|
||||||
dest_files=["res://.godot/imported/index.180x180.png-9c97e3aaba17027b76e6e765bcdc0add.ctex"]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
compress/mode=0
|
|
||||||
compress/high_quality=false
|
|
||||||
compress/lossy_quality=0.7
|
|
||||||
compress/hdr_compression=1
|
|
||||||
compress/normal_map=0
|
|
||||||
compress/channel_pack=0
|
|
||||||
mipmaps/generate=false
|
|
||||||
mipmaps/limit=-1
|
|
||||||
roughness/mode=0
|
|
||||||
roughness/src_normal=""
|
|
||||||
process/fix_alpha_border=true
|
|
||||||
process/premult_alpha=false
|
|
||||||
process/normal_map_invert_y=false
|
|
||||||
process/hdr_as_srgb=false
|
|
||||||
process/hdr_clamp_exposure=false
|
|
||||||
process/size_limit=0
|
|
||||||
detect_3d/compress_to=1
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 49 KiB |
@@ -1,34 +0,0 @@
|
|||||||
[remap]
|
|
||||||
|
|
||||||
importer="texture"
|
|
||||||
type="CompressedTexture2D"
|
|
||||||
uid="uid://c30mhkc1yernc"
|
|
||||||
path="res://.godot/imported/index.512x512.png-4cda31773312dccaaf53a4ff122aad13.ctex"
|
|
||||||
metadata={
|
|
||||||
"vram_texture": false
|
|
||||||
}
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://web/index.512x512.png"
|
|
||||||
dest_files=["res://.godot/imported/index.512x512.png-4cda31773312dccaaf53a4ff122aad13.ctex"]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
compress/mode=0
|
|
||||||
compress/high_quality=false
|
|
||||||
compress/lossy_quality=0.7
|
|
||||||
compress/hdr_compression=1
|
|
||||||
compress/normal_map=0
|
|
||||||
compress/channel_pack=0
|
|
||||||
mipmaps/generate=false
|
|
||||||
mipmaps/limit=-1
|
|
||||||
roughness/mode=0
|
|
||||||
roughness/src_normal=""
|
|
||||||
process/fix_alpha_border=true
|
|
||||||
process/premult_alpha=false
|
|
||||||
process/normal_map_invert_y=false
|
|
||||||
process/hdr_as_srgb=false
|
|
||||||
process/hdr_clamp_exposure=false
|
|
||||||
process/size_limit=0
|
|
||||||
detect_3d/compress_to=1
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
@@ -1,34 +0,0 @@
|
|||||||
[remap]
|
|
||||||
|
|
||||||
importer="texture"
|
|
||||||
type="CompressedTexture2D"
|
|
||||||
uid="uid://d0tny2k1tdlnq"
|
|
||||||
path="res://.godot/imported/index.apple-touch-icon.png-939ec69c79bbf504b92ad8ceed469d51.ctex"
|
|
||||||
metadata={
|
|
||||||
"vram_texture": false
|
|
||||||
}
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://web/index.apple-touch-icon.png"
|
|
||||||
dest_files=["res://.godot/imported/index.apple-touch-icon.png-939ec69c79bbf504b92ad8ceed469d51.ctex"]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
compress/mode=0
|
|
||||||
compress/high_quality=false
|
|
||||||
compress/lossy_quality=0.7
|
|
||||||
compress/hdr_compression=1
|
|
||||||
compress/normal_map=0
|
|
||||||
compress/channel_pack=0
|
|
||||||
mipmaps/generate=false
|
|
||||||
mipmaps/limit=-1
|
|
||||||
roughness/mode=0
|
|
||||||
roughness/src_normal=""
|
|
||||||
process/fix_alpha_border=true
|
|
||||||
process/premult_alpha=false
|
|
||||||
process/normal_map_invert_y=false
|
|
||||||
process/hdr_as_srgb=false
|
|
||||||
process/hdr_clamp_exposure=false
|
|
||||||
process/size_limit=0
|
|
||||||
detect_3d/compress_to=1
|
|
||||||
@@ -1,213 +0,0 @@
|
|||||||
/**************************************************************************/
|
|
||||||
/* audio.worklet.js */
|
|
||||||
/**************************************************************************/
|
|
||||||
/* This file is part of: */
|
|
||||||
/* GODOT ENGINE */
|
|
||||||
/* https://godotengine.org */
|
|
||||||
/**************************************************************************/
|
|
||||||
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
|
|
||||||
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
|
|
||||||
/* */
|
|
||||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
||||||
/* a copy of this software and associated documentation files (the */
|
|
||||||
/* "Software"), to deal in the Software without restriction, including */
|
|
||||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
||||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
||||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
||||||
/* the following conditions: */
|
|
||||||
/* */
|
|
||||||
/* The above copyright notice and this permission notice shall be */
|
|
||||||
/* included in all copies or substantial portions of the Software. */
|
|
||||||
/* */
|
|
||||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
||||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
||||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
|
|
||||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
||||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
||||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
||||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
||||||
/**************************************************************************/
|
|
||||||
|
|
||||||
class RingBuffer {
|
|
||||||
constructor(p_buffer, p_state, p_threads) {
|
|
||||||
this.buffer = p_buffer;
|
|
||||||
this.avail = p_state;
|
|
||||||
this.threads = p_threads;
|
|
||||||
this.rpos = 0;
|
|
||||||
this.wpos = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
data_left() {
|
|
||||||
return this.threads ? Atomics.load(this.avail, 0) : this.avail;
|
|
||||||
}
|
|
||||||
|
|
||||||
space_left() {
|
|
||||||
return this.buffer.length - this.data_left();
|
|
||||||
}
|
|
||||||
|
|
||||||
read(output) {
|
|
||||||
const size = this.buffer.length;
|
|
||||||
let from = 0;
|
|
||||||
let to_write = output.length;
|
|
||||||
if (this.rpos + to_write > size) {
|
|
||||||
const high = size - this.rpos;
|
|
||||||
output.set(this.buffer.subarray(this.rpos, size));
|
|
||||||
from = high;
|
|
||||||
to_write -= high;
|
|
||||||
this.rpos = 0;
|
|
||||||
}
|
|
||||||
if (to_write) {
|
|
||||||
output.set(this.buffer.subarray(this.rpos, this.rpos + to_write), from);
|
|
||||||
}
|
|
||||||
this.rpos += to_write;
|
|
||||||
if (this.threads) {
|
|
||||||
Atomics.add(this.avail, 0, -output.length);
|
|
||||||
Atomics.notify(this.avail, 0);
|
|
||||||
} else {
|
|
||||||
this.avail -= output.length;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
write(p_buffer) {
|
|
||||||
const to_write = p_buffer.length;
|
|
||||||
const mw = this.buffer.length - this.wpos;
|
|
||||||
if (mw >= to_write) {
|
|
||||||
this.buffer.set(p_buffer, this.wpos);
|
|
||||||
this.wpos += to_write;
|
|
||||||
if (mw === to_write) {
|
|
||||||
this.wpos = 0;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const high = p_buffer.subarray(0, mw);
|
|
||||||
const low = p_buffer.subarray(mw);
|
|
||||||
this.buffer.set(high, this.wpos);
|
|
||||||
this.buffer.set(low);
|
|
||||||
this.wpos = low.length;
|
|
||||||
}
|
|
||||||
if (this.threads) {
|
|
||||||
Atomics.add(this.avail, 0, to_write);
|
|
||||||
Atomics.notify(this.avail, 0);
|
|
||||||
} else {
|
|
||||||
this.avail += to_write;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class GodotProcessor extends AudioWorkletProcessor {
|
|
||||||
constructor() {
|
|
||||||
super();
|
|
||||||
this.threads = false;
|
|
||||||
this.running = true;
|
|
||||||
this.lock = null;
|
|
||||||
this.notifier = null;
|
|
||||||
this.output = null;
|
|
||||||
this.output_buffer = new Float32Array();
|
|
||||||
this.input = null;
|
|
||||||
this.input_buffer = new Float32Array();
|
|
||||||
this.port.onmessage = (event) => {
|
|
||||||
const cmd = event.data['cmd'];
|
|
||||||
const data = event.data['data'];
|
|
||||||
this.parse_message(cmd, data);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
process_notify() {
|
|
||||||
if (this.notifier) {
|
|
||||||
Atomics.add(this.notifier, 0, 1);
|
|
||||||
Atomics.notify(this.notifier, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
parse_message(p_cmd, p_data) {
|
|
||||||
if (p_cmd === 'start' && p_data) {
|
|
||||||
const state = p_data[0];
|
|
||||||
let idx = 0;
|
|
||||||
this.threads = true;
|
|
||||||
this.lock = state.subarray(idx, ++idx);
|
|
||||||
this.notifier = state.subarray(idx, ++idx);
|
|
||||||
const avail_in = state.subarray(idx, ++idx);
|
|
||||||
const avail_out = state.subarray(idx, ++idx);
|
|
||||||
this.input = new RingBuffer(p_data[1], avail_in, true);
|
|
||||||
this.output = new RingBuffer(p_data[2], avail_out, true);
|
|
||||||
} else if (p_cmd === 'stop') {
|
|
||||||
this.running = false;
|
|
||||||
this.output = null;
|
|
||||||
this.input = null;
|
|
||||||
this.lock = null;
|
|
||||||
this.notifier = null;
|
|
||||||
} else if (p_cmd === 'start_nothreads') {
|
|
||||||
this.output = new RingBuffer(p_data[0], p_data[0].length, false);
|
|
||||||
} else if (p_cmd === 'chunk') {
|
|
||||||
this.output.write(p_data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static array_has_data(arr) {
|
|
||||||
return arr.length && arr[0].length && arr[0][0].length;
|
|
||||||
}
|
|
||||||
|
|
||||||
process(inputs, outputs, parameters) {
|
|
||||||
if (!this.running) {
|
|
||||||
return false; // Stop processing.
|
|
||||||
}
|
|
||||||
if (this.output === null) {
|
|
||||||
return true; // Not ready yet, keep processing.
|
|
||||||
}
|
|
||||||
const process_input = GodotProcessor.array_has_data(inputs);
|
|
||||||
if (process_input) {
|
|
||||||
const input = inputs[0];
|
|
||||||
const chunk = input[0].length * input.length;
|
|
||||||
if (this.input_buffer.length !== chunk) {
|
|
||||||
this.input_buffer = new Float32Array(chunk);
|
|
||||||
}
|
|
||||||
if (!this.threads) {
|
|
||||||
GodotProcessor.write_input(this.input_buffer, input);
|
|
||||||
this.port.postMessage({ 'cmd': 'input', 'data': this.input_buffer });
|
|
||||||
} else if (this.input.space_left() >= chunk) {
|
|
||||||
GodotProcessor.write_input(this.input_buffer, input);
|
|
||||||
this.input.write(this.input_buffer);
|
|
||||||
} else {
|
|
||||||
// this.port.postMessage('Input buffer is full! Skipping input frame.'); // Uncomment this line to debug input buffer.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const process_output = GodotProcessor.array_has_data(outputs);
|
|
||||||
if (process_output) {
|
|
||||||
const output = outputs[0];
|
|
||||||
const chunk = output[0].length * output.length;
|
|
||||||
if (this.output_buffer.length !== chunk) {
|
|
||||||
this.output_buffer = new Float32Array(chunk);
|
|
||||||
}
|
|
||||||
if (this.output.data_left() >= chunk) {
|
|
||||||
this.output.read(this.output_buffer);
|
|
||||||
GodotProcessor.write_output(output, this.output_buffer);
|
|
||||||
if (!this.threads) {
|
|
||||||
this.port.postMessage({ 'cmd': 'read', 'data': chunk });
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// this.port.postMessage('Output buffer has not enough frames! Skipping output frame.'); // Uncomment this line to debug output buffer.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.process_notify();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static write_output(dest, source) {
|
|
||||||
const channels = dest.length;
|
|
||||||
for (let ch = 0; ch < channels; ch++) {
|
|
||||||
for (let sample = 0; sample < dest[ch].length; sample++) {
|
|
||||||
dest[ch][sample] = source[sample * channels + ch];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static write_input(dest, source) {
|
|
||||||
const channels = source.length;
|
|
||||||
for (let ch = 0; ch < channels; ch++) {
|
|
||||||
for (let sample = 0; sample < source[ch].length; sample++) {
|
|
||||||
dest[sample * channels + ch] = source[ch][sample];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
registerProcessor('godot-processor', GodotProcessor);
|
|
||||||
@@ -1,200 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0">
|
|
||||||
<title>MusicSearch</title>
|
|
||||||
<style>
|
|
||||||
html, body, #canvas {
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
border: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
color: white;
|
|
||||||
background-color: black;
|
|
||||||
overflow: hidden;
|
|
||||||
touch-action: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#canvas {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
#canvas:focus {
|
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#status, #status-splash, #status-progress {
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#status, #status-splash {
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#status {
|
|
||||||
background-color: #242424;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
#status-splash {
|
|
||||||
max-height: 100%;
|
|
||||||
max-width: 100%;
|
|
||||||
margin: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
#status-progress, #status-notice {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#status-progress {
|
|
||||||
bottom: 10%;
|
|
||||||
width: 50%;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
#status-notice {
|
|
||||||
background-color: #5b3943;
|
|
||||||
border-radius: 0.5rem;
|
|
||||||
border: 1px solid #9b3943;
|
|
||||||
color: #e0e0e0;
|
|
||||||
font-family: 'Noto Sans', 'Droid Sans', Arial, sans-serif;
|
|
||||||
line-height: 1.3;
|
|
||||||
margin: 0 2rem;
|
|
||||||
overflow: hidden;
|
|
||||||
padding: 1rem;
|
|
||||||
text-align: center;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<link id="-gd-engine-icon" rel="icon" type="image/png" href="index.icon.png" />
|
|
||||||
<link rel="apple-touch-icon" href="index.apple-touch-icon.png"/>
|
|
||||||
<link rel="manifest" href="index.manifest.json">
|
|
||||||
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<canvas id="canvas">
|
|
||||||
Your browser does not support the canvas tag.
|
|
||||||
</canvas>
|
|
||||||
|
|
||||||
<noscript>
|
|
||||||
Your browser does not support JavaScript.
|
|
||||||
</noscript>
|
|
||||||
|
|
||||||
<div id="status">
|
|
||||||
<img id="status-splash" src="index.png" alt="">
|
|
||||||
<progress id="status-progress"></progress>
|
|
||||||
<div id="status-notice"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script src="index.js"></script>
|
|
||||||
<script>
|
|
||||||
const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"ensureCrossOriginIsolationHeaders":false,"executable":"index","experimentalVK":false,"fileSizes":{"index.pck":86816,"index.wasm":35376909},"focusCanvas":true,"gdextensionLibs":[],"serviceWorker":"index.service.worker.js"};
|
|
||||||
const GODOT_THREADS_ENABLED = false;
|
|
||||||
const engine = new Engine(GODOT_CONFIG);
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
const statusOverlay = document.getElementById('status');
|
|
||||||
const statusProgress = document.getElementById('status-progress');
|
|
||||||
const statusNotice = document.getElementById('status-notice');
|
|
||||||
|
|
||||||
let initializing = true;
|
|
||||||
let statusMode = '';
|
|
||||||
|
|
||||||
function setStatusMode(mode) {
|
|
||||||
if (statusMode === mode || !initializing) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (mode === 'hidden') {
|
|
||||||
statusOverlay.remove();
|
|
||||||
initializing = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
statusOverlay.style.visibility = 'visible';
|
|
||||||
statusProgress.style.display = mode === 'progress' ? 'block' : 'none';
|
|
||||||
statusNotice.style.display = mode === 'notice' ? 'block' : 'none';
|
|
||||||
statusMode = mode;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setStatusNotice(text) {
|
|
||||||
while (statusNotice.lastChild) {
|
|
||||||
statusNotice.removeChild(statusNotice.lastChild);
|
|
||||||
}
|
|
||||||
const lines = text.split('\n');
|
|
||||||
lines.forEach((line) => {
|
|
||||||
statusNotice.appendChild(document.createTextNode(line));
|
|
||||||
statusNotice.appendChild(document.createElement('br'));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function displayFailureNotice(err) {
|
|
||||||
console.error(err);
|
|
||||||
if (err instanceof Error) {
|
|
||||||
setStatusNotice(err.message);
|
|
||||||
} else if (typeof err === 'string') {
|
|
||||||
setStatusNotice(err);
|
|
||||||
} else {
|
|
||||||
setStatusNotice('An unknown error occured');
|
|
||||||
}
|
|
||||||
setStatusMode('notice');
|
|
||||||
initializing = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const missing = Engine.getMissingFeatures({
|
|
||||||
threads: GODOT_THREADS_ENABLED,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (missing.length !== 0) {
|
|
||||||
if (GODOT_CONFIG['serviceWorker'] && GODOT_CONFIG['ensureCrossOriginIsolationHeaders'] && 'serviceWorker' in navigator) {
|
|
||||||
// There's a chance that installing the service worker would fix the issue
|
|
||||||
Promise.race([
|
|
||||||
navigator.serviceWorker.getRegistration().then((registration) => {
|
|
||||||
if (registration != null) {
|
|
||||||
return Promise.reject(new Error('Service worker already exists.'));
|
|
||||||
}
|
|
||||||
return registration;
|
|
||||||
}).then(() => engine.installServiceWorker()),
|
|
||||||
// For some reason, `getRegistration()` can stall
|
|
||||||
new Promise((resolve) => {
|
|
||||||
setTimeout(() => resolve(), 2000);
|
|
||||||
}),
|
|
||||||
]).catch((err) => {
|
|
||||||
console.error('Error while registering service worker:', err);
|
|
||||||
}).then(() => {
|
|
||||||
window.location.reload();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
// Display the message as usual
|
|
||||||
const missingMsg = 'Error\nThe following features required to run Godot projects on the Web are missing:\n';
|
|
||||||
displayFailureNotice(missingMsg + missing.join('\n'));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
setStatusMode('progress');
|
|
||||||
engine.startGame({
|
|
||||||
'onProgress': function (current, total) {
|
|
||||||
if (current > 0 && total > 0) {
|
|
||||||
statusProgress.value = current;
|
|
||||||
statusProgress.max = total;
|
|
||||||
} else {
|
|
||||||
statusProgress.removeAttribute('value');
|
|
||||||
statusProgress.removeAttribute('max');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}).then(() => {
|
|
||||||
setStatusMode('hidden');
|
|
||||||
}, displayFailureNotice);
|
|
||||||
}
|
|
||||||
}());
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.5 KiB |
@@ -1,34 +0,0 @@
|
|||||||
[remap]
|
|
||||||
|
|
||||||
importer="texture"
|
|
||||||
type="CompressedTexture2D"
|
|
||||||
uid="uid://c8gblkbcsrrwo"
|
|
||||||
path="res://.godot/imported/index.icon.png-c615af856eabc03ca93d51f6a8f07b60.ctex"
|
|
||||||
metadata={
|
|
||||||
"vram_texture": false
|
|
||||||
}
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://web/index.icon.png"
|
|
||||||
dest_files=["res://.godot/imported/index.icon.png-c615af856eabc03ca93d51f6a8f07b60.ctex"]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
compress/mode=0
|
|
||||||
compress/high_quality=false
|
|
||||||
compress/lossy_quality=0.7
|
|
||||||
compress/hdr_compression=1
|
|
||||||
compress/normal_map=0
|
|
||||||
compress/channel_pack=0
|
|
||||||
mipmaps/generate=false
|
|
||||||
mipmaps/limit=-1
|
|
||||||
roughness/mode=0
|
|
||||||
roughness/src_normal=""
|
|
||||||
process/fix_alpha_border=true
|
|
||||||
process/premult_alpha=false
|
|
||||||
process/normal_map_invert_y=false
|
|
||||||
process/hdr_as_srgb=false
|
|
||||||
process/hdr_clamp_exposure=false
|
|
||||||
process/size_limit=0
|
|
||||||
detect_3d/compress_to=1
|
|
||||||
@@ -1,908 +0,0 @@
|
|||||||
|
|
||||||
var Godot = (() => {
|
|
||||||
var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
|
|
||||||
|
|
||||||
return (
|
|
||||||
function(moduleArg = {}) {
|
|
||||||
var moduleRtn;
|
|
||||||
|
|
||||||
var Module=moduleArg;var readyPromiseResolve,readyPromiseReject;var readyPromise=new Promise((resolve,reject)=>{readyPromiseResolve=resolve;readyPromiseReject=reject});["_memory","__Z14godot_web_mainiPPc","__emwebxr_on_input_event","__emwebxr_on_simple_event","___indirect_function_table","_main","onRuntimeInitialized"].forEach(prop=>{if(!Object.getOwnPropertyDescriptor(readyPromise,prop)){Object.defineProperty(readyPromise,prop,{get:()=>abort("You are getting "+prop+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js"),set:()=>abort("You are setting "+prop+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js")})}});var ENVIRONMENT_IS_WEB=typeof window=="object";var ENVIRONMENT_IS_WORKER=typeof importScripts=="function";var ENVIRONMENT_IS_NODE=typeof process=="object"&&typeof process.versions=="object"&&typeof process.versions.node=="string";var ENVIRONMENT_IS_SHELL=!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_NODE&&!ENVIRONMENT_IS_WORKER;if(Module["ENVIRONMENT"]){throw new Error("Module.ENVIRONMENT has been deprecated. To force the environment, use the ENVIRONMENT compile-time option (for example, -sENVIRONMENT=web or -sENVIRONMENT=node)")}var moduleOverrides=Object.assign({},Module);var arguments_=[];var thisProgram="./this.program";var quit_=(status,toThrow)=>{throw toThrow};var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var readAsync,readBinary;if(ENVIRONMENT_IS_SHELL){if(typeof process=="object"&&typeof require==="function"||typeof window=="object"||typeof importScripts=="function")throw new Error("not compiled for this environment (did you build to HTML and try to run it not on the web, or set ENVIRONMENT to something - like node - and run it someplace else - like on the web?)")}else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){if(ENVIRONMENT_IS_WORKER){scriptDirectory=self.location.href}else if(typeof document!="undefined"&&document.currentScript){scriptDirectory=document.currentScript.src}if(_scriptName){scriptDirectory=_scriptName}if(scriptDirectory.startsWith("blob:")){scriptDirectory=""}else{scriptDirectory=scriptDirectory.substr(0,scriptDirectory.replace(/[?#].*/,"").lastIndexOf("/")+1)}if(!(typeof window=="object"||typeof importScripts=="function"))throw new Error("not compiled for this environment (did you build to HTML and try to run it not on the web, or set ENVIRONMENT to something - like node - and run it someplace else - like on the web?)");{if(ENVIRONMENT_IS_WORKER){readBinary=url=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.responseType="arraybuffer";xhr.send(null);return new Uint8Array(xhr.response)}}readAsync=url=>{assert(!isFileURI(url),"readAsync does not work with file:// URLs");return fetch(url,{credentials:"same-origin"}).then(response=>{if(response.ok){return response.arrayBuffer()}return Promise.reject(new Error(response.status+" : "+response.url))})}}}else{throw new Error("environment detection error")}var out=Module["print"]||console.log.bind(console);var err=Module["printErr"]||console.error.bind(console);Object.assign(Module,moduleOverrides);moduleOverrides=null;checkIncomingModuleAPI();if(Module["arguments"])arguments_=Module["arguments"];legacyModuleProp("arguments","arguments_");if(Module["thisProgram"])thisProgram=Module["thisProgram"];legacyModuleProp("thisProgram","thisProgram");if(Module["quit"])quit_=Module["quit"];legacyModuleProp("quit","quit_");assert(typeof Module["memoryInitializerPrefixURL"]=="undefined","Module.memoryInitializerPrefixURL option was removed, use Module.locateFile instead");assert(typeof Module["pthreadMainPrefixURL"]=="undefined","Module.pthreadMainPrefixURL option was removed, use Module.locateFile instead");assert(typeof Module["cdInitializerPrefixURL"]=="undefined","Module.cdInitializerPrefixURL option was removed, use Module.locateFile instead");assert(typeof Module["filePackagePrefixURL"]=="undefined","Module.filePackagePrefixURL option was removed, use Module.locateFile instead");assert(typeof Module["read"]=="undefined","Module.read option was removed");assert(typeof Module["readAsync"]=="undefined","Module.readAsync option was removed (modify readAsync in JS)");assert(typeof Module["readBinary"]=="undefined","Module.readBinary option was removed (modify readBinary in JS)");assert(typeof Module["setWindowTitle"]=="undefined","Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)");assert(typeof Module["TOTAL_MEMORY"]=="undefined","Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY");legacyModuleProp("asm","wasmExports");legacyModuleProp("readAsync","readAsync");legacyModuleProp("readBinary","readBinary");legacyModuleProp("setWindowTitle","setWindowTitle");assert(!ENVIRONMENT_IS_NODE,"node environment detected buLine truncated
|
|
||||||
|
|
||||||
|
|
||||||
return moduleRtn;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
})();
|
|
||||||
if (typeof exports === 'object' && typeof module === 'object')
|
|
||||||
module.exports = Godot;
|
|
||||||
else if (typeof define === 'function' && define['amd'])
|
|
||||||
define([], () => Godot);
|
|
||||||
|
|
||||||
const Features = {
|
|
||||||
/**
|
|
||||||
* Check whether WebGL is available. Optionally, specify a particular version of WebGL to check for.
|
|
||||||
*
|
|
||||||
* @param {number=} [majorVersion=1] The major WebGL version to check for.
|
|
||||||
* @returns {boolean} If the given major version of WebGL is available.
|
|
||||||
* @function Engine.isWebGLAvailable
|
|
||||||
*/
|
|
||||||
isWebGLAvailable: function (majorVersion = 1) {
|
|
||||||
try {
|
|
||||||
return !!document.createElement('canvas').getContext(['webgl', 'webgl2'][majorVersion - 1]);
|
|
||||||
} catch (e) { /* Not available */ }
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check whether the Fetch API available and supports streaming responses.
|
|
||||||
*
|
|
||||||
* @returns {boolean} If the Fetch API is available and supports streaming responses.
|
|
||||||
* @function Engine.isFetchAvailable
|
|
||||||
*/
|
|
||||||
isFetchAvailable: function () {
|
|
||||||
return 'fetch' in window && 'Response' in window && 'body' in window.Response.prototype;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check whether the engine is running in a Secure Context.
|
|
||||||
*
|
|
||||||
* @returns {boolean} If the engine is running in a Secure Context.
|
|
||||||
* @function Engine.isSecureContext
|
|
||||||
*/
|
|
||||||
isSecureContext: function () {
|
|
||||||
return window['isSecureContext'] === true;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check whether the engine is cross origin isolated.
|
|
||||||
* This value is dependent on Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy headers sent by the server.
|
|
||||||
*
|
|
||||||
* @returns {boolean} If the engine is running in a Secure Context.
|
|
||||||
* @function Engine.isSecureContext
|
|
||||||
*/
|
|
||||||
isCrossOriginIsolated: function () {
|
|
||||||
return window['crossOriginIsolated'] === true;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check whether SharedBufferArray is available.
|
|
||||||
*
|
|
||||||
* Most browsers require the page to be running in a secure context, and the
|
|
||||||
* the server to provide specific CORS headers for SharedArrayBuffer to be available.
|
|
||||||
*
|
|
||||||
* @returns {boolean} If SharedArrayBuffer is available.
|
|
||||||
* @function Engine.isSharedArrayBufferAvailable
|
|
||||||
*/
|
|
||||||
isSharedArrayBufferAvailable: function () {
|
|
||||||
return 'SharedArrayBuffer' in window;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check whether the AudioContext supports AudioWorkletNodes.
|
|
||||||
*
|
|
||||||
* @returns {boolean} If AudioWorkletNode is available.
|
|
||||||
* @function Engine.isAudioWorkletAvailable
|
|
||||||
*/
|
|
||||||
isAudioWorkletAvailable: function () {
|
|
||||||
return 'AudioContext' in window && 'audioWorklet' in AudioContext.prototype;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return an array of missing required features (as string).
|
|
||||||
*
|
|
||||||
* @returns {Array<string>} A list of human-readable missing features.
|
|
||||||
* @function Engine.getMissingFeatures
|
|
||||||
* @param {{threads: (boolean|undefined)}} supportedFeatures
|
|
||||||
*/
|
|
||||||
getMissingFeatures: function (supportedFeatures = {}) {
|
|
||||||
const {
|
|
||||||
// Quotes are needed for the Closure compiler.
|
|
||||||
'threads': supportsThreads = true,
|
|
||||||
} = supportedFeatures;
|
|
||||||
|
|
||||||
const missing = [];
|
|
||||||
if (!Features.isWebGLAvailable(2)) {
|
|
||||||
missing.push('WebGL2 - Check web browser configuration and hardware support');
|
|
||||||
}
|
|
||||||
if (!Features.isFetchAvailable()) {
|
|
||||||
missing.push('Fetch - Check web browser version');
|
|
||||||
}
|
|
||||||
if (!Features.isSecureContext()) {
|
|
||||||
missing.push('Secure Context - Check web server configuration (use HTTPS)');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (supportsThreads) {
|
|
||||||
if (!Features.isCrossOriginIsolated()) {
|
|
||||||
missing.push('Cross-Origin Isolation - Check that the web server configuration sends the correct headers.');
|
|
||||||
}
|
|
||||||
if (!Features.isSharedArrayBufferAvailable()) {
|
|
||||||
missing.push('SharedArrayBuffer - Check that the web server configuration sends the correct headers.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Audio is normally optional since we have a dummy fallback.
|
|
||||||
return missing;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const Preloader = /** @constructor */ function () { // eslint-disable-line no-unused-vars
|
|
||||||
function getTrackedResponse(response, load_status) {
|
|
||||||
function onloadprogress(reader, controller) {
|
|
||||||
return reader.read().then(function (result) {
|
|
||||||
if (load_status.done) {
|
|
||||||
return Promise.resolve();
|
|
||||||
}
|
|
||||||
if (result.value) {
|
|
||||||
controller.enqueue(result.value);
|
|
||||||
load_status.loaded += result.value.length;
|
|
||||||
}
|
|
||||||
if (!result.done) {
|
|
||||||
return onloadprogress(reader, controller);
|
|
||||||
}
|
|
||||||
load_status.done = true;
|
|
||||||
return Promise.resolve();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
const reader = response.body.getReader();
|
|
||||||
return new Response(new ReadableStream({
|
|
||||||
start: function (controller) {
|
|
||||||
onloadprogress(reader, controller).then(function () {
|
|
||||||
controller.close();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
}), { headers: response.headers });
|
|
||||||
}
|
|
||||||
|
|
||||||
function loadFetch(file, tracker, fileSize, raw) {
|
|
||||||
tracker[file] = {
|
|
||||||
total: fileSize || 0,
|
|
||||||
loaded: 0,
|
|
||||||
done: false,
|
|
||||||
};
|
|
||||||
return fetch(file).then(function (response) {
|
|
||||||
if (!response.ok) {
|
|
||||||
return Promise.reject(new Error(`Failed loading file '${file}'`));
|
|
||||||
}
|
|
||||||
const tr = getTrackedResponse(response, tracker[file]);
|
|
||||||
if (raw) {
|
|
||||||
return Promise.resolve(tr);
|
|
||||||
}
|
|
||||||
return tr.arrayBuffer();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function retry(func, attempts = 1) {
|
|
||||||
function onerror(err) {
|
|
||||||
if (attempts <= 1) {
|
|
||||||
return Promise.reject(err);
|
|
||||||
}
|
|
||||||
return new Promise(function (resolve, reject) {
|
|
||||||
setTimeout(function () {
|
|
||||||
retry(func, attempts - 1).then(resolve).catch(reject);
|
|
||||||
}, 1000);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return func().catch(onerror);
|
|
||||||
}
|
|
||||||
|
|
||||||
const DOWNLOAD_ATTEMPTS_MAX = 4;
|
|
||||||
const loadingFiles = {};
|
|
||||||
const lastProgress = { loaded: 0, total: 0 };
|
|
||||||
let progressFunc = null;
|
|
||||||
|
|
||||||
const animateProgress = function () {
|
|
||||||
let loaded = 0;
|
|
||||||
let total = 0;
|
|
||||||
let totalIsValid = true;
|
|
||||||
let progressIsFinal = true;
|
|
||||||
|
|
||||||
Object.keys(loadingFiles).forEach(function (file) {
|
|
||||||
const stat = loadingFiles[file];
|
|
||||||
if (!stat.done) {
|
|
||||||
progressIsFinal = false;
|
|
||||||
}
|
|
||||||
if (!totalIsValid || stat.total === 0) {
|
|
||||||
totalIsValid = false;
|
|
||||||
total = 0;
|
|
||||||
} else {
|
|
||||||
total += stat.total;
|
|
||||||
}
|
|
||||||
loaded += stat.loaded;
|
|
||||||
});
|
|
||||||
if (loaded !== lastProgress.loaded || total !== lastProgress.total) {
|
|
||||||
lastProgress.loaded = loaded;
|
|
||||||
lastProgress.total = total;
|
|
||||||
if (typeof progressFunc === 'function') {
|
|
||||||
progressFunc(loaded, total);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!progressIsFinal) {
|
|
||||||
requestAnimationFrame(animateProgress);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.animateProgress = animateProgress;
|
|
||||||
|
|
||||||
this.setProgressFunc = function (callback) {
|
|
||||||
progressFunc = callback;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.loadPromise = function (file, fileSize, raw = false) {
|
|
||||||
return retry(loadFetch.bind(null, file, loadingFiles, fileSize, raw), DOWNLOAD_ATTEMPTS_MAX);
|
|
||||||
};
|
|
||||||
|
|
||||||
this.preloadedFiles = [];
|
|
||||||
this.preload = function (pathOrBuffer, destPath, fileSize) {
|
|
||||||
let buffer = null;
|
|
||||||
if (typeof pathOrBuffer === 'string') {
|
|
||||||
const me = this;
|
|
||||||
return this.loadPromise(pathOrBuffer, fileSize).then(function (buf) {
|
|
||||||
me.preloadedFiles.push({
|
|
||||||
path: destPath || pathOrBuffer,
|
|
||||||
buffer: buf,
|
|
||||||
});
|
|
||||||
return Promise.resolve();
|
|
||||||
});
|
|
||||||
} else if (pathOrBuffer instanceof ArrayBuffer) {
|
|
||||||
buffer = new Uint8Array(pathOrBuffer);
|
|
||||||
} else if (ArrayBuffer.isView(pathOrBuffer)) {
|
|
||||||
buffer = new Uint8Array(pathOrBuffer.buffer);
|
|
||||||
}
|
|
||||||
if (buffer) {
|
|
||||||
this.preloadedFiles.push({
|
|
||||||
path: destPath,
|
|
||||||
buffer: pathOrBuffer,
|
|
||||||
});
|
|
||||||
return Promise.resolve();
|
|
||||||
}
|
|
||||||
return Promise.reject(new Error('Invalid object for preloading'));
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An object used to configure the Engine instance based on godot export options, and to override those in custom HTML
|
|
||||||
* templates if needed.
|
|
||||||
*
|
|
||||||
* @header Engine configuration
|
|
||||||
* @summary The Engine configuration object. This is just a typedef, create it like a regular object, e.g.:
|
|
||||||
*
|
|
||||||
* ``const MyConfig = { executable: 'godot', unloadAfterInit: false }``
|
|
||||||
*
|
|
||||||
* @typedef {Object} EngineConfig
|
|
||||||
*/
|
|
||||||
const EngineConfig = {}; // eslint-disable-line no-unused-vars
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @struct
|
|
||||||
* @constructor
|
|
||||||
* @ignore
|
|
||||||
*/
|
|
||||||
const InternalConfig = function (initConfig) { // eslint-disable-line no-unused-vars
|
|
||||||
const cfg = /** @lends {InternalConfig.prototype} */ {
|
|
||||||
/**
|
|
||||||
* Whether to unload the engine automatically after the instance is initialized.
|
|
||||||
*
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @default
|
|
||||||
* @type {boolean}
|
|
||||||
*/
|
|
||||||
unloadAfterInit: true,
|
|
||||||
/**
|
|
||||||
* The HTML DOM Canvas object to use.
|
|
||||||
*
|
|
||||||
* By default, the first canvas element in the document will be used is none is specified.
|
|
||||||
*
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @default
|
|
||||||
* @type {?HTMLCanvasElement}
|
|
||||||
*/
|
|
||||||
canvas: null,
|
|
||||||
/**
|
|
||||||
* The name of the WASM file without the extension. (Set by Godot Editor export process).
|
|
||||||
*
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @default
|
|
||||||
* @type {string}
|
|
||||||
*/
|
|
||||||
executable: '',
|
|
||||||
/**
|
|
||||||
* An alternative name for the game pck to load. The executable name is used otherwise.
|
|
||||||
*
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @default
|
|
||||||
* @type {?string}
|
|
||||||
*/
|
|
||||||
mainPack: null,
|
|
||||||
/**
|
|
||||||
* Specify a language code to select the proper localization for the game.
|
|
||||||
*
|
|
||||||
* The browser locale will be used if none is specified. See complete list of
|
|
||||||
* :ref:`supported locales <doc_locales>`.
|
|
||||||
*
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @type {?string}
|
|
||||||
* @default
|
|
||||||
*/
|
|
||||||
locale: null,
|
|
||||||
/**
|
|
||||||
* The canvas resize policy determines how the canvas should be resized by Godot.
|
|
||||||
*
|
|
||||||
* ``0`` means Godot won't do any resizing. This is useful if you want to control the canvas size from
|
|
||||||
* javascript code in your template.
|
|
||||||
*
|
|
||||||
* ``1`` means Godot will resize the canvas on start, and when changing window size via engine functions.
|
|
||||||
*
|
|
||||||
* ``2`` means Godot will adapt the canvas size to match the whole browser window.
|
|
||||||
*
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @type {number}
|
|
||||||
* @default
|
|
||||||
*/
|
|
||||||
canvasResizePolicy: 2,
|
|
||||||
/**
|
|
||||||
* The arguments to be passed as command line arguments on startup.
|
|
||||||
*
|
|
||||||
* See :ref:`command line tutorial <doc_command_line_tutorial>`.
|
|
||||||
*
|
|
||||||
* **Note**: :js:meth:`startGame <Engine.prototype.startGame>` will always add the ``--main-pack`` argument.
|
|
||||||
*
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @type {Array<string>}
|
|
||||||
* @default
|
|
||||||
*/
|
|
||||||
args: [],
|
|
||||||
/**
|
|
||||||
* When enabled, the game canvas will automatically grab the focus when the engine starts.
|
|
||||||
*
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @type {boolean}
|
|
||||||
* @default
|
|
||||||
*/
|
|
||||||
focusCanvas: true,
|
|
||||||
/**
|
|
||||||
* When enabled, this will turn on experimental virtual keyboard support on mobile.
|
|
||||||
*
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @type {boolean}
|
|
||||||
* @default
|
|
||||||
*/
|
|
||||||
experimentalVK: false,
|
|
||||||
/**
|
|
||||||
* The progressive web app service worker to install.
|
|
||||||
* @memberof EngineConfig
|
|
||||||
* @default
|
|
||||||
* @type {string}
|
|
||||||
*/
|
|
||||||
serviceWorker: '',
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @type {Array.<string>}
|
|
||||||
*/
|
|
||||||
persistentPaths: ['/userfs'],
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @type {boolean}
|
|
||||||
*/
|
|
||||||
persistentDrops: false,
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @type {Array.<string>}
|
|
||||||
*/
|
|
||||||
gdextensionLibs: [],
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @type {Array.<string>}
|
|
||||||
*/
|
|
||||||
fileSizes: [],
|
|
||||||
/**
|
|
||||||
* A callback function for handling Godot's ``OS.execute`` calls.
|
|
||||||
*
|
|
||||||
* This is for example used in the Web Editor template to switch between project manager and editor, and for running the game.
|
|
||||||
*
|
|
||||||
* @callback EngineConfig.onExecute
|
|
||||||
* @param {string} path The path that Godot's wants executed.
|
|
||||||
* @param {Array.<string>} args The arguments of the "command" to execute.
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @type {?function(string, Array.<string>)}
|
|
||||||
*/
|
|
||||||
onExecute: null,
|
|
||||||
/**
|
|
||||||
* A callback function for being notified when the Godot instance quits.
|
|
||||||
*
|
|
||||||
* **Note**: This function will not be called if the engine crashes or become unresponsive.
|
|
||||||
*
|
|
||||||
* @callback EngineConfig.onExit
|
|
||||||
* @param {number} status_code The status code returned by Godot on exit.
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @type {?function(number)}
|
|
||||||
*/
|
|
||||||
onExit: null,
|
|
||||||
/**
|
|
||||||
* A callback function for displaying download progress.
|
|
||||||
*
|
|
||||||
* The function is called once per frame while downloading files, so the usage of ``requestAnimationFrame()``
|
|
||||||
* is not necessary.
|
|
||||||
*
|
|
||||||
* If the callback function receives a total amount of bytes as 0, this means that it is impossible to calculate.
|
|
||||||
* Possible reasons include:
|
|
||||||
*
|
|
||||||
* - Files are delivered with server-side chunked compression
|
|
||||||
* - Files are delivered with server-side compression on Chromium
|
|
||||||
* - Not all file downloads have started yet (usually on servers without multi-threading)
|
|
||||||
*
|
|
||||||
* @callback EngineConfig.onProgress
|
|
||||||
* @param {number} current The current amount of downloaded bytes so far.
|
|
||||||
* @param {number} total The total amount of bytes to be downloaded.
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @type {?function(number, number)}
|
|
||||||
*/
|
|
||||||
onProgress: null,
|
|
||||||
/**
|
|
||||||
* A callback function for handling the standard output stream. This method should usually only be used in debug pages.
|
|
||||||
*
|
|
||||||
* By default, ``console.log()`` is used.
|
|
||||||
*
|
|
||||||
* @callback EngineConfig.onPrint
|
|
||||||
* @param {...*} [var_args] A variadic number of arguments to be printed.
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @type {?function(...*)}
|
|
||||||
*/
|
|
||||||
onPrint: function () {
|
|
||||||
console.log.apply(console, Array.from(arguments)); // eslint-disable-line no-console
|
|
||||||
},
|
|
||||||
/**
|
|
||||||
* A callback function for handling the standard error stream. This method should usually only be used in debug pages.
|
|
||||||
*
|
|
||||||
* By default, ``console.error()`` is used.
|
|
||||||
*
|
|
||||||
* @callback EngineConfig.onPrintError
|
|
||||||
* @param {...*} [var_args] A variadic number of arguments to be printed as errors.
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @type {?function(...*)}
|
|
||||||
*/
|
|
||||||
onPrintError: function (var_args) {
|
|
||||||
console.error.apply(console, Array.from(arguments)); // eslint-disable-line no-console
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @struct
|
|
||||||
* @constructor
|
|
||||||
* @param {EngineConfig} opts
|
|
||||||
*/
|
|
||||||
function Config(opts) {
|
|
||||||
this.update(opts);
|
|
||||||
}
|
|
||||||
|
|
||||||
Config.prototype = cfg;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @param {EngineConfig} opts
|
|
||||||
*/
|
|
||||||
Config.prototype.update = function (opts) {
|
|
||||||
const config = opts || {};
|
|
||||||
// NOTE: We must explicitly pass the default, accessing it via
|
|
||||||
// the key will fail due to closure compiler renames.
|
|
||||||
function parse(key, def) {
|
|
||||||
if (typeof (config[key]) === 'undefined') {
|
|
||||||
return def;
|
|
||||||
}
|
|
||||||
return config[key];
|
|
||||||
}
|
|
||||||
// Module config
|
|
||||||
this.unloadAfterInit = parse('unloadAfterInit', this.unloadAfterInit);
|
|
||||||
this.onPrintError = parse('onPrintError', this.onPrintError);
|
|
||||||
this.onPrint = parse('onPrint', this.onPrint);
|
|
||||||
this.onProgress = parse('onProgress', this.onProgress);
|
|
||||||
|
|
||||||
// Godot config
|
|
||||||
this.canvas = parse('canvas', this.canvas);
|
|
||||||
this.executable = parse('executable', this.executable);
|
|
||||||
this.mainPack = parse('mainPack', this.mainPack);
|
|
||||||
this.locale = parse('locale', this.locale);
|
|
||||||
this.canvasResizePolicy = parse('canvasResizePolicy', this.canvasResizePolicy);
|
|
||||||
this.persistentPaths = parse('persistentPaths', this.persistentPaths);
|
|
||||||
this.persistentDrops = parse('persistentDrops', this.persistentDrops);
|
|
||||||
this.experimentalVK = parse('experimentalVK', this.experimentalVK);
|
|
||||||
this.focusCanvas = parse('focusCanvas', this.focusCanvas);
|
|
||||||
this.serviceWorker = parse('serviceWorker', this.serviceWorker);
|
|
||||||
this.gdextensionLibs = parse('gdextensionLibs', this.gdextensionLibs);
|
|
||||||
this.fileSizes = parse('fileSizes', this.fileSizes);
|
|
||||||
this.args = parse('args', this.args);
|
|
||||||
this.onExecute = parse('onExecute', this.onExecute);
|
|
||||||
this.onExit = parse('onExit', this.onExit);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @param {string} loadPath
|
|
||||||
* @param {Response} response
|
|
||||||
*/
|
|
||||||
Config.prototype.getModuleConfig = function (loadPath, response) {
|
|
||||||
let r = response;
|
|
||||||
const gdext = this.gdextensionLibs;
|
|
||||||
return {
|
|
||||||
'print': this.onPrint,
|
|
||||||
'printErr': this.onPrintError,
|
|
||||||
'thisProgram': this.executable,
|
|
||||||
'noExitRuntime': false,
|
|
||||||
'dynamicLibraries': [`${loadPath}.side.wasm`].concat(this.gdextensionLibs),
|
|
||||||
'instantiateWasm': function (imports, onSuccess) {
|
|
||||||
function done(result) {
|
|
||||||
onSuccess(result['instance'], result['module']);
|
|
||||||
}
|
|
||||||
if (typeof (WebAssembly.instantiateStreaming) !== 'undefined') {
|
|
||||||
WebAssembly.instantiateStreaming(Promise.resolve(r), imports).then(done);
|
|
||||||
} else {
|
|
||||||
r.arrayBuffer().then(function (buffer) {
|
|
||||||
WebAssembly.instantiate(buffer, imports).then(done);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
r = null;
|
|
||||||
return {};
|
|
||||||
},
|
|
||||||
'locateFile': function (path) {
|
|
||||||
if (!path.startsWith('godot.')) {
|
|
||||||
return path;
|
|
||||||
} else if (path.endsWith('.worker.js')) {
|
|
||||||
return `${loadPath}.worker.js`;
|
|
||||||
} else if (path.endsWith('.audio.worklet.js')) {
|
|
||||||
return `${loadPath}.audio.worklet.js`;
|
|
||||||
} else if (path.endsWith('.js')) {
|
|
||||||
return `${loadPath}.js`;
|
|
||||||
} else if (path in gdext) {
|
|
||||||
return path;
|
|
||||||
} else if (path.endsWith('.side.wasm')) {
|
|
||||||
return `${loadPath}.side.wasm`;
|
|
||||||
} else if (path.endsWith('.wasm')) {
|
|
||||||
return `${loadPath}.wasm`;
|
|
||||||
}
|
|
||||||
return path;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
* @param {function()} cleanup
|
|
||||||
*/
|
|
||||||
Config.prototype.getGodotConfig = function (cleanup) {
|
|
||||||
// Try to find a canvas
|
|
||||||
if (!(this.canvas instanceof HTMLCanvasElement)) {
|
|
||||||
const nodes = document.getElementsByTagName('canvas');
|
|
||||||
if (nodes.length && nodes[0] instanceof HTMLCanvasElement) {
|
|
||||||
const first = nodes[0];
|
|
||||||
this.canvas = /** @type {!HTMLCanvasElement} */ (first);
|
|
||||||
}
|
|
||||||
if (!this.canvas) {
|
|
||||||
throw new Error('No canvas found in page');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Canvas can grab focus on click, or key events won't work.
|
|
||||||
if (this.canvas.tabIndex < 0) {
|
|
||||||
this.canvas.tabIndex = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Browser locale, or custom one if defined.
|
|
||||||
let locale = this.locale;
|
|
||||||
if (!locale) {
|
|
||||||
locale = navigator.languages ? navigator.languages[0] : navigator.language;
|
|
||||||
locale = locale.split('.')[0];
|
|
||||||
}
|
|
||||||
locale = locale.replace('-', '_');
|
|
||||||
const onExit = this.onExit;
|
|
||||||
|
|
||||||
// Godot configuration.
|
|
||||||
return {
|
|
||||||
'canvas': this.canvas,
|
|
||||||
'canvasResizePolicy': this.canvasResizePolicy,
|
|
||||||
'locale': locale,
|
|
||||||
'persistentDrops': this.persistentDrops,
|
|
||||||
'virtualKeyboard': this.experimentalVK,
|
|
||||||
'focusCanvas': this.focusCanvas,
|
|
||||||
'onExecute': this.onExecute,
|
|
||||||
'onExit': function (p_code) {
|
|
||||||
cleanup(); // We always need to call the cleanup callback to free memory.
|
|
||||||
if (typeof (onExit) === 'function') {
|
|
||||||
onExit(p_code);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
|
||||||
};
|
|
||||||
return new Config(initConfig);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Projects exported for the Web expose the :js:class:`Engine` class to the JavaScript environment, that allows
|
|
||||||
* fine control over the engine's start-up process.
|
|
||||||
*
|
|
||||||
* This API is built in an asynchronous manner and requires basic understanding
|
|
||||||
* of `Promises <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises>`__.
|
|
||||||
*
|
|
||||||
* @module Engine
|
|
||||||
* @header Web export JavaScript reference
|
|
||||||
*/
|
|
||||||
const Engine = (function () {
|
|
||||||
const preloader = new Preloader();
|
|
||||||
|
|
||||||
let loadPromise = null;
|
|
||||||
let loadPath = '';
|
|
||||||
let initPromise = null;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @classdesc The ``Engine`` class provides methods for loading and starting exported projects on the Web. For default export
|
|
||||||
* settings, this is already part of the exported HTML page. To understand practical use of the ``Engine`` class,
|
|
||||||
* see :ref:`Custom HTML page for Web export <doc_customizing_html5_shell>`.
|
|
||||||
*
|
|
||||||
* @description Create a new Engine instance with the given configuration.
|
|
||||||
*
|
|
||||||
* @global
|
|
||||||
* @constructor
|
|
||||||
* @param {EngineConfig} initConfig The initial config for this instance.
|
|
||||||
*/
|
|
||||||
function Engine(initConfig) { // eslint-disable-line no-shadow
|
|
||||||
this.config = new InternalConfig(initConfig);
|
|
||||||
this.rtenv = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load the engine from the specified base path.
|
|
||||||
*
|
|
||||||
* @param {string} basePath Base path of the engine to load.
|
|
||||||
* @param {number=} [size=0] The file size if known.
|
|
||||||
* @returns {Promise} A Promise that resolves once the engine is loaded.
|
|
||||||
*
|
|
||||||
* @function Engine.load
|
|
||||||
*/
|
|
||||||
Engine.load = function (basePath, size) {
|
|
||||||
if (loadPromise == null) {
|
|
||||||
loadPath = basePath;
|
|
||||||
loadPromise = preloader.loadPromise(`${loadPath}.wasm`, size, true);
|
|
||||||
requestAnimationFrame(preloader.animateProgress);
|
|
||||||
}
|
|
||||||
return loadPromise;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unload the engine to free memory.
|
|
||||||
*
|
|
||||||
* This method will be called automatically depending on the configuration. See :js:attr:`unloadAfterInit`.
|
|
||||||
*
|
|
||||||
* @function Engine.unload
|
|
||||||
*/
|
|
||||||
Engine.unload = function () {
|
|
||||||
loadPromise = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Safe Engine constructor, creates a new prototype for every new instance to avoid prototype pollution.
|
|
||||||
* @ignore
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
function SafeEngine(initConfig) {
|
|
||||||
const proto = /** @lends Engine.prototype */ {
|
|
||||||
/**
|
|
||||||
* Initialize the engine instance. Optionally, pass the base path to the engine to load it,
|
|
||||||
* if it hasn't been loaded yet. See :js:meth:`Engine.load`.
|
|
||||||
*
|
|
||||||
* @param {string=} basePath Base path of the engine to load.
|
|
||||||
* @return {Promise} A ``Promise`` that resolves once the engine is loaded and initialized.
|
|
||||||
*/
|
|
||||||
init: function (basePath) {
|
|
||||||
if (initPromise) {
|
|
||||||
return initPromise;
|
|
||||||
}
|
|
||||||
if (loadPromise == null) {
|
|
||||||
if (!basePath) {
|
|
||||||
initPromise = Promise.reject(new Error('A base path must be provided when calling `init` and the engine is not loaded.'));
|
|
||||||
return initPromise;
|
|
||||||
}
|
|
||||||
Engine.load(basePath, this.config.fileSizes[`${basePath}.wasm`]);
|
|
||||||
}
|
|
||||||
const me = this;
|
|
||||||
function doInit(promise) {
|
|
||||||
// Care! Promise chaining is bogus with old emscripten versions.
|
|
||||||
// This caused a regression with the Mono build (which uses an older emscripten version).
|
|
||||||
// Make sure to test that when refactoring.
|
|
||||||
return new Promise(function (resolve, reject) {
|
|
||||||
promise.then(function (response) {
|
|
||||||
const cloned = new Response(response.clone().body, { 'headers': [['content-type', 'application/wasm']] });
|
|
||||||
Godot(me.config.getModuleConfig(loadPath, cloned)).then(function (module) {
|
|
||||||
const paths = me.config.persistentPaths;
|
|
||||||
module['initFS'](paths).then(function (err) {
|
|
||||||
me.rtenv = module;
|
|
||||||
if (me.config.unloadAfterInit) {
|
|
||||||
Engine.unload();
|
|
||||||
}
|
|
||||||
resolve();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
preloader.setProgressFunc(this.config.onProgress);
|
|
||||||
initPromise = doInit(loadPromise);
|
|
||||||
return initPromise;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load a file so it is available in the instance's file system once it runs. Must be called **before** starting the
|
|
||||||
* instance.
|
|
||||||
*
|
|
||||||
* If not provided, the ``path`` is derived from the URL of the loaded file.
|
|
||||||
*
|
|
||||||
* @param {string|ArrayBuffer} file The file to preload.
|
|
||||||
*
|
|
||||||
* If a ``string`` the file will be loaded from that path.
|
|
||||||
*
|
|
||||||
* If an ``ArrayBuffer`` or a view on one, the buffer will used as the content of the file.
|
|
||||||
*
|
|
||||||
* @param {string=} path Path by which the file will be accessible. Required, if ``file`` is not a string.
|
|
||||||
*
|
|
||||||
* @returns {Promise} A Promise that resolves once the file is loaded.
|
|
||||||
*/
|
|
||||||
preloadFile: function (file, path) {
|
|
||||||
return preloader.preload(file, path, this.config.fileSizes[file]);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start the engine instance using the given override configuration (if any).
|
|
||||||
* :js:meth:`startGame <Engine.prototype.startGame>` can be used in typical cases instead.
|
|
||||||
*
|
|
||||||
* This will initialize the instance if it is not initialized. For manual initialization, see :js:meth:`init <Engine.prototype.init>`.
|
|
||||||
* The engine must be loaded beforehand.
|
|
||||||
*
|
|
||||||
* Fails if a canvas cannot be found on the page, or not specified in the configuration.
|
|
||||||
*
|
|
||||||
* @param {EngineConfig} override An optional configuration override.
|
|
||||||
* @return {Promise} Promise that resolves once the engine started.
|
|
||||||
*/
|
|
||||||
start: function (override) {
|
|
||||||
this.config.update(override);
|
|
||||||
const me = this;
|
|
||||||
return me.init().then(function () {
|
|
||||||
if (!me.rtenv) {
|
|
||||||
return Promise.reject(new Error('The engine must be initialized before it can be started'));
|
|
||||||
}
|
|
||||||
|
|
||||||
let config = {};
|
|
||||||
try {
|
|
||||||
config = me.config.getGodotConfig(function () {
|
|
||||||
me.rtenv = null;
|
|
||||||
});
|
|
||||||
} catch (e) {
|
|
||||||
return Promise.reject(e);
|
|
||||||
}
|
|
||||||
// Godot configuration.
|
|
||||||
me.rtenv['initConfig'](config);
|
|
||||||
|
|
||||||
// Preload GDExtension libraries.
|
|
||||||
if (me.config.gdextensionLibs.length > 0 && !me.rtenv['loadDynamicLibrary']) {
|
|
||||||
return Promise.reject(new Error('GDExtension libraries are not supported by this engine version. '
|
|
||||||
+ 'Enable "Extensions Support" for your export preset and/or build your custom template with "dlink_enabled=yes".'));
|
|
||||||
}
|
|
||||||
return new Promise(function (resolve, reject) {
|
|
||||||
for (const file of preloader.preloadedFiles) {
|
|
||||||
me.rtenv['copyToFS'](file.path, file.buffer);
|
|
||||||
}
|
|
||||||
preloader.preloadedFiles.length = 0; // Clear memory
|
|
||||||
me.rtenv['callMain'](me.config.args);
|
|
||||||
initPromise = null;
|
|
||||||
me.installServiceWorker();
|
|
||||||
resolve();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start the game instance using the given configuration override (if any).
|
|
||||||
*
|
|
||||||
* This will initialize the instance if it is not initialized. For manual initialization, see :js:meth:`init <Engine.prototype.init>`.
|
|
||||||
*
|
|
||||||
* This will load the engine if it is not loaded, and preload the main pck.
|
|
||||||
*
|
|
||||||
* This method expects the initial config (or the override) to have both the :js:attr:`executable` and :js:attr:`mainPack`
|
|
||||||
* properties set (normally done by the editor during export).
|
|
||||||
*
|
|
||||||
* @param {EngineConfig} override An optional configuration override.
|
|
||||||
* @return {Promise} Promise that resolves once the game started.
|
|
||||||
*/
|
|
||||||
startGame: function (override) {
|
|
||||||
this.config.update(override);
|
|
||||||
// Add main-pack argument.
|
|
||||||
const exe = this.config.executable;
|
|
||||||
const pack = this.config.mainPack || `${exe}.pck`;
|
|
||||||
this.config.args = ['--main-pack', pack].concat(this.config.args);
|
|
||||||
// Start and init with execName as loadPath if not inited.
|
|
||||||
const me = this;
|
|
||||||
return Promise.all([
|
|
||||||
this.init(exe),
|
|
||||||
this.preloadFile(pack, pack),
|
|
||||||
]).then(function () {
|
|
||||||
return me.start.apply(me);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a file at the specified ``path`` with the passed as ``buffer`` in the instance's file system.
|
|
||||||
*
|
|
||||||
* @param {string} path The location where the file will be created.
|
|
||||||
* @param {ArrayBuffer} buffer The content of the file.
|
|
||||||
*/
|
|
||||||
copyToFS: function (path, buffer) {
|
|
||||||
if (this.rtenv == null) {
|
|
||||||
throw new Error('Engine must be inited before copying files');
|
|
||||||
}
|
|
||||||
this.rtenv['copyToFS'](path, buffer);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request that the current instance quit.
|
|
||||||
*
|
|
||||||
* This is akin the user pressing the close button in the window manager, and will
|
|
||||||
* have no effect if the engine has crashed, or is stuck in a loop.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
requestQuit: function () {
|
|
||||||
if (this.rtenv) {
|
|
||||||
this.rtenv['request_quit']();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Install the progressive-web app service worker.
|
|
||||||
* @returns {Promise} The service worker registration promise.
|
|
||||||
*/
|
|
||||||
installServiceWorker: function () {
|
|
||||||
if (this.config.serviceWorker && 'serviceWorker' in navigator) {
|
|
||||||
return navigator.serviceWorker.register(this.config.serviceWorker);
|
|
||||||
}
|
|
||||||
return Promise.resolve();
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
Engine.prototype = proto;
|
|
||||||
// Closure compiler exported instance methods.
|
|
||||||
Engine.prototype['init'] = Engine.prototype.init;
|
|
||||||
Engine.prototype['preloadFile'] = Engine.prototype.preloadFile;
|
|
||||||
Engine.prototype['start'] = Engine.prototype.start;
|
|
||||||
Engine.prototype['startGame'] = Engine.prototype.startGame;
|
|
||||||
Engine.prototype['copyToFS'] = Engine.prototype.copyToFS;
|
|
||||||
Engine.prototype['requestQuit'] = Engine.prototype.requestQuit;
|
|
||||||
Engine.prototype['installServiceWorker'] = Engine.prototype.installServiceWorker;
|
|
||||||
// Also expose static methods as instance methods
|
|
||||||
Engine.prototype['load'] = Engine.load;
|
|
||||||
Engine.prototype['unload'] = Engine.unload;
|
|
||||||
return new Engine(initConfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Closure compiler exported static methods.
|
|
||||||
SafeEngine['load'] = Engine.load;
|
|
||||||
SafeEngine['unload'] = Engine.unload;
|
|
||||||
|
|
||||||
// Feature-detection utilities.
|
|
||||||
SafeEngine['isWebGLAvailable'] = Features.isWebGLAvailable;
|
|
||||||
SafeEngine['isFetchAvailable'] = Features.isFetchAvailable;
|
|
||||||
SafeEngine['isSecureContext'] = Features.isSecureContext;
|
|
||||||
SafeEngine['isCrossOriginIsolated'] = Features.isCrossOriginIsolated;
|
|
||||||
SafeEngine['isSharedArrayBufferAvailable'] = Features.isSharedArrayBufferAvailable;
|
|
||||||
SafeEngine['isAudioWorkletAvailable'] = Features.isAudioWorkletAvailable;
|
|
||||||
SafeEngine['getMissingFeatures'] = Features.getMissingFeatures;
|
|
||||||
|
|
||||||
return SafeEngine;
|
|
||||||
}());
|
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
window['Engine'] = Engine;
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"background_color":"#000000","display":"standalone","icons":[{"sizes":"144x144","src":"index.144x144.png","type":"image/png"},{"sizes":"180x180","src":"index.180x180.png","type":"image/png"},{"sizes":"512x512","src":"index.512x512.png","type":"image/png"}],"name":"MusicSearch","orientation":"any","start_url":"./index.html"}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<title>You are offline</title>
|
|
||||||
<style>
|
|
||||||
html {
|
|
||||||
background-color: #000000;
|
|
||||||
color: #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
|
|
||||||
margin: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
margin-block: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
display: block;
|
|
||||||
padding: 1rem 2rem;
|
|
||||||
margin: 3rem auto 0;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>You are offline</h1>
|
|
||||||
<p>This application requires an Internet connection to run for the first time.</p>
|
|
||||||
<p>Press the button below to try reloading:</p>
|
|
||||||
<button type="button">Reload</button>
|
|
||||||
<script>
|
|
||||||
document.querySelector('button').addEventListener('click', () => {
|
|
||||||
window.location.reload();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB |
@@ -1,34 +0,0 @@
|
|||||||
[remap]
|
|
||||||
|
|
||||||
importer="texture"
|
|
||||||
type="CompressedTexture2D"
|
|
||||||
uid="uid://bxh15ilo8hoq"
|
|
||||||
path="res://.godot/imported/index.png-80964ad67552d78b1e33f58ad16188ff.ctex"
|
|
||||||
metadata={
|
|
||||||
"vram_texture": false
|
|
||||||
}
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://web/index.png"
|
|
||||||
dest_files=["res://.godot/imported/index.png-80964ad67552d78b1e33f58ad16188ff.ctex"]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
compress/mode=0
|
|
||||||
compress/high_quality=false
|
|
||||||
compress/lossy_quality=0.7
|
|
||||||
compress/hdr_compression=1
|
|
||||||
compress/normal_map=0
|
|
||||||
compress/channel_pack=0
|
|
||||||
mipmaps/generate=false
|
|
||||||
mipmaps/limit=-1
|
|
||||||
roughness/mode=0
|
|
||||||
roughness/src_normal=""
|
|
||||||
process/fix_alpha_border=true
|
|
||||||
process/premult_alpha=false
|
|
||||||
process/normal_map_invert_y=false
|
|
||||||
process/hdr_as_srgb=false
|
|
||||||
process/hdr_clamp_exposure=false
|
|
||||||
process/size_limit=0
|
|
||||||
detect_3d/compress_to=1
|
|
||||||
@@ -1,166 +0,0 @@
|
|||||||
// This service worker is required to expose an exported Godot project as a
|
|
||||||
// Progressive Web App. It provides an offline fallback page telling the user
|
|
||||||
// that they need an Internet connection to run the project if desired.
|
|
||||||
// Incrementing CACHE_VERSION will kick off the install event and force
|
|
||||||
// previously cached resources to be updated from the network.
|
|
||||||
/** @type {string} */
|
|
||||||
const CACHE_VERSION = '1726998131|1051448710';
|
|
||||||
/** @type {string} */
|
|
||||||
const CACHE_PREFIX = 'MusicSearch-sw-cache-';
|
|
||||||
const CACHE_NAME = CACHE_PREFIX + CACHE_VERSION;
|
|
||||||
/** @type {string} */
|
|
||||||
const OFFLINE_URL = 'index.offline.html';
|
|
||||||
/** @type {boolean} */
|
|
||||||
const ENSURE_CROSSORIGIN_ISOLATION_HEADERS = false;
|
|
||||||
// Files that will be cached on load.
|
|
||||||
/** @type {string[]} */
|
|
||||||
const CACHED_FILES = ["index.html","index.js","index.offline.html","index.icon.png","index.apple-touch-icon.png","index.worker.js","index.audio.worklet.js"];
|
|
||||||
// Files that we might not want the user to preload, and will only be cached on first load.
|
|
||||||
/** @type {string[]} */
|
|
||||||
const CACHABLE_FILES = ["index.wasm","index.pck"];
|
|
||||||
const FULL_CACHE = CACHED_FILES.concat(CACHABLE_FILES);
|
|
||||||
|
|
||||||
self.addEventListener('install', (event) => {
|
|
||||||
event.waitUntil(caches.open(CACHE_NAME).then((cache) => cache.addAll(CACHED_FILES)));
|
|
||||||
});
|
|
||||||
|
|
||||||
self.addEventListener('activate', (event) => {
|
|
||||||
event.waitUntil(caches.keys().then(
|
|
||||||
function (keys) {
|
|
||||||
// Remove old caches.
|
|
||||||
return Promise.all(keys.filter((key) => key.startsWith(CACHE_PREFIX) && key !== CACHE_NAME).map((key) => caches.delete(key)));
|
|
||||||
}
|
|
||||||
).then(function () {
|
|
||||||
// Enable navigation preload if available.
|
|
||||||
return ('navigationPreload' in self.registration) ? self.registration.navigationPreload.enable() : Promise.resolve();
|
|
||||||
}));
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Ensures that the response has the correct COEP/COOP headers
|
|
||||||
* @param {Response} response
|
|
||||||
* @returns {Response}
|
|
||||||
*/
|
|
||||||
function ensureCrossOriginIsolationHeaders(response) {
|
|
||||||
if (response.headers.get('Cross-Origin-Embedder-Policy') === 'require-corp'
|
|
||||||
&& response.headers.get('Cross-Origin-Opener-Policy') === 'same-origin') {
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
const crossOriginIsolatedHeaders = new Headers(response.headers);
|
|
||||||
crossOriginIsolatedHeaders.set('Cross-Origin-Embedder-Policy', 'require-corp');
|
|
||||||
crossOriginIsolatedHeaders.set('Cross-Origin-Opener-Policy', 'same-origin');
|
|
||||||
const newResponse = new Response(response.body, {
|
|
||||||
status: response.status,
|
|
||||||
statusText: response.statusText,
|
|
||||||
headers: crossOriginIsolatedHeaders,
|
|
||||||
});
|
|
||||||
|
|
||||||
return newResponse;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calls fetch and cache the result if it is cacheable
|
|
||||||
* @param {FetchEvent} event
|
|
||||||
* @param {Cache} cache
|
|
||||||
* @param {boolean} isCacheable
|
|
||||||
* @returns {Response}
|
|
||||||
*/
|
|
||||||
async function fetchAndCache(event, cache, isCacheable) {
|
|
||||||
// Use the preloaded response, if it's there
|
|
||||||
/** @type { Response } */
|
|
||||||
let response = await event.preloadResponse;
|
|
||||||
if (response == null) {
|
|
||||||
// Or, go over network.
|
|
||||||
response = await self.fetch(event.request);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ENSURE_CROSSORIGIN_ISOLATION_HEADERS) {
|
|
||||||
response = ensureCrossOriginIsolationHeaders(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isCacheable) {
|
|
||||||
// And update the cache
|
|
||||||
cache.put(event.request, response.clone());
|
|
||||||
}
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
self.addEventListener(
|
|
||||||
'fetch',
|
|
||||||
/**
|
|
||||||
* Triggered on fetch
|
|
||||||
* @param {FetchEvent} event
|
|
||||||
*/
|
|
||||||
(event) => {
|
|
||||||
const isNavigate = event.request.mode === 'navigate';
|
|
||||||
const url = event.request.url || '';
|
|
||||||
const referrer = event.request.referrer || '';
|
|
||||||
const base = referrer.slice(0, referrer.lastIndexOf('/') + 1);
|
|
||||||
const local = url.startsWith(base) ? url.replace(base, '') : '';
|
|
||||||
const isCachable = FULL_CACHE.some((v) => v === local) || (base === referrer && base.endsWith(CACHED_FILES[0]));
|
|
||||||
if (isNavigate || isCachable) {
|
|
||||||
event.respondWith((async () => {
|
|
||||||
// Try to use cache first
|
|
||||||
const cache = await caches.open(CACHE_NAME);
|
|
||||||
if (isNavigate) {
|
|
||||||
// Check if we have full cache during HTML page request.
|
|
||||||
/** @type {Response[]} */
|
|
||||||
const fullCache = await Promise.all(FULL_CACHE.map((name) => cache.match(name)));
|
|
||||||
const missing = fullCache.some((v) => v === undefined);
|
|
||||||
if (missing) {
|
|
||||||
try {
|
|
||||||
// Try network if some cached file is missing (so we can display offline page in case).
|
|
||||||
const response = await fetchAndCache(event, cache, isCachable);
|
|
||||||
return response;
|
|
||||||
} catch (e) {
|
|
||||||
// And return the hopefully always cached offline page in case of network failure.
|
|
||||||
console.error('Network error: ', e); // eslint-disable-line no-console
|
|
||||||
return caches.match(OFFLINE_URL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let cached = await cache.match(event.request);
|
|
||||||
if (cached != null) {
|
|
||||||
if (ENSURE_CROSSORIGIN_ISOLATION_HEADERS) {
|
|
||||||
cached = ensureCrossOriginIsolationHeaders(cached);
|
|
||||||
}
|
|
||||||
return cached;
|
|
||||||
}
|
|
||||||
// Try network if don't have it in cache.
|
|
||||||
const response = await fetchAndCache(event, cache, isCachable);
|
|
||||||
return response;
|
|
||||||
})());
|
|
||||||
} else if (ENSURE_CROSSORIGIN_ISOLATION_HEADERS) {
|
|
||||||
event.respondWith((async () => {
|
|
||||||
let response = await fetch(event.request);
|
|
||||||
response = ensureCrossOriginIsolationHeaders(response);
|
|
||||||
return response;
|
|
||||||
})());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
self.addEventListener('message', (event) => {
|
|
||||||
// No cross origin
|
|
||||||
if (event.origin !== self.origin) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const id = event.source.id || '';
|
|
||||||
const msg = event.data || '';
|
|
||||||
// Ensure it's one of our clients.
|
|
||||||
self.clients.get(id).then(function (client) {
|
|
||||||
if (!client) {
|
|
||||||
return; // Not a valid client.
|
|
||||||
}
|
|
||||||
if (msg === 'claim') {
|
|
||||||
self.skipWaiting().then(() => self.clients.claim());
|
|
||||||
} else if (msg === 'clear') {
|
|
||||||
caches.delete(CACHE_NAME);
|
|
||||||
} else if (msg === 'update') {
|
|
||||||
self.skipWaiting().then(() => self.clients.claim()).then(() => self.clients.matchAll()).then((all) => all.forEach((c) => c.navigate(c.url)));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
Binary file not shown.
+2
-2
@@ -2,7 +2,7 @@ package web
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
"music-server/pkg/server"
|
"music-server/internal/backend"
|
||||||
"net/http"
|
"net/http"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -30,7 +30,7 @@ func FindGameWebHandler(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
func search(searchText string) {
|
func search(searchText string) {
|
||||||
games_added = nil
|
games_added = nil
|
||||||
games := server.GetAllGames()
|
games := backend.GetAllGames()
|
||||||
for _, game := range games {
|
for _, game := range games {
|
||||||
if is_match_exact(searchText, game) {
|
if is_match_exact(searchText, game) {
|
||||||
add_game(game)
|
add_game(game)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package server
|
package backend
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"music-server/pkg/db"
|
"music-server/pkg/db"
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package server
|
package backend
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package server
|
package backend
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/md5"
|
"crypto/md5"
|
||||||
@@ -1,66 +1,15 @@
|
|||||||
package helpers
|
package helpers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"embed"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/fs"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gin-contrib/static"
|
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
"github.com/labstack/echo"
|
"github.com/labstack/echo"
|
||||||
)
|
)
|
||||||
|
|
||||||
func SetCorsAndNoCacheHeaders() gin.HandlerFunc {
|
|
||||||
return func(c *gin.Context) {
|
|
||||||
c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
|
|
||||||
c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
|
|
||||||
c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
|
|
||||||
c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT")
|
|
||||||
|
|
||||||
if c.Request.Method == "OPTIONS" {
|
|
||||||
c.AbortWithStatus(204)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
c.Next()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type embedFileSystem struct {
|
|
||||||
http.FileSystem
|
|
||||||
indexes bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e embedFileSystem) Exists(_ string, path string) bool {
|
|
||||||
f, err := e.Open(path)
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// check if indexing is allowed
|
|
||||||
s, _ := f.Stat()
|
|
||||||
if s.IsDir() && !e.indexes {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func EmbedFolder(fsEmbed embed.FS, targetPath string, index bool) static.ServeFileSystem {
|
|
||||||
subFS, err := fs.Sub(fsEmbed, targetPath)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
return embedFileSystem{
|
|
||||||
FileSystem: http.FS(subFS),
|
|
||||||
indexes: index,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func SendSong(ctx echo.Context, Filename string) error {
|
func SendSong(ctx echo.Context, Filename string) error {
|
||||||
fmt.Println("Client requests: " + Filename)
|
fmt.Println("Client requests: " + Filename)
|
||||||
|
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"music-server/internal/backend"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/labstack/echo"
|
||||||
|
)
|
||||||
|
|
||||||
|
type IndexHandler struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewIndexHandler() *IndexHandler {
|
||||||
|
return &IndexHandler{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *IndexHandler) GetVersion(ctx echo.Context) error {
|
||||||
|
versionHistory := backend.GetVersionHistory()
|
||||||
|
if versionHistory.Version == "" {
|
||||||
|
return ctx.JSON(http.StatusNotFound, "version not found")
|
||||||
|
}
|
||||||
|
return ctx.JSON(http.StatusOK, versionHistory)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *IndexHandler) GetDBTest(ctx echo.Context) error {
|
||||||
|
backend.TestDB()
|
||||||
|
return ctx.JSON(http.StatusOK, "TestedDB")
|
||||||
|
}
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"music-server/internal/backend"
|
||||||
|
"music-server/internal/helpers"
|
||||||
|
"music-server/pkg/models"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/labstack/echo"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MusicHandler struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMusicHandler() *MusicHandler {
|
||||||
|
return &MusicHandler{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetSong(ctx echo.Context) error {
|
||||||
|
song := ctx.QueryParam("song")
|
||||||
|
if song == "" {
|
||||||
|
return ctx.String(http.StatusBadRequest, "song can't be empty")
|
||||||
|
}
|
||||||
|
s := backend.GetSong(song)
|
||||||
|
return helpers.SendSong(ctx, s)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetSoundCheckSong(ctx echo.Context) error {
|
||||||
|
song := backend.GetSoundCheckSong()
|
||||||
|
return helpers.SendSong(ctx, song)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) ResetMusic(ctx echo.Context) error {
|
||||||
|
backend.Reset()
|
||||||
|
return ctx.NoContent(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetRandomSong(ctx echo.Context) error {
|
||||||
|
song := backend.GetRandomSong()
|
||||||
|
return helpers.SendSong(ctx, song)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetRandomSongLowChance(ctx echo.Context) error {
|
||||||
|
song := backend.GetRandomSongLowChance()
|
||||||
|
return helpers.SendSong(ctx, song)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetRandomSongClassic(ctx echo.Context) error {
|
||||||
|
song := backend.GetRandomSongClassic()
|
||||||
|
return helpers.SendSong(ctx, song)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetSongInfo(ctx echo.Context) error {
|
||||||
|
song := backend.GetSongInfo()
|
||||||
|
return ctx.JSON(http.StatusOK, song)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetPlayedSongs(ctx echo.Context) error {
|
||||||
|
songList := backend.GetPlayedSongs()
|
||||||
|
return ctx.JSON(http.StatusOK, songList)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetNextSong(ctx echo.Context) error {
|
||||||
|
song := backend.GetNextSong()
|
||||||
|
return helpers.SendSong(ctx, song)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetPreviousSong(ctx echo.Context) error {
|
||||||
|
song := backend.GetPreviousSong()
|
||||||
|
return helpers.SendSong(ctx, song)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetAllGames(ctx echo.Context) error {
|
||||||
|
gameList := backend.GetAllGames()
|
||||||
|
return ctx.JSON(http.StatusOK, gameList)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) GetAllGamesRandom(ctx echo.Context) error {
|
||||||
|
gameList := backend.GetAllGamesRandom()
|
||||||
|
return ctx.JSON(http.StatusOK, gameList)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) PutPlayed(ctx echo.Context) error {
|
||||||
|
var played models.Played
|
||||||
|
err := ctx.Bind(&played)
|
||||||
|
if err != nil {
|
||||||
|
//helpers.NewError(ctx, http.StatusBadRequest, err)
|
||||||
|
return ctx.JSON(http.StatusBadRequest, err)
|
||||||
|
}
|
||||||
|
backend.SetPlayed(played.Song)
|
||||||
|
return ctx.NoContent(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) AddLatestToQue(ctx echo.Context) error {
|
||||||
|
backend.AddLatestToQue()
|
||||||
|
return ctx.NoContent(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MusicHandler) AddLatestPlayed(ctx echo.Context) error {
|
||||||
|
backend.AddLatestPlayed()
|
||||||
|
return ctx.NoContent(http.StatusOK)
|
||||||
|
}
|
||||||
@@ -3,7 +3,6 @@ package server
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"music-server/cmd/web"
|
"music-server/cmd/web"
|
||||||
"music-server/pkg/api"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -37,11 +36,11 @@ func (s *Server) RegisterRoutes() http.Handler {
|
|||||||
swagger := http.FileServer(http.FS(web.Swagger))
|
swagger := http.FileServer(http.FS(web.Swagger))
|
||||||
e.GET("/swagger/*", echo.WrapHandler(swagger))
|
e.GET("/swagger/*", echo.WrapHandler(swagger))
|
||||||
|
|
||||||
index := api.NewIndex()
|
index := NewIndexHandler()
|
||||||
e.GET("/version", index.GetVersion)
|
e.GET("/version", index.GetVersion)
|
||||||
e.GET("/health", index.GetDBTest)
|
e.GET("/health", index.GetDBTest)
|
||||||
|
|
||||||
sync := api.NewSync()
|
sync := NewSyncHandler()
|
||||||
syncGroup := e.Group("/sync")
|
syncGroup := e.Group("/sync")
|
||||||
syncGroup.GET("", sync.SyncGames)
|
syncGroup.GET("", sync.SyncGames)
|
||||||
syncGroup.GET("/new", sync.SyncGamesNewOnlyChanges)
|
syncGroup.GET("/new", sync.SyncGamesNewOnlyChanges)
|
||||||
@@ -49,7 +48,7 @@ func (s *Server) RegisterRoutes() http.Handler {
|
|||||||
syncGroup.GET("/quick", sync.SyncGamesQuick)
|
syncGroup.GET("/quick", sync.SyncGamesQuick)
|
||||||
syncGroup.GET("/reset", sync.ResetGames)
|
syncGroup.GET("/reset", sync.ResetGames)
|
||||||
|
|
||||||
music := api.NewMusic()
|
music := NewMusicHandler()
|
||||||
musicGroup := e.Group("/music")
|
musicGroup := e.Group("/music")
|
||||||
musicGroup.GET("", music.GetSong)
|
musicGroup.GET("", music.GetSong)
|
||||||
musicGroup.GET("/soundTest", music.GetSoundCheckSong)
|
musicGroup.GET("/soundTest", music.GetSoundCheckSong)
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ package server
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"music-server/pkg/conf"
|
"log"
|
||||||
|
"music-server/pkg/db"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
@@ -13,6 +14,15 @@ type Server struct {
|
|||||||
port int
|
port int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
host = os.Getenv("DB_HOST")
|
||||||
|
dbPort = os.Getenv("DB_PORT")
|
||||||
|
database = os.Getenv("DB_NAME")
|
||||||
|
username = os.Getenv("DB_USERNAME")
|
||||||
|
password = os.Getenv("DB_PASSWORD")
|
||||||
|
musicPath = os.Getenv("MUSIC_PATH")
|
||||||
|
)
|
||||||
|
|
||||||
func NewServer() *http.Server {
|
func NewServer() *http.Server {
|
||||||
|
|
||||||
port, _ := strconv.Atoi(os.Getenv("PORT"))
|
port, _ := strconv.Atoi(os.Getenv("PORT"))
|
||||||
@@ -20,7 +30,19 @@ func NewServer() *http.Server {
|
|||||||
port: port,
|
port: port,
|
||||||
}
|
}
|
||||||
|
|
||||||
conf.SetupDb()
|
//conf.SetupDb()
|
||||||
|
if host == "" || dbPort == "" || username == "" || password == "" || database == "" || musicPath == "" {
|
||||||
|
log.Fatal("Invalid settings")
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("host: %s, dbPort: %v, username: %s, password: %s, dbName: %s\n",
|
||||||
|
host, dbPort, username, password, database)
|
||||||
|
|
||||||
|
log.Printf("Path: %s\n", musicPath)
|
||||||
|
|
||||||
|
db.Migrate_db(host, dbPort, username, password, database)
|
||||||
|
|
||||||
|
db.InitDB(host, dbPort, username, password, database)
|
||||||
|
|
||||||
// Declare Server config
|
// Declare Server config
|
||||||
server := &http.Server{
|
server := &http.Server{
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
"music-server/internal/backend"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/labstack/echo"
|
||||||
|
)
|
||||||
|
|
||||||
|
type SyncHandler struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSyncHandler() *SyncHandler {
|
||||||
|
return &SyncHandler{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SyncHandler) SyncGames(ctx echo.Context) error {
|
||||||
|
backend.SyncGames()
|
||||||
|
backend.Reset()
|
||||||
|
return ctx.JSON(http.StatusOK, "Games are synced")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SyncHandler) SyncGamesQuick(ctx echo.Context) error {
|
||||||
|
backend.SyncGamesQuick()
|
||||||
|
backend.Reset()
|
||||||
|
return ctx.JSON(http.StatusOK, "Games are synced")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SyncHandler) SyncGamesNewOnlyChanges(ctx echo.Context) error {
|
||||||
|
log.Println("Syncing games new")
|
||||||
|
response := backend.SyncGamesNewOnlyChanges()
|
||||||
|
backend.Reset()
|
||||||
|
return ctx.JSON(http.StatusOK, response)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SyncHandler) SyncGamesNewFull(ctx echo.Context) error {
|
||||||
|
log.Println("Syncing games new full")
|
||||||
|
response := backend.SyncGamesNewFull()
|
||||||
|
backend.Reset()
|
||||||
|
return ctx.JSON(http.StatusOK, response)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SyncHandler) ResetGames(ctx echo.Context) error {
|
||||||
|
backend.ResetDB()
|
||||||
|
return ctx.JSON(http.StatusOK, "Games and songs are deleted from the database")
|
||||||
|
}
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"music-server/pkg/server"
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"github.com/labstack/echo"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Index struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewIndex() *Index {
|
|
||||||
return &Index{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (i *Index) GetVersion(ctx echo.Context) error {
|
|
||||||
versionHistory := server.GetVersionHistory()
|
|
||||||
if versionHistory.Version == "" {
|
|
||||||
return ctx.JSON(http.StatusNotFound, "version not found")
|
|
||||||
}
|
|
||||||
return ctx.JSON(http.StatusOK, versionHistory)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (i *Index) GetDBTest(ctx echo.Context) error {
|
|
||||||
server.TestDB()
|
|
||||||
return ctx.JSON(http.StatusOK, "TestedDB")
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"music-server/pkg/helpers"
|
|
||||||
"music-server/pkg/models"
|
|
||||||
"music-server/pkg/server"
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"github.com/labstack/echo"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Music struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewMusic() *Music {
|
|
||||||
return &Music{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetSong(ctx echo.Context) error {
|
|
||||||
song := ctx.QueryParam("song")
|
|
||||||
if song == "" {
|
|
||||||
return ctx.String(http.StatusBadRequest, "song can't be empty")
|
|
||||||
}
|
|
||||||
s := server.GetSong(song)
|
|
||||||
return helpers.SendSong(ctx, s)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetSoundCheckSong(ctx echo.Context) error {
|
|
||||||
song := server.GetSoundCheckSong()
|
|
||||||
return helpers.SendSong(ctx, song)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) ResetMusic(ctx echo.Context) error {
|
|
||||||
server.Reset()
|
|
||||||
return ctx.NoContent(http.StatusOK)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetRandomSong(ctx echo.Context) error {
|
|
||||||
song := server.GetRandomSong()
|
|
||||||
return helpers.SendSong(ctx, song)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetRandomSongLowChance(ctx echo.Context) error {
|
|
||||||
song := server.GetRandomSongLowChance()
|
|
||||||
return helpers.SendSong(ctx, song)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetRandomSongClassic(ctx echo.Context) error {
|
|
||||||
song := server.GetRandomSongClassic()
|
|
||||||
return helpers.SendSong(ctx, song)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetSongInfo(ctx echo.Context) error {
|
|
||||||
song := server.GetSongInfo()
|
|
||||||
return ctx.JSON(http.StatusOK, song)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetPlayedSongs(ctx echo.Context) error {
|
|
||||||
songList := server.GetPlayedSongs()
|
|
||||||
return ctx.JSON(http.StatusOK, songList)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetNextSong(ctx echo.Context) error {
|
|
||||||
song := server.GetNextSong()
|
|
||||||
return helpers.SendSong(ctx, song)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetPreviousSong(ctx echo.Context) error {
|
|
||||||
song := server.GetPreviousSong()
|
|
||||||
return helpers.SendSong(ctx, song)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetAllGames(ctx echo.Context) error {
|
|
||||||
gameList := server.GetAllGames()
|
|
||||||
return ctx.JSON(http.StatusOK, gameList)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) GetAllGamesRandom(ctx echo.Context) error {
|
|
||||||
gameList := server.GetAllGamesRandom()
|
|
||||||
return ctx.JSON(http.StatusOK, gameList)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) PutPlayed(ctx echo.Context) error {
|
|
||||||
var played models.Played
|
|
||||||
err := ctx.Bind(&played)
|
|
||||||
if err != nil {
|
|
||||||
//helpers.NewError(ctx, http.StatusBadRequest, err)
|
|
||||||
return ctx.JSON(http.StatusBadRequest, err)
|
|
||||||
}
|
|
||||||
server.SetPlayed(played.Song)
|
|
||||||
return ctx.NoContent(http.StatusOK)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) AddLatestToQue(ctx echo.Context) error {
|
|
||||||
server.AddLatestToQue()
|
|
||||||
return ctx.NoContent(http.StatusOK)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Music) AddLatestPlayed(ctx echo.Context) error {
|
|
||||||
server.AddLatestPlayed()
|
|
||||||
return ctx.NoContent(http.StatusOK)
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"log"
|
|
||||||
"music-server/pkg/server"
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"github.com/labstack/echo"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Sync struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewSync() *Sync {
|
|
||||||
return &Sync{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Sync) SyncGames(ctx echo.Context) error {
|
|
||||||
server.SyncGames()
|
|
||||||
server.Reset()
|
|
||||||
return ctx.JSON(http.StatusOK, "Games are synced")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Sync) SyncGamesQuick(ctx echo.Context) error {
|
|
||||||
server.SyncGamesQuick()
|
|
||||||
server.Reset()
|
|
||||||
return ctx.JSON(http.StatusOK, "Games are synced")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Sync) SyncGamesNewOnlyChanges(ctx echo.Context) error {
|
|
||||||
log.Println("Syncing games new")
|
|
||||||
response := server.SyncGamesNewOnlyChanges()
|
|
||||||
server.Reset()
|
|
||||||
return ctx.JSON(http.StatusOK, response)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Sync) SyncGamesNewFull(ctx echo.Context) error {
|
|
||||||
log.Println("Syncing games new full")
|
|
||||||
response := server.SyncGamesNewFull()
|
|
||||||
server.Reset()
|
|
||||||
return ctx.JSON(http.StatusOK, response)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Sync) ResetGames(ctx echo.Context) error {
|
|
||||||
server.ResetDB()
|
|
||||||
return ctx.JSON(http.StatusOK, "Games and songs are deleted from the database")
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
package conf
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"log"
|
|
||||||
"music-server/pkg/db"
|
|
||||||
"os"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
host = os.Getenv("DB_HOST")
|
|
||||||
dbPort = os.Getenv("DB_PORT")
|
|
||||||
database = os.Getenv("DB_NAME")
|
|
||||||
username = os.Getenv("DB_USERNAME")
|
|
||||||
password = os.Getenv("DB_PASSWORD")
|
|
||||||
musicPath = os.Getenv("MUSIC_PATH")
|
|
||||||
)
|
|
||||||
|
|
||||||
func SetupDb() {
|
|
||||||
|
|
||||||
if host == "" || dbPort == "" || username == "" || password == "" || database == "" || musicPath == "" {
|
|
||||||
log.Fatal("Invalid settings")
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Printf("host: %s, dbPort: %v, username: %s, password: %s, dbName: %s\n",
|
|
||||||
host, dbPort, username, password, database)
|
|
||||||
|
|
||||||
log.Printf("Path: %s\n", musicPath)
|
|
||||||
|
|
||||||
db.Migrate_db(host, dbPort, username, password, database)
|
|
||||||
|
|
||||||
db.InitDB(host, dbPort, username, password, database)
|
|
||||||
}
|
|
||||||
|
|
||||||
func CloseDb() {
|
|
||||||
fmt.Println("Closing connection to database")
|
|
||||||
db.CloseDb()
|
|
||||||
}
|
|
||||||
@@ -46,6 +46,7 @@ func InitDB(host string, port string, user string, password string, dbname strin
|
|||||||
}
|
}
|
||||||
|
|
||||||
func CloseDb() {
|
func CloseDb() {
|
||||||
|
fmt.Println("Closing connection to database")
|
||||||
Dbpool.Close()
|
Dbpool.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
package helpers
|
|
||||||
|
|
||||||
import "github.com/gin-gonic/gin"
|
|
||||||
|
|
||||||
func NewError(ctx *gin.Context, status int, err error) {
|
|
||||||
er := HTTPError{
|
|
||||||
Code: status,
|
|
||||||
Message: err.Error(),
|
|
||||||
}
|
|
||||||
ctx.JSON(status, er)
|
|
||||||
}
|
|
||||||
|
|
||||||
type HTTPError struct {
|
|
||||||
Code int `json:"code" example:"400"`
|
|
||||||
Message string `json:"message" example:"status bad request"`
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user