publish

a3a0e3fa · liuzheng712 · fe0df9c8 · a3a0e3fa · a3a0e3fa · a3a0e3fa
Commit a3a0e3fa authored Dec 12, 2017 by liuzheng712
9 changed files
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -34,7 +34,8 @@
        "../node_modules/jquery-sparkline/jquery.sparkline.js",
        "../node_modules/tether/dist/js/tether.min.js",
        "../node_modules/bootstrap/dist/js/bootstrap.min.js",
-        "../node_modules/xterm/dist/xterm.js",
+        "../node_modules/term.js/src/term.js",
+        "../node_modules/tty.js/static/tty.js",
        "../node_modules/layui-layer/dist/layer.js",
        "../node_modules/socket.io-client/dist/socket.io.js",
        "./assets/js/mstsc.js",

--- a/package-lock.json
+++ b/package-lock.json
@@ -411,6 +411,14 @@
        }
      }
    },
+    "active-x-obfuscator": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz",
+      "integrity": "sha1-CJuJs3FF/x2ex0r2UwvlUmyuHxo=",
+      "requires": {
+        "zeparser": "0.0.5"
+      }
+    },
    "adm-zip": {
      "version": "0.4.7",
      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
@@ -724,6 +732,11 @@
      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
      "dev": true
    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    },
    "asynckit": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -1204,6 +1217,11 @@
        }
      }
    },
+    "buffer-crc32": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz",
+      "integrity": "sha1-vj5TgvwCttYySVasGvmKqYsIU0w="
+    },
    "buffer-indexof": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
@@ -1901,8 +1919,7 @@
    "core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
    },
    "cosmiconfig": {
      "version": "2.2.2",
@@ -2627,42 +2644,50 @@
      }
    },
    "engine.io-client": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz",
-      "integrity": "sha1-QVqYUrrbFPoAj6PvHjFgjbZ2EyU=",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz",
+      "integrity": "sha1-T88TcLRxY70s6b4nM5ckMDUNTqE=",
      "requires": {
        "component-emitter": "1.2.1",
        "component-inherit": "0.0.3",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
        "engine.io-parser": "2.1.1",
        "has-cors": "1.1.0",
        "indexof": "0.0.1",
-        "parsejson": "0.0.3",
        "parseqs": "0.0.5",
        "parseuri": "0.0.5",
-        "ws": "2.3.1",
-        "xmlhttprequest-ssl": "1.5.3",
+        "ws": "3.3.2",
+        "xmlhttprequest-ssl": "1.5.4",
        "yeast": "0.1.2"
      },
      "dependencies": {
-        "safe-buffer": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
        },
        "ultron": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz",
-          "integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+          "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
        },
        "ws": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz",
-          "integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=",
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
+          "integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
          "requires": {
-            "safe-buffer": "5.0.1",
-            "ultron": "1.1.0"
+            "async-limiter": "1.0.0",
+            "safe-buffer": "5.1.1",
+            "ultron": "1.1.1"
          }
+        },
+        "xmlhttprequest-ssl": {
+          "version": "1.5.4",
+          "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz",
+          "integrity": "sha1-BPVgkVcks4kIhxXMDteBPpZ3v1c="
        }
      }
    },
@@ -5404,8 +5429,7 @@
    "isarray": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
    },
    "isbinaryfile": {
      "version": "3.0.2",
@@ -6108,6 +6132,11 @@
        "source-map-support": "0.4.16"
      }
    },
+    "keypress": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz",
+      "integrity": "sha1-SjGI1CkbZrT2XtuZ+AaqmuKTWSo="
+    },
    "killable": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz",
@@ -6701,6 +6730,28 @@
      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
      "dev": true
    },
+    "multiparty": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz",
+      "integrity": "sha1-pWfCrwAK0i3I8qZT2Rl4rh9TFvQ=",
+      "requires": {
+        "readable-stream": "1.1.14",
+        "stream-counter": "0.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        }
+      }
+    },
    "nan": {
      "version": "2.7.0",
      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
@@ -7026,9 +7077,9 @@
      }
    },
    "npm": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz",
