Fix cache plugin response getter, refactor rollup bundle

.babelrc

@@ -23,16 +23,6 @@
         "transform-runtime",
         "transform-es2015-modules-commonjs"
       ]
-    },
-    "commonjs": {
-      "plugins": [
-        [
-          "transform-es2015-modules-commonjs",
-          {
-            "loose": true
-          }
-        ]
-      ]
     }
   }
 }

.gitignore

@@ -1,7 +1,6 @@
 .DS_Store
 *.log
 node_modules
-dist
 lib
 es
 coverage

example/index.html

@@ -29,7 +29,7 @@ <h1>PeerCDN Example</h1>
     </video>
   </main>
 
-  <script src="vendor/peer-cdn.js"></script>
+  <script src="peer-cdn/index.js"></script>
   <script src="js/main.js"></script>
 </body>
 

example/js/main.js

@@ -24,7 +24,6 @@ if ("serviceWorker" in navigator) {
   // handler and taken control of the page, so you should see this message event fire once.
   // You can force it to fire again by visiting this page in an Incognito window.
   navigator.serviceWorker.addEventListener('message', function (event) {
-    console.log('onMessage', event.data);
     const request = new Request(event.data.url);
     // mock sw event wrapping request with object
     const middleware = peerPlugin.getMiddleware({ request });
@@ -44,10 +43,7 @@ if ("serviceWorker" in navigator) {
   navigator.serviceWorker.register("sw.js")
     .then(function (registration) {
       // Registration was successful
-      console.log(
-        "ServiceWorker registration successful with scope: ",
-        registration.scope
-      );
+      console.log("ServiceWorker registration successful with scope: ", registration.scope);
     })
     .catch(function (error) {
       console.error("Service Worker Error", error);

example/package.json

@@ -17,10 +17,7 @@
   "dependencies": {
     "cookie-parser": "1.4.3",
     "express": "^4.15.3",
-    "peer-cdn": "^0.1.0-alpha",
-    "peer-data": "^3.0.23",
-    "peer-data-server": "^1.0.9",
-    "socket.io": "^2.0.2"
+    "peer-cdn": "^0.1.0-alpha"
   },
   "devDependencies": {}
 }

example/server.js

@@ -3,7 +3,8 @@ const fspath = require("path");
 const cookieParser = require("cookie-parser");
 const http = require("http");
 const fs = require("fs");
-const PeerDataServer = require("peer-data-server");
+// const PeerCdnServer = require("peer-cdn/server");
+const PeerCdnServer = require("../src/server");
 
 const PeerEventType = { PEER: "PEER" };
 const port = process.env.PORT || 3000;
@@ -16,8 +17,8 @@ app.use("/css", express.static(fspath.join(__dirname, "css")));
 app.use("/fonts", express.static(fspath.join(__dirname, "fonts")));
 app.use("/images", express.static(fspath.join(__dirname, "images")));
 app.use("/js", express.static(fspath.join(__dirname, "js")));
-// app.use("/vendor", express.static(fspath.join(__dirname, "./node_modules/peer-cdn/dist")));
-app.use("/vendor", express.static(fspath.join(__dirname, "../dist")));
+// app.use("/vendor", express.static(fspath.join(__dirname, "./node_modules/peer-cdn/lib")));
+app.use("/peer-cdn", express.static(fspath.join(__dirname, "../lib")));
 app.use(cookieParser());
 app.get("/favicon.ico", (req, res) => res.sendStatus(404));
 app.get("*", (req, res) => res.sendFile(index));
@@ -69,17 +70,9 @@ app.get("/movie.mp4", (req, res) => {
 
 const server = http.createServer(app);
 
-const createPeerDataServer = PeerDataServer.default || PeerDataServer;
-createPeerDataServer(server, function (socket, event) {
-  switch (event.type) {
-    case PeerEventType.PEER:
-      // todo: we should pick best peer and ask only one socket to connect
-      socket.broadcast.emit("message", event);
-      break;
-    default:
-      socket.broadcast.to(event.room.id).emit("message", event);
-  }
-});
+// Setup peer-cdn signaling server
+const appendPeerCdnServer = PeerCdnServer.default || PeerCdnServer;
+appendPeerCdnServer(server);
 
 server.listen(port, () => {
   // eslint-disable-next-line no-console

example/sw.js

@@ -1,7 +1,7 @@
 (function () {
   "use strict";
 
-  self.importScripts("/vendor/peer-cdn.js");
+  self.importScripts("/peer-cdn/index.js");
 
   const cachePlugin = new CachePlugin({ version: 1 });
   // since sw does not support webrtc yet we use PeerPlugin on client side 
@@ -11,9 +11,7 @@
 
   function run() {
     const cdn = new PeerCDN();
-    cdn.GET("/", STRATEGIES.ordered,
-      // cdn.GET("/js/main.js", STRATEGIES.ordered,
-      // all of the following plugins are required
+    cdn.GET("/css/main.css", STRATEGIES.ordered,
       cachePlugin.getMiddleware,
       delegatePlugin.getMiddleware,
       networkPlugin.getMiddleware