@contember/engine-server 1.2.0 → 1.3.0-alpha.2

package/dist/src/start.js

@@ -27,31 +27,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("./index");
+const engine_http_1 = require("@contember/engine-http");
 const loadPlugins_1 = __importDefault(require("./loadPlugins"));
-const serverStartup_1 = require("./utils/serverStartup");
-const logger = (0, index_1.createDefaultLogger)();
+const logger = (0, engine_http_1.createDefaultLogger)();
 process.on('warning', message => {
     logger.warn(message);
 });
 (async () => {
     var _a;
-    const isDebug = (0, serverStartup_1.isDebugMode)();
+    const isDebug = (0, engine_http_1.isDebugMode)();
     if (process.env.NODE_HEAPDUMP === 'true') {
         logger.info('Initializing heapdump');
         await Promise.resolve().then(() => __importStar(require('heapdump')));
     }
     const terminationJobs = [];
-    (0, index_1.listenOnProcessTermination)(terminationJobs, logger);
-    const version = (0, serverStartup_1.getServerVersion)();
-    (0, serverStartup_1.printStartInfo)({ version, isDebug }, logger);
+    (0, engine_http_1.listenOnProcessTermination)(terminationJobs, logger);
+    const version = (0, engine_http_1.getServerVersion)();
+    (0, engine_http_1.printStartInfo)({ version, isDebug }, logger);
     const plugins = await (0, loadPlugins_1.default)();
-    const { serverConfig, projectConfigResolver, tenantConfigResolver } = await (0, serverStartup_1.resolveServerConfig)({ plugins, serverConfigSchema: index_1.serverConfigSchema });
-    const sentryTransport = (0, index_1.createSentryLoggerHandler)((_a = serverConfig.logging.sentry) === null || _a === void 0 ? void 0 : _a.dsn);
+    const { serverConfig, projectConfigResolver, tenantConfigResolver } = await (0, engine_http_1.resolveServerConfig)({
+        plugins,
+        serverConfigSchema: engine_http_1.serverConfigSchema,
+    });
+    const sentryTransport = (0, engine_http_1.createSentryLoggerHandler)((_a = serverConfig.logging.sentry) === null || _a === void 0 ? void 0 : _a.dsn);
     if (sentryTransport !== null) {
         logger.addHandler(sentryTransport);
     }
-    const container = (0, index_1.createContainer)({
+    const container = (0, engine_http_1.createContainer)({
         debugMode: isDebug,
         serverConfig,
         projectConfigResolver,
@@ -61,11 +63,10 @@ process.on('warning', message => {
         logger,
     });
     const initializedProjects = await container.initializer.initialize();
-    const httpServer = container.koa.listen(serverConfig.port, () => {
-        logger.info(`Contember API running on http://localhost:${(serverConfig.port)}`);
-        logger.info(initializedProjects.length ? `Initialized projects: ${initializedProjects.join(', ')}` : 'No project initialized');
-    });
-    terminationJobs.push(() => new Promise(resolve => httpServer.close(resolve)));
+    const httpServerPromise = container.application.listen();
+    terminationJobs.push(async () => await (await httpServerPromise).close());
+    logger.info(`Contember API running on http://localhost:${(serverConfig.port)}`);
+    logger.info(initializedProjects.length ? `Initialized projects: ${initializedProjects.join(', ')}` : 'No project initialized');
 })().catch(e => {
     logger.crit(e);
     process.exit(1);

package/dist/src/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,mCAMgB;AAChB,gEAAuC;AACvC,yDAA0G;AAE1G,MAAM,MAAM,GAAG,IAAA,2BAAmB,GAAE,CAAA;AACpC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;IAC/B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACrB,CAAC,CAAC,CACD;AAAA,CAAC,KAAK,IAAI,EAAE;;IACZ,MAAM,OAAO,GAAG,IAAA,2BAAW,GAAE,CAAA;IAC7B,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM,EAAE;QACzC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;QACpC,wDAAa,UAAU,GAAC,CAAA;KACxB;IACD,MAAM,eAAe,GAAqB,EAAE,CAAA;IAC5C,IAAA,kCAA0B,EAAC,eAAe,EAAE,MAAM,CAAC,CAAA;IAEnD,MAAM,OAAO,GAAG,IAAA,gCAAgB,GAAE,CAAA;IAClC,IAAA,8BAAc,EAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,CAAA;IAC5C,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAW,GAAE,CAAA;IACnC,MAAM,EAAE,YAAY,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,GAAG,MAAM,IAAA,mCAAmB,EAAC,EAAE,OAAO,EAAE,kBAAkB,EAAlB,0BAAkB,EAAE,CAAC,CAAA;IAEhI,MAAM,eAAe,GAAG,IAAA,iCAAyB,EAAC,MAAA,YAAY,CAAC,OAAO,CAAC,MAAM,0CAAE,GAAG,CAAC,CAAA;IACnF,IAAI,eAAe,KAAK,IAAI,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;KAClC;IAED,MAAM,SAAS,GAAG,IAAA,uBAAe,EAAC;QACjC,SAAS,EAAE,OAAO;QAClB,YAAY;QACZ,qBAAqB;QACrB,oBAAoB;QACpB,OAAO;QACP,OAAO;QACP,MAAM;KACN,CAAC,CAAA;IAEF,MAAM,mBAAmB,GAAa,MAAM,SAAS,CAAC,WAAW,CAAC,UAAU,EAAE,CAAA;IAE9E,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE;QAC/D,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC/E,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,yBAAyB,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAA;IAC/H,CAAC,CAAC,CAAA;IACF,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAM,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AACnF,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACd,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAChB,CAAC,CAAC,CAAA"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,wDAO+B;AAC/B,gEAAuC;AAEvC,MAAM,MAAM,GAAG,IAAA,iCAAmB,GAAE,CAAA;AACpC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;IAC/B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACrB,CAAC,CAAC,CACD;AAAA,CAAC,KAAK,IAAI,EAAE;;IACZ,MAAM,OAAO,GAAG,IAAA,yBAAW,GAAE,CAAA;IAC7B,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM,EAAE;QACzC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;QACpC,wDAAa,UAAU,GAAC,CAAA;KACxB;IACD,MAAM,eAAe,GAAqB,EAAE,CAAA;IAC5C,IAAA,wCAA0B,EAAC,eAAe,EAAE,MAAM,CAAC,CAAA;IAEnD,MAAM,OAAO,GAAG,IAAA,8BAAgB,GAAE,CAAA;IAClC,IAAA,4BAAc,EAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,CAAA;IAC5C,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAW,GAAE,CAAA;IACnC,MAAM,EAAE,YAAY,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,GAAG,MAAM,IAAA,iCAAmB,EAAC;QAC/F,OAAO;QACP,kBAAkB,EAAlB,gCAAkB;KAClB,CAAC,CAAA;IAEF,MAAM,eAAe,GAAG,IAAA,uCAAyB,EAAC,MAAA,YAAY,CAAC,OAAO,CAAC,MAAM,0CAAE,GAAG,CAAC,CAAA;IACnF,IAAI,eAAe,KAAK,IAAI,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;KAClC;IAED,MAAM,SAAS,GAAG,IAAA,6BAAe,EAAC;QACjC,SAAS,EAAE,OAAO;QAClB,YAAY;QACZ,qBAAqB;QACrB,oBAAoB;QACpB,OAAO;QACP,OAAO;QACP,MAAM;KACN,CAAC,CAAA;IAEF,MAAM,mBAAmB,GAAa,MAAM,SAAS,CAAC,WAAW,CAAC,UAAU,EAAE,CAAA;IAE9E,MAAM,iBAAiB,GAAG,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,CAAA;IACxD,eAAe,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,iBAAiB,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC/E,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,yBAAyB,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAA;AAC/H,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACd,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAChB,CAAC,CAAC,CAAA"}