@celljs/express-adapter 4.1.0 → 4.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -1 +1,3 @@
1
- # Cell - Express Adapter Component
1
+ # Cell - Express Adapter Component
2
+
3
+ The backend entry of an HTTP application: it starts the application and serves it with `node:http` on `cell.server.host` / `cell.server.port` (`CELL_BACKEND__SERVER__PORT` overrides the port). Despite the name it no longer depends on express; the handler is `HttpServerUtil.createHandler()` of `@celljs/web`.
@@ -2,11 +2,9 @@ import { container } from '@celljs/core/lib/common/container/dynamic-container';
2
2
  import { Application } from '@celljs/core/lib/common/application/application-protocol';
3
3
  import { ApplicationHost } from '@celljs/core/lib/common/application/application-host';
4
4
  import { ContainerProvider } from '@celljs/core/lib/common/container/container-provider';
5
- import { Dispatcher } from '@celljs/web/lib/node/dispatcher/dispatcher-protocol';
6
- import { Context } from '@celljs/web/lib/node/context';
7
5
  import { ServerAware } from '@celljs/web/lib/node/http';
6
+ import { HttpServerUtil } from '@celljs/web/lib/node/server';
8
7
  import { ConfigProvider } from '@celljs/core/lib/common/config/config-protocol';
9
- import express from 'express';
10
8
  import { DEFAULT_SERVER_OPTIONS } from './context.js';
11
9
  const host = ApplicationHost.get();
