Merge remote-tracking branch 'upstream/dev' into dev

Author: Xavier Hahn

appveyor.yml

@@ -28,17 +28,17 @@ artifacts:
 #  - build.cmd verify
 clone_depth: 1
 test_script:
-  - dotnet restore ./src
-  - npm install -g selenium-standalone
-  - selenium-standalone install
+  # - dotnet restore ./src
+  # - npm install -g selenium-standalone
+  # - selenium-standalone install
   # The nosys flag is needed for selenium to work on Appveyor
-  - ps: Start-Process selenium-standalone 'start','--','-Djna.nosys=true'
-  - ps: Push-Location
-  - cd test
-  - npm install
-  - npm test
+  # - ps: Start-Process selenium-standalone 'start','--','-Djna.nosys=true'
+  # - ps: Push-Location
+  # - cd test
+  # - npm install
+  # - npm test
 on_finish :
-  - ps: Pop-Location
+  # - ps: Pop-Location
   # After running tests, upload results to Appveyor
-  - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test\tmp\junit\*.xml))
+  # - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test\tmp\junit\*.xml))
 deploy: off

makefile.shade

@@ -5,5 +5,10 @@ var AUTHORS='Microsoft Open Technologies, Inc.'
 var TEST_PROJECT_GLOB='templates/*/project.json'
 var SAMPLES_PROJECT_GLOB='samples/misc/*/project.json'
 
+@{
+    // The build quality values are set in each of the project.json files
+    BuildQuality = "";
+}
+
 use-standard-lifecycle
 k-standard-goals

samples/react/MusicStore/ReactApp/configureStore.ts

@@ -1,4 +1,4 @@
-import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer } from 'redux';
+import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer, Store as ReduxStore } from 'redux';
 import thunk from 'redux-thunk';
 import { routerReducer } from 'react-router-redux';
 import * as Store from './store';
