Standalone windows patch

dts/typings/pty.js/pty.js.d.ts → dts/typings/ptyw.js/ptyw.js.d.ts

@@ -5,7 +5,7 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'pty.js' {
+declare module 'ptyw.js' {
     /** Options that can be used when creating a new pseudo-terminal. */
     interface TerminalOptions {
         name?: string;

package.json

@@ -29,7 +29,7 @@
     "lodash": "3.10.1",
     "node-ansiparser": "2.0.2",
     "octicons": "2.4.1",
-    "pty.js": "0.3.0",
+    "ptyw.js": "^0.3.2",
     "react": "0.13.3",
     "react-json-inspector": "5.2.1",
     "rx": "3.1.2"

src/Aliases.ts

@@ -1,5 +1,5 @@
-import * as pty from 'pty.js';
-import * as _ from 'lodash'
+import * as pty from 'ptyw.js';
+import * as _ from 'lodash';
 
 export default class Aliases {
     static aliases: _.Dictionary<string>;
@@ -14,6 +14,8 @@ export default class Aliases {
     }
 
     private static importAliases(shellName: string = process.env.SHELL): void {
+        if (process.platform === 'win32') return;
+
         var shell = pty.spawn(shellName, ['-i', '-c', 'alias'], {env: process.env});
 
         var aliases = '';

src/Buffer.ts

@@ -34,7 +34,10 @@ export default class Buffer extends events.EventEmitter {
         var current = {attributes: <i.Attributes>null, text: ''};
         var cursorPosition = cursor.getPosition();
 
-        if (index === cursorPosition.row && this.cursor.getShow()) {
+        /* Quick fix for the strange character at the end (https://github.com/black-screen/black-screen/pull/56#issuecomment-139653723) */
+        if (process.platform === 'win32' && row.length < 1) return;
+
+        if (index == cursorPosition.row && this.cursor.getShow()) {
             var rowWithCursor: Char[] = [];
 
             for (var i = 0; i !== row.length; ++i) {

src/Command.ts

@@ -1,13 +1,14 @@
 import * as fs from 'fs';
 import * as Path from 'path';
+import Utils from './Utils';
 
 // A class representing built in commands
 export default class Command {
     static cd(currentDirectory: string, args: Array<string>): string {
         if (!args.length) {
-            return process.env.HOME;
+            return Utils.getHomeDirectory();
         }
-        var path = args[0].replace(/^~/, process.env.HOME);
+        var path = args[0].replace(/^~/, Utils.getHomeDirectory());
         var newDirectory = Path.resolve(currentDirectory, path);
 
         if (!fs.existsSync(newDirectory)) {
@@ -21,7 +22,7 @@ export default class Command {
         return newDirectory;
     }
 
-    static isBuiltIn(command: String): any {
+    static isBuiltIn(command: string): any {
         return command === 'cd';
     }
 }

src/CommandExecutor.ts

@@ -1,7 +1,8 @@
 import Invocation from "./Invocation";
 import Command from "./Command";
 import Utils from './Utils';
-import * as pty from 'pty.js';
+import * as Path from 'path';
+import * as pty from 'ptyw.js';
 import * as _ from 'lodash';
 
 abstract class CommandExecutionStrategy {
@@ -63,6 +64,47 @@ class SystemFileExecutionStrategy extends CommandExecutionStrategy {
     }
 }
 
+class WindowsSystemFileExecutionStrategy extends CommandExecutionStrategy {
+    static canExecute(command: string): Promise<boolean> {
+        return new Promise(resolve => Utils.getExecutablesInPaths().then(executables => resolve(_.include(executables, command))));
+    }
+
+    startExecution() {
+        return new Promise((resolve, reject) => {
+            this.args.unshift(this.command);
+            this.args = ['/s', '/c', this.args.join(' ')];
+            this.command = this.cmdPath;
+
+            this.invocation.command = pty.spawn(this.command, this.args, {
+                cols: this.invocation.dimensions.columns,
+                rows: this.invocation.dimensions.rows,
+                cwd: this.invocation.directory,
+                env: process.env
+            });
+
+            this.invocation.command.stdout.on('data', (data: string) => this.invocation.parser.parse(data.toString()));
+            this.invocation.command.on('exit', (code: number) => {
+                /* In windows there is no code returned (null) so instead of comparing to 0 we check if its 0 or null with ! */
+                if (Number(code) === 0) {
+                    resolve();
+                } else {
+                    reject();
+                }
+            })
+        })
+    }
+
+    private get cmdPath(): string {
+        if (process.env.comspec) {
+            return process.env.comspec;
+        }
+        else if (process.env.SystemRoot) {
+            return require('path').join(process.env.SystemRoot, 'System32', 'cmd.exe');
+        }
+        else return 'cmd.exe';
+    }
+}
+
 class NullExecutionStrategy extends CommandExecutionStrategy {
     static canExecute(command: string): Promise<boolean> {
         return new Promise(resolve => resolve(true));
@@ -76,14 +118,17 @@ class NullExecutionStrategy extends CommandExecutionStrategy {
 export default class CommandExecutor {
     private static executors = [
         BuiltInCommandExecutionStrategy,
-        SystemFileExecutionStrategy,
+        process.platform === 'win32' ? WindowsSystemFileExecutionStrategy : SystemFileExecutionStrategy
     ];
 
     static execute(invocation: Invocation): Promise<CommandExecutionStrategy> {
         var command = invocation.getPrompt().getCommandName();
 
-        return Utils.filterWithPromising(this.executors.concat(NullExecutionStrategy), executor => executor.canExecute(command))
-            .then(applicableExecutors => new applicableExecutors[0](invocation, command).startExecution());
+        return Utils.filterWithPromising(
+            this.executors.concat(NullExecutionStrategy), 
+            executor => executor.canExecute(command))
+                .then(applicableExecutors => new applicableExecutors[0](invocation, command).startExecution()
+        );
     }
 }
 

src/Invocation.ts

@@ -1,6 +1,6 @@
 /// <reference path="references.ts" />
 
-import * as pty from 'pty.js';
+import * as pty from 'ptyw.js';
 import * as child_process from 'child_process';
 import * as _ from 'lodash';
 import * as React from 'react';

src/Terminal.ts

@@ -16,11 +16,11 @@ export default class Terminal extends events.EventEmitter {
     history: History;
     gitBranchWatcher: fs.FSWatcher;
 
-    private stateFileName = `${process.env.HOME}/.black-screen-state`;
+    private stateFileName = `${Utils.getHomeDirectory()}/.black-screen-state`;
 
     // The value of the dictionary is the default value used if there is no serialized data.
     private serializableProperties: _.Dictionary<any> = {
-        currentDirectory: `String:${process.env.HOME}`,
+        currentDirectory: `String:${Utils.getHomeDirectory()}`,
         history: `History:[]`
     };
 
@@ -37,14 +37,17 @@ export default class Terminal extends events.EventEmitter {
 
     createInvocation(): void {
         var invocation = new Invocation(this.currentDirectory, this.dimensions, this.history);
-        invocation.once('end', () => {
-            if (app.dock) {
-                app.dock.bounce('informational');
-            }
-            this.createInvocation();
-        }).once('working-directory-changed', (newWorkingDirectory: string) =>
-            this.setCurrentDirectory(newWorkingDirectory)
-        );
+
+        invocation
+            .once('clear', _ => this.clearInvocations())
+            .once('end', _ => {
+                if (app.dock) {
+                    app.dock.bounce('informational');
+                }
+                this.createInvocation();
+            })
+            .once('working-directory-changed', (newWorkingDirectory: string) => this.setCurrentDirectory(newWorkingDirectory));
+
         this.invocations = this.invocations.concat(invocation);
         this.emit('invocation');
     }

src/Utils.ts

@@ -123,6 +123,10 @@ export default class Utils {
         });
     }
 
+    static getHomeDirectory(): string {
+        return process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
+    }
+
     private static delegate(name: string, args: Array<any>): void {
         if ((typeof window !== 'undefined') && (<any>window)['DEBUG']) {
             (<any>console)[name](...args);

src/references.ts

@@ -6,4 +6,4 @@
 /// <reference path="../dts/typings/jquery/jquery.d.ts" />
 /// <reference path="../dts/typings/lodash/lodash.d.ts" />
 /// <reference path="../dts/typings/react/react.d.ts" />
-/// <reference path="../dts/typings/pty.js/pty.js.d.ts" />
+/// <reference path="../dts/typings/ptyw.js/ptyw.js.d.ts" />