cory/tildefriends
5
6
Fork 2
Code Issues 39 Pull Requests Actions Releases 33 Wiki Activity

Fixes to improve chat experience. Suppress spurrious ping messages. Try to reconnect when a network connection is restored. Send messages to multiple sessions from the same user.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3230 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams
2016-05-07 11:07:54 +00:00
parent 1c85875db4
commit e7feab4a4a
3 changed files with 112 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
core/client.js
View File

@ -281,8 +281,10 @@ function setErrorMessage(message) {
while (node.firstChild) {
node.removeChild(node.firstChild);
}
node.appendChild(document.createTextNode(message));
node.setAttribute("style", "display: inline; color: #dc322f");
if (message) {
node.appendChild(document.createTextNode(message));
node.setAttribute("style", "display: inline; color: #dc322f");
}
}
function send(command) {
@ -429,11 +431,17 @@ function hashChange() {
}
function focus() {
send({event: "focus"});
if (gSocket && gSocket.readyState == gSocket.CLOSED) {
connectSocket();
} else {
send({event: "focus"});
}
}
function blur() {
send({event: "blur"});
if (gSocket && gSocket.readyState == gSocket.OPEN) {
send({event: "blur"});
}
}
function onMessage(event) {
@ -452,6 +460,39 @@ function submitButton() {
send({event: "submit", value: data});
}
function connectSocket() {
if (!gSocket || gSocket.readyState == gSocket.CLOSED) {
gSocket = new WebSocket(
(window.location.protocol == "https:" ? "wss://" : "ws://")
+ window.location.hostname
+ (window.location.port.length ? ":" + window.location.port : "")
+ "/terminal/socket");
gSocket.onopen = function() {
setErrorMessage(null);
gSocket.send(JSON.stringify({
action: "hello",
path: window.location.pathname,
terminalApi: [
['clear'],
['notify', 'title', 'options'],
['postMessageToIframe', 'name', 'message'],
['setHash', 'value'],
['setPassword', 'value'],
['setPrompt', 'value'],
['setTitle', 'value'],
['split', 'options'],
],
}));
}
gSocket.onmessage = function(event) {
receive(JSON.parse(event.data));
}
gSocket.onclose = function(event) {
setErrorMessage("Connection closed with code " + event.code);
}
}
}
window.addEventListener("load", function() {
if (window.Notification) {
Notification.requestPermission();
@ -463,33 +504,7 @@ window.addEventListener("load", function() {
window.addEventListener("focus", focus);
window.addEventListener("blur", blur);
window.addEventListener("message", onMessage, false);
window.addEventListener("online", connectSocket);
enableDragDrop();
gSocket = new WebSocket(
(window.location.protocol == "https:" ? "wss://" : "ws://")
+ window.location.hostname
+ (window.location.port.length ? ":" + window.location.port : "")
+ "/terminal/socket");
gSocket.onopen = function() {
gSocket.send(JSON.stringify({
action: "hello",
path: window.location.pathname,
terminalApi: [
['clear'],
['notify', 'title', 'options'],
['postMessageToIframe', 'name', 'message'],
['setHash', 'value'],
['setPassword', 'value'],
['setPrompt', 'value'],
['setTitle', 'value'],
['split', 'options'],
],
}));
}
gSocket.onmessage = function(event) {
receive(JSON.parse(event.data));
}
gSocket.onclose = function(event) {
setErrorMessage("Connection closed with code " + event.code);
}
connectSocket();
});