@@ -16,7 +16,7 @@ export default function configureStore(initialState?: Store.ApplicationState) {
 
     // Combine all reducers and instantiate the app-wide store instance
     const allReducers = buildRootReducer(Store.reducers);
-    const store = createStoreWithMiddleware(allReducers, initialState) as Redux.Store<Store.ApplicationState>;
+    const store = createStoreWithMiddleware(allReducers, initialState) as ReduxStore<Store.ApplicationState>;
 
     // Enable Webpack hot module replacement for reducers
     if (module.hot) {

samples/react/MusicStore/package.json

@@ -2,6 +2,7 @@
   "name": "music-store",
   "version": "0.0.0",
   "dependencies": {
+    "@types/history": "^2.0.0",
     "@types/react": "^0.14.29",
     "@types/react-bootstrap": "^0.0.35",
     "@types/react-dom": "^0.14.14",
@@ -41,7 +42,7 @@
     "redux-typed": "^2.0.0",
     "style-loader": "^0.13.0",
     "ts-loader": "^0.8.1",
-    "typescript": "2.0.3",
+    "typescript": "^2.0.3",
     "url-loader": "^0.5.7",
     "webpack": "^1.13.2",
     "webpack-hot-middleware": "^2.12.2",

samples/react/MusicStore/tsconfig.json

@@ -1,11 +1,19 @@
 {
   "compilerOptions": {
+    "baseUrl": ".",
     "moduleResolution": "node",
     "target": "es6",
     "jsx": "preserve",
     "sourceMap": true,
     "experimentalDecorators": true,
-    "types": [ "webpack-env", "whatwg-fetch" ]
+    "types": [ "webpack-env", "whatwg-fetch" ],
+    "paths": {
+      // Fix "Duplicate identifier" errors caused by multiple dependencies fetching their own copies of type definitions.
+      // We tell TypeScript which type definitions module to treat as the canonical one (instead of combining all of them).
+      "history": ["./node_modules/@types/history/index"],
+      "redux": ["./node_modules/@types/redux/index"],
+      "react": ["./node_modules/@types/react/index"]
+    }
   },
   "exclude": [
       "node_modules"

src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs

@@ -62,11 +62,15 @@ protected override async Task<T> InvokeExportAsync<T>(NodeInvocationInfo invocat
         {
             if (_connectionHasFailed)
             {
+                // _connectionHasFailed implies a protocol-level error. The old instance is no longer of any use.
+                var allowConnectionDraining = false;
+
                 // This special exception type forces NodeServicesImpl to restart the Node instance
                 throw new NodeInvocationException(
                     "The SocketNodeInstance socket connection failed. See logs to identify the reason.",
-                    null,
-                    nodeInstanceUnavailable: true);
+                    details: null,
+                    nodeInstanceUnavailable: true,
+                    allowConnectionDraining: allowConnectionDraining);
             }
 
             if (_virtualConnectionClient == null)

src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationException.cs

@@ -13,6 +13,13 @@ public class NodeInvocationException : Exception
         /// </summary>
         public bool NodeInstanceUnavailable { get; private set; }
 
+        /// <summary>
+        /// If true, indicates that even though the invocation failed because the Node.js instance could not be reached
+        /// or needs to be restarted, that Node.js instance may remain alive for a period in order to complete any
+        /// outstanding requests.
+        /// </summary>
+        public bool AllowConnectionDraining { get; private set;}
+
         /// <summary>
         /// Creates a new instance of <see cref="NodeInvocationException"/>.
         /// </summary>
@@ -29,10 +36,20 @@ public NodeInvocationException(string message, string details)
         /// <param name="message">A description of the exception.</param>
         /// <param name="details">Additional information, such as a Node.js stack trace, representing the exception.</param>
         /// <param name="nodeInstanceUnavailable">Specifies a value for the <see cref="NodeInstanceUnavailable"/> flag.</param>
-        public NodeInvocationException(string message, string details, bool nodeInstanceUnavailable)
+        /// <param name="allowConnectionDraining">Specifies a value for the <see cref="AllowConnectionDraining"/> flag.</param>
+        public NodeInvocationException(string message, string details, bool nodeInstanceUnavailable, bool allowConnectionDraining)
             : this(message, details)
         {
+            // Reject a meaningless combination of flags
+            if (allowConnectionDraining && !nodeInstanceUnavailable)
+            {
+                throw new ArgumentException(
+                    $"The '${ nameof(allowConnectionDraining) }' parameter cannot be true " +
+                    $"unless the '${ nameof(nodeInstanceUnavailable) }' parameter is also true.");
+            }
+
             NodeInstanceUnavailable = nodeInstanceUnavailable;
+            AllowConnectionDraining = allowConnectionDraining;
         }
     }
 }

src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs

@@ -42,6 +42,7 @@ npm install -g node-inspector
         private readonly StringAsTempFile _entryPointScript;
         private FileSystemWatcher _fileSystemWatcher;
         private int _invocationTimeoutMilliseconds;
+        private bool _launchWithDebugging;
         private readonly Process _nodeProcess;
         private int? _nodeDebuggingPort;
         private bool _nodeProcessNeedsRestart;
@@ -78,9 +79,10 @@ public OutOfProcessNodeInstance(
             OutputLogger = nodeOutputLogger;
             _entryPointScript = new StringAsTempFile(entryPointScript);
             _invocationTimeoutMilliseconds = invocationTimeoutMilliseconds;
+            _launchWithDebugging = launchWithDebugging;
 
             var startInfo = PrepareNodeProcessStartInfo(_entryPointScript.FileName, projectPath, commandLineArguments,
-                environmentVars, launchWithDebugging, debuggingPort);
+                environmentVars, _launchWithDebugging, debuggingPort);
             _nodeProcess = LaunchNodeProcess(startInfo);
             _watchFileExtensions = watchFileExtensions;
             _fileSystemWatcher = BeginFileWatcher(projectPath);
@@ -103,10 +105,17 @@ public async Task<T> InvokeExportAsync<T>(
             {
                 // This special kind of exception triggers a transparent retry - NodeServicesImpl will launch
                 // a new Node instance and pass the invocation to that one instead.
+                // Note that if the Node process is listening for debugger connections, then we need it to shut
+                // down immediately and not stay open for connection draining (because if it did, the new Node
+                // instance wouldn't able to start, because the old one would still hold the debugging port).
                 var message = _nodeProcess.HasExited
                     ? "The Node process has exited"
                     : "The Node process needs to restart";
-                throw new NodeInvocationException(message, null, nodeInstanceUnavailable: true);
+                throw new NodeInvocationException(
+                    message,
+                    details: null,
+                    nodeInstanceUnavailable: true,
+                    allowConnectionDraining: !_launchWithDebugging);
             }
 
             // Construct a new cancellation token that combines the supplied token with the configured invocation

src/Microsoft.AspNetCore.NodeServices/NodeServicesImpl.cs

@@ -72,7 +72,8 @@ private async Task<T> InvokeExportWithPossibleRetryAsync<T>(string moduleName, s
                     {
                         if (_currentNodeInstance == nodeInstance)
                         {
-                            DisposeNodeInstance(_currentNodeInstance, delay: ConnectionDrainingTimespan);
+                            var disposalDelay = ex.AllowConnectionDraining ? ConnectionDrainingTimespan : TimeSpan.Zero;
+                            DisposeNodeInstance(_currentNodeInstance, disposalDelay);
                             _currentNodeInstance = null;
                         }
                     }

src/Microsoft.AspNetCore.NodeServices/project.json

@@ -1,6 +1,6 @@
 {
   "description": "Invoke Node.js modules at runtime in ASP.NET Core applications.",
-  "version": "1.1.0-beta2-*",
+  "version": "1.1.0-rc2-*",
   "packOptions": {
     "repository": {
       "type": "git",