Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow manually configuring the hostname #143

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −19
Open

Allow manually configuring the hostname #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions src/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,33 @@ var client = {
awc: null,
lastSyncSuccess: true,
browserName: null,
hostname: "",

setup: function() {
console.log("Setting up client");
client.browserName = getBrowserName();
// Check if in dev mode
chrome.management.getSelf(function(info) {
client.testing = info.installType === "development";
console.log("testing: " + client.testing);

client.awc = new AWClient("aw-client-web", {testing: client.testing});
client.createBucket();

// Needed in order to show testing information in popup
chrome.storage.local.set({"testing": client.testing, "baseURL": client.awc.baseURL});
chrome.storage.local.get(["hostname"], (obj) => {
console.log("Setting up client");
client.browserName = getBrowserName();
// TODO: We might want to get the hostname automatically somehow, maybe like this:
// https://stackoverflow.com/questions/28223087/how-can-i-allow-firefox-or-chrome-to-read-a-pcs-hostname-or-other-assignable
client.hostname = obj.hostname || "";
// Check if in dev mode
chrome.management.getSelf(function(info) {
client.testing = info.installType === "development";
console.log("testing: " + client.testing);

client.awc = new AWClient("aw-client-web", {testing: client.testing});
client.createBucket();

// Needed in order to show testing information in popup
chrome.storage.local.set({"testing": client.testing, "baseURL": client.awc.baseURL});
});
});
},

getBucketId: function () {
return "aw-watcher-web-" + client.browserName.toLowerCase();
if (client.hostname != "")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use !== for strict comparison to avoid type coercion issues.

Suggested change
if (client.hostname != "")
if (client.hostname !== "")

return `aw-watcher-web-${client.browserName.toLowerCase()}_${client.hostname}`;
return `aw-watcher-web-${client.browserName.toLowerCase()}`;
},

updateSyncStatus: function(){
Expand All @@ -68,11 +76,11 @@ var client = {
createBucket: function(){
if (this.testing === null)
return;
// TODO: We might want to get the hostname somehow, maybe like this:
// https://stackoverflow.com/questions/28223087/how-can-i-allow-firefox-or-chrome-to-read-a-pcs-hostname-or-other-assignable
var bucket_id = this.getBucketId();
var eventtype = "web.tab.current";
var hostname = "unknown";
var hostname = client.hostname || "";
if (hostname == "")
hostname = "unknown";

function attempt() {
return client.awc.ensureBucket(bucket_id, eventtype, hostname)
Expand Down
14 changes: 12 additions & 2 deletions static/popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,22 @@
</td>
</tr>

<tr align="right">
<th>Last sync:</th>
<tr>
<th align="right">Last sync:</th>
<td id="status-last-sync">
<!-- Filled by JS -->
</td>
</tr>

<tr>
<th align="right">Hostname:</th>
<td>
<input id="hostname-textbox">
<!-- Filled by JS -->
</input>
<button id="hostname-save-button">Save</button>
</td>
</tr>
</table>

<hr>
Expand Down
17 changes: 16 additions & 1 deletion static/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

function renderStatus() {
chrome.storage.local.get(["lastSync", "lastSyncSuccess", "testing", "baseURL", "enabled"], function(obj) {
chrome.storage.local.get(["lastSync", "lastSyncSuccess", "testing", "baseURL", "enabled", "hostname"], function(obj) {
// Enabled checkbox
let enabledCheckbox = document.getElementById('status-enabled-checkbox');
enabledCheckbox.checked = obj.enabled;
Expand Down Expand Up @@ -37,6 +37,10 @@ function renderStatus() {
let lastSyncString = obj.lastSync ? new Date(obj.lastSync).toLocaleString() : "never";
document.getElementById('status-last-sync').innerHTML = lastSyncString;

// Hostname
let hostnameTextbox = document.getElementById('hostname-textbox');
hostnameTextbox.value = obj.hostname || "";

// Set webUI button link
document.getElementById('webui-link').href = obj.baseURL;
});
Expand All @@ -53,6 +57,17 @@ function domListeners() {
const url = chrome.runtime.getURL("../static/consent.html");
chrome.windows.create({ url, type: "popup", height: 550, width: 416, });
});
let hostnameTextbox = document.getElementById('hostname-textbox');
let hostnameSaveButton = document.getElementById('hostname-save-button');
hostnameSaveButton.addEventListener("click", () => {
chrome.storage.local.set({ hostname: hostnameTextbox.value });
// Need to restart the extension to update the bucket name
let enabled = enabled_checkbox.checked;
if (enabled) {
chrome.runtime.sendMessage({enabled: false});
chrome.runtime.sendMessage({enabled: true});
}
});
}

document.addEventListener('DOMContentLoaded', function() {
Expand Down