rlz-engine 1.0.52 → 1.0.54

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.
@@ -1,4 +1,5 @@
1
1
  import { FastifyInstance, RawReplyDefaultExpression, RawRequestDefaultExpression, RawServerBase } from 'fastify';
2
+ import { type AcmeProvider } from 'fastify-acme';
2
3
  import { Logger } from 'pino';
3
4
  export type InitServerFuncType = <S extends RawServerBase>(server: FastifyInstance<S, RawRequestDefaultExpression<S>, RawReplyDefaultExpression<S>, Logger>) => Promise<void>;
4
5
  export interface RunServerParams {
@@ -8,7 +9,9 @@ export interface RunServerParams {
8
9
  securePort?: number;
9
10
  domain: string;
10
11
  certDir: string;
12
+ /** Certificate authority used for ACME issuance and renewal. Defaults to Let's Encrypt. */
13
+ acmeProvider?: AcmeProvider;
11
14
  staticDir: string;
12
15
  init: InitServerFuncType;
13
16
  }
14
- export declare function runServer({ production, debug, domain, certDir, staticDir, securePort, unsecurePort, init }: RunServerParams): Promise<() => Promise<void>>;
17
+ export declare function runServer({ production, debug, domain, certDir, acmeProvider, staticDir, securePort, unsecurePort, init }: RunServerParams): Promise<() => Promise<void>>;
@@ -11,7 +11,7 @@ import { installIntoGlobal } from 'iterator-helpers-polyfill';
11
11
  import path from 'path';
12
12
  import { logger } from './logger.js';
13
13
  installIntoGlobal();
14
- export async function runServer({ production, debug = false, domain, certDir, staticDir, securePort, unsecurePort, init }) {
14
+ export async function runServer({ production, debug = false, domain, certDir, acmeProvider, staticDir, securePort, unsecurePort, init }) {
15
15
  const L = logger('init', { debug });
16
16
  L.info({ production }, 'runServer');
17
17
  const httpServer = fastify({
@@ -40,7 +40,7 @@ export async function runServer({ production, debug = false, domain, certDir, st
40
40
  httpServer.register(fastifyAcmeUnsecurePlugin, { redirectDomain: domain });
41
41
  await httpServer.listen({ port: unsecurePort ?? 80, host: '::' });
42
42
  L.info('Get certificates');
43
- const certAndKey = await getCertAndKey(certDir, domain, httpServer.log);
43
+ const certAndKey = await getCertAndKey(certDir, domain, httpServer.log, acmeProvider);
44
44
  L.info('Init secure server');
45
45
  const httpsServer = fastify({
46
46
  http2: true,
@@ -54,7 +54,8 @@ export async function runServer({ production, debug = false, domain, certDir, st
54
54
  });
55
55
  await httpsServer.register(fastifyAcmeSecurePlugin, {
56
56
  certDir,
57
- domain
57
+ domain,
58
+ provider: acmeProvider
58
59
  });
59
60
  await httpsServer.register(fastifyCors, {
60
61
  methods: ['get', 'post']
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/back/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/back/server.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rlz-engine",
3
- "version": "1.0.52",
3
+ "version": "1.0.54",
4
4
  "description": "Deps and tools for my style of development",
5
5
  "author": "Dmitry Maslennikov <maslennikovdm@gmail.com>",
6
6
  "license": "ISC",
@@ -53,7 +53,7 @@
53
53
  "embla-carousel-react": "^8.6.0",
54
54
  "embla-carousel-wheel-gestures": "^8.1.0",
55
55
  "fastify": "^5.12.1",
56
- "fastify-acme": "^1.0.12",
56
+ "fastify-acme": "^1.0.17",
57
57
  "fastify-plugin": "^6.0.0",
58
58
  "immer": "^11.1.18",
59
59
  "iterator-helpers-polyfill": "^3.0.1",