-      "integrity": "sha512-M3aO8EjHebaCw6uur4C86SZqkypnoaEVo5R63FEEU0dw9wLxf/JlwWtJItShYVyQS2WDxG2It10GEe5GmVEM2Q==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz",
+      "integrity": "sha512-mt839mCsI5hzdBJLf1iRBwt610P35iUfvqLVuL7VFdanUwRBAmGtbsjdGIuzegplR95xx+fTHE0vBMuMJp1sLQ==",
      "requires": {
        "JSONStream": "1.3.1",
        "abbrev": "1.1.1",
@@ -7037,8 +7088,9 @@
        "ansistyles": "0.1.3",
        "aproba": "1.2.0",
        "archy": "1.0.0",
-        "bluebird": "3.5.0",
-        "cacache": "9.2.9",
+        "bin-links": "1.1.0",
+        "bluebird": "3.5.1",
+        "cacache": "10.0.1",
        "call-limit": "1.1.0",
        "chownr": "1.0.1",
        "cli-table2": "0.2.0",
@@ -7049,8 +7101,10 @@
        "detect-indent": "5.0.0",
        "dezalgo": "1.0.3",
        "editor": "1.0.0",
+        "find-npm-prefix": "1.0.1",
        "fs-vacuum": "1.2.10",
        "fs-write-stream-atomic": "1.0.10",
+        "gentle-fs": "2.0.1",
        "glob": "7.1.2",
        "graceful-fs": "4.1.11",
        "has-unicode": "2.0.1",
@@ -7063,7 +7117,7 @@
        "init-package-json": "1.10.1",
        "is-cidr": "1.0.0",
        "lazy-property": "1.0.0",
-        "libnpx": "9.6.0",
+        "libnpx": "9.7.1",
        "lockfile": "1.0.3",
        "lodash._baseindexof": "3.1.0",
        "lodash._baseuniq": "4.6.0",
@@ -7081,26 +7135,25 @@
        "mississippi": "1.3.0",
        "mkdirp": "0.5.1",
        "move-concurrently": "1.0.1",
-        "node-gyp": "3.6.2",
        "nopt": "4.0.1",
        "normalize-package-data": "2.4.0",
        "npm-cache-filename": "1.0.2",
        "npm-install-checks": "3.0.0",
-        "npm-lifecycle": "1.0.3",
-        "npm-package-arg": "5.1.2",
-        "npm-packlist": "1.1.9",
-        "npm-profile": "2.0.4",
+        "npm-lifecycle": "2.0.0",
+        "npm-package-arg": "6.0.0",
+        "npm-packlist": "1.1.10",
+        "npm-profile": "2.0.5",
        "npm-registry-client": "8.5.0",
        "npm-user-validate": "1.0.0",
        "npmlog": "4.1.2",
        "once": "1.4.0",
        "opener": "1.4.3",
        "osenv": "0.1.4",
-        "pacote": "6.0.2",
+        "pacote": "7.0.2",
        "path-is-inside": "1.0.2",
        "promise-inflight": "1.0.1",
        "qrcode-terminal": "0.11.0",
-        "query-string": "5.0.0",
+        "query-string": "5.0.1",
        "qw": "1.0.1",
        "read": "1.0.7",
        "read-cmd-shim": "1.0.1",
@@ -7118,20 +7171,20 @@
        "slide": "1.1.6",
        "sorted-object": "2.0.1",
        "sorted-union-stream": "2.1.3",
-        "ssri": "4.1.6",
+        "ssri": "5.0.0",
        "strip-ansi": "4.0.0",
-        "tar": "4.0.1",
+        "tar": "4.0.2",
        "text-table": "0.2.0",
        "uid-number": "0.0.6",
        "umask": "1.1.0",
        "unique-filename": "1.1.0",
        "unpipe": "1.0.0",
-        "update-notifier": "2.2.0",
+        "update-notifier": "2.3.0",
        "uuid": "3.1.0",
        "validate-npm-package-license": "3.0.1",
        "validate-npm-package-name": "3.0.0",
        "which": "1.3.0",
-        "worker-farm": "1.5.0",
+        "worker-farm": "1.5.1",
        "wrappy": "1.0.2",
        "write-file-atomic": "2.1.0"
      },
@@ -7178,15 +7231,27 @@
          "version": "1.0.0",
          "bundled": true
        },