12
10
  container.then(async (c) => {
@@ -15,30 +13,25 @@ container.then(async (c) => {
15
13
  await ((_a = host === null || host === void 0 ? void 0 : host.beforeStart) === null || _a === void 0 ? void 0 : _a.call(host));
16
14
  const application = c.get(Application);
17
15
  await application.start();
18
- const app = express();
19
- app.all('*', async (req, res) => {
20
- const dispatcher = c.get(Dispatcher);
21
- const httpContext = new Context(req, res);
22
- Context.run(() => dispatcher.dispatch(httpContext));
23
- });
16
+ const handler = HttpServerUtil.createHandler(c);
24
17
  // In-process hosts (cell dev, tests) serve the handler themselves.
25
- const server = host ? host.server : startServer(app, c.get(ConfigProvider));
18
+ const server = host ? host.server : startServer(handler, c.get(ConfigProvider));
26
19
  if (server) {
27
20
  for (const serverAware of c.getAll(ServerAware)) {
28
21
  await serverAware.setServer(server);
29
22
  }
30
23
  }
31
- host === null || host === void 0 ? void 0 : host.started({ container: c, handler: app, stop: () => application.stop() });
24
+ host === null || host === void 0 ? void 0 : host.started({ container: c, handler, stop: () => application.stop() });
32
25
  }).catch(error => {
33
26
  if (!host) {
34
27
  throw error;
35
28
  }
36
29
  host.failed(error);
37
30
  });
38
- function startServer(app, configProvider) {
31
+ function startServer(handler, configProvider) {
39
32
  // Override with CELL_BACKEND__SERVER__PORT / CELL_BACKEND__SERVER__HOST like any other key.
40
33
  const { port, host: hostname } = { ...DEFAULT_SERVER_OPTIONS, ...configProvider.get('cell.server', {}) };
41
- const server = app.listen(port, hostname);
34
+ const server = HttpServerUtil.createHttpServer(handler).listen(port, hostname);
42
35
  console.log(`serve ${port}`);
43
36
  return server;
44
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"http-application-entry.js","sourceRoot":"","sources":["../../src/node/http-application-entry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"http-application-entry.js","sourceRoot":"","sources":["../../src/node/http-application-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qDAAqD,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,0DAA0D,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAEnD,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC;AAEnC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;;IACrB,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACzB,OAAM,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,+CAAjB,IAAI,CAAiB,CAAA,CAAC;IAC5B,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAc,WAAW,CAAC,CAAC;IACpD,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAChD,mEAAmE;IACnE,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAiB,cAAc,CAAC,CAAC,CAAC;IAChG,IAAI,MAAM,EAAE,CAAC;QACT,KAAK,MAAM,WAAW,IAAI,CAAC,CAAC,MAAM,CAAc,WAAW,CAAC,EAAE,CAAC;YAC3D,MAAM,WAAW,CAAC,SAAS,CAAC,MAAa,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IACD,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC7E,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;IACb,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,MAAM,KAAK,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,SAAS,WAAW,CAAC,OAAwB,EAAE,cAA8B;IACzE,4FAA4F;IAC5F,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,sBAAsB,EAAE,GAAG,cAAc,CAAC,GAAG,CAAM,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC;IAC9G,MAAM,MAAM,GAAG,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC;AAClB,CAAC"}
@@ -1,2 +1,2 @@
1
- declare const _default: import("inversify").interfaces.ContainerModule;
1
+ declare const _default: import("@celljs/core").ContainerModule;
2
2
  export default _default;
@@ -1,18 +1,13 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  const dynamic_container_1 = require("@celljs/core/lib/common/container/dynamic-container");
7
4
  const application_protocol_1 = require("@celljs/core/lib/common/application/application-protocol");
8
5
  const application_host_1 = require("@celljs/core/lib/common/application/application-host");
9
6
  const container_provider_1 = require("@celljs/core/lib/common/container/container-provider");
10
- const dispatcher_protocol_1 = require("@celljs/web/lib/node/dispatcher/dispatcher-protocol");
11
- const context_1 = require("@celljs/web/lib/node/context");
12
7
  const http_1 = require("@celljs/web/lib/node/http");
8
+ const server_1 = require("@celljs/web/lib/node/server");
13
9
  const config_protocol_1 = require("@celljs/core/lib/common/config/config-protocol");
14
- const express_1 = __importDefault(require("express"));
15
- const context_2 = require("./context");
10
+ const context_1 = require("./context");
16
11
  const host = application_host_1.ApplicationHost.get();
17
12
  dynamic_container_1.container.then(async (c) => {
18
13
  var _a;
@@ -20,30 +15,25 @@ dynamic_container_1.container.then(async (c) => {
20
15
  await ((_a = host === null || host === void 0 ? void 0 : host.beforeStart) === null || _a === void 0 ? void 0 : _a.call(host));
21
16
  const application = c.get(application_protocol_1.Application);
22
17
  await application.start();
23
- const app = (0, express_1.default)();
24
- app.all('*', async (req, res) => {
25
- const dispatcher = c.get(dispatcher_protocol_1.Dispatcher);
26
- const httpContext = new context_1.Context(req, res);
27
- context_1.Context.run(() => dispatcher.dispatch(httpContext));
28
- });
18
+ const handler = server_1.HttpServerUtil.createHandler(c);
29
19
  // In-process hosts (cell dev, tests) serve the handler themselves.
30
- const server = host ? host.server : startServer(app, c.get(config_protocol_1.ConfigProvider));
20
+ const server = host ? host.server : startServer(handler, c.get(config_protocol_1.ConfigProvider));
31
21
  if (server) {
32
22
  for (const serverAware of c.getAll(http_1.ServerAware)) {
33
23
  await serverAware.setServer(server);
34
24
  }
35
25
  }
36
- host === null || host === void 0 ? void 0 : host.started({ container: c, handler: app, stop: () => application.stop() });
26
+ host === null || host === void 0 ? void 0 : host.started({ container: c, handler, stop: () => application.stop() });
37
27
  }).catch(error => {
38
28
  if (!host) {
39
29
  throw error;
40
30
  }
41
31
  host.failed(error);
42
32
  });
43
- function startServer(app, configProvider) {
33
+ function startServer(handler, configProvider) {
44
34
  // Override with CELL_BACKEND__SERVER__PORT / CELL_BACKEND__SERVER__HOST like any other key.
45
- const { port, host: hostname } = { ...context_2.DEFAULT_SERVER_OPTIONS, ...configProvider.get('cell.server', {}) };
46
- const server = app.listen(port, hostname);
35
+ const { port, host: hostname } = { ...context_1.DEFAULT_SERVER_OPTIONS, ...configProvider.get('cell.server', {}) };
36
+ const server = server_1.HttpServerUtil.createHttpServer(handler).listen(port, hostname);
47
37
  console.log(`serve ${port}`);
48
38
  return server;
49
39
  }
@@ -1 +1 @@
1
- {"version":3,"file":"http-application-entry.js","sourceRoot":"","sources":["../../src/node/http-application-entry.ts"],"names":[],"mappings":";;;;;AAAA,2FAAgF;AAChF,mGAAuF;AACvF,2FAAuF;AACvF,6FAAyF;AACzF,6FAAiF;AACjF,0DAAuD;AACvD,oDAAwD;AACxD,oFAAgF;AAEhF,sDAA8B;AAC9B,uCAAmD;AAEnD,MAAM,IAAI,GAAG,kCAAe,CAAC,GAAG,EAAE,CAAC;AAEnC,6BAAS,CAAC,IAAI,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;;IACrB,sCAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACzB,OAAM,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,+CAAjB,IAAI,CAAiB,CAAA,CAAC;IAC5B,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAc,kCAAW,CAAC,CAAC;IACpD,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;IACtB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAQ,EAAE,GAAQ,EAAE,EAAE;QACtC,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAsB,gCAAU,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAI,iBAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1C,iBAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,mEAAmE;IACnE,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAiB,gCAAc,CAAC,CAAC,CAAC;IAC5F,IAAI,MAAM,EAAE,CAAC;QACT,KAAK,MAAM,WAAW,IAAI,CAAC,CAAC,MAAM,CAAc,kBAAW,CAAC,EAAE,CAAC;YAC3D,MAAM,WAAW,CAAC,SAAS,CAAC,MAAa,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IACD,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAClF,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;IACb,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,MAAM,KAAK,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,SAAS,WAAW,CAAC,GAAoB,EAAE,cAA8B;IACrE,4FAA4F;IAC5F,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,gCAAsB,EAAE,GAAG,cAAc,CAAC,GAAG,CAAM,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC;IAC9G,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"http-application-entry.js","sourceRoot":"","sources":["../../src/node/http-application-entry.ts"],"names":[],"mappings":";;AAAA,2FAAgF;AAChF,mGAAuF;AACvF,2FAAuF;AACvF,6FAAyF;AACzF,oDAAwD;AACxD,wDAA8E;AAC9E,oFAAgF;AAChF,uCAAmD;AAEnD,MAAM,IAAI,GAAG,kCAAe,CAAC,GAAG,EAAE,CAAC;AAEnC,6BAAS,CAAC,IAAI,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;;IACrB,sCAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACzB,OAAM,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,+CAAjB,IAAI,CAAiB,CAAA,CAAC;IAC5B,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAc,kCAAW,CAAC,CAAC;IACpD,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,uBAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAChD,mEAAmE;IACnE,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAiB,gCAAc,CAAC,CAAC,CAAC;IAChG,IAAI,MAAM,EAAE,CAAC;QACT,KAAK,MAAM,WAAW,IAAI,CAAC,CAAC,MAAM,CAAc,kBAAW,CAAC,EAAE,CAAC;YAC3D,MAAM,WAAW,CAAC,SAAS,CAAC,MAAa,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IACD,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC7E,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;IACb,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,MAAM,KAAK,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,SAAS,WAAW,CAAC,OAAwB,EAAE,cAA8B;IACzE,4FAA4F;IAC5F,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,gCAAsB,EAAE,GAAG,cAAc,CAAC,GAAG,CAAM,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC;IAC9G,MAAM,MAAM,GAAG,uBAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC;AAClB,CAAC"}
@@ -1,3 +1,3 @@
1
- declare const _default: import("inversify").interfaces.ContainerModule;
1
+ declare const _default: import("@celljs/core").ContainerModule;
2
2
  export default _default;
3
3
  //# sourceMappingURL=module.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@celljs/express-adapter",
3
- "version": "4.1.0",
3
+ "version": "4.3.0",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "cell-component"
@@ -14,6 +14,9 @@
14
14
  "url": "https://github.com/cellbang/cell.git"
15
15
  },
16
16
  "license": "MIT",
17
+ "engines": {
18
+ "node": ">=18.0.0"
19
+ },
17
20
  "main": "lib/node/index.js",
18
21
  "typings": "lib/node/index.d.ts",
19
22
  "files": [
@@ -28,9 +31,8 @@
28
31
  "watch": "tsc -b -w --preserveWatchOutput"
29
32
  },
30
33
  "dependencies": {
31
- "@celljs/core": "4.1.0",
32
- "@celljs/web": "4.1.0",
33
- "express": "^4.22.3"
34
+ "@celljs/core": "4.3.0",
35
+ "@celljs/web": "4.3.0"
34
36
  },
35
37
  "publishConfig": {
36
38
  "access": "public"
@@ -2,12 +2,9 @@ import { container } from '@celljs/core/lib/common/container/dynamic-container';
2
2
  import { Application } from '@celljs/core/lib/common/application/application-protocol';
3
3
  import { ApplicationHost } from '@celljs/core/lib/common/application/application-host';
4
4
  import { ContainerProvider } from '@celljs/core/lib/common/container/container-provider';
5
- import { Dispatcher } from '@celljs/web/lib/node/dispatcher/dispatcher-protocol';
6
- import { Context } from '@celljs/web/lib/node/context';
7
5
  import { ServerAware } from '@celljs/web/lib/node/http';
6
+ import { HttpServerUtil, RequestListener } from '@celljs/web/lib/node/server';
8
7
  import { ConfigProvider } from '@celljs/core/lib/common/config/config-protocol';
9
-
10
- import express from 'express';
11
8
  import { DEFAULT_SERVER_OPTIONS } from './context';
12
9
 
13
10
  const host = ApplicationHost.get();
@@ -17,20 +14,15 @@ container.then(async c => {
17
14
  await host?.beforeStart?.();
18
15
  const application = c.get<Application>(Application);
19
16
  await application.start();
20
- const app = express();
21
- app.all('*', async (req: any, res: any) => {
22
- const dispatcher = c.get<Dispatcher<Context>>(Dispatcher);
23
- const httpContext = new Context(req, res);
24
- Context.run(() => dispatcher.dispatch(httpContext));
25
- });
17
+ const handler = HttpServerUtil.createHandler(c);
26
18
  // In-process hosts (cell dev, tests) serve the handler themselves.
27
- const server = host ? host.server : startServer(app, c.get<ConfigProvider>(ConfigProvider));
19
+ const server = host ? host.server : startServer(handler, c.get<ConfigProvider>(ConfigProvider));
28
20
  if (server) {
29
21
  for (const serverAware of c.getAll<ServerAware>(ServerAware)) {
30
22
  await serverAware.setServer(server as any);
31
23
  }
32
24
  }
33
- host?.started({ container: c, handler: app, stop: () => application.stop() });
25
+ host?.started({ container: c, handler, stop: () => application.stop() });
34
26
  }).catch(error => {
35
27
  if (!host) {
36
28
  throw error;
@@ -38,10 +30,10 @@ container.then(async c => {
38
30
  host.failed(error);
39
31
  });
40
32
 
41
- function startServer(app: express.Express, configProvider: ConfigProvider) {
33
+ function startServer(handler: RequestListener, configProvider: ConfigProvider) {
42
34
  // Override with CELL_BACKEND__SERVER__PORT / CELL_BACKEND__SERVER__HOST like any other key.
43
35
  const { port, host: hostname } = { ...DEFAULT_SERVER_OPTIONS, ...configProvider.get<any>('cell.server', {}) };
44
- const server = app.listen(port, hostname);
36
+ const server = HttpServerUtil.createHttpServer(handler).listen(port, hostname);
45
37
  console.log(`serve ${port}`);
46
38
  return server;
47
- }
39
+ }