[add][bugfix] catch rtm connect failure

cli/ui.js

@@ -462,7 +462,8 @@ function updateTitle() {
             title = "(" +hasUnread +") - ";
         setFavicon(0, hasUnread);
     }
-    title += SLACK.context.team.name;
+    if (SLACK.context.team)
+        title += SLACK.context.team.name;
     document.title = title;
 }
 

srv/public/slack.min.js

@@ -1,13 +1,13 @@
 function aa(a){this.id=a;this.a={W:"",Y:"",$:"",aa:"",P:"",R:"",T:"",ba:""};this.version=0}function m(a){this.id=a;this.b=this.a=0;this.c={};this.version=0}function q(a){this.id=a;this.c={};this.version=this.b=this.a=this.h=0}function x(a,b){this.id=a;this.g=b;this.version=this.b=this.a=0}function ba(a){this.id=a;this.a={U:"",V:"",s:"",F:"",S:"",Z:""};this.g={};this.c=this.b=null;this.version=0}function ca(){this.b={};this.a=[]}
-function da(a,b,c){a.b=JSON.parse(b.emoji_use);b.highlight_words?a.a=(b.highlight_words||"").split(",").filter(function(a){return""!==a.trim()}):b.highlights&&(a.a=b.highlights);a.version=Math.max(a.version,c)}function ea(a){this.id=a;this.a={X:"",s:"",F:""};this.c=this.b=null;this.version=0;this.f=!1}function fa(a,b){this.a=b.desc;this.name=b.name;this.type=b.type;this.usage=b.usage;this.A=ga(a,b)}
-function ga(a,b){if(b.service_name)return b.service_name;if(b.app){var c=b.app,d=[],g;for(g in a.f)a.f[g].l===c&&d.push(a.f[g]);if(d)for(c=0;c<d.length;c++)if(d[c].name)return d[c].name;console.log("Unknown app "+b.app);return""}return"Slack"}function y(){this.C=null;this.l={};this.w={};this.B={};this.b={};this.a=null;this.f={};this.h={version:0,data:{}};this.g={version:0,data:{}};this.c={};this.J=0}
+function da(a,b,c){a.b=JSON.parse(b.emoji_use);b.highlight_words?a.a=(b.highlight_words||"").split(",").filter(function(a){return""!==a.trim()}):b.highlights&&(a.a=b.highlights);a.version=Math.max(a.version,c)}function ea(a){this.id=a;this.a={X:"",s:"",F:""};this.c=this.b=null;this.version=0;this.f=!1}function fa(a,b){this.a=b.desc;this.name=b.name;this.type=b.type;this.usage=b.usage;this.B=ga(a,b)}
+function ga(a,b){if(b.service_name)return b.service_name;if(b.app){var c=b.app,d=[],g;for(g in a.f)a.f[g].l===c&&d.push(a.f[g]);if(d)for(c=0;c<d.length;c++)if(d[c].name)return d[c].name;console.log("Unknown app "+b.app);return""}return"Slack"}function y(){this.A=null;this.l={};this.w={};this.C={};this.b={};this.a=null;this.f={};this.h={version:0,data:{}};this.g={version:0,data:{}};this.c={};this.J=0}
 function ha(a,b){var c=Date.now();if(b.bots)for(var d=0,g=b.bots.length;d<g;d++){var e=a.f[b.bots[d].id];e||(e=a.f[b.bots[d].id]=new ea(b.bots[d].id));var f=b.bots[d],h=c;void 0!==f.deleted&&(e.h=f.deleted);void 0!==f.name&&(e.name=f.name);void 0!==f.app_id&&(e.l=f.app_id);f.icons&&(e.a.X=f.icons.image_36,e.a.s=f.icons.image_48,e.a.F=f.icons.image_72);void 0!==f.presence&&(e.f="away"!==f.presence);void 0!==f.isPresent&&(e.f=f.isPresent);e.version=Math.max(e.version,h)}if(b.users)for(d=0,g=b.users.length;d<
 g;d++)(e=a.b[b.users[d].id])||(e=a.b[b.users[d].id]=new ba(b.users[d].id)),f=b.users[d],h=c,void 0!==f.name&&(e.name=f.name),void 0!==f.deleted&&(e.h=f.deleted),void 0!==f.status&&(e.status=f.status),void 0!==f.presence&&(e.f="away"!==f.presence),void 0!==f.isPresent&&(e.f=f.isPresent),f.profile&&(e.a.U=f.profile.image_24,e.a.V=f.profile.image_32,e.a.s=f.profile.image_48,e.a.F=f.profile.image_72,e.a.S=f.profile.image_192,e.a.Z=f.profile.image_512),e.version=Math.max(e.version,h);if(b.ims)for(d=0,
-g=b.ims.length;d<g;d++)if(f=B(a,b.ims[d].user)){f.b||(a.B[b.ims[d].id]=f.b=new x(b.ims[d].id,f));var e=f.b,h=b.ims[d],l=c;void 0!==h.last_read&&(e.a=Math.max(parseFloat(h.last_read),e.a));void 0!==h.last_msg&&(e.b=parseFloat(h.last_msg));h.latest&&(e.b=parseFloat(h.latest.ts));e.f=f.h;e.version=Math.max(e.version,l)}if(b.channels)for(d=0,g=b.channels.length;d<g;d++){(e=a.l[b.channels[d].id])||(e=a.l[b.channels[d].id]=new m(b.channels[d].id));f=b.channels[d];h=a;l=c;void 0!==f.name&&(e.name=f.name);
+g=b.ims.length;d<g;d++)if(f=B(a,b.ims[d].user)){f.b||(a.C[b.ims[d].id]=f.b=new x(b.ims[d].id,f));var e=f.b,h=b.ims[d],l=c;void 0!==h.last_read&&(e.a=Math.max(parseFloat(h.last_read),e.a));void 0!==h.last_msg&&(e.b=parseFloat(h.last_msg));h.latest&&(e.b=parseFloat(h.latest.ts));e.f=f.h;e.version=Math.max(e.version,l)}if(b.channels)for(d=0,g=b.channels.length;d<g;d++){(e=a.l[b.channels[d].id])||(e=a.l[b.channels[d].id]=new m(b.channels[d].id));f=b.channels[d];h=a;l=c;void 0!==f.name&&(e.name=f.name);
 void 0!==f.is_archived&&(e.f=f.is_archived);void 0!==f.last_read&&(e.a=Math.max(parseFloat(f.last_read),e.a));void 0!==f.last_msg&&(e.b=parseFloat(f.last_msg));f.latest&&(e.b=parseFloat(f.latest.ts));if(f.members&&(e.c={},f.members))for(var n=0,k=f.members.length;n<k;n++){var p=B(h,f.members[n]);e.c[p.id]=p;p.g[e.id]=e}e.version=Math.max(e.version,l)}d=0;for(g=b.groups.length;d<g;d++){(e=a.w[b.groups[d].id])||(e=a.w[b.groups[d].id]=new q(b.groups[d].id));f=a;h=b.groups[d];l=c;n=[];if(h.members){e.c=
 {};k=e.h=0;for(p=h.members.length;k<p;k++){var r=B(f,h.members[k]);e.c[h.members[k]]=r;r.g[e.id]=e;n.push(r.name);e.h++}e.name=n.join(", ")}void 0!==h.is_archived&&(e.f=h.is_archived||!1===h.is_open);void 0!==h.last_read&&(e.a=Math.max(parseFloat(h.last_read),e.a));void 0!==h.last_msg?e.b=parseFloat(h.last_msg):h.latest&&(e.b=parseFloat(h.latest.ts));e.version=Math.max(e.version,l)}b.emojis&&(a.h.data=b.emojis,a.h.version=c);if(void 0!==b.commands){a.g.data={};for(d in b.commands)a.g.data[d]=new fa(a,
-b.commands[d]);a.g.version=c}b.team&&(a.C||(a.C=new aa(b.team.id)),g=a.C,e=b.team,void 0!==e.name&&(g.name=e.name),e.icon&&(g.a.W=e.icon.image_34,g.a.Y=e.icon.image_44,g.a.$=e.icon.image_68,g.a.aa=e.icon.image_88,g.a.P=e.icon.image_102,g.a.R=e.icon.image_132,g.a.T=e.icon.image_230,g.a.ba=e.icon.image_default),g.version=Math.max(g.version,c));a.J=Math.max(a.J,c);b.self&&(a.a=B(a,b.self.id),a.a.c||(a.a.c=new ca),da(a.a.c,b.self.prefs,c));if(void 0!==b.typing)for(d in a.c={},b.typing){a.c[d]={};for(var u in b.typing[d])a.c[d][u]=
-c}}function B(a,b){return a.b[b]||a.f[b]||null}function C(a,b){return a.l[b]||a.B[b]||a.w[b]||null}function D(a,b){for(var c in a.l)if(!1===b(a.l[c]))return;for(c in a.B)if(!1===!b(a.B[c]))return;for(c in a.w)if(!1===!b(a.w[c]))break}"undefined"!==typeof module&&(module.O.ca=y);function ia(a,b){this.m=a.user||a.bot_id;this.f=a.username;this.id=a.ts;this.i=parseFloat(a.ts);this.text=a.text||"";this.c=a.attachments||[];this.o=!!a.edited;this.b=a.removed||!1;this.g="me_message"===a.subtype||a.isMeMessage;this.a={};this.version=b;var c=this;a.reactions&&a.reactions.forEach(function(a){c.a[a.name]=[];a.users.forEach(function(b){c.a[a.name].push(b)})})}
+b.commands[d]);a.g.version=c}b.team&&(a.A||(a.A=new aa(b.team.id)),g=a.A,e=b.team,void 0!==e.name&&(g.name=e.name),e.icon&&(g.a.W=e.icon.image_34,g.a.Y=e.icon.image_44,g.a.$=e.icon.image_68,g.a.aa=e.icon.image_88,g.a.P=e.icon.image_102,g.a.R=e.icon.image_132,g.a.T=e.icon.image_230,g.a.ba=e.icon.image_default),g.version=Math.max(g.version,c));a.J=Math.max(a.J,c);b.self&&(a.a=B(a,b.self.id),a.a.c||(a.a.c=new ca),da(a.a.c,b.self.prefs,c));if(void 0!==b.typing)for(d in a.c={},b.typing){a.c[d]={};for(var u in b.typing[d])a.c[d][u]=
+c}}function B(a,b){return a.b[b]||a.f[b]||null}function C(a,b){return a.l[b]||a.C[b]||a.w[b]||null}function D(a,b){for(var c in a.l)if(!1===b(a.l[c]))return;for(c in a.C)if(!1===!b(a.C[c]))return;for(c in a.w)if(!1===!b(a.w[c]))break}"undefined"!==typeof module&&(module.O.ca=y);function ia(a,b){this.m=a.user||a.bot_id;this.f=a.username;this.id=a.ts;this.i=parseFloat(a.ts);this.text=a.text||"";this.c=a.attachments||[];this.o=!!a.edited;this.b=a.removed||!1;this.g="me_message"===a.subtype||a.isMeMessage;this.a={};this.version=b;var c=this;a.reactions&&a.reactions.forEach(function(a){c.a[a.name]=[];a.users.forEach(function(b){c.a[a.name].push(b)})})}
 function ja(a,b,c){b?(a.text=b.text||"",b.attachments&&(a.c=b.attachments),a.o=!!b.edited,a.b=!!b.removed,b.reactions&&(a.a={},b.reactions.forEach(function(b){a.a[b.name]=[];b.users.forEach(function(c){a.a[b.name].push(c)})}))):a.b=!0;a.version=c}function F(a,b,c,d){this.id="string"===typeof a?a:a.id;this.a=[];this.b=b;c&&ka(this,c,d)}
 function la(a,b,c,d){var g=!1;a.a[b]&&(1===a.a[b].length&&a.a[b][0]===c?(delete a.a[b],g=!0):a.a[b]=a.a[b].filter(function(a){return a!==c?!1:g=!0}));g&&(a.version=d)}function ka(a,b,c){var d=0;b.forEach(function(a){d=Math.max(this.push(a,c),d)}.bind(a));ma(a)}
 F.prototype.push=function(a,b){var c;if(a.type&&"message"!==a.type)if("reaction_added"===a.type){if(c=G(this,a.item.ts)){var d=a.reaction,g=a.user;c.a[d]||(c.a[d]=[]);c.a[d].push(g);c.version=b}}else if("reaction_removed"===a.type)(c=G(this,a.item.ts))&&la(c,a.reaction,a.user,b);else return 0;else{var d=!1,g=a.ts,e=a;"message_changed"===a.subtype&&a.previous_message?(g=a.previous_message.ts,e=a.message):"message_deleted"===a.subtype&&a.previous_message&&(g=a.previous_message.ts,e=null);for(var f=
@@ -30,7 +30,7 @@ function W(a){a=a.split(/\r?\n/g);for(var b=0,c=a.length;b<c;b++){for(var d=a[b]
 a[b]!=c&&a[b+1]==c)return!0;b++}return!1},k=function(a){return Object.keys(e).length?'<span class="'+Object.keys(a).join(" ")+'">':""};h<l&&(" "===d[h]||"\t"===d[h]);)h++;"&gt;"===d.substr(h,4)&&(f=!0,h+=4);for(;h<l;h++){var p=d[h];if("<"===p){do g+=d[h++];while(">"!==d[h-1]);h--}else if(!e["slackmsg-style-bold"]&&"*"===p&&d[h+1]&&n(d,h,p))Object.keys(e).length&&(g+="</span>"),e["slackmsg-style-bold"]=!0,g+=k(e);else if(!e["slackmsg-style-strike"]&&"~"===p&&d[h+1]&&n(d,h,p))Object.keys(e).length&&
 (g+="</span>"),e["slackmsg-style-strike"]=!0,g+=k(e);else if(!e["slackmsg-style-code"]&&"`"===p&&d[h+1]&&n(d,h,p))Object.keys(e).length&&(g+="</span>"),e["slackmsg-style-code"]=!0,g+=k(e);else if(!e["slackmsg-style-italic"]&&"_"===p&&d[h+1]&&n(d,h,p))Object.keys(e).length&&(g+="</span>"),e["slackmsg-style-italic"]=!0,g+=k(e);else{var r=!1,g=g+p;do{if(e["slackmsg-style-bold"]&&"*"!==p&&"*"===d[h+1])delete e["slackmsg-style-bold"],r=!0;else if(e["slackmsg-style-strike"]&&"~"!==p&&"~"===d[h+1])delete e["slackmsg-style-strike"],
 r=!0;else if(e["slackmsg-style-code"]&&"`"!==p&&"`"===d[h+1])delete e["slackmsg-style-code"],r=!0;else if(e["slackmsg-style-italic"]&&"_"!==p&&"_"===d[h+1])delete e["slackmsg-style-italic"],r=!0;else break;p=d[++h]}while(h<l);r&&(g+="</span>"+k(e))}}e&&(g+="</span>");a[b]=f?'<span class="slackmsg-style-quote">'+g+"</span>":g}return a.join("<br/>")}function R(a,b,c){b.g?(a=za(a,b,c),a.classList.add("slackmsg-me_message")):a=za(a,b,c);b.o&&a.classList.add("slackmsg-edited");return a}
