theolem
/
educ-bot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trying to fix ws on internet

This commit is contained in:
Adrian Amaglio 2020-04-06 17:17:12 +02:00
parent c759779135
commit 9939d027b9
5 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,11 +1,11 @@
from node:alpine3.10
from node:13
WORKDIR /usr/src/app
COPY package*.json ./
RUN npm install
COPY index.js avatar.jpg
COPY index.js defaultReactions.json avatar.png ./
EXPOSE 8080
CMD [ "node", "index.js" ]
CMD [ "node", "./index.js" ]

4
index.html
View File

@ -7,14 +7,12 @@
<script src="main.js"></script>
</head>
<body>
<main id="educbot-status">
<main id="educbotstatus">
<p v-if="connection">Connecté !</p>
<p v-else="">Non connecté !</p>
<p>{{message}}</p>
<ul>
<li v-for="(value, key) in reactions">
<!--<img src="https://discordapp.com/assets/08c0a077780263f3df97613e58e71744.svg" width="30px" />
-->
{{value.prefix}}
<span v-for="person in value.people">{{person}}</span>
</li>

13
index.js
View File

@ -17,12 +17,19 @@ const defaultReactions = JSON.parse(fs.readFileSync('defaultReactions.json', 'ut
/* The html page will render data passed in WS */
const WebSocket = require('ws')
const wss = new WebSocket.Server({ port: process.env.WS_PORT })
const wss = new WebSocket.Server({ port: process.env.WS_PORT || '8080' })
wss.on('connection', ws => {
ws.isAlive = true;
ws.on('pong', heartbeat);
ws.on('message', message => {
const data = JSON.parse(message)
var data;
try {
data = JSON.parse(message)
} catch (e) {
console.log(e)
return
}
if (!('channel' in data && 'action' in data && 'web_token' in data)) {
ws.send('{"error":"invalid request"}')
return
@ -199,7 +206,7 @@ client.on('message', msg => {
msg.reply(text)
}
else if (msg.content === '!educpop-web') {
msg.reply('https://educbot.jean-cloud.net?channel_id=' + msg.channel.id + '&web_token=' + channel.web_token)
msg.reply('https://educbot.jean-cloud.net?channel_id=' + msg.channel.id + '&web_token=' + channel.web_token + '&ws_port=' + (process.env.EXT_WS_PORT || process.env.WS_PORT || '8080')
}
/* save and ignore own messages */
else if(msg.author.username === process.env.BOT_USERNAME){

16
main.js
View File

@ -1,11 +1,11 @@
window.onload = function () {
var app = new Vue({
el: '#educbot-status',
el: '#educbotstatus',
data: {
web_token: '',
channel_id: '',
ws: null,
ws_url: 'ws://localhost:8080',
ws_url: 'wss://educbot.jean-cloud.net',
reactions: {},
connection: false,
message: '',
@ -14,17 +14,19 @@ window.onload = function () {
var url = new URL(location.href)
this.web_token = url.searchParams.get('web_token')
this.channel_id = url.searchParams.get('channel_id')
if (this.web_token == '' || this.channel_id == '') {
console.err('missing parameters to vue instance')
this.ws_port = url.searchParams.get('ws_port') || '8080'
if (this.web_token == '' || this.channel_id == '' || this.ws_port == '') {
this.message = 'Erreur ! L’adresse n’est pas valide :( Redemandez-la à Educ-Bot avec la commande « !educpop-web ».'
return
}
this.ws = new WebSocket(this.ws_url)
window.WebSocket = window.WebSocket || window.MozWebSocket
this.ws = new WebSocket(this.ws_url + ':' + this.ws_port)
this.ws.onmessage = (data) => {
var reactions = JSON.parse(data.data)
if ('error' in reactions) {
this.message = 'Erreur ! '
if (reactions.error === "bad channel") {
this.message += 'Les identifiants sont incorrect ! Redemandez les à Educ-Bot avec la commande "!educpop-web"'
this.message += 'Les identifiants sont incorrect ! Redemandez les à Educ-Bot avec la commande « !educpop-web ».'
}
return
}
@ -36,9 +38,11 @@ window.onload = function () {
}
this.ws.onclose = () => {
this.connection = false
this.message = 'Erreur ! La connection avec le bot a été perdue :( Essayez d’actualiser la page.'
}
this.ws.onerror = () => {
this.connection = false
this.message = 'Erreur ! La connection avec le bot a été perdue :( Essayez d’actualiser la page.'
}
},
methods: {

5
package.json
View File

@ -13,6 +13,9 @@
"author": "",
"license": "ISC",
"dependencies": {
"discord.js": "^12.1.1"
"discord.js": "^12.1.1",
"dotenv": "^8.2.0",
"lodash.clonedeep": "^4.5.0",
"randomstring": "^1.1.5"
}
}