Clean up terminal connectTo

package.json

@@ -5,10 +5,10 @@
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "@phosphor/algorithm": "^0.1.0",
+    "@phosphor/algorithm": "^0.1.1",
     "@phosphor/coreutils": "^0.1.5",
-    "@phosphor/disposable": "^0.1.0",
-    "@phosphor/signaling": "^0.1.1",
+    "@phosphor/disposable": "^0.1.1",
+    "@phosphor/signaling": "^0.1.2",
     "@types/minimist": "^1.2.0",
     "@types/text-encoding": "0.0.30",
     "minimist": "^1.2.0",

src/terminal/default.ts

@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  each, map, toArray
+  ArrayExt, each, map, toArray
 } from '@phosphor/algorithm';
 
 import {
@@ -291,13 +291,10 @@ namespace DefaultTerminalSession {
    * If the session was already started via `startNew`, the existing
    * session object is used as the fulfillment value.
    *
-   * Otherwise, if `options` are given, we attempt to connect to the existing
-   * session.
-   * The promise is fulfilled when the session is ready on the server,
-   * otherwise the promise is rejected.
+   * Otherwise, if `options` are given, we resolve the promise after
+   * confirming that the session exists on the server.
    *
-   * If the session was not already started and no `options` are given,
-   * the promise is rejected.
+   * If the session does not exist on the server, the promise is rejected.
    */
   export
   function connectTo(name: string, options: TerminalSession.IOptions = {}): Promise<TerminalSession.ISession> {
@@ -309,8 +306,16 @@ namespace DefaultTerminalSession {
     if (url in Private.running) {
       return Promise.resolve(Private.running[url]);
     }
-    let session = new DefaultTerminalSession(name, options);
-    return Promise.resolve(session);
+    return listRunning(options).then(models => {
+      let index = ArrayExt.findFirstIndex(models, model => {
+        return model.name === name;
+      });
+      if (index !== -1) {
+        let session = new DefaultTerminalSession(name, options);
+        return Promise.resolve(session);
+      }
+      return Promise.reject<TerminalSession.ISession>('Could not find session');
+    });
   }
 
   /**

src/terminal/terminal.ts

@@ -130,13 +130,10 @@ namespace TerminalSession {
    * If the session was already started via `startNew`, the existing
    * session object is used as the fulfillment value.
    *
-   * Otherwise, if `options` are given, we attempt to connect to the existing
-   * session.
-   * The promise is fulfilled when the session is ready on the server,
-   * otherwise the promise is rejected.
+   * Otherwise, if `options` are given, we resolve the promise after
+   * confirming that the session exists on the server.
    *
-   * If the session was not already started and no `options` are given,
-   * the promise is rejected.
+   * If the session does not exist on the server, the promise is rejected.
    */
   export
   function connectTo(name: string, options?: IOptions): Promise<ISession> {

test/src/terminal/terminal.spec.ts

@@ -64,14 +64,33 @@ describe('terminals', () => {
 
     describe('.connectTo', () => {
 
-      it('should give back an existing session', (done) => {
-        TerminalSession.startNew().then(s => {
+      it('should give back an existing session', () => {
+        return TerminalSession.startNew().then(s => {
           session = s;
-          return TerminalSession.connectTo(s.name).then(newSession => {
+          return TerminalSession.connectTo(s.name);
+        }).then(newSession => {
             expect(newSession).to.be(session);
-            done();
-          });
-        }).catch(done);
+         });
+      });
+
+      it('should give back a session that exists on the server', () => {
+        tester.onRequest = () => {
+          tester.respond(200, [{ name: 'foo' }]);
+        };
+        return TerminalSession.connectTo('foo').then(s => {
+          expect(s.name).to.be('foo');
+          s.dispose();
+        });
+      });
+
+      it('should reject if the session does not exist on the server', () => {
+        tester.onRequest = () => {
+          tester.respond(200, [{ name: 'foo' }]);
+        };
+        return TerminalSession.connectTo('bar').then(
+          () => { throw Error('should not get here'); },
+          () => undefined
+        );
       });
 
     });