Merge branch 'release/0.9.0'

nwtgck · Mar 8, 2019 · 61af41d · 61af41d
2 parents 9f01bdd + bb901a2
commit 61af41d
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 80 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -29,14 +29,21 @@ jobs:
       - run:
           name: Working test with Docker image
           command: |
+            set -x
             # Run a server
             docker run -d -p 8080:8080 piping-server
             # Wait for server running
             sleep 1
+            # Create a file to send
+            echo 'hello, world' > /tmp/hello.txt
             # Send and wait for a reciever
-            curl --data-binary 'hello, world' localhost:8080/mypath &
-            # Get data
-            curl localhost:8080/mypath
+            curl -T /tmp/hello.txt localhost:8080/mypath &
+            # Get data as a file
+            curl localhost:8080/mypath > /tmp/download.txt
+            # Print downloaded file
+            cat  /tmp/download.txt
+            # Test the equality
+            diff /tmp/hello.txt /tmp/download.txt
 
   # (from: https://circleci.com/blog/publishing-npm-packages-using-circleci-2-0/)
   npm_publish:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [0.9.0] - 2019-03-08
+### Changed
+* Make logs for sender consistent
+* Update dependencies
+
 ## [0.8.10] - 2019-02-24
 ### Changed
 * Not to allow user to send "/robots.txt" and return 404 when user access to "/rebots.txt"
@@ -138,7 +143,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 * Docker automated build on Docker Hub
 * Support HTTPS
 
-[Unreleased]: https://github.com/nwtgck/piping-server/compare/v0.8.10...HEAD
+[Unreleased]: https://github.com/nwtgck/piping-server/compare/v0.9.0...HEAD
+[0.9.0]: https://github.com/nwtgck/piping-seraver/compare/v0.8.10...v0.9.0
 [0.8.10]: https://github.com/nwtgck/piping-seraver/compare/v0.8.9...v0.8.10
 [0.8.9]: https://github.com/nwtgck/piping-seraver/compare/v0.8.8...v0.8.9
 [0.8.8]: https://github.com/nwtgck/piping-seraver/compare/v0.8.7...v0.8.8

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "piping-server",
-  "version": "0.8.10",
+  "version": "0.9.0",
   "description": "Streaming Data Transfer Server over HTTP/HTTPS",
   "bin": {
     "piping-server": "dist/src/index.js"
@@ -38,7 +38,6 @@
     "espower-typescript": "^9.0.0",
     "get-port": "^4.0.0",
     "mocha": "^6.0.0",
-    "pkginfo": "^0.4.1",
     "power-assert": "^1.4.4",
     "request": "^2.88.0",
     "then-request": "^6.0.0",

diff --git a/src/piping.ts b/src/piping.ts
@@ -15,7 +15,7 @@ type ReqRes = {
 
 type Pipe = {
   readonly sender: ReqRes;
-  readonly receivers: ReqRes[];
+  readonly receivers: ReadonlyArray<ReqRes>;
 };
 
 type ReqResAndUnsubscribe = {
@@ -272,7 +272,7 @@ export class Server {
           }
           break;
         default:
-          res.end(`Error: Unsupported method: ${req.method}\n`);
+          res.end(`[ERROR] Unsupported method: ${req.method}.\n`);
           break;
       }
     };
@@ -293,6 +293,9 @@ export class Server {
 
     const {sender, receivers} = pipe;
 
+    // Emit message to sender
+    sender.res.write(`[INFO] Start sending with ${pipe.receivers.length} receiver(s)!\n`);
+
     const isMultipart: boolean = (sender.req.headers["content-type"] || "").includes("multipart/form-data");
 
     const part: multiparty.Part | undefined =
@@ -324,16 +327,10 @@ export class Server {
         }
       };
 
-      // Common headers for receivers
-      const commonHeaders: http.OutgoingHttpHeaders = {
-        "Access-Control-Allow-Origin": "*"
-      };
-
       const headers: http.OutgoingHttpHeaders =
         // If not multi-part sending
         part === undefined ?
           {
-            ...commonHeaders,
             // Add Content-Length if it exists
             ...(
               sender.req.headers["content-length"] === undefined ?
@@ -351,7 +348,6 @@ export class Server {
             )
           } :
           {
-            ...commonHeaders,
             // Add Content-Length if it exists
             ...(
               part.byteCount === undefined ?
@@ -369,7 +365,12 @@ export class Server {
           };
 
       // Write headers to a receiver
-      receiver.res.writeHead(200, headers);
+      receiver.res.writeHead(200, {
+        ...{
+          "Access-Control-Allow-Origin": "*"
+        },
+        ...headers
+      });
 
       const passThrough = new stream.PassThrough();
       senderData.pipe(passThrough);
@@ -399,13 +400,13 @@ export class Server {
     });
 
     senderData.on("end", () => {
-      sender.res.end("[INFO] Sending Successful!\n");
+      sender.res.end("[INFO] Sending successful!\n");
       // Delete from established
       delete this.pathToEstablished[path];
     });
 
     senderData.on("error", (error) => {
-      sender.res.end("[ERROR] Sending Failed.\n");
+      sender.res.end("[ERROR] Sending failed.\n");
       // Delete from established
       delete this.pathToEstablished[path];
     });
@@ -454,14 +455,12 @@ export class Server {
               getPipeIfEstablished(unestablishedPipe);
 
             if (pipe !== undefined) {
-              // Emit message to sender
-              res.write("Start sending!\n");
               // Start data transfer
               this.runPipe(reqPath, pipe);
             }
           } else {
             res.writeHead(400);
-            res.end(`Error: The number of receivers should be ${unestablishedPipe.nReceivers} but ${nReceivers}.\n`);
+            res.end(`[ERROR] The number of receivers should be ${unestablishedPipe.nReceivers} but ${nReceivers}.\n`);
           }
         } else {
           res.writeHead(400);
@@ -497,7 +496,7 @@ export class Server {
       res.end(`[ERROR] n should > 0, but n = ${nReceivers}.\n`);
     } else if (reqPath in this.pathToEstablished) {
       res.writeHead(400);
-      res.end(`Error: Connection on '${reqPath}' has been established already.\n`);
+      res.end(`[ERROR] Connection on '${reqPath}' has been established already.\n`);
     } else {
       // If the path connection is connecting
       if (reqPath in this.pathToUnestablishedPipe) {
@@ -522,18 +521,16 @@ export class Server {
               getPipeIfEstablished(unestablishedPipe);
 
             if (pipe !== undefined) {
-              // Emit message to sender
-              pipe.sender.res.write(`[INFO] Start sending with ${pipe.receivers.length} receiver(s)!\n`);
               // Start data transfer
               this.runPipe(reqPath, pipe);
             }
           } else {
             res.writeHead(400);
-            res.end("Error: The number of receivers has reached limits.\n");
+            res.end("[ERROR] The number of receivers has reached limits.\n");
           }
         } else {
           res.writeHead(400);
-          res.end(`Error: The number of receivers should be ${unestablishedPipe.nReceivers} but ${nReceivers}.\n`);
+          res.end(`[ERROR] The number of receivers should be ${unestablishedPipe.nReceivers} but ${nReceivers}.\n`);
         }
       } else {
         // Create a receiver

diff --git a/test/piping.test.ts b/test/piping.test.ts
@@ -1,13 +1,10 @@
 import * as getPort from "get-port";
 import * as http from "http";
-import * as pkginfo from "pkginfo";
 import * as assert from "power-assert";
 import * as request from "request";
 import thenRequest from "then-request";
 import * as piping from "../src/piping";
-
-// Set module.exports.version
-pkginfo(module, "version");
+import {VERSION} from "../src/version";
 
 /**
  * Listen on the specify port
@@ -26,7 +23,7 @@ function listenPromise(server: http.Server, port: number): Promise<void> {
  */
 function closePromise(server: http.Server): Promise<void> {
   return new Promise<void>((resolve) => {
-    server.close(resolve);
+    server.close(() => resolve());
   });
 }
 
@@ -74,7 +71,7 @@ describe("piping.Server", () => {
 
       // Body should be index page
       // (from: https://stackoverflow.com/a/22339262/2885946)
-      assert.equal(res.getBody("UTF-8"), module.exports.version + "\n");
+      assert.equal(res.getBody("UTF-8"), VERSION + "\n");
     });
 
     it("should return help page", async () => {
@@ -175,6 +172,8 @@ describe("piping.Server", () => {
     // Get request promise
     const reqPromise = thenRequest("GET", `${pipingUrl}/mydataid`);
 
+    await sleep(10);
+
     // Send data
     const postRes = await thenRequest("POST", `${pipingUrl}/mydataid`, {
       body: "this is a content"

diff --git a/types/pkginfo.d.ts b/types/pkginfo.d.ts