Compare commits
No commits in common. "master" and "live-requests" have entirely different histories.
master
...
live-reque
12 changed files with 68 additions and 175 deletions
15
README.md
15
README.md
|
|
@ -37,18 +37,3 @@ Go enjoy the dashboard @ *localhost:5000*
|
|||
## The client
|
||||
|
||||
This is an example client and will also be used as first link in the machine.
|
||||
|
||||
### Requirements
|
||||
|
||||
A local http file server of some kind.
|
||||
for ex the python http server.
|
||||
|
||||
### Running
|
||||
|
||||
Go into the correct directory with the code
|
||||
|
||||
cd client
|
||||
|
||||
with python's http server
|
||||
|
||||
python -m http.server
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
RUN_NUMBER=0
|
||||
LINK_NUMBER=0
|
||||
|
||||
SERVER_URL="10.1.0.155:5000"
|
||||
|
||||
curl http://${SERVER_URL}/link/handoff/${RUN_NUMBER}/${LINK_NUMBER}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
.input-group {
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
input {
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
label {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<html>
|
||||
|
||||
<head>
|
||||
<link href="index.css" rel="stylesheet" />
|
||||
<script src="index.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<form name="link">
|
||||
<div class="input-group">
|
||||
<label for="url-field">Watch server url</label>
|
||||
<input name="url-field" type="text" value="10.1.0.155:5000" required></input>
|
||||
</div>
|
||||
<div class="input-group">
|
||||
<label for="run-field">Run id</label>
|
||||
<input name="run-field" type="number" value="1" required></input>
|
||||
</div>
|
||||
<div class="input-group">
|
||||
<label for="link-field"> Link id </label>
|
||||
<input name="link-field" type="number" value="0" required></input>
|
||||
</div>
|
||||
|
||||
<div class="input-group">
|
||||
<input type="button" name="start" value="Start" onclick="call_backend()" />
|
||||
<input type="button" name="handoff" value="Handoff" onclick="call_backend()" />
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<p>Result: <span id="result" style="font-weight: bold;"></span></p>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
let call_backend = function(e) {
|
||||
type = event.target.getAttribute('name');
|
||||
|
||||
var url_base = document.forms["link"]["url-field"].value;
|
||||
var run = document.forms["link"]["run-field"].value;
|
||||
var link = document.forms["link"]["link-field"].value;
|
||||
|
||||
x = new XMLHttpRequest();
|
||||
x.onreadystatechange = function() {
|
||||
if (x.readyState === 4) {
|
||||
console.log("response: " + x.responseText);
|
||||
document.getElementById("result").innerHTML = x.responseText;
|
||||
};
|
||||
};
|
||||
|
||||
var url = "http://" + url_base + "/link/" + (type === "start" ? "start" : "handoff") + "/" + run + "/" + link;
|
||||
// console.log(url);
|
||||
x.open("GET", url, true);
|
||||
x.send();
|
||||
};
|
||||
8
client/start.sh
Executable file → Normal file
8
client/start.sh
Executable file → Normal file
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
RUN_NUMBER=0
|
||||
LINK_NUMBER=0
|
||||
|
||||
SERVER_URL="10.1.0.155:5000"
|
||||
|
||||
curl http://${SERVER_URL}/link/start/${RUN_NUMBER}/${LINK_NUMBER}
|
||||
|
|
@ -1,22 +1,17 @@
|
|||
import asyncio
|
||||
import atexit
|
||||
import datetime
|
||||
import json
|
||||
import os.path
|
||||
import socket
|
||||
from functools import lru_cache
|
||||
from pathlib import Path
|
||||
from time import sleep, time
|
||||
|
||||
import matplotlib.pyplot as plt
|
||||
import socketio
|
||||
from apscheduler.schedulers.background import BackgroundScheduler
|
||||
from flask import Flask, render_template, request
|
||||
from flask_cors import CORS
|
||||
|
||||
sio = socketio.Server()
|
||||
app = Flask(__name__)
|
||||
CORS(app, resources={r"/*": {"origins": "*"}})
|
||||
app.wsgi_app = socketio.WSGIApp(sio, app.wsgi_app)
|
||||
|
||||
# We request users to send the run number to prevent accidentially getting old requests from a previous run
|
||||
|
|
@ -34,21 +29,6 @@ function_times = []
|
|||
function_data = []
|
||||
|
||||
|
||||
def save_data():
|
||||
with open('data.json', 'w') as outfile:
|
||||
json.dump(db, outfile)
|
||||
|
||||
|
||||
def load_data():
|
||||
with open('data.json', 'r') as infile:
|
||||
db = json.load(infile)
|
||||
|
||||
|
||||
data_file = Path("data.json")
|
||||
if data_file.is_file():
|
||||
load_data()
|
||||
|
||||
|
||||
@app.route("/")
|
||||
def index():
|
||||
return render_template('index.html')
|
||||
|
|
@ -56,22 +36,11 @@ def index():
|
|||
|
||||
@app.route("/start_run/<run_index>")
|
||||
def start_run(run_index):
|
||||
if "Authorization" not in request.headers or request.headers[
|
||||
'Authorization'] != "dsfqlkjmlkjls,,n":
|
||||
return "Unauthorized"
|
||||
|
||||
request_data = live_request(
|
||||
f'/start_run/{run_index}') #make request show up on the live requests
|
||||
|
||||
if not run_index.isdigit():
|
||||
return f'{run_index} is not a number'
|
||||
|
||||
if run_index in db["run_data"]:
|
||||
return "This run is already ran, take another number."
|
||||
db["current_run"] = run_index
|
||||
starttime = time()
|
||||
if run_index in db["run_data"]:
|
||||
return "This run is already ran, take another number."
|
||||
db["run_data"][run_index] = {"starttime": starttime, "data": {}}
|
||||
save_data()
|
||||
# TODO send start request to the first person in the chain. Probably a zeus part already written as example
|
||||
sio.emit('start_run', run_index)
|
||||
return f'Run {run_index} started at {starttime}'
|
||||
|
|
@ -79,13 +48,9 @@ def start_run(run_index):
|
|||
|
||||
@app.route("/link/start/<run>/<link_index>")
|
||||
def link_start(run, link_index):
|
||||
request_data = live_request(f'/link/start/{run}/{link_index}'
|
||||
) #make request show up on the live requests
|
||||
|
||||
if not run.isdigit() or not link_index.isdigit():
|
||||
return f'{run} and/or {link_index} is not a number'
|
||||
|
||||
start = time()
|
||||
request_data = live_request(run, link_index)
|
||||
sio.emit('live_request', request_data)
|
||||
|
||||
if db["current_run"] != run:
|
||||
response = "Wrong run number, check that you update your run", 404
|
||||
|
|
@ -95,7 +60,6 @@ def link_start(run, link_index):
|
|||
response = "you already started in this run. Ignoring this request."
|
||||
else:
|
||||
run_data[link_index] = {"id": link_index, "start": time()}
|
||||
save_data()
|
||||
sio.emit('link_start', run_data[link_index])
|
||||
response = "Success."
|
||||
stop = time()
|
||||
|
|
@ -104,21 +68,12 @@ def link_start(run, link_index):
|
|||
return response
|
||||
|
||||
|
||||
@app.route("/link/handoff/<run>/<link_index>")
|
||||
def link_handoff(run, link_index):
|
||||
request_data = live_request(f'/link/handoff/{run}/{link_index}'
|
||||
) #make request show up on the live requests
|
||||
|
||||
if not run.isdigit() or not link_index.isdigit():
|
||||
return f'{run} and/or {link_index} is not a number'
|
||||
|
||||
@app.route("/link/handoff/<run>/<index>")
|
||||
def link_handoff(run, index):
|
||||
if db["current_run"] != run:
|
||||
return "Wrong run number, check that you updated you run", 404
|
||||
else:
|
||||
if index not in db["run_data"][run]["data"]:
|
||||
return "This link did not start yet..."
|
||||
link_data = db["run_data"][run]["data"][link_index]
|
||||
save_data()
|
||||
link_data = db["run_data"][run]["data"][index]
|
||||
if "handoff" in link_data:
|
||||
return "you already handed off control during this run. Ignoring this request"
|
||||
else:
|
||||
|
|
@ -134,14 +89,12 @@ def connect(sid, data):
|
|||
sio.emit('sync_current_run', current_run, room=sid)
|
||||
|
||||
|
||||
def live_request(route_data):
|
||||
def live_request(run, index):
|
||||
ip = request.remote_addr
|
||||
request_data = {}
|
||||
request_data["hostname"] = lookup_hostname(ip)
|
||||
request_data["time"] = time()
|
||||
request_data["route"] = route_data
|
||||
|
||||
sio.emit('live_request', request_data)
|
||||
return request_data
|
||||
|
||||
|
||||
@lru_cache()
|
||||
|
|
@ -163,7 +116,7 @@ if __name__ == '__main__':
|
|||
# scheduler = BackgroundScheduler()
|
||||
# scheduler.add_job(func=plot_graph, trigger="interval", seconds=5)
|
||||
# scheduler.start()
|
||||
app.run(host="10.1.0.155", debug=True)
|
||||
app.run(host="0.0.0.0", debug=True)
|
||||
|
||||
# shut down the scheduler when exiting the app
|
||||
# atexit.register(lambda: scheduler.shutdown())
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
flask
|
||||
flask-cors
|
||||
python-socketio
|
||||
apscheduler
|
||||
matplotlib
|
||||
|
|
|
|||
3
watcher/static/hello.js
Normal file
3
watcher/static/hello.js
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
function sayHello() {
|
||||
alert("Hello World");
|
||||
}
|
||||
|
|
@ -46,8 +46,7 @@ h1 {
|
|||
padding: 5px;
|
||||
padding-left: 12px;
|
||||
padding-right: 12;
|
||||
min-height: 5%;
|
||||
max-height: 5%;
|
||||
height: 5%;
|
||||
border: 1px solid rgba(0, 0, 0, 0.2);
|
||||
border-radius: 6px;
|
||||
background: #fff;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ require(['jquery', 'socket.io'], function(jq, io) {
|
|||
|
||||
|
||||
$(function() {
|
||||
const socket = io('10.1.0.155:5000');
|
||||
const socket = io('localhost:5000');
|
||||
socket.on('start_run', function(run_index) {});
|
||||
|
||||
socket.on('link_start', function(link_data) {
|
||||
|
|
@ -46,23 +46,19 @@ require(['jquery', 'socket.io'], function(jq, io) {
|
|||
socket.on('live_request', function(request_data) {
|
||||
console.log("live request");
|
||||
request_time = new Date(request_data["time"] * 1000);
|
||||
addLiveRequest(request_data["hostname"], request_time, request_data["route"]);
|
||||
addLiveRequest(request_data["hostname"], request_time);
|
||||
});
|
||||
});
|
||||
|
||||
function addLiveRequest(request_host, request_time, link_route) {
|
||||
function addLiveRequest(request_host, request_time) {
|
||||
let hostname = request_host;
|
||||
let timesting = request_time.getHours() + ":" + request_time.getMinutes();
|
||||
let route = link_route;
|
||||
|
||||
let html = `
|
||||
<div class="item">
|
||||
<div>
|
||||
${hostname}
|
||||
</div>
|
||||
<div>
|
||||
${route}
|
||||
</div>
|
||||
<div>
|
||||
${timesting}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -21,31 +21,69 @@
|
|||
<body>
|
||||
<div class="container">
|
||||
<div id="current_run" class="card">
|
||||
<!-- <div class="item">
|
||||
<div class="item">
|
||||
<div>
|
||||
0
|
||||
</div>
|
||||
<div>
|
||||
<button type="button" onclick="$.get('10.1.0.155:5000/start_run/0')">Start</button>
|
||||
<button type="button">Start</button>
|
||||
</div>
|
||||
<div>
|
||||
<i class="fas fa-question" style="color:grey"></i>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="item">
|
||||
<div>
|
||||
1
|
||||
</div>
|
||||
<div>
|
||||
Time: ...
|
||||
</div>
|
||||
<div>
|
||||
<i class="fas fa-check" style="color:green"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card__title">
|
||||
Links
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="item">
|
||||
<div>
|
||||
1
|
||||
</div>
|
||||
<div>
|
||||
total time
|
||||
</div>
|
||||
<div>
|
||||
max fase
|
||||
</div>
|
||||
</div>
|
||||
<div class="card__title">
|
||||
Runs
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="live_requests" class="card">
|
||||
<div class="item">
|
||||
<div>
|
||||
Hostname
|
||||
</div>
|
||||
<div>
|
||||
Time
|
||||
</div>
|
||||
</div>
|
||||
<div class="card__title">
|
||||
Live Requests
|
||||
</div>
|
||||
<div class="item">
|
||||
<div>
|
||||
Hostname
|
||||
</div>
|
||||
<div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
|
|
|||
Loading…
Reference in a new issue