+        "bin-links": {
+          "version": "1.1.0",
+          "bundled": true,
+          "requires": {
+            "bluebird": "3.5.1",
+            "cmd-shim": "2.0.2",
+            "fs-write-stream-atomic": "1.0.10",
+            "gentle-fs": "2.0.1",
+            "graceful-fs": "4.1.11",
+            "slide": "1.1.6"
+          }
+        },
        "bluebird": {
-          "version": "3.5.0",
+          "version": "3.5.1",
          "bundled": true
        },
        "cacache": {
-          "version": "9.2.9",
+          "version": "10.0.1",
          "bundled": true,
          "requires": {
-            "bluebird": "3.5.0",
+            "bluebird": "3.5.1",
            "chownr": "1.0.1",
            "glob": "7.1.2",
            "graceful-fs": "4.1.11",
@@ -7196,27 +7261,16 @@
            "move-concurrently": "1.0.1",
            "promise-inflight": "1.0.1",
            "rimraf": "2.6.2",
-            "ssri": "4.1.6",
+            "ssri": "5.0.0",
            "unique-filename": "1.1.0",
            "y18n": "3.2.1"
          },
          "dependencies": {
-            "lru-cache": {
-              "version": "4.1.1",
+            "ssri": {
+              "version": "5.0.0",
              "bundled": true,
              "requires": {
-                "pseudomap": "1.0.2",
-                "yallist": "2.1.2"
-              },
-              "dependencies": {
-                "pseudomap": {
-                  "version": "1.0.2",
-                  "bundled": true
-                },
-                "yallist": {
-                  "version": "2.1.2",
-                  "bundled": true
-                }
+                "safe-buffer": "5.1.1"
              }
            },
            "y18n": {
@@ -7387,6 +7441,10 @@
          "version": "1.0.0",
          "bundled": true
        },
+        "find-npm-prefix": {
+          "version": "1.0.1",
+          "bundled": true
+        },
        "fs-vacuum": {
          "version": "1.2.10",
          "bundled": true,
@@ -7406,6 +7464,20 @@
            "readable-stream": "2.3.3"
          }
        },
+        "gentle-fs": {
+          "version": "2.0.1",
+          "bundled": true,
+          "requires": {
+            "aproba": "1.2.0",
+            "fs-vacuum": "1.2.10",
+            "graceful-fs": "4.1.11",
+            "iferr": "0.1.5",
+            "mkdirp": "0.5.1",
+            "path-is-inside": "1.0.2",
+            "read-cmd-shim": "1.0.1",
+            "slide": "1.1.6"
+          }
+        },
        "glob": {
          "version": "7.1.2",
          "bundled": true,
@@ -7505,6 +7577,16 @@
            "validate-npm-package-name": "3.0.0"
          },
          "dependencies": {
+            "npm-package-arg": {
+              "version": "5.1.2",
+              "bundled": true,
+              "requires": {
+                "hosted-git-info": "2.5.0",
+                "osenv": "0.1.4",
+                "semver": "5.4.1",
+                "validate-npm-package-name": "3.0.0"
+              }
+            },
            "promzard": {
              "version": "0.3.0",
              "bundled": true,
@@ -7532,14 +7614,14 @@
          "bundled": true
        },
        "libnpx": {
-          "version": "9.6.0",
+          "version": "9.7.1",
          "bundled": true,
          "requires": {
            "dotenv": "4.0.0",
            "npm-package-arg": "5.1.2",
            "rimraf": "2.6.2",
            "safe-buffer": "5.1.1",
-            "update-notifier": "2.2.0",
+            "update-notifier": "2.3.0",
            "which": "1.3.0",
            "y18n": "3.2.1",
            "yargs": "8.0.2"
@@ -7549,6 +7631,16 @@
              "version": "4.0.0",
              "bundled": true
            },
+            "npm-package-arg": {
+              "version": "5.1.2",
+              "bundled": true,
+              "requires": {
+                "hosted-git-info": "2.5.0",
+                "osenv": "0.1.4",
+                "semver": "5.4.1",
+                "validate-npm-package-name": "3.0.0"
+              }
+            },
            "y18n": {
              "version": "3.2.1",
              "bundled": true
@@ -8159,7 +8251,7 @@
          "bundled": true,
          "requires": {
            "aproba": "1.2.0",
-            "copy-concurrently": "1.0.3",
+            "copy-concurrently": "1.0.5",
            "fs-write-stream-atomic": "1.0.10",
            "mkdirp": "0.5.1",
            "rimraf": "2.6.2",
@@ -8167,7 +8259,7 @@
          },
          "dependencies": {
            "copy-concurrently": {
-              "version": "1.0.3",
+              "version": "1.0.5",
              "bundled": true,
              "requires": {
                "aproba": "1.2.0",
@@ -8319,18 +8411,31 @@
          }
        },
        "npm-lifecycle": {
-          "version": "1.0.3",
+          "version": "2.0.0",
          "bundled": true,
          "requires": {
+            "byline": "5.0.0",
            "graceful-fs": "4.1.11",
+            "node-gyp": "3.6.2",
+            "resolve-from": "4.0.0",
            "slide": "1.1.6",
            "uid-number": "0.0.6",
            "umask": "1.1.0",
            "which": "1.3.0"
+          },
+          "dependencies": {
+            "byline": {
+              "version": "5.0.0",
+              "bundled": true
+            },
+            "resolve-from": {
+              "version": "4.0.0",
+              "bundled": true
+            }
          }
        },
        "npm-package-arg": {
-          "version": "5.1.2",
+          "version": "6.0.0",
          "bundled": true,
          "requires": {
            "hosted-git-info": "2.5.0",
@@ -8340,15 +8445,15 @@
          }
        },
        "npm-packlist": {
-          "version": "1.1.9",
+          "version": "1.1.10",
          "bundled": true,
          "requires": {
-            "ignore-walk": "3.0.0",
+            "ignore-walk": "3.0.1",
            "npm-bundled": "1.0.3"
          },
          "dependencies": {
            "ignore-walk": {
-              "version": "3.0.0",
+              "version": "3.0.1",
              "bundled": true,
              "requires": {
                "minimatch": "3.0.4"
@@ -8390,7 +8495,7 @@
          }
        },
        "npm-profile": {
-          "version": "2.0.4",
+          "version": "2.0.5",
          "bundled": true,
          "requires": {
            "aproba": "1.2.0",
@@ -8402,8 +8507,8 @@
              "bundled": true,
              "requires": {
                "agentkeepalive": "3.3.0",
-                "cacache": "9.2.9",
-                "http-cache-semantics": "3.7.3",
+                "cacache": "9.3.0",
+                "http-cache-semantics": "3.8.0",
                "http-proxy-agent": "2.0.0",
                "https-proxy-agent": "2.1.0",
                "lru-cache": "4.1.1",
@@ -8436,8 +8541,33 @@
                    }
                  }
                },
+                "cacache": {
+                  "version": "9.3.0",
+                  "bundled": true,
+                  "requires": {
+                    "bluebird": "3.5.1",
+                    "chownr": "1.0.1",
+                    "glob": "7.1.2",
+                    "graceful-fs": "4.1.11",
+                    "lru-cache": "4.1.1",
+                    "mississippi": "1.3.0",
+                    "mkdirp": "0.5.1",
+                    "move-concurrently": "1.0.1",
+                    "promise-inflight": "1.0.1",
+                    "rimraf": "2.6.2",
+                    "ssri": "4.1.6",
+                    "unique-filename": "1.1.0",
+                    "y18n": "3.2.1"
+                  },
+                  "dependencies": {
+                    "y18n": {
+                      "version": "3.2.1",
+                      "bundled": true
+                    }
+                  }
+                },
                "http-cache-semantics": {
-                  "version": "3.7.3",
+                  "version": "3.8.0",
                  "bundled": true
                },
                "http-proxy-agent": {
@@ -8621,6 +8751,13 @@
                      }
                    }
                  }
+                },
+                "ssri": {
+                  "version": "4.1.6",
+                  "bundled": true,
+                  "requires": {
+                    "safe-buffer": "5.1.1"
+                  }
                }
              }
            }
@@ -8657,6 +8794,23 @@
                  "bundled": true
                }
              }
+            },
+            "npm-package-arg": {
+              "version": "5.1.2",
+              "bundled": true,
+              "requires": {
+                "hosted-git-info": "2.5.0",
+                "osenv": "0.1.4",
+                "semver": "5.4.1",
+                "validate-npm-package-name": "3.0.0"
+              }
+            },
+            "ssri": {
+              "version": "4.1.6",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "5.1.1"
+              }
            }
          }
        },
