Skip to content

Commit

Permalink
Add is_default to configs to auto assign the default config to an una…
Browse files Browse the repository at this point in the history 
…ssigned device
  • Loading branch information
@versx
versx committed Apr 17, 2020
1 parent 66395f8 commit 2f694d2
Show file tree
Hide file tree
Showing 17 changed files with 299 additions and 77 deletions.
2 changes: 1 addition & 1 deletion config.example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"username": "user123",
"password": "pass123",
"database": "dcm",
"charset": "utf8"
"charset": "utf8mb4"
}
}
4 changes: 2 additions & 2 deletions db.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function getConnection() {
charset: config.db.charset
});

conn.connect(err => {
conn.connect(function(err) {
if (err) {
console.log('Error connecting to database');
return;
Expand All @@ -31,7 +31,7 @@ function query(sql, args) {
// The Promise constructor should catch any errors thrown on
// this tick. Alternately, try/catch and reject(err) on catch.
var conn = getConnection();
conn.query(sql, args, function (err, rows, fields) {
conn.query(sql, args, function(err, rows, fields) {
// Call reject on error states,
// call resolve with results
if (err) {
Expand Down
201 changes: 158 additions & 43 deletions index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const Log = require('./models/log.js');
// TODO: Error checking/handling
// TODO: Security / token auth
// TODO: Default config for devices, auto assigned?
// TODO: If default config is set, assign to device

// Middleware
app.set('view engine', 'mustache');
Expand Down Expand Up @@ -68,42 +69,38 @@ app.get('/config/new', function(req, res) {
});

app.get('/config/edit/:name', async function(req, res) {
var name = req.params.name;
var sql = "SELECT backend_url, port, heartbeat_max_time, pokemon_max_time, raid_max_time, startup_lat, startup_lon, token, jitter_value, max_warning_time_raid, encounter_delay, min_delay_logout, max_empty_gmo, max_failed_count, max_no_quest_count, logging_url, logging_port, logging_tls, logging_tcp, account_manager, deploy_eggs, nearby_tracker, auto_login, ultra_iv, ultra_quests FROM config WHERE name=? LIMIT 1";
var args = [name];
var cfg = await query(sql, args);
// TODO: Error checking
var c = cfg[0];
c.name = name;
var name = req.params.name;
var c = await Config.getByName(name);
var data = {
title: config.title,
old_name: name,
name: name,
backend_url: c.backend_url,
name: c.name,
backend_url: c.backendUrl,
port: c.port,
heartbeat_max_time: c.heartbeat_max_time,
pokemon_max_time: c.pokemon_max_time,
raid_max_time: c.raid_max_time,
startup_lat: c.startup_lat,
startup_lon: c.startup_lon,
heartbeat_max_time: c.heartbeatMaxTime,
pokemon_max_time: c.pokemonMaxTime,
raid_max_time: c.raidMaxTime,
startup_lat: c.startupLat,
startup_lon: c.startupLon,
token: c.token,
jitter_value: c.jitter_value,
max_warning_time_raid: c.max_warning_time_raid,
encounter_delay: c.encounter_delay,
min_delay_logout: c.min_delay_logout,
max_empty_gmo: c.max_empty_gmo,
max_failed_count: c.max_failed_count,
max_no_quest_count: c.max_no_quest_count,
logging_url: c.logging_url,
logging_port: c.logging_port,
logging_tls: c.logging_tls === 1 ? "checked" : "",
logging_tcp: c.logging_tcp === 1 ? "checked" : "",
account_manager: c.account_manager === 1 ? "checked" : "",
deploy_eggs: c.deploy_eggs === 1 ? "checked" : "",
nearby_tracker: c.nearby_tracker === 1 ? "checked" : "",
auto_login: c.auto_login === 1 ? "checked" : "",
ultra_iv: c.ultra_iv === 1 ? "checked" : "",
ultra_quests: c.ultra_quests === 1 ? "checked" : ""
jitter_value: c.jitterValue,
max_warning_time_raid: c.maxWarningTimeRaid,
encounter_delay: c.encounterDelay,
min_delay_logout: c.minDelayLogout,
max_empty_gmo: c.maxEmptyGmo,
max_failed_count: c.maxFailedCount,
max_no_quest_count: c.maxNoQuestCount,
logging_url: c.loggingUrl,
logging_port: c.loggingPort,
logging_tls: c.loggingTls === 1 ? "checked" : "",
logging_tcp: c.loggingTcp === 1 ? "checked" : "",
account_manager: c.accountManager === 1 ? "checked" : "",
deploy_eggs: c.deployEggs === 1 ? "checked" : "",
nearby_tracker: c.nearbyTracker === 1 ? "checked" : "",
auto_login: c.autoLogin === 1 ? "checked" : "",
ultra_iv: c.ultraIV === 1 ? "checked" : "",
ultra_quests: c.ultraQuests === 1 ? "checked" : "",
is_default: c.isDefault === 1 ? "checked" : ""
};
res.render('config-edit', data);
});
Expand Down Expand Up @@ -141,7 +138,10 @@ app.get('/api/devices', async function(req, res) {
app.post('/api/device/new', async function(req, res) {
var uuid = req.body.uuid;
var config = req.body.config;
var result = await Device.create(uuid, config || null, null)
var result = await Device.create(uuid, config || null, null)
if (result) {
// Success
}
console.log("New device result:", result);
res.redirect('/devices');
});
Expand All @@ -160,6 +160,7 @@ app.get('/api/configs', async function(req, res) {
try {
var configs = await Config.getAll();
configs.forEach(function(config) {
config.is_default = config.is_default ? "Yes" : "No";
config.buttons = "<a href='/config/edit/" + config.name + "'><button type='button' class='btn btn-primary' data-toggle='modal' data-target='#editConfigModal'>Edit</button></a> \
<a href='/config/delete/" + config.name + "'><button type='button'class='btn btn-danger' data-toggle='modal' data-target='#deleteConfigModal'>Delete</button></a>";
});
Expand All @@ -171,13 +172,121 @@ app.get('/api/configs', async function(req, res) {
});

app.get('/api/config/:uuid', async function(req, res) {
// TODO: Device says hello, db checks if it exists.
// TODO: If device does exist, check if it has been assigned a config.
// TODO: - if device is assigned config, send it. If it isn't attempt the assign default config if there is one.
// TODO: if device does not exist, create it and attempt to assign default config if there is one.

var uuid = req.params.uuid;
var device = await Device.getByName(uuid);
var noConfig = false;
// Check if device config is empty, if not provide it as json response
if (device) {
// Device exists
device.lastSeen = new Date() / 1000;
device.save();
if (device.config) {
// Do something
} else {
console.log("Device", uuid, "not assigned a config, attempting to assign the default config if one is set...");
// Not assigned a config
var defaultConfig = await Config.getDefault();
if (defaultConfig !== null) {
console.log("Assigning device", uuid, "default config", defaultConfig.name);
device.config = defaultConfig.name;
device.save();
} else {
// No default config so don't give config response
noConfig = true;
}
}
} else {
console.log("Device doesn't exist, creating...");
// Device doesn't exist, create db entry
var result = await Device.create(uuid);
if (result) {
// Success, assign default config if there is one.
var defaultConfig = await Config.getDefault();
if (defaultConfig !== null) {
console.log("Assigning device", uuid, "default config", defaultConfig.name);
device = await Device.getByName(uuid);
device.config = defaultConfig.name;
device.save();
} else {
// No default config so don't give config response
noConfig = true;
}
} else {
// Failed to create device so don't give config response
noConfig = true;
}
}

if (noConfig) {
console.log("No config assigned to device", uuid, "and no default config to assign!");
var data = {
status: "error",
error: "Device not assigned to config!"
}
var json = JSON.stringify(data);
res.send(json);
return;
}

// TODO: Use Config.getByName instead
var sql = "SELECT * FROM config WHERE name = ? LIMIT 1";
var args = [device.config];
var configs = await query(sql, args);
if (configs.length > 0) {
var c = configs[0];
// Build json config
var json = buildConfig(
c.backend_url,
c.port,
c.heartbeat_max_time,
c.pokemon_max_time,
c.raid_max_time,
c.startup_lat,
c.startup_lon,
c.token,
c.jitter_value,
c.max_warning_time_raid,
c.encounter_delay,
c.min_delay_logout,
c.max_empty_gmo,
c.max_failed_count,
c.max_no_quest_count,
c.logging_url,
c.logging_port,
c.logging_tls,
c.logging_tcp,
c.account_manager,
c.deploy_eggs,
c.nearby_tracker,
c.auto_login,
c.ultra_iv,
c.ultra_quests,
c.is_default
);
console.log("Config response:", json);
res.send(json);
}
});

app.get('/api/config/:uuid', async function(req, res) {
// TODO: Device says hello, db checks if it exists.
// TODO: If device does exist, check if it has been assigned a config.
// TODO: - if device is assigned config, send it. If it isn't attempt the assign default config if there is one.
// TODO: if device does not exist, create it and attempt to assign default config if there is one.

var uuid = req.params.uuid;
var device = await Device.getByName(uuid);
// Check if device config is empty, if not provide it as json response
if (device) {
device.lastSeen = new Date() / 1000;
device.save();
if (device.config) {
// TODO: Use Config.getByName instead
var sql = "SELECT * FROM config WHERE name = ? LIMIT 1";
var args = [device.config];
var configs = await query(sql, args);
Expand Down Expand Up @@ -209,7 +318,8 @@ app.get('/api/config/:uuid', async function(req, res) {
c.nearby_tracker,
c.auto_login,
c.ultra_iv,
c.ultra_quests,
c.ultra_quests,
c.is_default
);
console.log("Config response:", json);
res.send(json);
Expand Down Expand Up @@ -278,7 +388,8 @@ app.post('/api/config/new', async function(req, res) {
data.nearby_tracker === 'on' ? 1 : 0,
data.auto_login === 'on' ? 1 : 0,
data.ultra_iv === 'on' ? 1 : 0,
data.ultra_quests === 'on' ? 1 : 0,
data.ultra_quests === 'on' ? 1 : 0,
data.is_default === 'on' ? 1 : 0
);
if (result) {
console.log("Config inserted");
Expand Down Expand Up @@ -310,16 +421,20 @@ app.post('/api/config/edit/:name', async function(req, res) {
c.maxNoQuestCount = data.max_no_quest_count;
c.loggingUrl = data.logging_url;
c.loggingPort = data.logging_port;
c.loggingTls = data.logging_tls === "on" ? 1 : 0;
c.loggingTcp = data.logging_tcp === "on" ? 1 : 0;
c.accountManager = data.account_manager === "on" ? 1 : 0;
c.deployEggs = data.deploy_eggs === "on" ? 1 : 0;
c.nearbyTracker = data.nearby_tracker === "on" ? 1 : 0;
c.autoLogin = data.auto_login === "on" ? 1 : 0;
c.ultraIV = data.ultra_iv === "on" ? 1 : 0;
c.ultraQuests = data.ultra_quests === "on" ? 1 : 0;
c.loggingTls = data.logging_tls === 'on' ? 1 : 0;
c.loggingTcp = data.logging_tcp === 'on' ? 1 : 0;
c.accountManager = data.account_manager === 'on' ? 1 : 0;
c.deployEggs = data.deploy_eggs === 'on' ? 1 : 0;
c.nearbyTracker = data.nearby_tracker === 'on' ? 1 : 0;
c.autoLogin = data.auto_login === 'on' ? 1 : 0;
c.ultraIV = data.ultra_iv === 'on' ? 1 : 0;
c.ultraQuests = data.ultra_quests === 'on' ? 1 : 0;
c.isDefault = data.is_default === 'on' ? 1 : 0;
if (await c.save(oldName)) {
// Success
// Success
if (c.isDefault !== false) {
await Config.setDefault(oldName);
}
}
res.redirect('/configs');
});
Expand Down
Loading

0 comments on commit 2f694d2

Please sign in to comment.