Merge pull request #6 from floodfx/refactor_msg_router

Refactor msg router
floodfx · Jan 25, 2022 · 5b67f4a · 5b67f4a
2 parents bd60a2a + e507923
commit 5b67f4a
Show file tree

Hide file tree

Showing 17 changed files with 796 additions and 389 deletions.
diff --git a/coverage/clover.xml b/coverage/clover.xml
@@ -1,14 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1642888960109" clover="3.2.0">
-  <project timestamp="1642888960109" name="All files">
-    <metrics statements="5" coveredstatements="4" conditionals="1" coveredconditionals="0" methods="2" coveredmethods="2" elements="8" coveredelements="6" complexity="0" loc="5" ncloc="5" packages="1" files="1" classes="1"/>
-    <file name="data.ts" path="/Users/donnie/src/github.com/floodfx/liveviewjs-poc/src/server/live/autocomplete/data.ts">
-      <metrics statements="5" coveredstatements="4" conditionals="1" coveredconditionals="0" methods="2" coveredmethods="2"/>
-      <line num="3" count="1" type="stmt"/>
-      <line num="4" count="1" type="cond" truecount="0" falsecount="1"/>
-      <line num="5" count="0" type="stmt"/>
-      <line num="7" count="1001" type="stmt"/>
-      <line num="10" count="1" type="stmt"/>
+<coverage generated="1643089445215" clover="3.2.0">
+  <project timestamp="1643089445216" name="All files">
+    <metrics statements="43" coveredstatements="15" conditionals="17" coveredconditionals="0" methods="13" coveredmethods="5" elements="73" coveredelements="20" complexity="0" loc="43" ncloc="43" packages="1" files="1" classes="1"/>
+    <file name="index.ts" path="/Users/donnie/src/github.com/floodfx/liveviewjs/src/server/templates/index.ts">
+      <metrics statements="43" coveredstatements="15" conditionals="17" coveredconditionals="0" methods="13" coveredmethods="5"/>
+      <line num="8" count="1" type="stmt"/>
+      <line num="19" count="1" type="stmt"/>
+      <line num="21" count="1" type="stmt"/>
+      <line num="23" count="1" type="stmt"/>
+      <line num="24" count="0" type="cond" truecount="0" falsecount="3"/>
+      <line num="25" count="0" type="stmt"/>
+      <line num="27" count="0" type="cond" truecount="0" falsecount="1"/>
+      <line num="28" count="0" type="stmt"/>
+      <line num="31" count="0" type="stmt"/>
+      <line num="35" count="2" type="cond" truecount="0" falsecount="1"/>
+      <line num="36" count="0" type="stmt"/>
+      <line num="38" count="2" type="cond" truecount="0" falsecount="1"/>
+      <line num="39" count="0" type="stmt"/>
+      <line num="41" count="2" type="stmt"/>
+      <line num="44" count="1" type="stmt"/>
+      <line num="50" count="2" type="stmt"/>
+      <line num="51" count="2" type="stmt"/>
+      <line num="55" count="0" type="stmt"/>
+      <line num="56" count="0" type="cond" truecount="0" falsecount="1"/>
+      <line num="57" count="0" type="stmt"/>
+      <line num="59" count="0" type="cond" truecount="0" falsecount="1"/>
+      <line num="60" count="0" type="stmt"/>
+      <line num="63" count="0" type="stmt"/>
+      <line num="69" count="0" type="cond" truecount="0" falsecount="1"/>
+      <line num="70" count="0" type="stmt"/>
+      <line num="75" count="0" type="stmt"/>
+      <line num="76" count="0" type="cond" truecount="0" falsecount="2"/>
+      <line num="77" count="0" type="stmt"/>
+      <line num="81" count="0" type="cond" truecount="0" falsecount="2"/>
+      <line num="83" count="0" type="cond" truecount="0" falsecount="2"/>
+      <line num="84" count="0" type="stmt"/>
+      <line num="91" count="0" type="stmt"/>
+      <line num="94" count="0" type="stmt"/>
+      <line num="95" count="0" type="stmt"/>
+      <line num="101" count="0" type="stmt"/>
+      <line num="108" count="0" type="cond" truecount="0" falsecount="1"/>
+      <line num="109" count="0" type="stmt"/>
+      <line num="111" count="0" type="stmt"/>
+      <line num="115" count="2" type="stmt"/>
+      <line num="116" count="2" type="stmt"/>
+      <line num="117" count="2" type="stmt"/>
+      <line num="123" count="1" type="stmt"/>
+      <line num="124" count="2" type="stmt"/>
     </file>
   </project>
 </coverage>
diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json
@@ -1,2 +1,2 @@
-{"/Users/donnie/src/github.com/floodfx/liveviewjs-poc/src/server/live/autocomplete/data.ts": {"path":"/Users/donnie/src/github.com/floodfx/liveviewjs-poc/src/server/live/autocomplete/data.ts","statementMap":{"0":{"start":{"line":4,"column":4},"end":{"line":6,"column":null}},"1":{"start":{"line":5,"column":6},"end":{"line":5,"column":null}},"2":{"start":{"line":7,"column":4},"end":{"line":7,"column":90}},"3":{"start":{"line":7,"column":37},"end":{"line":7,"column":88}},"4":{"start":{"line":3,"column":2},"end":{"line":3,"column":18}},"5":{"start":{"line":10,"column":15},"end":{"line":1012,"column":null}}},"fnMap":{"0":{"name":"suggest","decl":{"start":{"line":3,"column":18},"end":{"line":3,"column":25}},"loc":{"start":{"line":3,"column":40},"end":{"line":8,"column":3}}},"1":{"name":"(anonymous_1)","decl":{"start":{"line":7,"column":29},"end":{"line":7,"column":33}},"loc":{"start":{"line":7,"column":37},"end":{"line":7,"column":88}}}},"branchMap":{"0":{"loc":{"start":{"line":4,"column":4},"end":{"line":6,"column":null}},"type":"if","locations":[{"start":{"line":4,"column":4},"end":{"line":6,"column":null}}]}},"s":{"0":1,"1":0,"2":1,"3":1001,"4":1,"5":1},"f":{"0":1,"1":1001},"b":{"0":[0]}}
+{"/Users/donnie/src/github.com/floodfx/liveviewjs/src/server/templates/index.ts": {"path":"/Users/donnie/src/github.com/floodfx/liveviewjs/src/server/templates/index.ts","statementMap":{"0":{"start":{"line":8,"column":4},"end":{"line":17,"column":null}},"1":{"start":{"line":19,"column":16},"end":{"line":19,"column":56}},"2":{"start":{"line":21,"column":18},"end":{"line":21,"column":66}},"3":{"start":{"line":24,"column":2},"end":{"line":26,"column":null}},"4":{"start":{"line":25,"column":4},"end":{"line":25,"column":null}},"5":{"start":{"line":27,"column":2},"end":{"line":29,"column":null}},"6":{"start":{"line":28,"column":4},"end":{"line":28,"column":null}},"7":{"start":{"line":31,"column":2},"end":{"line":31,"column":null}},"8":{"start":{"line":23,"column":0},"end":{"line":23,"column":16}},"9":{"start":{"line":35,"column":2},"end":{"line":37,"column":null}},"10":{"start":{"line":36,"column":4},"end":{"line":36,"column":null}},"11":{"start":{"line":38,"column":2},"end":{"line":40,"column":null}},"12":{"start":{"line":39,"column":4},"end":{"line":39,"column":null}},"13":{"start":{"line":41,"column":2},"end":{"line":41,"column":null}},"14":{"start":{"line":41,"column":53},"end":{"line":41,"column":67}},"15":{"start":{"line":50,"column":4},"end":{"line":50,"column":null}},"16":{"start":{"line":51,"column":4},"end":{"line":51,"column":null}},"17":{"start":{"line":55,"column":4},"end":{"line":64,"column":null}},"18":{"start":{"line":56,"column":6},"end":{"line":58,"column":null}},"19":{"start":{"line":57,"column":8},"end":{"line":57,"column":null}},"20":{"start":{"line":59,"column":6},"end":{"line":61,"column":null}},"21":{"start":{"line":60,"column":8},"end":{"line":60,"column":null}},"22":{"start":{"line":63,"column":6},"end":{"line":63,"column":null}},"23":{"start":{"line":69,"column":4},"end":{"line":73,"column":null}},"24":{"start":{"line":70,"column":6},"end":{"line":72,"column":null}},"25":{"start":{"line":75,"column":18},"end":{"line":106,"column":40}},"26":{"start":{"line":76,"column":6},"end":{"line":105,"column":null}},"27":{"start":{"line":77,"column":8},"end":{"line":80,"column":null}},"28":{"start":{"line":81,"column":13},"end":{"line":105,"column":null}},"29":{"start":{"line":83,"column":8},"end":{"line":99,"column":null}},"30":{"start":{"line":84,"column":10},"end":{"line":87,"column":null}},"31":{"start":{"line":91,"column":20},"end":{"line":91,"column":67}},"32":{"start":{"line":91,"column":33},"end":{"line":91,"column":66}},"33":{"start":{"line":94,"column":20},"end":{"line":94,"column":46}},"34":{"start":{"line":94,"column":33},"end":{"line":94,"column":42}},"35":{"start":{"line":95,"column":10},"end":{"line":98,"column":null}},"36":{"start":{"line":101,"column":8},"end":{"line":104,"column":null}},"37":{"start":{"line":108,"column":4},"end":{"line":110,"column":null}},"38":{"start":{"line":109,"column":6},"end":{"line":109,"column":32}},"39":{"start":{"line":111,"column":4},"end":{"line":111,"column":null}},"40":{"start":{"line":115,"column":4},"end":{"line":118,"column":null}},"41":{"start":{"line":116,"column":16},"end":{"line":116,"column":37}},"42":{"start":{"line":117,"column":6},"end":{"line":117,"column":null}},"43":{"start":{"line":44,"column":0},"end":{"line":44,"column":13}},"44":{"start":{"line":124,"column":2},"end":{"line":124,"column":null}},"45":{"start":{"line":123,"column":0},"end":{"line":123,"column":24}}},"fnMap":{"0":{"name":"join","decl":{"start":{"line":23,"column":16},"end":{"line":23,"column":20}},"loc":{"start":{"line":23,"column":91},"end":{"line":32,"column":1}}},"1":{"name":"escapehtml","decl":{"start":{"line":34,"column":9},"end":{"line":34,"column":19}},"loc":{"start":{"line":34,"column":35},"end":{"line":42,"column":1}}},"2":{"name":"(anonymous_2)","decl":{"start":{"line":41,"column":43},"end":{"line":41,"column":44}},"loc":{"start":{"line":41,"column":53},"end":{"line":41,"column":67}}},"3":{"name":"(anonymous_3)","decl":{"start":{"line":49,"column":2},"end":{"line":49,"column":14}},"loc":{"start":{"line":49,"column":70},"end":{"line":52,"column":3}}},"4":{"name":"(anonymous_4)","decl":{"start":{"line":54,"column":2},"end":{"line":54,"column":6}},"loc":{"start":{"line":54,"column":14},"end":{"line":65,"column":3}}},"5":{"name":"(anonymous_5)","decl":{"start":{"line":55,"column":30},"end":{"line":55,"column":31}},"loc":{"start":{"line":55,"column":36},"end":{"line":64,"column":5}}},"6":{"name":"(anonymous_6)","decl":{"start":{"line":67,"column":2},"end":{"line":67,"column":11}},"loc":{"start":{"line":67,"column":42},"end":{"line":112,"column":3}}},"7":{"name":"(anonymous_7)","decl":{"start":{"line":75,"column":40},"end":{"line":75,"column":41}},"loc":{"start":{"line":75,"column":105},"end":{"line":106,"column":5}}},"8":{"name":"(anonymous_8)","decl":{"start":{"line":91,"column":28},"end":{"line":91,"column":29}},"loc":{"start":{"line":91,"column":33},"end":{"line":91,"column":66}}},"9":{"name":"(anonymous_9)","decl":{"start":{"line":94,"column":28},"end":{"line":94,"column":29}},"loc":{"start":{"line":94,"column":33},"end":{"line":94,"column":42}}},"10":{"name":"(anonymous_10)","decl":{"start":{"line":114,"column":2},"end":{"line":114,"column":10}},"loc":{"start":{"line":114,"column":10},"end":{"line":119,"column":3}}},"11":{"name":"(anonymous_11)","decl":{"start":{"line":115,"column":31},"end":{"line":115,"column":32}},"loc":{"start":{"line":115,"column":48},"end":{"line":118,"column":5}}},"12":{"name":"escapeHtml","decl":{"start":{"line":123,"column":24},"end":{"line":123,"column":34}},"loc":{"start":{"line":123,"column":88},"end":{"line":125,"column":1}}}},"branchMap":{"0":{"loc":{"start":{"line":24,"column":2},"end":{"line":26,"column":null}},"type":"if","locations":[{"start":{"line":24,"column":2},"end":{"line":26,"column":null}}]},"1":{"loc":{"start":{"line":24,"column":6},"end":{"line":24,"column":51}},"type":"binary-expr","locations":[{"start":{"line":24,"column":6},"end":{"line":24,"column":29}},{"start":{"line":24,"column":33},"end":{"line":24,"column":51}}]},"2":{"loc":{"start":{"line":27,"column":2},"end":{"line":29,"column":null}},"type":"if","locations":[{"start":{"line":27,"column":2},"end":{"line":29,"column":null}}]},"3":{"loc":{"start":{"line":35,"column":2},"end":{"line":37,"column":null}},"type":"if","locations":[{"start":{"line":35,"column":2},"end":{"line":37,"column":null}}]},"4":{"loc":{"start":{"line":38,"column":2},"end":{"line":40,"column":null}},"type":"if","locations":[{"start":{"line":38,"column":2},"end":{"line":40,"column":null}}]},"5":{"loc":{"start":{"line":56,"column":6},"end":{"line":58,"column":null}},"type":"if","locations":[{"start":{"line":56,"column":6},"end":{"line":58,"column":null}}]},"6":{"loc":{"start":{"line":59,"column":6},"end":{"line":61,"column":null}},"type":"if","locations":[{"start":{"line":59,"column":6},"end":{"line":61,"column":null}}]},"7":{"loc":{"start":{"line":67,"column":12},"end":{"line":67,"column":42}},"type":"default-arg","locations":[{"start":{"line":67,"column":38},"end":{"line":67,"column":42}}]},"8":{"loc":{"start":{"line":69,"column":4},"end":{"line":73,"column":null}},"type":"if","locations":[{"start":{"line":69,"column":4},"end":{"line":73,"column":null}}]},"9":{"loc":{"start":{"line":76,"column":6},"end":{"line":105,"column":null}},"type":"if","locations":[{"start":{"line":76,"column":6},"end":{"line":105,"column":null}},{"start":{"line":81,"column":13},"end":{"line":105,"column":null}}]},"10":{"loc":{"start":{"line":81,"column":13},"end":{"line":105,"column":null}},"type":"if","locations":[{"start":{"line":81,"column":13},"end":{"line":105,"column":null}},{"start":{"line":100,"column":13},"end":{"line":105,"column":null}}]},"11":{"loc":{"start":{"line":83,"column":8},"end":{"line":99,"column":null}},"type":"if","locations":[{"start":{"line":83,"column":8},"end":{"line":99,"column":null}},{"start":{"line":89,"column":13},"end":{"line":99,"column":null}}]},"12":{"loc":{"start":{"line":108,"column":4},"end":{"line":110,"column":null}},"type":"if","locations":[{"start":{"line":108,"column":4},"end":{"line":110,"column":null}}]}},"s":{"0":1,"1":1,"2":1,"3":0,"4":0,"5":0,"6":0,"7":0,"8":1,"9":2,"10":0,"11":2,"12":0,"13":2,"14":0,"15":2,"16":2,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":2,"41":2,"42":2,"43":1,"44":2,"45":1},"f":{"0":0,"1":2,"2":0,"3":2,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":2,"11":2,"12":2},"b":{"0":[0],"1":[0,0],"2":[0],"3":[0],"4":[0],"5":[0],"6":[0],"7":[0],"8":[0],"9":[0,0],"10":[0,0],"11":[0,0],"12":[0]}}
 }
diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html
@@ -23,30 +23,30 @@ <h1>All files</h1>
         <div class='clearfix'>
 
             <div class='fl pad1y space-right2'>
-                <span class="strong">83.33% </span>
+                <span class="strong">32.6% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>5/6</span>
+                <span class='fraction'>15/46</span>
             </div>
 
 
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/1</span>
+                <span class='fraction'>0/17</span>
             </div>
 
 
             <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
+                <span class="strong">38.46% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>2/2</span>
+                <span class='fraction'>5/13</span>
             </div>
 
 
             <div class='fl pad1y space-right2'>
-                <span class="strong">80% </span>
+                <span class="strong">34.88% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>4/5</span>
+                <span class='fraction'>15/43</span>
             </div>
 
 
@@ -61,7 +61,7 @@ <h1>All files</h1>
             </div>
         </template>
     </div>
-    <div class='status-line medium'></div>
+    <div class='status-line low'></div>
     <div class="pad1">
 <table class="coverage-summary">
 <thead>
@@ -79,18 +79,18 @@ <h1>All files</h1>
 </tr>
 </thead>
 <tbody><tr>
-	<td class="file medium" data-value="data.ts"><a href="data.ts.html">data.ts</a></td>
-	<td data-value="83.33" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 83%"></div><div class="cover-empty" style="width: 17%"></div></div>
+	<td class="file low" data-value="index.ts"><a href="index.ts.html">index.ts</a></td>
+	<td data-value="32.6" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 32%"></div><div class="cover-empty" style="width: 68%"></div></div>
 	</td>
-	<td data-value="83.33" class="pct medium">83.33%</td>
-	<td data-value="6" class="abs medium">5/6</td>
+	<td data-value="32.6" class="pct low">32.6%</td>
+	<td data-value="46" class="abs low">15/46</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="1" class="abs low">0/1</td>
-	<td data-value="100" class="pct high">100%</td>
-	<td data-value="2" class="abs high">2/2</td>
-	<td data-value="80" class="pct medium">80%</td>
-	<td data-value="5" class="abs medium">4/5</td>
+	<td data-value="17" class="abs low">0/17</td>
+	<td data-value="38.46" class="pct low">38.46%</td>
+	<td data-value="13" class="abs low">5/13</td>
+	<td data-value="34.88" class="pct low">34.88%</td>
+	<td data-value="43" class="abs low">15/43</td>
 	</tr>
 
 </tbody>
@@ -101,7 +101,7 @@ <h1>All files</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Sat Jan 22 2022 15:02:40 GMT-0700 (Mountain Standard Time)
+                at Mon Jan 24 2022 22:44:05 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="prettify.js"></script>
         <script>