-function Aa(a,b){document.getElementById("linkFavicon").href=a||b?"favicon.png?h="+a+"&m="+b:"favicon_ok.png"}function N(){var a=M.length,b="";if(X)b="!"+K.H+" - ",document.getElementById("linkFavicon").href="favicon_err.png";else if(a)b="(!"+a+") - ",Aa(a,a);else{var c=0;D(H.a,function(a){a.b>a.a&&c++});c&&(b="("+c+") - ");Aa(0,c)}b+=H.a.C.name;document.title=b}
+function Aa(a,b){document.getElementById("linkFavicon").href=a||b?"favicon.png?h="+a+"&m="+b:"favicon_ok.png"}function N(){var a=M.length,b="";if(X)b="!"+K.H+" - ",document.getElementById("linkFavicon").href="favicon_err.png";else if(a)b="(!"+a+") - ",Aa(a,a);else{var c=0;D(H.a,function(a){a.b>a.a&&c++});c&&(b="("+c+") - ");Aa(0,c)}H.a.A&&(b+=H.a.A.name);document.title=b}
 function Ba(){if("Notification"in window)if("granted"===Notification.permission){var a=Date.now();if(L+3E4<a){var b=new Notification(K.I);L=a;setTimeout(function(){b.close()},5E3)}}else"denied"!==Notification.permission&&Notification.requestPermission()}
 function Ca(){var a=document.createDocumentFragment(),b=I.id,c=null,d=0,g=null;H.b[b]&&H.b[b].a.forEach(function(e){if(!e.b){var f=R(b,e);c&&c.m===e.m&&e.m?(f.classList.add("slackmsg-same-author"),30>Math.abs(d-e.i)?g.classList.add("slackmsg-same-ts"):d=e.i):d=e.i;(!c||c.i<=I.a)&&e.i>I.a&&f.classList.add("slackmsg-first-unread");c=e;g=f;a.appendChild(f)}});var e=document.getElementById("chatWindow");e.textContent="";e.appendChild(a);e.scrollTop=e.scrollHeight-e.clientHeight;window.hasFocus&&Y()}
 function Da(a){function b(a,b){for(b=b||a.target;b!==a.currentTarget&&b;){if(b.classList.contains("slackmsg-item"))return b.id;b=b.parentElement}}for(var c=a.target;c!==a.currentTarget&&c&&!c.classList.contains("slackmsg-hover");){if(c.parentElement&&c.parentElement.classList.contains("slackmsg-hover")){if(a=b(a,c)){a=parseFloat(a.split("_")[1]);var d=oa(a);d&&c.classList.contains("slackmsg-hover-reply")?(U&&(U=null,T()),Q!==d&&(Q=d,P())):d&&c.classList.contains("slackmsg-hover-reaction")?Ea.L(document.body,
@@ -38,8 +38,8 @@ function(a){a&&wa(I.id,d.id,a)}):d&&c.classList.contains("slackmsg-hover-edit")?
 document.addEventListener("DOMContentLoaded",function(){pa();document.getElementById("chatWindow").addEventListener("click",Da);window.addEventListener("hashchange",function(){document.location.hash&&"#"===document.location.hash[0]&&sa()});document.getElementById("fileUploadCancel").addEventListener("click",function(a){a.preventDefault();document.getElementById("fileUploadError").classList.add("hidden");document.getElementById("fileUploadContainer").classList.add("hidden");document.getElementById("fileUploadInput").value=
 "";return!1});document.getElementById("fileUploadForm").addEventListener("submit",function(a){a.preventDefault();a=document.getElementById("fileUploadInput");var b=a.value;b&&(b=b.substr(b.lastIndexOf("\\")+1),Ha(b,a.files[0],function(a){var b=document.getElementById("fileUploadError");a?(b.textContent=a,b.classList.remove("hidden")):(b.classList.add("hidden"),document.getElementById("fileUploadInput").value="",document.getElementById("fileUploadContainer").classList.add("hidden"))}));return!1});
 document.getElementById("attachFile").addEventListener("click",function(a){a.preventDefault();I&&document.getElementById("fileUploadContainer").classList.remove("hidden");return!1});document.getElementById("msgForm").addEventListener("submit",function(a){a.preventDefault();a=document.getElementById("msgInput");I&&a.value&&Ia(a.value)&&(a.value="",Q&&(Q=null,P()),U&&(U=null,P()),document.getElementById("slashList").textContent="");S();return!1});window.addEventListener("blur",function(){window.hasFocus=
-!1});window.addEventListener("focus",function(){window.hasFocus=!0;L=0;I&&Y();S()});var a=0;document.getElementById("msgInput").addEventListener("input",function(){if(I){var b=Date.now();!(a+3E3<b)||!H.a.a.f&&I instanceof m||(Ja(),a=b);var b=[],c=this.value;if("/"===this.value[0]){var d=c.indexOf(" "),g=-1!==d,d=-1===d?c.length:d,c=c.substr(0,d),e;for(e in H.a.g.data){var f=H.a.g.data[e];(!g&&f.name.substr(0,d)===c||g&&f.name===c)&&b.push(f)}}b.sort(function(a,b){return a.A.localeCompare(b.A)||a.name.localeCompare(b.name)});
-var d=document.getElementById("slashList"),g=document.createDocumentFragment(),h;d.textContent="";e=0;for(c=b.length;e<c;e++)f=b[e],h!==f.A&&(h=f.A,g.appendChild(Ka(f.A))),g.appendChild(La(f));d.appendChild(g)}});window.hasFocus=!0;(function(){var a=document.getElementById("emojiButton");if("makeEmoji"in window){var c=window.makeEmoji("smile");c?a.innerHTML="<span class='emoji-small'>"+c.outerHTML+"</span>":a.style.backgroundImage='url("smile.svg")';(c=window.makeEmoji("paperclip"))?document.getElementById("attachFile").innerHTML=
+!1});window.addEventListener("focus",function(){window.hasFocus=!0;L=0;I&&Y();S()});var a=0;document.getElementById("msgInput").addEventListener("input",function(){if(I){var b=Date.now();!(a+3E3<b)||!H.a.a.f&&I instanceof m||(Ja(),a=b);var b=[],c=this.value;if("/"===this.value[0]){var d=c.indexOf(" "),g=-1!==d,d=-1===d?c.length:d,c=c.substr(0,d),e;for(e in H.a.g.data){var f=H.a.g.data[e];(!g&&f.name.substr(0,d)===c||g&&f.name===c)&&b.push(f)}}b.sort(function(a,b){return a.B.localeCompare(b.B)||a.name.localeCompare(b.name)});
+var d=document.getElementById("slashList"),g=document.createDocumentFragment(),h;d.textContent="";e=0;for(c=b.length;e<c;e++)f=b[e],h!==f.B&&(h=f.B,g.appendChild(Ka(f.B))),g.appendChild(La(f));d.appendChild(g)}});window.hasFocus=!0;(function(){var a=document.getElementById("emojiButton");if("makeEmoji"in window){var c=window.makeEmoji("smile");c?a.innerHTML="<span class='emoji-small'>"+c.outerHTML+"</span>":a.style.backgroundImage='url("smile.svg")';(c=window.makeEmoji("paperclip"))?document.getElementById("attachFile").innerHTML=
 "<span class='emoji-small'>"+c.outerHTML+"</span>":document.getElementById("attachFile").style.backgroundImage='url("public/paperclip.svg")';a.addEventListener("click",function(){Ea.L(document.body,function(a){a&&(document.getElementById("msgInput").value+=":"+a+":");S()})})}else a.classList.add("hidden")})();Z()});function ra(){var a=document.createElement("span"),b=document.createElement("span"),c=document.createElement("span"),d=document.createElement("span");a.className="typing-container";b.className="typing-dot1";c.className="typing-dot2";d.className="typing-dot3";b.textContent=c.textContent=d.textContent=".";a.appendChild(b);a.appendChild(c);a.appendChild(d);return a}
 function Ma(a,b,c,d){var g=xa(c);if(g){for(var e=document.createElement("li"),f=document.createElement("a"),h=document.createElement("span"),l=document.createElement("span"),n=[],k=0,p=d.length;k<p;k++){var r=B(H.a,d[k]);r&&n.push(r.name)}n.sort();l.textContent=n.join(", ");h.appendChild(g);h.className="emoji-small";f.href="javascript:toggleReaction('"+a+"', '"+b+"', '"+c+"')";f.appendChild(h);f.appendChild(l);e.className="slackmsg-reaction-item";e.appendChild(f);return e}return null}
 function za(a,b,c){var d=document.createElement("div"),g=document.createElement("div"),e=document.createElement("div"),f=document.createElement("div"),h=document.createElement("img"),l=document.createElement("span"),n=document.createElement("ul"),k=document.createElement("li"),p=document.createElement("ul"),r=document.createElement("ul"),u=B(H.a,b.m);d.id=a+"_"+b.i;d.className="slackmsg-item";e.className="slackmsg-ts";f.className="slackmsg-msg";h.className="slackmsg-author-img";l.className="slackmsg-author-name";

srv/src/slack.js

@@ -292,7 +292,8 @@ Slack.prototype.ping = function() {
 Slack.prototype.close = function() {
     if (!this.closing) {
         this.closing = true;
-        this.rtm.close();
+        if (this.rtm)
+            this.rtm.close();
         this.onClose();
     }
 };