fix(console) event path -> label

Author: coderaiser

README.md

@@ -36,15 +36,6 @@ For more details see [Jq-console keyboard shortcuts](https://github.com/replit/j
 
 ### Client API
 
-`Console` inhertis from [Emitify](https://github.com/coderaiser/emitify) so you can subscribe to next events:
-
-- `path`
-
-```js
-const konsole = Console();
-konsole.on('path', console.log);
-```
-
 #### Console(element [, options, prefix], callback)
 
 - element   - html element, or selector

client/console.js

@@ -8,8 +8,6 @@ require('../css/ansi.css');
 module.exports = ConsoleProto;
 
 const load = require('load.js');
-const inherits = require('inherits');
-const Emitify = require('emitify/legacy');
 const currify = require('currify/legacy');
 const getHost = require('./get-host');
 const getEnv = require('./get-env');
@@ -18,8 +16,6 @@ const isFn = (fn) => typeof fn === 'function';
 const exec = (fn, ...a) => isFn(fn) && fn(...a);
 const sum = currify((a, b) => a + b);
 
-inherits(ConsoleProto, Emitify);
-
 function ConsoleProto(element, options, callback) {
     let Spawn;
     let jqconsole;
@@ -28,7 +24,6 @@ function ConsoleProto(element, options, callback) {
     if (!(this instanceof ConsoleProto))
         return new ConsoleProto(element, options, callback);
 
-    Emitify.call(this);
     Console(element, options, callback);
 
     const self = this;
@@ -212,15 +207,13 @@ function ConsoleProto(element, options, callback) {
                     self.setPromptText(promptText.pop());
             });
 
-            socket.on('path', (path) => {
+            socket.on('label', (path) => {
                 if (commands.length)
                     execute(commands.pop(), env);
                 else
                     setPromptLabel(path + '> ');
 
                 cwd = path;
-                
-                self.emit('path', path);
             });
 
             socket.on('connect', () => {

package.json

@@ -40,7 +40,8 @@
     "rendy": "^1.1.0",
     "socket.io": "^2.0.1",
     "spawnify": "^4.0.0",
-    "tildify": "^1.2.0"
+    "tildify": "^1.2.0",
+    "untildify": "^3.0.2"
   },
   "devDependencies": {
     "babel-core": "^6.25.0",
@@ -49,7 +50,6 @@
     "babel-preset-env": "^1.6.0",
     "clean-css-loader": "^0.1.2",
     "css-loader": "^0.28.4",
-    "emitify": "^3.1.0",
     "eslint": "^4.0.0",
     "inherits": "^2.0.3",
     "load.js": "^1.1.5",

server/console.js

@@ -3,14 +3,23 @@
 const io = require('socket.io');
 const tildify = require('tildify');
 const debug = require('debug');
+
 const logConsole = debug('console');
 const logClients = debug('console:clients');
+const rmLastSlash = (a) => a.replace(/\/$/, '') || '/';
 
 const WIN = process.platform === 'win32';
 const CWD = process.cwd();
 
 const Clients = [];
 
+const cwd = (conNum) => (path) => {
+    if (!path)
+        return Clients[conNum].cwd;
+    
+    Clients[conNum].cwd = path;
+};
+
 let Socket;
 let ConNum = -1;
 
@@ -62,7 +71,7 @@ function onConnection(options, socket) {
     const dir = WIN ? cwd : tildify(cwd);
 
     socket.emit('data', msg);
-    socket.emit('path', options.prompt || dir);
+    socket.emit('label', options.prompt || rmLastSlash(dir));
     socket.emit('prompt');
 
     Clients[ConNum] = {
@@ -100,15 +109,6 @@ function processing(socket, conNum, fn, command) {
     fn(socket, command, cwd(conNum));
 }
 
-function cwd(conNum) {
-    return (path) => {
-        if (!path)
-            return Clients[conNum].cwd;
-        
-        Clients[conNum].cwd = path;
-    };
-}
-
 function getType(type) {
     if (!type)
         return ' ';

server/index.js

@@ -7,12 +7,16 @@ const join = require('join-io');
 const spawnify = require('spawnify');
 const rendy = require('rendy');
 
+const untildify = require('untildify');
 const express = require('express');
 const currify = require('currify/legacy');
 const Router = express.Router;
 
 const modules = require('../json/modules');
 
+const rmLastSlash = (a) => a.replace(/\/$/, '') || '/';
+const addLastSlash = (a) => a[a.length - 1] === '/' ? a : `${a}/`;
+
 const modulesFn = currify(_modulesFn);
 const joinFn = currify(_joinFn);
 const konsoleFn = currify(_konsoleFn);
@@ -169,7 +173,9 @@ function execute(socket, command, cwd) {
     }
 
     function onPath(path) {
-        socket.emit('path', path);
+        socket.emit('label', rmLastSlash(path));
+        socket.emit('path', addLastSlash(untildify(path)));
+        
         cwd(path);
     }