@modern-js/prod-server 2.28.0 → 2.30.0

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # @modern-js/prod-server
 
+## 2.30.0
+
+### Minor Changes
+
+- a5ee81a: feat(server): add new server hooks `beforeServerInit` & `afterServerInit`
+  feat(server): 添加新的服务端钩子 `beforeServerInit` & `afterServerInit`
+
+### Patch Changes
+
+- 9f21f28: fix(server): add catch and imporve url parse logic in modern server
+  fix(server): 在 modern server 中优化 url 解析逻辑并添加错误捕获并
+- 883692c: fix: can't proxy WebSocket without the initial http request
+  fix: WebSocket 代理只能在首次 http 请求后生效
+- b6ab299: fix(prod-server): remove req bodyParser, let uesr parses body by themself.
+  fix(prod-server): 移除 req bodyParser, 让用户自行解析 body
+- Updated dependencies [a5ee81a]
+  - @modern-js/server-core@2.30.0
+  - @modern-js/utils@2.30.0
+  - @modern-js/plugin@2.30.0
+
+## 2.29.0
+
+### Minor Changes
+
+- 16e5195: feat(prod-server): add body parser
+  feat(prod-server): 增加 body 解析器
+- cba7675: feat: add a server reporter that report server cost, logger about error, info etc.
+  feat: 添加一个 server 端 reporter，来报告 server 端耗时，报错等
+
+### Patch Changes
+
+- 76ace5d: fix(prod-server): bff may run bodyParser by themself, so we need't to run
+  fix(prod-server): bff 可能会在内部运行, 所以我们不需要运行
+- Updated dependencies [e6b5355]
+- Updated dependencies [93db783]
+- Updated dependencies [cba7675]
+- Updated dependencies [99052ea]
+- Updated dependencies [1d71d2e]
+  - @modern-js/utils@2.29.0
+  - @modern-js/server-core@2.29.0
+  - @modern-js/plugin@2.29.0
+
 ## 2.28.0
 
 ### Minor Changes

package/dist/cjs/libs/context/context.js

