@modern-js/prod-server 2.47.1 → 2.48.1

package/dist/esm/libs/render/ssrCache/index.js

@@ -11,7 +11,7 @@ function ssrCache(req, render, ssrContext) {
 }
 function _ssrCache() {
   _ssrCache = _async_to_generator(function(req, render, ssrContext) {
-    var customContainer, cacheOption, cacheControl, cacheManager, renderResult, stream;
+    var customContainer, cacheOption, cacheControl, cacheManager, renderResult, stream, data;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -39,30 +39,49 @@ function _ssrCache() {
           ];
         case 3:
           renderResult = _state.sent();
-          if (!renderResult) {
+          if (!!renderResult)
             return [
-              2,
-              ""
-            ];
-          } else if (typeof renderResult === "string") {
-            return [
-              2,
-              renderResult
+              3,
+              4
             ];
-          } else {
-            stream = new Transform({
-              write: function write(chunk, _, callback) {
-                this.push(chunk);
-                callback();
-              }
-            });
+          return [
+            2,
+            {
+              data: ""
+            }
+          ];
+        case 4:
+          if (!(typeof renderResult === "string"))
             return [
-              2,
-              renderResult(stream)
+              3,
+              5
             ];
-          }
-          _state.label = 4;
-        case 4:
+          return [
+            2,
+            {
+              data: renderResult
+            }
+          ];
+        case 5:
+          stream = new Transform({
+            write: function write(chunk, _, callback) {
+              this.push(chunk);
+              callback();
+            }
+          });
+          return [
+            4,
+            renderResult(stream)
+          ];
+        case 6:
+          data = _state.sent();
+          return [
+            2,
+            {
+              data
+            }
+          ];
+        case 7:
           return [
             2
           ];

package/dist/esm/libs/render/ssrCache/manager.js

@@ -1,168 +1,176 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _create_class } from "@swc/helpers/_/_create_class";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { Transform } from "stream";
+import { normalizePathname } from "@modern-js/runtime-utils/url";
 var CacheManager = /* @__PURE__ */ function() {
   "use strict";
   function CacheManager2(container) {
     _class_call_check(this, CacheManager2);
-    _define_property(this, "container", void 0);
     this.container = container;
   }
-  _create_class(CacheManager2, [
-    {
-      key: "getCacheResult",
-      value: function getCacheResult(req, cacheControl, render, ssrContext) {
-        var _this = this;
-        return _async_to_generator(function() {
-          var key, value, maxAge, staleWhileRevalidate, ttl, cache, interval;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                key = _this.computedKey(req, cacheControl);
-                return [
-                  4,
-                  _this.container.get(key)
-                ];
-              case 1:
-                value = _state.sent();
-                maxAge = cacheControl.maxAge, staleWhileRevalidate = cacheControl.staleWhileRevalidate;
-                ttl = maxAge + staleWhileRevalidate;
-                if (value) {
-                  cache = JSON.parse(value);
-                  interval = Date.now() - cache.cursor;
-                  if (interval <= maxAge) {
-                    return [
-                      2,
-                      cache.val
-                    ];
-                  } else if (interval <= staleWhileRevalidate + maxAge) {
-                    _this.processCache(key, render, ssrContext, ttl);
-                    return [
-                      2,
-                      cache.val
-                    ];
-                  } else {
-                    return [
-                      2,
-                      _this.processCache(key, render, ssrContext, ttl)
-                    ];
-                  }
-                } else {
-                  return [
-                    2,
-                    _this.processCache(key, render, ssrContext, ttl)
-                  ];
-                }
-                return [
-                  2
-                ];
-            }
-          });
-        })();
-      }
-    },
-    {
-      key: "processCache",
-      value: function processCache(key, render, ssrContext, ttl) {
-        var _this = this;
-        return _async_to_generator(function() {
-          var renderResult, current, cache, html, stream;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                return [
-                  4,
-                  render(ssrContext)
-                ];
-              case 1:
-                renderResult = _state.sent();
-                if (!!renderResult)
-                  return [
-                    3,
-                    2
-                  ];
+  var _proto = CacheManager2.prototype;
+  _proto.getCacheResult = function getCacheResult(req, cacheControl, render, ssrContext) {
+    var _this = this;
+    return _async_to_generator(function() {
+      var key, value, maxAge, staleWhileRevalidate, ttl, cache, interval;
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            key = _this.computedKey(req, cacheControl);
+            return [
+              4,
+              _this.container.get(key)
+            ];
+          case 1:
+            value = _state.sent();
+            maxAge = cacheControl.maxAge, staleWhileRevalidate = cacheControl.staleWhileRevalidate;
+            ttl = maxAge + staleWhileRevalidate;
+            if (value) {
+              cache = JSON.parse(value);
+              interval = Date.now() - cache.cursor;
+              if (interval <= maxAge) {
                 return [
                   2,
-                  ""
-                ];
-              case 2:
-                if (!(typeof renderResult === "string"))
-                  return [
-                    3,
-                    4
-                  ];
-                current = Date.now();
-                cache = {
-                  val: renderResult,
-                  cursor: current
-                };
-                return [
-                  4,
-                  _this.container.set(key, JSON.stringify(cache), {
-                    ttl
-                  })
+                  {
+                    data: cache.val,
+                    status: "hit"
+                  }
                 ];
-              case 3:
-                _state.sent();
+              } else if (interval <= staleWhileRevalidate + maxAge) {
+                _this.processCache(key, render, ssrContext, ttl);
                 return [
                   2,
-                  renderResult
-                ];
-              case 4:
-                html = "";
-                stream = new Transform({
-                  write: function write(chunk, _, callback) {
-                    html += chunk.toString();
-                    this.push(chunk);
-                    callback();
+                  {
+                    data: cache.val,
+                    status: "stale"
                   }
-                });
-                stream.on("close", function() {
-                  var current2 = Date.now();
-                  var cache2 = {
-                    val: html,
-                    cursor: current2
-                  };
-                  _this.container.set(key, JSON.stringify(cache2), {
-                    ttl
-                  });
-                });
-                return [
-                  2,
-                  renderResult(stream)
                 ];
-              case 5:
+              } else {
                 return [
-                  2
+                  2,
+                  _this.processCache(key, render, ssrContext, ttl, "expired")
                 ];
+              }
+            } else {
+              return [
+                2,
+                _this.processCache(key, render, ssrContext, ttl, "miss")
+              ];
             }
-          });
-        })();
-      }
-    },
-    {
-      key: "computedKey",
-      value: function computedKey(req, cacheControl) {
-        var url = req.url;
-        var _url_split = _sliced_to_array(url.split("?"), 1), pathname = _url_split[0];
-        var customKey = cacheControl.customKey;
-        var defaultKey = pathname.replace(/.+\/+$/, "");
-        if (customKey) {
-          if (typeof customKey === "string") {
-            return customKey;
-          } else {
-            return customKey(defaultKey);
-          }
-        } else {
-          return defaultKey;
+            return [
+              2
+            ];
+        }
+      });
+    })();
+  };
+  _proto.processCache = function processCache(key, render, ssrContext, ttl, status) {
+    var _this = this;
+    return _async_to_generator(function() {
+      var renderResult, current, cache, html, stream, readable;
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            return [
+              4,
+              render(ssrContext)
+            ];
+          case 1:
+            renderResult = _state.sent();
+            if (!!renderResult)
+              return [
+                3,
+                2
+              ];
+            return [
+              2,
+              {
+                data: ""
+              }
+            ];
+          case 2:
+            if (!(typeof renderResult === "string"))
+              return [
+                3,
+                4
+              ];
+            current = Date.now();
+            cache = {
+              val: renderResult,
+              cursor: current
+            };
+            return [
+              4,
+              _this.container.set(key, JSON.stringify(cache), {
+                ttl
+              })
+            ];
+          case 3:
+            _state.sent();
+            return [
+              2,
+              {
+                data: renderResult,
+                status
+              }
+            ];
+          case 4:
+            html = "";
+            stream = new Transform({
+              write: function write(chunk, _, callback) {
+                html += chunk.toString();
+                this.push(chunk);
+                callback();
+              }
+            });
+            stream.on("close", function() {
+              var current2 = Date.now();
+              var cache2 = {
+                val: html,
+                cursor: current2
+              };
+              _this.container.set(key, JSON.stringify(cache2), {
+                ttl
+              });
+            });
+            return [
+              4,
+              renderResult(stream)
+            ];
+          case 5:
+            readable = _state.sent();
+            return [
+              2,
+              {
+                data: readable,
+                status
+              }
+            ];
+          case 6:
+            return [
+              2
+            ];
         }
+      });
+    })();
+  };
+  _proto.computedKey = function computedKey(req, cacheControl) {
+    var url = req.url;
+    var _url_split = _sliced_to_array(url.split("?"), 1), pathname = _url_split[0];
+    var customKey = cacheControl.customKey;
+    var defaultKey = normalizePathname(pathname);
+    if (customKey) {
+      if (typeof customKey === "string") {
+        return customKey;
+      } else {
+        return customKey(defaultKey);
       }
+    } else {
+      return defaultKey;
     }
-  ]);
+  };
   return CacheManager2;
 }();
 export {

package/dist/esm/libs/route/index.js

@@ -1,113 +1,79 @@
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _create_class } from "@swc/helpers/_/_create_class";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { RouteMatcher } from "./matcher";
 var RouteMatchManager = /* @__PURE__ */ function() {
   "use strict";
   function RouteMatchManager2() {
     _class_call_check(this, RouteMatchManager2);
-    _define_property(this, "matchers", void 0);
-    _define_property(this, "specs", []);
+    this.specs = [];
     this.matchers = [];
   }
-  _create_class(RouteMatchManager2, [
-    {
-      key: "filter",
-      value: (
-        // get all routes matches pathname
-        function filter(pathname) {
-          return this.matchers.reduce(function(matches, matcher) {
-            if (matcher.matchUrlPath(pathname)) {
-              matches.push(matcher);
-            }
-            return matches;
-          }, []);
+  var _proto = RouteMatchManager2.prototype;
+  _proto.filter = function filter(pathname) {
+    return this.matchers.reduce(function(matches, matcher) {
+      if (matcher.matchUrlPath(pathname)) {
+        matches.push(matcher);
+      }
+      return matches;
+    }, []);
+  };
+  _proto.best = function best(pathname, matches) {
+    var best2;
+    var matchedLen = 0;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+    try {
+      for (var _iterator = matches[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var match = _step.value;
+        var len = match.matchLength(pathname);
+        if (len === null) {
+          continue;
         }
-      )
-    },
-    {
-      key: "best",
-      value: (
-        // get best match from a set of matches
-        function best(pathname, matches) {
-          var best2;
-          var matchedLen = 0;
-          var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-          try {
-            for (var _iterator = matches[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-              var match = _step.value;
-              var len = match.matchLength(pathname);
-              if (len === null) {
-                continue;
-              }
-              if (len > matchedLen) {
-                best2 = match;
-                matchedLen = len;
-              }
-            }
-          } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-          } finally {
-            try {
-              if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-              }
-            } finally {
-              if (_didIteratorError) {
-                throw _iteratorError;
-              }
-            }
-          }
-          return best2;
+        if (len > matchedLen) {
+          best2 = match;
+          matchedLen = len;
         }
-      )
-    },
-    {
-      key: "reset",
-      value: (
-        // reset routes matcher
-        function reset(specs) {
-          this.specs = specs;
-          var matchers = specs.reduce(function(ms, spec) {
-            ms.push(new RouteMatcher(spec));
-            return ms;
-          }, []);
-          this.matchers = matchers;
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
         }
-      )
-    },
-    {
-      key: "match",
-      value: (
-        // get best match from all matcher in manager
-        function match(pathname) {
-          var matches = this.filter(pathname);
-          var best = this.best(pathname, matches);
-          return best;
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
         }
-      )
-    },
-    {
-      key: "matchEntry",
-      value: function matchEntry(entryname) {
-        return this.matchers.find(function(matcher) {
-          return matcher.matchEntry(entryname);
-        });
-      }
-    },
-    {
-      key: "getBundles",
-      value: function getBundles() {
-        var bundles = this.specs.filter(function(route) {
-          return route.isSSR;
-        }).map(function(route) {
-          return route.bundle;
-        });
-        return bundles;
       }
     }
-  ]);
+    return best2;
+  };
+  _proto.reset = function reset(specs) {
+    this.specs = specs;
+    var matchers = specs.reduce(function(ms, spec) {
+      ms.push(new RouteMatcher(spec));
+      return ms;
+    }, []);
+    this.matchers = matchers;
+  };
+  _proto.match = function match(pathname) {
+    var matches = this.filter(pathname);
+    var best = this.best(pathname, matches);
+    return best;
+  };
+  _proto.matchEntry = function matchEntry(entryname) {
+    return this.matchers.find(function(matcher) {
+      return matcher.matchEntry(entryname);
+    });
+  };
+  _proto.getBundles = function getBundles() {
+    var bundles = this.specs.filter(function(route) {
+      return route.isSSR;
+    }).map(function(route) {
+      return route.bundle;
+    });
+    return bundles;
+  };
   return RouteMatchManager2;
 }();
 export {