@@ -8800,47 +8954,52 @@
          }
        },
        "pacote": {
-          "version": "6.0.2",
+          "version": "7.0.2",
          "bundled": true,
          "requires": {
-            "bluebird": "3.5.0",
-            "cacache": "9.2.9",
+            "bluebird": "3.5.1",
+            "cacache": "10.0.1",
+            "get-stream": "3.0.0",
            "glob": "7.1.2",
            "lru-cache": "4.1.1",
-            "make-fetch-happen": "2.5.0",
+            "make-fetch-happen": "2.6.0",
            "minimatch": "3.0.4",
            "mississippi": "1.3.0",
            "normalize-package-data": "2.4.0",
-            "npm-package-arg": "5.1.2",
-            "npm-packlist": "1.1.9",
-            "npm-pick-manifest": "1.0.4",
+            "npm-package-arg": "6.0.0",
+            "npm-packlist": "1.1.10",
+            "npm-pick-manifest": "2.1.0",
            "osenv": "0.1.4",
            "promise-inflight": "1.0.1",
            "promise-retry": "1.1.1",
            "protoduck": "4.0.0",
            "safe-buffer": "5.1.1",
            "semver": "5.4.1",
-            "ssri": "4.1.6",
-            "tar": "4.0.1",
+            "ssri": "5.0.0",
+            "tar": "4.0.2",
            "unique-filename": "1.1.0",
            "which": "1.3.0"
          },
          "dependencies": {
+            "get-stream": {
+              "version": "3.0.0",
+              "bundled": true
+            },
            "make-fetch-happen": {
-              "version": "2.5.0",
+              "version": "2.6.0",
              "bundled": true,
              "requires": {
                "agentkeepalive": "3.3.0",
-                "cacache": "9.2.9",
-                "http-cache-semantics": "3.7.3",
+                "cacache": "10.0.1",
+                "http-cache-semantics": "3.8.0",
                "http-proxy-agent": "2.0.0",
                "https-proxy-agent": "2.1.0",
                "lru-cache": "4.1.1",
                "mississippi": "1.3.0",
                "node-fetch-npm": "2.0.2",
                "promise-retry": "1.1.1",
-                "socks-proxy-agent": "3.0.0",
-                "ssri": "4.1.6"
+                "socks-proxy-agent": "3.0.1",
+                "ssri": "5.0.0"
              },
              "dependencies": {
                "agentkeepalive": {
@@ -8866,19 +9025,19 @@
                  }
                },
                "http-cache-semantics": {
-                  "version": "3.7.3",
+                  "version": "3.8.0",
                  "bundled": true
                },
                "http-proxy-agent": {
                  "version": "2.0.0",
                  "bundled": true,
                  "requires": {
-                    "agent-base": "4.1.1",
-                    "debug": "2.6.8"
+                    "agent-base": "4.1.2",
+                    "debug": "2.6.9"
                  },
                  "dependencies": {
                    "agent-base": {
-                      "version": "4.1.1",
+                      "version": "4.1.2",
                      "bundled": true,
                      "requires": {
                        "es6-promisify": "5.0.0"
@@ -8900,7 +9059,7 @@
                      }
                    },
                    "debug": {
-                      "version": "2.6.8",
+                      "version": "2.6.9",
                      "bundled": true,
                      "requires": {
                        "ms": "2.0.0"
@@ -8918,12 +9077,12 @@
                  "version": "2.1.0",
                  "bundled": true,
                  "requires": {
-                    "agent-base": "4.1.1",
-                    "debug": "2.6.8"
+                    "agent-base": "4.1.2",
+                    "debug": "2.6.9"
                  },
                  "dependencies": {
                    "agent-base": {
-                      "version": "4.1.1",
+                      "version": "4.1.2",
                      "bundled": true,
                      "requires": {
                        "es6-promisify": "5.0.0"
@@ -8945,7 +9104,7 @@
                      }
                    },
                    "debug": {
-                      "version": "2.6.8",
+                      "version": "2.6.9",
                      "bundled": true,
                      "requires": {
                        "ms": "2.0.0"
@@ -8972,11 +9131,11 @@
                      "version": "0.1.12",
                      "bundled": true,
                      "requires": {
-                        "iconv-lite": "0.4.18"
+                        "iconv-lite": "0.4.19"
                      },
                      "dependencies": {
                        "iconv-lite": {
-                          "version": "0.4.18",
+                          "version": "0.4.19",
                          "bundled": true
                        }
                      }
@@ -8988,15 +9147,15 @@
                  }
                },
                "socks-proxy-agent": {
-                  "version": "3.0.0",
+                  "version": "3.0.1",
                  "bundled": true,
                  "requires": {
-                    "agent-base": "4.1.1",
+                    "agent-base": "4.1.2",
                    "socks": "1.1.10"
                  },
                  "dependencies": {
                    "agent-base": {
-                      "version": "4.1.1",
+                      "version": "4.1.2",
                      "bundled": true,
                      "requires": {
                        "es6-promisify": "5.0.0"
@@ -9067,10 +9226,10 @@
              }
            },
            "npm-pick-manifest": {
-              "version": "1.0.4",
+              "version": "2.1.0",
              "bundled": true,
              "requires": {
-                "npm-package-arg": "5.1.2",
+                "npm-package-arg": "6.0.0",
                "semver": "5.4.1"
              }
            },
@@ -9116,7 +9275,7 @@
          "bundled": true
        },
        "query-string": {
-          "version": "5.0.0",
+          "version": "5.0.1",
          "bundled": true,
          "requires": {
            "decode-uri-component": "0.2.0",
@@ -9701,7 +9860,7 @@
          }
        },
        "ssri": {
-          "version": "4.1.6",
+          "version": "5.0.0",
          "bundled": true,
          "requires": {
            "safe-buffer": "5.1.1"
@@ -9721,12 +9880,12 @@
          }
        },
        "tar": {
-          "version": "4.0.1",
+          "version": "4.0.2",
          "bundled": true,
          "requires": {
            "chownr": "1.0.1",
            "minipass": "2.2.1",
-            "minizlib": "1.0.3",
+            "minizlib": "1.0.4",
            "mkdirp": "0.5.1",
            "yallist": "3.0.2"
          },
@@ -9739,7 +9898,7 @@
              }
            },
            "minizlib": {
-              "version": "1.0.3",
+              "version": "1.0.4",
              "bundled": true,
              "requires": {
                "minipass": "2.2.1"
@@ -9784,13 +9943,14 @@
          "bundled": true
        },
        "update-notifier": {
-          "version": "2.2.0",
+          "version": "2.3.0",
          "bundled": true,
          "requires": {
-            "boxen": "1.1.0",
-            "chalk": "1.1.3",
-            "configstore": "3.1.0",
+            "boxen": "1.2.1",
+            "chalk": "2.1.0",
+            "configstore": "3.1.1",
            "import-lazy": "2.1.0",
+            "is-installed-globally": "0.1.0",
            "is-npm": "1.0.0",
            "latest-version": "3.1.0",
            "semver-diff": "2.1.0",
@@ -9798,15 +9958,15 @@
          },
          "dependencies": {
            "boxen": {
-              "version": "1.1.0",
+              "version": "1.2.1",
              "bundled": true,
              "requires": {
                "ansi-align": "2.0.0",
                "camelcase": "4.1.0",
-                "chalk": "1.1.3",
+                "chalk": "2.1.0",
                "cli-boxes": "1.0.0",
-                "string-width": "2.1.0",
-                "term-size": "0.1.1",
+                "string-width": "2.1.1",
+                "term-size": "1.2.0",
                "widest-line": "1.0.0"
              },
              "dependencies": {
@@ -9814,7 +9974,7 @@
                  "version": "2.0.0",
                  "bundled": true,
                  "requires": {
-                    "string-width": "2.1.0"
+                    "string-width": "2.1.1"
                  }
                },
                "camelcase": {
@@ -9826,7 +9986,7 @@
                  "bundled": true
                },
                "string-width": {
-                  "version": "2.1.0",
+                  "version": "2.1.1",
                  "bundled": true,
                  "requires": {
                    "is-fullwidth-code-point": "2.0.0",
@@ -9836,62 +9996,82 @@
                    "is-fullwidth-code-point": {
                      "version": "2.0.0",
                      "bundled": true
-                    },
-                    "strip-ansi": {
-                      "version": "4.0.0",
-                      "bundled": true,
-                      "requires": {
-                        "ansi-regex": "3.0.0"
-                      }
                    }
                  }
                },
                "term-size": {
-                  "version": "0.1.1",
+                  "version": "1.2.0",
                  "bundled": true,
                  "requires": {
-                    "execa": "0.4.0"
+                    "execa": "0.7.0"
                  },
                  "dependencies": {
                    "execa": {
-                      "version": "0.4.0",
+                      "version": "0.7.0",
                      "bundled": true,
                      "requires": {
-                        "cross-spawn-async": "2.2.5",
+                        "cross-spawn": "5.1.0",
+                        "get-stream": "3.0.0",
                        "is-stream": "1.1.0",
-                        "npm-run-path": "1.0.0",
-                        "object-assign": "4.1.1",
-                        "path-key": "1.0.0",
+                        "npm-run-path": "2.0.2",
+                        "p-finally": "1.0.0",
+                        "signal-exit": "3.0.2",
                        "strip-eof": "1.0.0"
                      },
                      "dependencies": {
-                        "cross-spawn-async": {
-                          "version": "2.2.5",
+                        "cross-spawn": {
+                          "version": "5.1.0",
                          "bundled": true,
                          "requires": {
                            "lru-cache": "4.1.1",
+                            "shebang-command": "1.2.0",
                            "which": "1.3.0"
+                          },
+                          "dependencies": {
+                            "shebang-command": {
+                              "version": "1.2.0",
+                              "bundled": true,
+                              "requires": {
+                                "shebang-regex": "1.0.0"
+                              },
+                              "dependencies": {
+                                "shebang-regex": {
+                                  "version": "1.0.0",
+                                  "bundled": true
+                                }
+                              }
+                            }
                          }
                        },
+                        "get-stream": {
+                          "version": "3.0.0",
+                          "bundled": true
+                        },
                        "is-stream": {
                          "version": "1.1.0",
                          "bundled": true
                        },
                        "npm-run-path": {
-                          "version": "1.0.0",
+                          "version": "2.0.2",
                          "bundled": true,
                          "requires": {
-                            "path-key": "1.0.0"
-                          }
+                            "path-key": "2.0.1"
                          },
-                        "object-assign": {
-                          "version": "4.1.1",
+                          "dependencies": {
+                            "path-key": {
+                              "version": "2.0.1",
                              "bundled": true
+                            }
+                          }
                        },
-                        "path-key": {
+                        "p-finally": {
                          "version": "1.0.0",
                          "bundled": true
                        },
+                        "signal-exit": {
+                          "version": "3.0.2",
+                          "bundled": true
+                        },
                        "strip-eof": {
                          "version": "1.0.0",
                          "bundled": true
@@ -9953,61 +10133,60 @@
              }
            },
            "chalk": {
-              "version": "1.1.3",
+              "version": "2.1.0",
              "bundled": true,
              "requires": {
-                "ansi-styles": "2.2.1",
+                "ansi-styles": "3.2.0",
                "escape-string-regexp": "1.0.5",
-                "has-ansi": "2.0.0",
-                "strip-ansi": "3.0.1",
-                "supports-color": "2.0.0"
+                "supports-color": "4.4.0"
              },
              "dependencies": {
                "ansi-styles": {
-                  "version": "2.2.1",
-                  "bundled": true
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.5",
-                  "bundled": true
+                  "version": "3.2.0",
+                  "bundled": true,
+                  "requires": {
+                    "color-convert": "1.9.0"
                  },
-                "has-ansi": {
-                  "version": "2.0.0",
+                  "dependencies": {
+                    "color-convert": {
+                      "version": "1.9.0",
                      "bundled": true,
                      "requires": {
-                    "ansi-regex": "2.1.1"
+                        "color-name": "1.1.3"
                      },
                      "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.1.1",
+                        "color-name": {
+                          "version": "1.1.3",
                          "bundled": true
                        }
                      }
+                    }
+                  }
                },
-                "strip-ansi": {
-                  "version": "3.0.1",
+                "escape-string-regexp": {
+                  "version": "1.0.5",
+                  "bundled": true
+                },
+                "supports-color": {
+                  "version": "4.4.0",
                  "bundled": true,
                  "requires": {
-                    "ansi-regex": "2.1.1"
+                    "has-flag": "2.0.0"
                  },
                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.1.1",
+                    "has-flag": {
+                      "version": "2.0.0",
                      "bundled": true
                    }
                  }
-                },
-                "supports-color": {
-                  "version": "2.0.0",
-                  "bundled": true
                }
              }
            },
            "configstore": {
-              "version": "3.1.0",
+              "version": "3.1.1",
              "bundled": true,
              "requires": {
-                "dot-prop": "4.1.1",
+                "dot-prop": "4.2.0",
                "graceful-fs": "4.1.11",
                "make-dir": "1.0.0",
                "unique-string": "1.0.0",
@@ -10016,7 +10195,7 @@
              },
              "dependencies": {
                "dot-prop": {
-                  "version": "4.1.1",
+                  "version": "4.2.0",
                  "bundled": true,
                  "requires": {
                    "is-obj": "1.0.1"
@@ -10060,6 +10239,30 @@
              "version": "2.1.0",
              "bundled": true
            },
+            "is-installed-globally": {
+              "version": "0.1.0",
+              "bundled": true,
+              "requires": {
+                "global-dirs": "0.1.0",
+                "is-path-inside": "1.0.0"
+              },
+              "dependencies": {
+                "global-dirs": {
+                  "version": "0.1.0",
+                  "bundled": true,
+                  "requires": {
+                    "ini": "1.3.4"
+                  }
+                },
+                "is-path-inside": {
+                  "version": "1.0.0",
+                  "bundled": true,
+                  "requires": {
+                    "path-is-inside": "1.0.2"
+                  }
+                }
+              }
+            },
            "is-npm": {
              "version": "1.0.0",
              "bundled": true
@@ -10300,7 +10503,7 @@
          }
        },
        "worker-farm": {
-          "version": "1.5.0",
+          "version": "1.5.1",
          "bundled": true,
          "requires": {
            "errno": "0.1.4",
@@ -10482,8 +10685,7 @@
    "options": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
-      "dev": true
+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
    },
    "original": {
      "version": "1.0.0",
@@ -10666,6 +10868,7 @@
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
      "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
+      "dev": true,
      "requires": {
        "better-assert": "1.0.2"
      }
@@ -10748,6 +10951,11 @@
        "pinkie-promise": "2.0.1"
      }
    },
+    "pause": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+      "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10="
+    },
    "pbkdf2": {
      "version": "3.0.14",
      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
@@ -10813,6 +11021,11 @@
        }
      }
    },
+    "policyfile": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz",
+      "integrity": "sha1-1rgurZiueeviKOLa9ZAzEeyYLk0="
+    },
    "portfinder": {
      "version": "1.0.13",
      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz",
@@ -11809,7 +12022,6 @@
      "version": "0.3.1",
      "resolved": "https://registry.npmjs.org/pty.js/-/pty.js-0.3.1.tgz",
      "integrity": "sha1-gfW+0zLW5eeraFaI0boDc0ENUbU=",
-      "dev": true,
      "requires": {
        "extend": "1.2.1",
        "nan": "2.3.5"
@@ -11818,14 +12030,12 @@
        "extend": {
          "version": "1.2.1",
          "resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz",
-          "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=",
-          "dev": true
+          "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w="
        },
        "nan": {
          "version": "2.3.5",
          "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz",
-          "integrity": "sha1-gioNwmYpDOTNOhIoLKPn42Rmigg=",
-          "dev": true
+          "integrity": "sha1-gioNwmYpDOTNOhIoLKPn42Rmigg="
        }
      }
    },
@@ -12097,6 +12307,12 @@
        "strip-indent": "1.0.1"
      }
    },
+    "redis": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz",
+      "integrity": "sha1-7le3pE0l7BWU5ENl2BZfp9HUgRo=",
+      "optional": true
+    },
    "reduce-css-calc": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
@@ -12329,6 +12545,11 @@
        "inherits": "2.0.3"
      }
    },
+    "roboto-fontface": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.8.0.tgz",
+      "integrity": "sha512-ZYzRkETgBrdEGzL5JSKimvjI2CX7ioyZCkX2BpcfyjqI+079W0wHAyj5W4rIZMcDSOHgLZtgz1IdDi/vU77KEQ=="
+    },
    "run-queue": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -12349,8 +12570,7 @@
    "safe-buffer": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-      "dev": true
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
    },
    "sass-graph": {
      "version": "2.2.4",
@@ -12697,7 +12917,7 @@
        "engine.io": "3.1.0",
        "object-assign": "4.1.1",
        "socket.io-adapter": "1.1.1",
-        "socket.io-client": "2.0.3",
+        "socket.io-client": "2.0.4",
        "socket.io-parser": "3.1.2"
      }
    },
@@ -12707,16 +12927,16 @@
      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs="
    },
    "socket.io-client": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz",
-      "integrity": "sha1-bK9K/5+FsZ/ZG2zhPWmttWT4hzs=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz",
+      "integrity": "sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=",
      "requires": {
        "backo2": "1.0.2",
        "base64-arraybuffer": "0.1.5",
        "component-bind": "1.0.0",
        "component-emitter": "1.2.1",
        "debug": "2.6.8",
-        "engine.io-client": "3.1.1",
+        "engine.io-client": "3.1.4",
        "has-cors": "1.1.0",
        "indexof": "0.0.1",
        "object-component": "0.0.3",
@@ -13065,6 +13285,27 @@
        }
      }
    },
+    "stream-counter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz",
+      "integrity": "sha1-3tJmVWMZyLDiIoErnPOyb6fZR94=",
+      "requires": {
+        "readable-stream": "1.1.14"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        }
+      }
+    },
    "stream-each": {
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
@@ -13146,8 +13387,7 @@
    "string_decoder": {
      "version": "0.10.31",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
    },
    "stringstream": {
      "version": "0.0.5",
@@ -13305,6 +13545,11 @@
        "inherits": "2.0.3"
      }
    },
+    "term.js": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/term.js/-/term.js-0.0.7.tgz",
+      "integrity": "sha1-Um8kz8Dy72+A9RfJ4n2ulHvIcxU="
+    },
    "tether": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/tether/-/tether-1.4.0.tgz",
@@ -13384,6 +13629,11 @@
      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
      "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow=="
    },
