Fixes for Windows

Author: jfrux

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/node:8.10.0
+      - image: circleci/node:8.14.0
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -19,19 +19,9 @@ jobs:
     steps:
       - checkout
 
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "package.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
+      - run: npm run setup
 
-      - run: yarn install
-
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
+      - run: npm run package
 
       # run tests!
       # - run: yarn test

app/components/Layout/index.js

@@ -64,7 +64,7 @@ class Layout extends React.PureComponent {
           <div className={'top-bar'}>
           {isMac && <span className={'title'}>{title}</span>}
           {!isMac && 
-            <TitleBar menu={windowsMenu} icon={"https://github.com/openpilot-community/workbench/blob/master/resources/icons/36x36.png?raw=true"}>
+            <TitleBar menu={windowsMenu} icon={"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAALEsAACxLAaU9lqkAAALDSURBVFhH7ZU/TFNRFMZPsBsdnHSwsWLUikrbR9tXSKsV/0HSRBONOlQWrE2jLCwGHJTB6KQbGyiYghRf7YUCCoqEPwIONgwkdmM0aVNdYNNT73tUpO2JifHdTv2SX3rSnO9+X95rbqGiinTTkn8fJK8Mw+KlZZi5WB7UrM+XozDbYsq32KHktT64K+XAsru8qJnJ68/yLXZo+cY42Pcin8qLbQ/CUmCCz0X62MagwbS9aDabMRgMYmNjY+EBeqNmLtwc5XORFm/HoWG/tlRTU4PpdBp/KxAIlB6kF26euXCH8blI8x0M3Ae0pVAolK+ypVQqhVVVVaWH6YGaOddBPKHZLl7ooLYkSVK+ypYymQwajcbSw/RA5pmzXUShmW4G8uHtRa/Xi+FwGCORCGazWTQYDIUH6YV8COFDN1Ho/SNeyFJiiMVimEgkSr7XDdcRhHePiULTTxi4aguW3W43bm5uYm1t4fe64jqKMPWUKDTVwwsd15bUH3Brayuura2h3+/fNsuyjL29vQX897XgPIbwtocoNNnHwFmnLVVXV2N7ezuaTH/uJRWPx6O9QkVRNNTZ5/MV7PwzzhPIs6lCQ3Fw2miTSBxWhIlB4h4aj8XBIdEmkTjsCAmFKDSWYOBw0CaR1NcjjI4Rr4xNM6h30SaRqJnxKaJQbJ4XctMmkUg88/UcUUj5xEAS/M9OoWYqK0ShkVVeyEObRGLnmdFVolD0CwP7KdokEvtJhOEUUWh4nRc6TZtEYuMX68t1otDQ1zjYztAmkdiakGcT91DkGy90jjaJxHoWYfA7UejFBgPrBdokEut5hIEN4pX1/2RQ10ybRFLHH8LzH0ShAZwES1OOT7RRFBZfDvrxDZ+LNID3oXMlBy33ctDcxVE//4YOO2pW57Ja6EG+xQ5dze2CEQzCKD6EV2ViK+uWll1RRboI4BdIk2xIFFBxogAAAABJRU5ErkJggg=="}>
               <span className={'title'}>{title}</span>
             </TitleBar>}
           </div>

app/components/Terminal.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-use-before-define */
 import React from 'react';
+import defaultShell from '../main/default-shell';
 import PropTypes from 'prop-types';
 import { Terminal } from 'xterm';
 import electron from 'electron';
@@ -17,8 +18,8 @@ import * as webLinks from 'xterm/lib/addons/webLinks/webLinks';
 import * as fullscreen from 'xterm/lib/addons/fullscreen/fullscreen';
 import * as search from 'xterm/lib/addons/search/search';
 import * as winptyCompat from 'xterm/lib/addons/winptyCompat/winptyCompat';
+const fs = require('fs');
 import processClipboard from '../utils/paste';
-console.log(processClipboard);
 const { ipcRenderer, remote, clipboard } = electron;
 const { app } = remote;
 

app/main/services/server.js

@@ -58,6 +58,7 @@ module.exports = {
 
       app.post('/terminals', function (req, res) {
         let shell = defaultShell;
+        writeLog("Using shell...",shell);
         let cols = parseInt(req.query.cols, 10);
         let rows = parseInt(req.query.rows, 10);
         let term = pty.fork(shell, [], {

app/package.json

@@ -19,8 +19,10 @@
     "bufferutil": "^4.0.0",
     "ndb-node-pty-prebuilt": "^0.8.0",
     "net-ping": "^1.2.3",
+    "node-pty-prebuilt": "^0.7.6",
     "raw-socket": "^1.6.4",
     "utf-8-validate": "^5.0.1",
-    "winattr": "^2.0.0"
+    "winattr": "^2.0.0",
+    "zeromq": "^5.1.0"
   }
 }

app/sagas/network_scanner_sagas.js

@@ -215,6 +215,7 @@ function pingEon(eon) {
 }
 
 function* handlePingEon(action) {
+  console.warn(`[NetworkScanner] Pinging IP address to check validity`,action);
   const eon = action.payload.data;
   yield put(eonListActions.PING_EON(eon));
   try {

appveyor.yml

@@ -5,7 +5,7 @@ platform:
 
 environment:
   matrix:
-    - nodejs_version: 8
+    - nodejs_version: 8.14.0
   GH_TOKEN:
     secure: JQTogieeX60CDa5l+4NGvmE3do+t8iDPrrppjHYfGbx2vlGMvNUtPbJvnsqZ07tF
 
@@ -19,18 +19,18 @@ matrix:
   fast_finish: true
 
 build: off
-deploy:
-  release: v$(appveyor_build_version)
-  description: 'Features'
-  provider: GitHub
-  auth_token:
-    secure: 'JQTogieeX60CDa5l+4NGvmE3do+t8iDPrrppjHYfGbx2vlGMvNUtPbJvnsqZ07tF' # your encrypted token from GitHub
-  artifact: /.*\.exe/            # upload all NuGet packages to release assets
-  draft: false
-  prerelease: false
-  on:
-    branch: master                 # release from master branch only
-    appveyor_repo_tag: true
+# deploy:
+#   release: v$(appveyor_build_version)
+#   description: 'Features'
+#   provider: GitHub
+#   auth_token:
+#     secure: 'JQTogieeX60CDa5l+4NGvmE3do+t8iDPrrppjHYfGbx2vlGMvNUtPbJvnsqZ07tF' # your encrypted token from GitHub
+#   artifact: /.*\.exe/            # upload all NuGet packages to release assets
+#   draft: false
+#   prerelease: false
+#   on:
+#     branch: master                 # release from master branch only
+#     appveyor_repo_tag: true
 version: '{build}'
 
 shallow_clone: true
@@ -42,7 +42,9 @@ install:
   - set CI=true
   # NOTE: Remove this if your project is private and you don't have a paid greenkeeper account
   # - yarn global add greenkeeper-lockfile@2
-  - yarn
+  - npm run setup
+  - npm run build-dll
+  - npm run package
 
 # NOTE: Remove this if your project is private and you don't have a paid greenkeeper account
 # before_test: