Optimize web-server.js and metrics. (#72)

flomesh-io · Oct 16, 2023 · b01c4b9 · b01c4b9
1 parent ff73ce5
commit b01c4b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/pjs/http/codec.js b/pjs/http/codec.js
@@ -1,5 +1,10 @@
 ((
   { metrics } = pipy.solve('lib/metrics.js'),
+  acceptedMetric = metrics.fgwHttpCurrentConnections.withLabels('accepted'),
+  activeMetric = metrics.fgwHttpCurrentConnections.withLabels('active'),
+  handledMetric = metrics.fgwHttpCurrentConnections.withLabels('handled'),
+  fgwHttpRequestsTotal = metrics.fgwHttpRequestsTotal,
+
 ) => pipy()
 
 .export('http', {
@@ -11,14 +16,14 @@
 .pipeline()
 .handleStreamStart(
   () => (
-    metrics.fgwHttpCurrentConnections.withLabels('accepted').increase(),
-    metrics.fgwHttpCurrentConnections.withLabels('active').increase()
+    acceptedMetric.increase(),
+    activeMetric.increase()
   )
 )
 .handleStreamEnd(
   () => (
-    metrics.fgwHttpCurrentConnections.withLabels('handled').increase(),
-    metrics.fgwHttpCurrentConnections.withLabels('active').decrease()
+    handledMetric.increase(),
+    activeMetric.decrease()
   )
 )
 .demuxHTTP().to(
@@ -27,7 +32,7 @@
     msg => (
       __http = msg?.head,
       __request = { head: msg?.head, reqTime: Date.now() },
-      metrics.fgwHttpRequestsTotal.increase()
+      fgwHttpRequestsTotal.increase()
     )
   )
   .handleMessageEnd(

diff --git a/pjs/server/web-server.js b/pjs/server/web-server.js
@@ -186,9 +186,7 @@
 .replaceMessage(
   msg => (
     (_path = msg?.head?.path) && (
-      _uri = _path.split('?')[0]
-    ),
-    _uri && (_uri.indexOf('/../') < 0) && (
+      _uri = _path.split('?')[0],
       _tryFiles = tryFilesCache.get(__route)?.(_uri),
       (_tryFiles || [_uri]).find(
         tf => (