+    "tinycolor": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz",
+      "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ="
+    },
    "tmp": {
      "version": "0.0.31",
      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
@@ -13580,6 +13830,194 @@
      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
      "dev": true
    },
+    "tty.js": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tty.js/-/tty.js-0.2.15.tgz",
+      "integrity": "sha1-iCM+qnPRhTqLyU6K94e3zcdUj6c=",
+      "requires": {
+        "express": "3.4.4",
+        "pty.js": "0.3.1",
+        "socket.io": "0.9.16",
+        "term.js": "0.0.7"
+      },
+      "dependencies": {
+        "base64id": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz",
+          "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8="
+        },
+        "bytes": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz",
+          "integrity": "sha1-VVsIq8sGP4l1kFMCUj5M1P/f3zE="
+        },
+        "commander": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz",
+          "integrity": "sha1-io8w7GcKb91kr1LxkUuQfXnq1bU=",
+          "requires": {
+            "keypress": "0.1.0"
+          }
+        },
+        "connect": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npmjs.org/connect/-/connect-2.11.0.tgz",
+          "integrity": "sha1-mZHOCf+bhdnq0n+dQdCyot8vkoQ=",
+          "requires": {
+            "buffer-crc32": "0.2.1",
+            "bytes": "0.2.1",
+            "cookie": "0.1.0",
+            "cookie-signature": "1.0.1",
+            "debug": "2.6.8",
+            "fresh": "0.2.0",
+            "methods": "0.0.1",
+            "multiparty": "2.2.0",
+            "negotiator": "0.3.0",
+            "pause": "0.0.1",
+            "qs": "0.6.5",
+            "raw-body": "0.0.3",
+            "send": "0.1.4",
+            "uid2": "0.0.3"
+          },
+          "dependencies": {
+            "methods": {
+              "version": "0.0.1",
+              "resolved": "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz",
+              "integrity": "sha1-J3yQ+L7zlwlkWoNxxRw7bGSOBow="
+            }
+          }
+        },
+        "cookie": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz",
+          "integrity": "sha1-kOtGndzpBchm3mh+/EMTHYgB+dA="
+        },
+        "cookie-signature": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz",
+          "integrity": "sha1-ROByFIrwHm6OJK+/EmkNaK5pjss="
+        },
+        "express": {
+          "version": "3.4.4",
+          "resolved": "https://registry.npmjs.org/express/-/express-3.4.4.tgz",
+          "integrity": "sha1-C2OuYmyWtxt40T384HnBA1FjWoY=",
+          "requires": {
+            "buffer-crc32": "0.2.1",
+            "commander": "1.3.2",
+            "connect": "2.11.0",
+            "cookie": "0.1.0",
+            "cookie-signature": "1.0.1",
+            "debug": "2.6.8",
+            "fresh": "0.2.0",
+            "methods": "0.1.0",
+            "mkdirp": "0.3.5",
+            "range-parser": "0.0.4",
+            "send": "0.1.4"
+          }
+        },
+        "fresh": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz",
+          "integrity": "sha1-v9lALPPfEsSkwxDHn5mj3eE9NKc="
+        },
+        "methods": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz",
+          "integrity": "sha1-M11Cnu/SG3us8unJIqjSvRSjDk8="
+        },
+        "mime": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA="
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc="
+        },
+        "nan": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz",
+          "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg="
+        },
+        "negotiator": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz",
+          "integrity": "sha1-cG1pLv7d9XTVfqn7GriaT6fuj2A="
+        },
+        "qs": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz",
+          "integrity": "sha1-KUsmjksNQlD23eGbO4s0k13/FO8="
+        },
+        "range-parser": {
+          "version": "0.0.4",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz",
+          "integrity": "sha1-wEJ//vUcEKy6B4KkbJYC50T/Ygs="
+        },
+        "raw-body": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz",
+          "integrity": "sha1-DLPrIs7RymB9Mt2P2Upus4Pz64o="
+        },
+        "send": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.1.4.tgz",
+          "integrity": "sha1-vnDY0b4B3mGCGvE3gLUDRaT3Gr0=",
+          "requires": {
+            "debug": "2.6.8",
+            "fresh": "0.2.0",
+            "mime": "1.2.11",
+            "range-parser": "0.0.4"
+          }
+        },
+        "socket.io": {
+          "version": "0.9.16",
+          "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz",
+          "integrity": "sha1-O6sEROSbVfu8FXQk29Qao3WlGnY=",
+          "requires": {
+            "base64id": "0.1.0",
+            "policyfile": "0.0.4",
+            "redis": "0.7.3",
+            "socket.io-client": "0.9.16"
+          }
+        },
+        "socket.io-client": {
+          "version": "0.9.16",
+          "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz",
+          "integrity": "sha1-TadRXF53MEHRtCOXBBW8xDDzX8Y=",
+          "requires": {
+            "active-x-obfuscator": "0.0.1",
+            "uglify-js": "1.2.5",
+            "ws": "0.4.32",
+            "xmlhttprequest": "1.4.2"
+          }
+        },
+        "uglify-js": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz",
+          "integrity": "sha1-tULCx29477NLIAsgF3Y0Mw/3ArY="
+        },
+        "ws": {
+          "version": "0.4.32",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz",
+          "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=",
+          "requires": {
+            "commander": "2.1.0",
+            "nan": "1.0.0",
+            "options": "0.0.6",
+            "tinycolor": "0.0.1"
+          },
+          "dependencies": {
+            "commander": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz",
+              "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E="
+            }
+          }
+        }
+      }
+    },
    "tunnel-agent": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -13676,6 +14114,11 @@
        }
      }
    },
