dj7nt/mqtsream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dj7nt:a05656efff4e4a8eed6100a4c630a8760921fbbc
Branches Tags
dj7nt:dev
...
compare: dj7nt:dev
Branches Tags
dj7nt:dev

15 Commits
a05656efff ... dev

Author SHA1 Message Date
Joerg
02e8a102d3 Missing Files 2025-04-11 18:40:29 +02:00
Joerg
27fda231ea lockb 2025-04-11 18:20:54 +02:00
Joerg (DJ7NT)
1a70eb6aa5 Update Dockerfile 2025-04-11 18:19:19 +02:00
Joerg (DJ7NT)
bf4d7fd3ee Update Dockerfile 2025-04-11 18:18:27 +02:00
Joerg
fb0fb2e508 Dockerizing... 2025-04-11 18:08:31 +02:00
Joerg
2175a55a61 Added prefix, port, host 2025-04-11 17:39:53 +02:00
Joerg
e620f2532d Merge remote-tracking branch 'int/dev' into dev 2025-04-11 14:45:44 +02:00
DJ7NT
b2981fd54f In JS/Browser Filtering on own call 2025-04-11 12:45:11 +00:00
DJ7NT
4aae8d743c Friendly debuggng/verbosity at console 2025-04-11 12:24:59 +00:00
Joerg
90115079a3 Merge remote-tracking branch 'int/dev' into dev 2025-04-11 12:35:31 +02:00
DJ7NT
d5de48350c Config-item for it 2025-04-11 08:36:46 +00:00
DJ7NT
21af41467e Glonal en/disabling of whitelist 2025-04-11 08:36:24 +00:00
DJ7NT
c60764fa66 Filtering with whitelist 2025-04-11 08:21:39 +00:00
DJ7NT
d928d93d25 Added whitelist-URL 2025-04-11 07:28:32 +00:00
Joerg
fdcb58493a Typo 2025-04-10 10:51:54 +02:00
7 changed files with 154 additions and 78 deletions
Expand all files Collapse all files

33
Dockerfile Normal file
View 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
README.md
View File

@@ -10,6 +10,6 @@
7. Point browser to localhost:8000 7. Point browser to localhost:8000
8. Enjoy streaming 8. Enjoy streaming
# Prequisites: # Prerequisites:
* MQTT Server (`apt install mosquitto` or docker-mosquitto) * MQTT Server (`apt install mosquitto` or docker-mosquitto)
* MQTT-Streaming at wavelog enabled (`config.php`-switch: `$config['mqtt_server']='your_mosquitto_server';`) * MQTT-Streaming at wavelog enabled (`config.php`-switch: `$config['mqtt_server']='your_mosquitto_server';`)

BIN
bun.lockb Executable file
View File

Binary file not shown.

7
config.js.sample
View File

@@ -1,7 +1,12 @@
const config = { const config = {
mqttserver: { mqttserver: {
host: "mqtt://[your mqtt-server here]" host: "mqtt://[your mqtt-server here]"
} },
prefix: "",
whitelist_url: "https://laber",
whitelist_enabled: false,
webport: 8000,
webbind:"0.0.0.0"
}; };
module.exports = config; module.exports = config;

11
docker-compose.yaml Normal file
View 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

31
index.html
View File

