Merge remote-tracking branch 'origin/v2.5' into master

Author: AArnott

src/Nerdbank.Streams/Nerdbank.Streams.csproj

@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" PrivateAssets="compile" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.7.56" PrivateAssets="build;analyzers;compile" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.7.56" PrivateAssets="all" />

src/nerdbank-streams/.gitignore

@@ -1,4 +1,6 @@
 dist/
-*.js
+out/
+asyncprocess.js
+gulpfile.js
 *.d.ts
 *.js.map

src/nerdbank-streams/gulpfile.ts

@@ -17,9 +17,14 @@ async function copyPackageContents() {
         .src([
             "package.json",
             "README.md",
-            "out/*",
         ])
         .pipe(gulp.dest(outDir));
+        await gulp
+        .src(["out/*"])
+        .pipe(gulp.dest(path.join(outDir, 'js')));
+        await gulp
+        .src(["src/*"])
+        .pipe(gulp.dest(path.join(outDir, 'src')));
 }
 
 async function setPackageVersion() {

src/nerdbank-streams/package.json

@@ -8,7 +8,7 @@
     "multiplexing",
     "duplex"
   ],
-  "main": "index.js",
+  "main": "js/index.js",
   "homepage": "https://github.com/AArnott/Nerdbank.Streams",
   "repository": {
     "type": "git",

src/nerdbank-streams/src/Channel.ts

@@ -9,6 +9,7 @@ import { MultiplexingStreamClass, MultiplexingStream } from "./MultiplexingStrea
 import { OfferParameters } from "./OfferParameters";
 import { AcceptanceParameters } from "./AcceptanceParameters";
 import { QualifiedChannelId, ChannelSource } from "./QualifiedChannelId";
+import caught = require("caught");
 
 export abstract class Channel implements IDisposableObservable {
     /**
@@ -197,6 +198,11 @@ export class ChannelClass extends Channel {
         const cancellationReason = new CancellationToken.CancellationError(reason);
         this._acceptance.reject(cancellationReason);
         this._completion.reject(cancellationReason);
+
+        // Also mark completion's promise rejections as 'caught' since we do not require
+        // or even expect it to be recognized by anyone else.
+        // The acceptance promise rejection is observed by the offer channel method.
+        caught(this._completion.promise);
     }
 
     public onAccepted(acceptanceParameter: AcceptanceParameters): boolean {

src/nerdbank-streams/src/tests/MultiplexingStream.spec.ts

@@ -6,6 +6,8 @@ import { getBufferFrom } from "../Utilities";
 import { startJsonRpc } from "./jsonRpcStreams";
 import { timeout } from "./Timeout";
 import { Channel } from "../Channel";
+import CancellationToken from "cancellationtoken";
+import * as assert from "assert";
 
 [1, 2, 3].forEach(protocolMajorVersion => {
     describe(`MultiplexingStream v${protocolMajorVersion}`, () => {
@@ -105,7 +107,14 @@ import { Channel } from "../Channel";
             await expectThrow(offer.acceptance);
         });
 
-        it("Channel offer is canceled by event handler", async () => {
+        it("Channel offer is canceled by sender", async () => {
+            const cts = CancellationToken.create();
+            const offer = mx1.offerChannelAsync('', undefined, cts.token);
+            cts.cancel();
+            await assert.rejects(offer);
+        });
+
+        it("Channel offer is rejected by event handler", async () => {
             const handler = new Deferred<void>();
             mx2.on("channelOffered", (args) => {
                 try {