+    "uid2": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz",
+      "integrity": "sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I="
+    },
    "ultron": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
@@ -14658,10 +15101,16 @@
      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
    },
+    "xmlhttprequest": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz",
+      "integrity": "sha1-AUU6HZvtHo8XL2SVu/TIxCYyFQA="
+    },
    "xmlhttprequest-ssl": {
      "version": "1.5.3",
      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
-      "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0="
+      "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=",
+      "dev": true
    },
    "xtend": {
      "version": "4.0.1",
@@ -14743,6 +15192,11 @@
      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
      "dev": true
    },
+    "zeparser": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz",
+      "integrity": "sha1-A3JlYbwmjy5URPVMZlt/1KjAKeI="
+    },
    "zone.js": {
      "version": "0.8.17",
      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.17.tgz",

--- a/package.json
+++ b/package.json
@@ -40,12 +40,15 @@
    "ng2-charts": "^1.5.0",
    "ng2-cookies": "^1.0.12",
    "ngx-bootstrap": "^1.6.6",
-    "npm": "^5.5.1",
+    "npm": "^5.6.0",
    "peity": "^3.2.1",
+    "roboto-fontface": "^0.8.0",
    "rxjs": "^5.4.2",
    "socket.io": "^2.0.3",
+    "socket.io-client": "^2.0.4",
    "ssh-keygen": "^0.4.1",
    "tether": "^1.4.0",
+    "tty.js": "^0.2.15",
    "xterm": "^2.9.2",
    "zone.js": "^0.8.14"
  },
