Merge pull request #4335 from hashicorp/b-ui-safari-log-streaming

UI: Use polling instead of streaming for following logs in Safari
hashicorp · May 30, 2018 · d5cbcc6 · d5cbcc6
2 parents 5febedd + 65adc38
commit d5cbcc6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/ui/app/utils/classes/poll-logger.js b/ui/app/utils/classes/poll-logger.js
@@ -30,11 +30,15 @@ export default EmberObject.extend(AbstractLogger, {
 
       if (text) {
         const lines = text.replace(/\}\{/g, '}\n{').split('\n');
-        const frames = lines.map(line => JSON.parse(line));
-        frames.forEach(frame => (frame.Data = window.atob(frame.Data)));
-
-        this.set('endOffset', frames[frames.length - 1].Offset);
-        this.get('write')(frames.mapBy('Data').join(''));
+        const frames = lines
+          .map(line => JSON.parse(line))
+          .filter(frame => frame.Data != null && frame.Offset != null);
+
+        if (frames.length) {
+          frames.forEach(frame => (frame.Data = window.atob(frame.Data)));
+          this.set('endOffset', frames[frames.length - 1].Offset);
+          this.get('write')(frames.mapBy('Data').join(''));
+        }
       }
 
       yield timeout(interval);

diff --git a/ui/app/utils/classes/stream-logger.js b/ui/app/utils/classes/stream-logger.js
@@ -73,5 +73,16 @@ export default EmberObject.extend(AbstractLogger, {
     }
   }),
 }).reopenClass({
-  isSupported: !!window.ReadableStream,
+  isSupported: !!window.ReadableStream && !isSafari(),
 });
+
+// Fetch streaming doesn't work in Safari yet despite all the primitives being in place.
+// Bug: https://bugs.webkit.org/show_bug.cgi?id=185924
+// Until this is fixed, Safari needs to be explicitly targeted for poll-based logging.
+function isSafari() {
+  const oldSafariTest = /constructor/i.test(window.HTMLElement);
+  const newSafariTest = (function(p) {
+    return p.toString() === '[object SafariRemoteNotification]';
+  })(!window['safari'] || (typeof window.safari !== 'undefined' && window.safari.pushNotification));
+  return oldSafariTest || newSafariTest;
+}
diff --git a/ui/tests/integration/task-log-test.js b/ui/tests/integration/task-log-test.js
@@ -9,7 +9,7 @@ import { logEncode } from '../../mirage/data/logs';
 const HOST = '1.1.1.1:1111';
 const allowedConnectionTime = 100;
 const commonProps = {
-  interval: 50,
+  interval: 200,
   allocation: {
     id: 'alloc-1',
     node: {