@@ -1,10 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<base href="/">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="/jquery/jquery.min.js"></script> <style type="text/css">
<script src="/socket.io/socket.io.js"></script>
<style type="text/css" rel="stylesheet">
#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;} #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;} .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;} .selection::selection , .selection *::selection{background: #EEE;color:#000;border-color:#000; text-shadow:#fff 0 0 2px;}
@@ -46,18 +45,27 @@
</tbody> </tbody>
</table> </table>
<script type="text/javascript"> <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() { (function() {
const queryString = window.location.search;
const urlParams = new URLSearchParams(queryString);
const filter = urlParams.get('call') || '';
const tableBody = document.getElementById('messagesTable').querySelector('tbody'); const tableBody = document.getElementById('messagesTable').querySelector('tbody');
var lines = 0; var lines = 0;
var buffer = $('#mqtt'); 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() { socket.on('connect', function() {
console.log('Connected to:', socket.host); console.log('Connected to:', socket.host);
}); });
socket.on('mqtt', function(message) { socket.on('mqtt', function(message) {
try { if ((filter == '') || (filter == message.station_call)) {
showit=JSON.stringify(message);
} catch {};
const row = document.createElement('tr'); const row = document.createElement('tr');
const timestampCell = document.createElement('td'); const timestampCell = document.createElement('td');
const CellCall = document.createElement('td'); const CellCall = document.createElement('td');
@@ -96,16 +104,9 @@
setTimeout(() => { setTimeout(() => {
row.classList.remove('new-row'); row.classList.remove('new-row');
}, 1500); }, 1500);
}
}); });
/*
$( "#i_topic" ).change(function() {
socket.emit("wishtopic",this.value);
$('#mqtt').empty();
});
*/
})(); })();
function tsclean(timestamp) { function tsclean(timestamp) {
const parts = timestamp.split(':'); const parts = timestamp.split(':');

40
mqtt.js
View File

@@ -6,12 +6,13 @@ const path = require('path');
const express = require('express'); const express = require('express');
const app = express(); // http-express framework laden (macht routing, etc.) const app = express(); // http-express framework laden (macht routing, etc.)
const http = require('http').Server(app); // http-server module laden 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 app.get(config.prefix+'/', (req, res) => {
res.sendFile(__dirname + '/index.html'); // index.html rauspusten res.sendFile(__dirname + '/index.html');
}); });
const mqttC=mqtt.connect(mqttserver); const mqttC=mqtt.connect(mqttserver);
@@ -40,6 +41,7 @@ mqttC.on('message', function (topic, message) { // Handler, wenn mqtt-message ko
} else { } else {
msg.content=message.toString(); // Ist nix json? dann ab in "content" damit msg.content=message.toString(); // Ist nix json? dann ab in "content" damit
} }
if (!(config.whitelist_enabled) || (whitelist.whitelist.includes(msg.content.user_name))) {
if (topic.startsWith('wavelog/qso/logged')) { if (topic.startsWith('wavelog/qso/logged')) {
tobrowser=parse_qso_msg(msg.content); tobrowser=parse_qso_msg(msg.content);
if (tobrowser.qso_time) { if (tobrowser.qso_time) {
@@ -54,7 +56,10 @@ mqttC.on('message', function (topic, message) { // Handler, wenn mqtt-message ko
} else { } else {
tobrowser=parse_cat_msg(topic,msg.content); tobrowser=parse_cat_msg(topic,msg.content);
// io.emit("cat",tobrowser); // und raus an den Browser (nur fuer DIESES Socket, nicht fuer alle Clients) damit // io.emit("cat",tobrowser); // und raus an den Browser (nur fuer DIESES Socket, nicht fuer alle Clients) damit
console.log(topic+' / CAT for User '+tobrowser.user_id+' at '+tobrowser.qrg+' in Mode '+tobrowser.mode); console.log(topic+' / CAT for User '+tobrowser.user_id+' ('+msg.content.user_name+') at '+tobrowser.qrg+' in Mode '+tobrowser.mode);
}
} else {
console.log(msg.content.user_name+' not in Whitelist');
} }
}); });
@@ -75,6 +80,21 @@ function parse_cat_msg(topic,msg) {
return retmsg; return retmsg;
} }
async function getWhitelist() {
if (config.whitelist_enabled) {
try {
const response = await fetch(config.whitelist_url);
if (!response.ok) {
throw new Error(`HTTP error! Status: ${response.status}`);
}
const data = await response.json();
whitelist = data;
} catch (error) {
console.error('Error fetching JSON data:', error);
}
}
}
function parse_qso_msg(msg) { function parse_qso_msg(msg) {
let retmsg={}; let retmsg={};
retmsg.call=msg.COL_CALL; retmsg.call=msg.COL_CALL;
@@ -94,6 +114,12 @@ const dinmin = (timestamp) => {
return Math.floor((Date.now() - new Date(timestamp).getTime()) / 60000); return Math.floor((Date.now() - new Date(timestamp).getTime()) / 60000);
} }
http.listen(8000,'127.0.0.1', () => { // Webserver starten function startup() {
console.log(`Socket.IO server running at http://localhost:8000/`); // debug getWhitelist();
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);
}
startup();