Merge pull request #699 from JunoLab/sp/fixcrashes

Fix Atom crashes on Windows

Author: aviatesk

lib/connection.coffee

@@ -1,11 +1,6 @@
 {time} = require './misc'
 externalTerminal = require './connection/terminal'
 
-metrics = ->
-  if id = localStorage.getItem 'metrics.userId'
-    r = require('http').get "http://data.junolab.org/hit?id=#{id}&app=atom-julia-boot"
-    r.on 'error', ->
-
 module.exports =
   IPC:      require './connection/ipc'
   messages: require './connection/messages'
@@ -48,8 +43,7 @@ module.exports =
         @booting = false
       p.catch =>
         @booting = false
-      time "Julia Boot", @client.import('ping')().then =>
-        metrics()
+      time "Julia Boot", @client.import('ping')()
 
   bootRemote: ->
     @_boot('Remote')

lib/connection/client.coffee

@@ -3,8 +3,6 @@
 
 IPC = require './ipc'
 
-metrics = throttle metrics, 60*60*1000
-
 module.exports =
 
   # Connection logic injects a connection via `attach`.

lib/connection/local.coffee

@@ -37,31 +37,7 @@ module.exports =
         @provider().start? paths.jlpath(), client.clargs()
       .catch ->
 
-  monitorExit: (proc) ->
-    proc.onExit (code, signal) ->
-      msg = "Julia has stopped"
-      if not proc.wrapper and code isnt 0
-        msg += ": #{code}"
-        if signal then msg += ", #{signal}"
-      else
-        msg += "."
-      client.info msg
-
-  pipeStreams: (proc) ->
-    out = (data) -> client.stdout data.toString()
-    err = (data) -> client.stderr data.toString()
-    proc.flush? out, err
-    proc.onStdout out
-    proc.onStderr err
-
   monitor: (proc) ->
-    proc.ready = -> false
-    @pipeStreams proc
-    @monitorExit proc
-    client.attach proc
-    proc
-
-  monitor2: (proc) ->
     client.emitter.emit('boot', proc)
     proc.ready = -> false
     client.attach(proc)
@@ -92,7 +68,7 @@ module.exports =
 
     proc = check
       .then => @spawnJulia(path, args, provider)
-      .then (proc) => if proc.ty? then @monitor2(proc) else @monitor(proc)
+      .then (proc) => @monitor(proc)
 
     # set working directory here, so we queue this task before anything else
     if provider is 'Remote'

lib/connection/process/basic.js