@@ -67,7 +70,6 @@
    "karma-jasmine-html-reporter": "^0.2.2",
    "node-sass": "^4.7.2",
    "protractor": "~5.1.2",
-    "pty.js": "^0.3.1",
    "ts-node": "~3.2.0",
    "tslint": "~5.3.2",
    "typescript": "~2.3.3"

--- a/proxy.conf.json
+++ b/proxy.conf.json
 {
  "/api": {
-    "target": "http://localhost:3000",
+    "target": "http://localhost:5000",
    "secure": false
  },
  "/socket.io/": {
-    "target": "http://127.0.0.1:3000",
+    "target": "http://127.0.0.1:5000",
    "secure": false
  },
  "/rdp/socket.io/": {

--- a/src/app/ControlPage/cleftbar/cleftbar.component.html
+++ b/src/app/ControlPage/cleftbar/cleftbar.component.html
@@ -9,8 +9,8 @@
      <input type="checkbox" id="hostgroup-{{i}}">
      <label for="hostgroup-{{i}}">{{hostGroup.name}}</label>
      <ul>
-        <li *ngFor="let host of hostGroup.assets | SearchFilter: q" (click)="Connect(host)">
-          <i class="fa" [ngClass]="'fa-'+host.system" id="rdp-{{i}}"></i>
+        <li *ngFor="let host of hostGroup.assets_granted | SearchFilter: q" (click)="Connect(host)">
+          <i class="fa" [ngClass]="'fa-'+host.system" id="fa-{{i}}"></i>
          {{host.hostname}}
        </li>
      </ul>

--- a/src/app/ControlPage/cleftbar/cleftbar.component.ts
+++ b/src/app/ControlPage/cleftbar/cleftbar.component.ts
@@ -20,13 +20,13 @@ declare let jQuery: any;

 export class HostGroup {
  name: string;
-  id: number;
+  id: string;
  children: Array<Host>;
 }

 export class Host {
  name: string;
-  uuid: string;
+  id: string;
  type: string;
 }

@@ -95,9 +95,9 @@ export class CleftbarComponent implements OnInit {
  Connect(host) {
    console.log(host);
    let username: string;
-    if (host.system_users.length > 1) {
+    if (host.system_users_granted.length > 1) {
      let options = '';
-      for (let u of host.system_users) {
+      for (let u of host.system_users_granted) {
        options += '<option value="' + u.username + '">' + u.username + '</option>';
      }
      layer.open({
@@ -118,12 +118,15 @@ export class CleftbarComponent implements OnInit {
          // return false 开启该代码可禁止点击该按钮关闭
        }
      });
-    } else if (host.system_users.length === 1) {
-      username = host.system_users[0].username;
+    } else if (host.system_users_granted.length === 1) {
+      username = host.system_users_granted[0].username;
    }
    if (username === '') {
      return;
    }
+      jQuery('app-ssh').show();
+      jQuery('app-rdp').hide();
+      this._term.TerminalConnect(host, username);
    if (host.system === 'linux') {
      jQuery('app-ssh').show();
      jQuery('app-rdp').hide();

--- a/src/app/ControlPage/control/ssh/ssh.component.ts
+++ b/src/app/ControlPage/control/ssh/ssh.component.ts
@@ -49,6 +49,7 @@ export class SshComponent implements OnInit {
  }

  TerminalConnect(host, username) {
+  console.log(host,username);
    const socket = io.connect('/ssh');
    let cols = '80';
    let rows = '24';
@@ -69,7 +70,7 @@ export class SshComponent implements OnInit {
    NavList.List[id].closed = false;
    NavList.List[id].type = 'ssh';
    NavList.List[id].Term = new Term;
-    NavList.List[id].Term.machine = host.uuid;
+    NavList.List[id].Term.machine = host.id;
    NavList.List[id].Term.socket = socket;
    NavList.List[id].Term.term = new Terminal({
      cols: cols,
@@ -98,7 +99,7 @@ export class SshComponent implements OnInit {
    NavList.List[id].Term.term.write('\x1b[31mWelcome to Jumpserver!\x1b[m\r\n');

    socket.on('connect', function () {
-      socket.emit('host', {'uuid': host.uuid, 'user': username});
+      socket.emit('host', {'uuid': host.id, 'user': username});

      NavList.List[id].Term.term.on('data', function (data) {
        socket.emit('data', data);
@@ -110,7 +111,7 @@ export class SshComponent implements OnInit {
      });

      socket.on('disconnect', function () {
-        this.TerminalDisconnect(id);
+        this.TerminalDisconnect(NavList.List[id]);
        // TermStore.term[id]["term"].destroy();
        // TermStore.term[id]["connected"] = false;
      });
@@ -122,10 +123,10 @@ export class SshComponent implements OnInit {
        let cols = 80;

        if (Cookie.get('rows')) {
-          rows = parseInt(Cookie.get('rows'));
+          rows = parseInt(Cookie.get('rows'), 10);
        }
        if (Cookie.get('cols')) {
-          cols = parseInt(Cookie.get('cols'));
+          cols = parseInt(Cookie.get('cols'), 10);
        }
        if (col < 80) {
          col = 80;

--- a/src/app/app.service.ts
+++ b/src/app/app.service.ts
@@ -18,14 +18,14 @@ declare let jQuery: any;
 import * as io from 'socket.io-client';

 export class Group {
-  id: number;
+  id: string;
  name: string;
  membercount: number;
  comment: string;
 }

 export let User: {
-  id: number;
+  id: string;
  name: string;
  username: string;
  password: string;
@@ -39,7 +39,7 @@ export let User: {
  groups: Array<Group>;
  logined: boolean;
 } = {
-  id: 0,
+  id: '',
  name: 'nobody',
  username: '',
  password: '',

--- a/src/styles.css
+++ b/src/styles.css
@@ -30,7 +30,9 @@ app-root {
  padding-bottom: 16px !important;
  font-family: 'Monaco', iosevka !important;
 }
-
+.terminal{
+   white-space: nowrap;
+}
 .terminal, .terminal .xterm-viewport {
  background-color: inherit;
 }