Compare commits
10 Commits
b2981fd54f
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
02e8a102d3
|
|||
|
27fda231ea
|
|||
|
|
1a70eb6aa5 | ||
|
|
bf4d7fd3ee | ||
|
fb0fb2e508
|
|||
|
2175a55a61
|
|||
|
e620f2532d
|
|||
|
90115079a3
|
|||
|
fdcb58493a
|
|||
| a05656efff |
33
Dockerfile
Normal file
33
Dockerfile
Normal file
@@ -0,0 +1,33 @@
|
||||
# use the official Bun image
|
||||
# see all versions at https://hub.docker.com/r/oven/bun/tags
|
||||
FROM oven/bun:1 as base
|
||||
WORKDIR /usr/src/app
|
||||
|
||||
# install dependencies into temp directory
|
||||
# this will cache them and speed up future builds
|
||||
FROM base AS install
|
||||
RUN mkdir -p /temp/dev
|
||||
COPY package.json bun.lockb /temp/dev/
|
||||
RUN cd /temp/dev && bun install --frozen-lockfile
|
||||
|
||||
# install with --production (exclude devDependencies)
|
||||
RUN mkdir -p /temp/prod
|
||||
COPY package.json bun.lockb /temp/prod/
|
||||
RUN cd /temp/prod && bun install --frozen-lockfile --production
|
||||
|
||||
# copy node_modules from temp directory
|
||||
# then copy all (non-ignored) project files into the image
|
||||
FROM base AS prerelease
|
||||
COPY --from=install /temp/dev/node_modules node_modules
|
||||
COPY . .
|
||||
|
||||
# copy production dependencies and source code into final image
|
||||
FROM base AS release
|
||||
COPY --from=install /temp/prod/node_modules node_modules
|
||||
COPY --from=prerelease /usr/src/app/mqtt.js .
|
||||
COPY --from=prerelease /usr/src/app/package.json .
|
||||
COPY --from=prerelease /usr/src/app/index.html .
|
||||
|
||||
# run the app
|
||||
USER bun
|
||||
ENTRYPOINT [ "bun", "run", "mqtt.js" ]
|
||||
@@ -2,10 +2,14 @@
|
||||
|
||||
# Install:
|
||||
1. git clone it
|
||||
2. you need nodeJS / npm or bun
|
||||
2. you need nodeJS / npm or [bun](https://bun.sh/docs/installation)
|
||||
3. `npm install` or `bun i`
|
||||
4. rename config.js.sample to config.js
|
||||
5. adjust config.js to your local MQTT-Broker
|
||||
6. ` node ./mqtt.js` or `bun ./mqtt.js`
|
||||
7. Point browser to localhost:8000
|
||||
8. Enjoy streaming
|
||||
|
||||
# Prerequisites:
|
||||
* MQTT Server (`apt install mosquitto` or docker-mosquitto)
|
||||
* MQTT-Streaming at wavelog enabled (`config.php`-switch: `$config['mqtt_server']='your_mosquitto_server';`)
|
||||
|
||||
@@ -2,8 +2,11 @@ const config = {
|
||||
mqttserver: {
|
||||
host: "mqtt://[your mqtt-server here]"
|
||||
},
|
||||
prefix: "",
|
||||
whitelist_url: "https://laber",
|
||||
whitelist_enabled: false
|
||||
whitelist_enabled: false,
|
||||
webport: 8000,
|
||||
webbind:"0.0.0.0"
|
||||
};
|
||||
|
||||
module.exports = config;
|
||||
|
||||
11
docker-compose.yaml
Normal file
11
docker-compose.yaml
Normal file
@@ -0,0 +1,11 @@
|
||||
version: '3'
|
||||
services:
|
||||
liveqso:
|
||||
build:
|
||||
dockerfile: ./Dockerfile
|
||||
container_name: liveqso
|
||||
ports:
|
||||
- 8098:8000 # Exposed port - see WEBPORT above
|
||||
volumes:
|
||||
- ./config.js:/usr/src/app/config.js:U
|
||||
restart: unless-stopped
|
||||
15
index.html
15
index.html
@@ -1,10 +1,9 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<base href="/">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<script src="/jquery/jquery.min.js"></script>
|
||||
<script src="/socket.io/socket.io.js"></script>
|
||||
<style type="text/css" rel="stylesheet">
|
||||
<style type="text/css">
|
||||
#mqtt{ border: 1px solid #444; overflow-x:hidden; overflow-y:auto; background-color:#333; color: #EEE; text-shadow:#000 0 0 2px; height: 400px; padding: 10px; font-size:12px; line-height:20px;}
|
||||
.monospace{font-family: Monaco,"Bitstream Vera Sans Mono","Lucida Console",Terminal,monospace;}
|
||||
.selection::selection , .selection *::selection{background: #EEE;color:#000;border-color:#000; text-shadow:#fff 0 0 2px;}
|
||||
@@ -46,6 +45,14 @@
|
||||
</tbody>
|
||||
</table>
|
||||
<script type="text/javascript">
|
||||
const base = document.querySelector('base');
|
||||
if (base) {
|
||||
base.href = window.location.pathname;
|
||||
}
|
||||
document.write(`<script src="${base.href}/jquery/jquery.min.js"><\/script>`);
|
||||
document.write(`<script src="${base.href}/socket.io/socket.io.js"><\/script>`);
|
||||
</script>
|
||||
<script type="text/javascript" defer>
|
||||
(function() {
|
||||
const queryString = window.location.search;
|
||||
const urlParams = new URLSearchParams(queryString);
|
||||
@@ -53,7 +60,7 @@
|
||||
const tableBody = document.getElementById('messagesTable').querySelector('tbody');
|
||||
var lines = 0;
|
||||
var buffer = $('#mqtt');
|
||||
var socket = io.connect("/"); // http://localhost:8000");
|
||||
var socket = io.connect({ path: window.location.pathname+"/socket.io" }); // http://localhost:8000");
|
||||
socket.on('connect', function() {
|
||||
console.log('Connected to:', socket.host);
|
||||
});
|
||||
|
||||
12
mqtt.js
12
mqtt.js
@@ -6,13 +6,13 @@ const path = require('path');
|
||||
const express = require('express');
|
||||
const app = express(); // http-express framework laden (macht routing, etc.)
|
||||
const http = require('http').Server(app); // http-server module laden
|
||||
const io = require('socket.io')(http); // socket.io einbinden
|
||||
const io = require('socket.io')(http, {path: `${config.prefix}/socket.io`,}); // socket.io einbinden
|
||||
var whitelist=[];
|
||||
|
||||
app.use('/jquery', express.static(path.join(__dirname, 'node_modules', 'jquery', 'dist')));
|
||||
app.use(config.prefix+'/jquery', express.static(path.join(__dirname, 'node_modules', 'jquery', 'dist')));
|
||||
|
||||
app.get('/', (req, res) => { // Routing fuer index.html
|
||||
res.sendFile(__dirname + '/index.html'); // index.html rauspusten
|
||||
app.get(config.prefix+'/', (req, res) => {
|
||||
res.sendFile(__dirname + '/index.html');
|
||||
});
|
||||
|
||||
const mqttC=mqtt.connect(mqttserver);
|
||||
@@ -116,8 +116,8 @@ const dinmin = (timestamp) => {
|
||||
|
||||
function startup() {
|
||||
getWhitelist();
|
||||
http.listen(8000,'127.0.0.1', () => { // Webserver starten
|
||||
console.log(`Socket.IO server running at http://localhost:8000/`); // debug
|
||||
http.listen(config.webport,config.webbind, () => { // Webserver starten
|
||||
console.log(`Socket.IO server running at http://${config.webbind}:${config.webport}`); // debug
|
||||
});
|
||||
const intervalID = setInterval(getWhitelist,5*60*1000);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user