@@ -20,7 +20,7 @@ export function get (path, args) {
 
 export function get_ (path, args) {
   const env = customEnv()
-  return getUnix(path, args, env)
+  return getProcess(path, args, env)
 }
 
 export function customEnv (env = process.env) {
@@ -43,7 +43,7 @@ export function customEnv (env = process.env) {
   return env
 }
 
-function getUnix (path, args, env) {
+function getProcess (path, args, env) {
   return new Promise((resolve, reject) => {
     tcp.listen().then((port) => {
       paths.fullPath(path).then((path) => {
@@ -54,21 +54,56 @@ function getUnix (path, args, env) {
             rows: 30,
             env: env,
             cwd: cwd,
-            useConpty: true
+            useConpty: true,
+            handleFlowControl: true
           })
 
           let sock = socket(ty)
 
-          sock.catch((err) => reject(err))
+          sock.catch((err) => {
+            reject(err)
+          })
 
+          // catch errors when interacting with ty, just to be safe (errors might crash Atom)
           let proc = {
             ty: ty,
-            kill: () => ty.kill(),
-            interrupt: () => ty.write('\x03'),
+            kill: () => {
+              // only kill pty if it's still alive:
+              if (ty._readable || ty._writable) {
+                try {
+                  ty.kill()
+                } catch (err) {
+                  console.log('Terminal:')
+                  console.log(err);
+                }
+              }
+            },
+            interrupt: () => {
+              try {
+                ty.write('\x03')
+              } catch (err) {
+                console.log('Terminal:')
+                console.log(err);
+              }
+            },
             socket: sock,
-            onExit: (f) => ty.on('exit', f),
+            onExit: (f) => {
+              try {
+                ty.on('exit', f)
+              } catch (err) {
+                console.log('Terminal:')
+                console.log(err);
+              }
+            },
             onStderr: (f) => {},
-            onStdout: (f) => ty.on('data', f)
+            onStdout: (f) => {
+              try {
+                ty.on('data', f)
+              } catch (err) {
+                console.log('Terminal:')
+                console.log(err);
+              }
+            }
           }
 
           resolve(proc)
@@ -84,17 +119,6 @@ function getUnix (path, args, env) {
   })
 }
 
-function freePort() {
-  return new Promise((resolve) => {
-    let server = net.createServer()
-    server.listen(0, '127.0.0.1', () => {
-      let port = server.address().port
-      server.close()
-      resolve(port)
-    })
-  })
-}
-
 function socket (ty) {
   conn = tcp.next()
   failure = new Promise((resolve, reject) => {

lib/connection/process/remote.js

@@ -17,6 +17,7 @@ export function get (path, args) {
   return lock((release) => {
     let p = get_(path, args)
     release(p.then(({socket}) => socket))
+    p.catch(() => release())
     return p
   })
 }

lib/runtime/completions.js

@@ -112,6 +112,8 @@ class AutoCompleteProvider {
         completion.description = ' '
       }
       return completion
+    }).catch(err => {
+      console.log(err)
     })
     return Promise.race([completionWithDetail, this.sleep()])
   }

lib/runtime/console.js

@@ -185,7 +185,9 @@ function newTerminal (cwd) {
     term.setDefaultLocation(atom.config.get('julia-client.uiOptions.layouts.terminal.defaultLocation'))
     term.open({
       split: atom.config.get('julia-client.uiOptions.layouts.terminal.split')
-    }).then(() => term.show())
+    }).then(() => term.show()).catch(err => {
+      console.log(err)
+    })
   }).catch(() => {})
 }
 
@@ -334,14 +336,16 @@ function shellPty (cwd) {
           cwd = paths.home()
         }
         const env = customEnv()
+        const ty = pty.spawn(atom.config.get("julia-client.consoleOptions.shell"), [], {
+          cols: 100,
+          rows: 30,
+          cwd: cwd,
+          env: env,
+          useConpty: true,
+          handleFlowControl: true
+        })
         resolve({
-          pty: pty.fork(atom.config.get("julia-client.consoleOptions.shell"), [], {
-            cols: 100,
-            rows: 30,
-            cwd: cwd,
-            env: env,
-            useConpty: true
-          }),
+          pty: ty,
           cwd: cwd})
       } else {
         reject()

lib/runtime/debugger.js

@@ -225,6 +225,8 @@ export function debugFile(shouldStep, el) {
         const data = { path, code, row: 1, column: 1 }
         getmodule(data).then(mod => {
           debugfile(modules.current(mod), code, path, shouldStep)
+        }).catch(err => {
+          console.log(err)
         })
       } catch (err) {
         atom.notifications.addError('Error happened', {

lib/runtime/evaluation.coffee

@@ -87,14 +87,21 @@ module.exports =
           code: code
           row: 1
           column: 1
-        getmodule(data).then (mod) =>
-          evalall({
-            path: path
-            module: modules.current mod
-            code: code
-          }).then (result) ->
-            notifications.show "Evaluation Finished"
-            workspace.update()
+        getmodule(data)
+          .then (mod) =>
+            evalall({
+              path: path
+              module: modules.current mod
+              code: code
+            })
+              .then (result) ->
+                notifications.show "Evaluation Finished"
+                workspace.update()
+              .catch (err) =>
+                console.log(err)
+          .catch (err) =>
+            console.log(err)
+
       catch error
         atom.notifications.addError 'Error happened',
           detail: error
@@ -110,9 +117,12 @@ module.exports =
         path: edpath
         module: module
         code: code
-      }).then (result) ->
-        notifications.show "Evaluation Finished"
-        workspace.update()
+      })
+        .then (result) ->
+          notifications.show "Evaluation Finished"
+          workspace.update()
+        .catch (err) =>
+          console.log(err)
 
   toggleDocs: () ->
     { editor, mod, edpath } = @_currentContext()
@@ -123,18 +133,21 @@ module.exports =
     word = editor.getTextInBufferRange(range)
 
     return unless words.isValidWordToInspect(word)
-    searchDoc({word: word, mod: mod}).then (result) =>
-      if result.error then return
-      v = views.render result
-      processLinks(v.getElementsByTagName('a'))
-      if atom.config.get('julia-client.uiOptions.docsDisplayMode') == 'inline'
-        d = new @ink.InlineDoc editor, range,
-          content: v
-          highlight: true
-        d.view.classList.add 'julia'
-      else
-        docpane.ensureVisible()
-        docpane.showDocument(v, [])
+    searchDoc({word: word, mod: mod})
+      .then (result) =>
+        if result.error then return
+        v = views.render result
+        processLinks(v.getElementsByTagName('a'))
+        if atom.config.get('julia-client.uiOptions.docsDisplayMode') == 'inline'
+          d = new @ink.InlineDoc editor, range,
+            content: v
+            highlight: true
+          d.view.classList.add 'julia'
+        else
+          docpane.ensureVisible()
+          docpane.showDocument(v, [])
+      .catch (err) =>
+        console.log(err)
 
   # Working Directory
 
@@ -177,9 +190,12 @@ module.exports =
     else if dirs.length == 1
       @_cd dirs[0]
     else
-      selector.show(dirs).then (dir) =>
-        return unless dir?
-        @_cd dir
+      selector.show(dirs)
+        .then (dir) =>
+          return unless dir?
+          @_cd dir
+        .catch (err) =>
+          console.log(err)
 
   cdHome: ->
     @_cd paths.home()

lib/runtime/formatter.js

@@ -60,6 +60,8 @@ function formatEditorTextInRange (editor, range, text) {
         })
       }
     }
+  }).catch(err => {
+    console.log(err)
   }).finally(() => {
     marker.destroy()
   })
@@ -92,7 +94,11 @@ export function activate() {
             edWatch.delete(ed)
             ed.save().then(() => {
               edWatch.add(ed)
+            }).catch(err => {
+              console.log(err)
             })
+          }).catch(err => {
+            console.log(err)
           })
         }
       }