@@ -15,7 +15,10 @@ const _querystring = /* @__PURE__ */ _interop_require_default._(require("queryst
 const _buffer = require("buffer");
 const _etag = /* @__PURE__ */ _interop_require_default._(require("etag"));
 const _fresh = /* @__PURE__ */ _interop_require_default._(require("fresh"));
-const _utils = require("../../utils");
+const _utils = require("@modern-js/utils");
+const _serverTiming = require("../serverTiming");
+const _reporter = require("../reporter");
+const _utils1 = require("../../utils");
 const MOCK_URL_BASE = "https://modernjs.dev/";
 class ModernServerContext {
   get logger() {
@@ -25,8 +28,12 @@ class ModernServerContext {
     return this.req.metrics;
   }
   get parsedURL() {
-    const url = new _url.URL(this.req.url, MOCK_URL_BASE);
-    return url;
+    try {
+      return new _url.URL(this.req.url, MOCK_URL_BASE);
+    } catch (e) {
+      this.logger.error("Parse URL error", e.stack || e.message);
+      return new _url.URL("/_modern_mock_path", MOCK_URL_BASE);
+    }
   }
   bind() {
     const { req, res } = this;
@@ -157,18 +164,21 @@ class ModernServerContext {
     return this.res.writableEnded;
   }
   error(dig, e = "") {
-    this.logger.error(`Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, this.path, (0, _utils.headersWithoutCookie)(this.headers));
+    this.logger.error(`Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, this.path, (0, _utils1.headersWithoutCookie)(this.headers));
   }
   constructor(req, res, options) {
+    var _options;
     _define_property._(this, "req", void 0);
     _define_property._(this, "res", void 0);
     _define_property._(this, "params", {});
-    _define_property._(this, "serverData", void 0);
+    _define_property._(this, "reporter", _reporter.defaultReporter);
+    _define_property._(this, "serverTiming", void 0);
+    _define_property._(this, "serverData", {});
     _define_property._(this, "options", {});
     this.req = req;
     this.res = res;
     this.options = options || {};
-    this.serverData = {};
+    this.serverTiming = new _serverTiming.ServerTiming(res, (0, _utils.cutNameByHyphen)(((_options = options) === null || _options === void 0 ? void 0 : _options.metaName) || "modern-js"));
     this.bind();
   }
 }

package/dist/cjs/libs/hook-api/index.js

@@ -27,10 +27,11 @@ const _route = require("./route");
 const _template = require("./template");
 const _base = require("./base");
 const base = (context) => {
-  const { res } = context;
+  const { res, reporter } = context;
   return {
     response: new _base.BaseResponse(res),
     request: new _base.BaseRequest(context),
+    reporter,
     logger: context.logger,
     metrics: context.metrics
   };

package/dist/cjs/libs/hook-api/index.worker.js

@@ -56,7 +56,7 @@ class ServerResponse {
   }
 }
 const base = (context) => {
-  const { req, res, logger, metrics } = context;
+  const { req, res, logger, metrics, reporter } = context;
   const serverResponse = new ServerResponse(res);
   const { host, pathname, searchParams } = new URL(req.url);
   const headers = {};
@@ -65,6 +65,7 @@ const base = (context) => {
   });
   return {
     response: new _base.BaseResponse(serverResponse),
+    reporter,
     request: new _base.BaseRequest({
       url: req.url,
       host,

package/dist/cjs/libs/proxy.js

@@ -45,24 +45,42 @@ function formatProxyOptions(proxyOptions) {
 }
 const createProxyHandler = (proxyOptions) => {
   (0, _utils.debug)("createProxyHandler", proxyOptions);
+  const middlewares = [];
+  const handlers = [];
+  const handleUpgrade = (req, socket, head) => {
+    for (const middleware of middlewares) {
+      if (typeof middleware.upgrade === "function") {
+        middleware.upgrade(req, socket, head);
+      }
+    }
+  };
   if (!proxyOptions) {
-    return null;
+    return {
+      handlers,
+      handleUpgrade
+    };
   }
-  const formattedProxy = formatProxyOptions(proxyOptions);
-  const middlewares = formattedProxy.map((option) => {
-    const middleware = (0, _httpproxymiddleware.createProxyMiddleware)(option.context, option);
-    return async (ctx, next) => {
+  const formattedOptionsList = formatProxyOptions(proxyOptions);
+  for (const options of formattedOptionsList) {
+    const middleware = (0, _httpproxymiddleware.createProxyMiddleware)(options.context, options);
+    const handler = async (ctx, next) => {
       const { req, res } = ctx;
-      const bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
+      const bypassUrl = typeof options.bypass === "function" ? options.bypass(req, res, options) : null;
       if (typeof bypassUrl === "boolean") {
         ctx.status = 404;
-        return next();
+        next();
       } else if (typeof bypassUrl === "string") {
         ctx.url = bypassUrl;
-        return next();
+        next();
+      } else {
+        middleware(req, res, next);
       }
-      middleware(req, res, next);
     };
-  });
-  return middlewares;
+    middlewares.push(middleware);
+    handlers.push(handler);
+  }
+  return {
+    handlers,
+    handleUpgrade
+  };
 };

package/dist/cjs/libs/render/ssr.js

@@ -22,7 +22,6 @@ const render = async (ctx, renderOptions, runner) => {
   const loadableStats = _utils.fs.existsSync(loadableUri) ? require(loadableUri) : "";
   const routesManifestUri = _path.default.join(distDir, _utils.ROUTE_MANIFEST_FILE);
   const routeManifest = _utils.fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
-  const body = await getRequestBody(ctx.req);
   const context = {
     request: {
       baseUrl: urlPath,
@@ -31,8 +30,7 @@ const render = async (ctx, renderOptions, runner) => {
       host: ctx.host,
       query: ctx.query,
       url: ctx.href,
-      headers: ctx.headers,
-      body
+      headers: ctx.headers
     },
     response: {
       setHeader: (key, value) => {
@@ -51,6 +49,8 @@ const render = async (ctx, renderOptions, runner) => {
     staticGenerate,
     logger: void 0,
     metrics: void 0,
+    reporter: ctx.reporter,
+    serverTiming: ctx.serverTiming,
     req: ctx.req,
     res: ctx.res,
     enableUnsafeCtx,
@@ -84,20 +84,3 @@ const render = async (ctx, renderOptions, runner) => {
     };
   }
 };
-const getRequestBody = (req) => new Promise((resolve, reject) => {
-  var _req;
-  if (((_req = req) === null || _req === void 0 ? void 0 : _req.method) && req.method.toLowerCase() !== "get") {
-    let body = "";
-    req.on("data", (chunk) => {
-      body += chunk.toString();
-    });
-    req.on("end", () => {
-      resolve(body);
-    });
-    req.on("error", (err) => {
-      reject(err);
-    });
-  } else {
-    resolve(void 0);
-  }
-});

package/dist/cjs/libs/reporter.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "defaultReporter", {
+  enumerable: true,
+  get: function() {
+    return defaultReporter;
+  }
+});
+const defaultReporter = {
+  init() {
+  },
+  reportError() {
+  },
+  reportTiming() {
+  },
+  reportInfo() {
+  },
+  reportWarn() {
+  }
+};

package/dist/cjs/libs/serverTiming.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "ServerTiming", {
+  enumerable: true,
+  get: function() {
+    return ServerTiming;
+  }
+});
+const _define_property = require("@swc/helpers/_/_define_property");
+const SERVER_TIMING = "Server-Timing";
+class ServerTiming {
+  addServeTiming(name, dur, desc) {
+    const _name = `bd-${this.meta}-${name}`;
+    const serverTiming = this.res.getHeader(SERVER_TIMING) || this.res.getHeader(SERVER_TIMING.toLocaleLowerCase());
+    const value = `${_name};${desc ? `decs="${desc}";` : ""} dur=${dur}`;
+    this.res.setHeader(SERVER_TIMING, serverTiming ? `${serverTiming}, ${value}` : value);
+    return this;
+  }
+  constructor(res, meta) {
+    _define_property._(this, "meta", void 0);
+    _define_property._(this, "res", void 0);
+    this.meta = meta;
+    this.res = res;
+  }
+}

package/dist/cjs/server/index.js

@@ -47,7 +47,21 @@ class Server {
     if (!disableHttpServer) {
       this.app = await this.server.createHTTPServer(this.getRequestHandler());
     }
+    {
+      const result = await this.runner.beforeServerInit({
+        app: this.app,
+        server: this.server
+      });
+      ({ app: this.app = this.app, server: this.server } = result);
+    }
     await this.server.onInit(this.runner, this.app);
+    {
+      const result = await this.runner.afterServerInit({
+        app: this.app,
+        server: this.server
+      });
+      ({ app: this.app = this.app, server: this.server } = result);
+    }
     return this;
   }
   /**

package/dist/cjs/server/modernServer.js

@@ -14,6 +14,7 @@ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildc
 const _http = require("http");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
+const _time = require("@modern-js/utils/universal/time");
 const _route = require("../libs/route");
 const _render = require("../libs/render");
 const _serveFile = require("../libs/serveFile");
@@ -32,12 +33,11 @@ class ModernServer {
     const { distDir, conf } = this;
     this.initReader();
     (0, _utils1.debug)("final server conf", this.conf);
-    this.proxyHandler = (0, _proxy.createProxyHandler)((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
-    if (this.proxyHandler) {
-      this.proxyHandler.forEach((handler) => {
-        this.addHandler(handler);
-      });
-    }
+    const proxyHandlers = (0, _proxy.createProxyHandler)((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
+    app.on("upgrade", proxyHandlers.handleUpgrade);
+    proxyHandlers.handlers.forEach((handler) => {
+      this.addHandler(handler);
+    });
     (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", () => {
       this.reader.close();
     });
@@ -76,7 +76,9 @@ class ModernServer {
   async render(req, res, url) {
     req.logger = req.logger || this.logger;
     req.metrics = req.metrics || this.metrics;
-    const context = (0, _context.createContext)(req, res);
+    const context = (0, _context.createContext)(req, res, {
+      metaName: this.metaName
+    });
     const matched = this.router.match(url || context.path);
     if (!matched) {
       return null;
@@ -277,12 +279,20 @@ class ModernServer {
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
   async routeHandler(context) {
-    const { res } = context;
+    const { res, reporter } = context;
     const matched = this.router.match(context.path);
     if (!matched) {
       this.render404(context);
       return;
     }
+    await reporter.init({
+      match: matched
+    });
+    const end = (0, _time.time)();
+    res.on("finish", () => {
+      const cost = end();
+      reporter.reportTiming("server_handle_request", cost);
+    });
     let route = matched.generate(context.url);
     if (route.isApi) {
       await this.handleAPI(context);
@@ -291,9 +301,12 @@ class ModernServer {
     if (route.entryName) {
       const afterMatchContext = (0, _hookapi.createAfterMatchContext)(context, route.entryName);
       if (this.runMode === _constants.RUN_MODE.FULL) {
+        const end2 = (0, _time.time)();
         await this.runner.afterMatch(afterMatchContext, {
           onLast: _utils1.noop
         });
+        const cost = end2();
+        reporter.reportTiming("server_hook_after_render", cost);
       }
       if (this.isSend(res)) {
         return;
@@ -315,7 +328,10 @@ class ModernServer {
     if (this.frameWebHandler) {
       res.locals = res.locals || {};
       const middlewareContext = (0, _hookapi.createMiddlewareContext)(context);
+      const end2 = (0, _time.time)();
       await this.frameWebHandler(middlewareContext);
+      const cost = end2();
+      reporter.reportTiming("server_middleware", cost);
       res.locals = {
         ...res.locals,
         ...middlewareContext.response.locals
@@ -337,9 +353,12 @@ class ModernServer {
     if (route.entryName) {
       const afterRenderContext = (0, _hookapi.createAfterRenderContext)(context, response.toString());
       if (this.runMode === _constants.RUN_MODE.FULL) {
+        const end2 = (0, _time.time)();
         await this.runner.afterRender(afterRenderContext, {
           onLast: _utils1.noop
         });
+        const cost = end2();
+        reporter.reportTiming("server_hook_after_render", cost);
       }
       if (this.isSend(res)) {
         return;
@@ -472,7 +491,6 @@ class ModernServer {
     _define_property._(this, "loaderHandler", null);
     _define_property._(this, "frameWebHandler", null);
     _define_property._(this, "frameAPIHandler", null);
-    _define_property._(this, "proxyHandler", null);
     _define_property._(this, "_handler", void 0);
     require("ignore-styles");
     this.pwd = pwd;

package/dist/cjs/workerServer.js

@@ -23,6 +23,7 @@ const _indexworker = require("./libs/hook-api/index.worker");
 const _logger = require("./libs/logger");
 const _route = require("./libs/route");
 const _metrics = require("./libs/metrics");
+const _reporter = require("./libs/reporter");
 class ReturnResponse {
   /**
   * Iterate a Object
@@ -101,7 +102,8 @@ const createHandler = (manifest) => {
       level: "warn"
     });
     const metrics = _metrics.metrics;
-    const hookContext = createWorkerHookContext(request.url, logger, metrics);
+    const reporter = _reporter.defaultReporter;
+    const hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
     const afterMatchHookContext = (0, _indexworker.createAfterMatchContext)(hookContext, entryName);
     (_page = page) === null || _page === void 0 ? void 0 : (_page_serverHooks = _page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0);
     if (checkIsSent(hookContext)) {
@@ -137,9 +139,15 @@ const createHandler = (manifest) => {
           template: page.template,
           entryName: page.entryName,
           logger,
+          reporter: _reporter.defaultReporter,
           metrics,
           // FIXME: pass correctly req & res
           req: request,
+          serverTiming: {
+            addServeTiming() {
+              return this;
+            }
+          },
           res: responseLike
         };
         const body = await page.serverRender(serverRenderContext);
@@ -184,7 +192,7 @@ function createResponse(template) {
     return RESPONSE_NOTFOUND;
   }
 }
-function createWorkerHookContext(url, logger, metrics) {
+function createWorkerHookContext(url, logger, metrics, reporter) {
   const [res, req] = [
     {
       headers: new Headers(),
@@ -198,7 +206,8 @@ function createWorkerHookContext(url, logger, metrics) {
     res,
     req,
     logger,
-    metrics
+    metrics,
+    reporter
   };
 }
 function applyMiddlewares(ctx, middleware) {

package/dist/esm/libs/context/context.js

@@ -7,21 +7,27 @@ import qs from "querystring";
 import { Buffer } from "buffer";
 import createEtag from "etag";
 import fresh from "fresh";
+import { cutNameByHyphen } from "@modern-js/utils";
+import { ServerTiming } from "../serverTiming";
+import { defaultReporter } from "../reporter";
 import { headersWithoutCookie } from "../../utils";
 var MOCK_URL_BASE = "https://modernjs.dev/";
 export var ModernServerContext = /* @__PURE__ */ function() {
   "use strict";
   function ModernServerContext2(req, res, options) {
     _class_call_check(this, ModernServerContext2);
+    var _options;
     _define_property(this, "req", void 0);
     _define_property(this, "res", void 0);
     _define_property(this, "params", {});
-    _define_property(this, "serverData", void 0);
+    _define_property(this, "reporter", defaultReporter);
+    _define_property(this, "serverTiming", void 0);
+    _define_property(this, "serverData", {});
     _define_property(this, "options", {});
     this.req = req;
     this.res = res;
     this.options = options || {};
-    this.serverData = {};
+    this.serverTiming = new ServerTiming(res, cutNameByHyphen(((_options = options) === null || _options === void 0 ? void 0 : _options.metaName) || "modern-js"));
     this.bind();
   }
   _create_class(ModernServerContext2, [
@@ -40,8 +46,12 @@ export var ModernServerContext = /* @__PURE__ */ function() {
     {
       key: "parsedURL",
       get: function get() {
-        var url = new URL(this.req.url, MOCK_URL_BASE);
-        return url;
+        try {
+          return new URL(this.req.url, MOCK_URL_BASE);
+        } catch (e) {
+          this.logger.error("Parse URL error", e.stack || e.message);
+          return new URL("/_modern_mock_path", MOCK_URL_BASE);
+        }
       }
     },
     {

package/dist/esm/libs/hook-api/index.js

@@ -4,10 +4,11 @@ import { RouteAPI } from "./route";
 import { TemplateAPI } from "./template";
 import { BaseRequest, BaseResponse } from "./base";
 export var base = function(context) {
-  var res = context.res;
+  var res = context.res, reporter = context.reporter;
   return {
     response: new BaseResponse(res),
     request: new BaseRequest(context),
+    reporter: reporter,
     logger: context.logger,
     metrics: context.metrics
   };

package/dist/esm/libs/hook-api/index.worker.js

@@ -55,7 +55,7 @@ var ServerResponse = /* @__PURE__ */ function() {
   return ServerResponse2;
 }();
 export var base = function(context) {
-  var req = context.req, res = context.res, logger = context.logger, metrics = context.metrics;
+  var req = context.req, res = context.res, logger = context.logger, metrics = context.metrics, reporter = context.reporter;
   var serverResponse = new ServerResponse(res);
   var _ref = new URL(req.url), host = _ref.host, pathname = _ref.pathname, searchParams = _ref.searchParams;
   var headers = {};
@@ -64,6 +64,7 @@ export var base = function(context) {
   });
   return {
     response: new BaseResponse(serverResponse),
+    reporter: reporter,
     request: new BaseRequest({
       url: req.url,
       host: host,

package/dist/esm/libs/proxy.js

@@ -30,41 +30,89 @@ export function formatProxyOptions(proxyOptions) {
 }
 export var createProxyHandler = function(proxyOptions) {
   debug("createProxyHandler", proxyOptions);
+  var middlewares = [];
+  var handlers = [];
+  var handleUpgrade = function(req, socket, head) {
+    var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
+    try {
+      for (var _iterator2 = middlewares[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+        var middleware = _step2.value;
+        if (typeof middleware.upgrade === "function") {
+          middleware.upgrade(req, socket, head);
+        }
+      }
+    } catch (err) {
+      _didIteratorError2 = true;
+      _iteratorError2 = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+          _iterator2.return();
+        }
+      } finally {
+        if (_didIteratorError2) {
+          throw _iteratorError2;
+        }
+      }
+    }
+  };
   if (!proxyOptions) {
-    return null;
+    return {
+      handlers: handlers,
+      handleUpgrade: handleUpgrade
+    };
   }
-  var formattedProxy = formatProxyOptions(proxyOptions);
-  var middlewares = formattedProxy.map(function(option) {
-    var middleware = createProxyMiddleware(option.context, option);
-    return function() {
-      var _ref = _async_to_generator(function(ctx, next) {
-        var req, res, bypassUrl;
-        return _ts_generator(this, function(_state) {
-          req = ctx.req, res = ctx.res;
-          bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
-          if (typeof bypassUrl === "boolean") {
-            ctx.status = 404;
-            return [
-              2,
-              next()
-            ];
-          } else if (typeof bypassUrl === "string") {
-            ctx.url = bypassUrl;
+  var formattedOptionsList = formatProxyOptions(proxyOptions);
+  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    var _loop = function() {
+      var options = _step.value;
+      var middleware = createProxyMiddleware(options.context, options);
+      var handler = function() {
+        var _ref = _async_to_generator(function(ctx, next) {
+          var req, res, bypassUrl;
+          return _ts_generator(this, function(_state) {
+            req = ctx.req, res = ctx.res;
+            bypassUrl = typeof options.bypass === "function" ? options.bypass(req, res, options) : null;
+            if (typeof bypassUrl === "boolean") {
+              ctx.status = 404;
+              next();
+            } else if (typeof bypassUrl === "string") {
+              ctx.url = bypassUrl;
+              next();
+            } else {
+              middleware(req, res, next);
+            }
             return [
-              2,
-              next()
+              2
             ];
-          }
-          middleware(req, res, next);
-          return [
-            2
-          ];
+          });
         });
-      });
-      return function(ctx, next) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-  });
-  return middlewares;
+        return function handler2(ctx, next) {
+          return _ref.apply(this, arguments);
+        };
+      }();
+      middlewares.push(middleware);
+      handlers.push(handler);
+    };
+    for (var _iterator = formattedOptionsList[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)
+      _loop();
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+  return {
+    handlers: handlers,
+    handleUpgrade: handleUpgrade
+  };
 };