@tramvai/cli 3.26.2 → 3.27.0

package/src/api/start-prod/providers/application.ts

@@ -7,6 +7,8 @@ import {
   CONFIG_ENTRY_TOKEN,
   CONFIG_MANAGER_TOKEN,
   PORT_MANAGER_TOKEN,
+  SELF_SIGNED_CERTIFICATE_TOKEN,
+  STATIC_SERVER_TOKEN,
 } from '../../../di/tokens';
 import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 import { CLOSE_HANDLER_TOKEN, SERVER_PROCESS_TOKEN } from '../tokens';
@@ -14,8 +16,23 @@ import { DEBUG_ARGV } from '../../../config/constants';
 import { safeRequire } from '../../../utils/safeRequire';
 import type { ConfigManager } from '../../../config/configManager';
 import { createConfigManager } from '../../../config/configManager';
+import { selfSignedCertificateProvider } from '../../shared/providers/selfSignedCertificateProvider';
+import { createServer } from '../../start/utils/createServer';
 
 export const applicationsProviders: readonly Provider[] = [
+  ...selfSignedCertificateProvider,
+  provide({
+    provide: STATIC_SERVER_TOKEN,
+    useFactory: ({ selfSignedCertificate }) => {
+      return createServer(selfSignedCertificate);
+    },
+    deps: {
+      selfSignedCertificate: {
+        token: SELF_SIGNED_CERTIFICATE_TOKEN,
+        optional: true,
+      },
+    },
+  }),
   provide({
     provide: CONFIG_MANAGER_TOKEN,
     useFactory: ({ configEntry, parameters, portManager }) =>
@@ -35,16 +52,15 @@ export const applicationsProviders: readonly Provider[] = [
   }),
   provide({
     provide: SERVER_PROCESS_TOKEN,
-    useFactory: ({ configManager, parameters }) => {
+    useFactory: ({ configManager, parameters, selfSignedCertificate }) => {
       const { env } = parameters;
       const serverConfigManager = (
         configManager as ConfigManager<ApplicationConfigEntry>
       ).withSettings({
         buildType: 'server',
       });
-      const { debug, port, assetsPrefix } = serverConfigManager;
+      const { debug, port, assetsPrefix, https } = serverConfigManager;
       const root = serverConfigManager.buildPath;
-
       return fork(path.resolve(root, 'server.js'), [], {
         execArgv: debug ? DEBUG_ARGV : [],
         cwd: root,
@@ -58,12 +74,20 @@ export const applicationsProviders: readonly Provider[] = [
           PORT: `${port}`,
           PORT_SERVER: `${port}`,
           ASSETS_PREFIX: assetsPrefix,
+          HOST: serverConfigManager.host,
+          HTTPS: serverConfigManager.https
+            ? JSON.stringify({
+                key: selfSignedCertificate.keyPath,
+                cert: selfSignedCertificate.certificatePath,
+              })
+            : null,
         },
       });
     },
     deps: {
       configManager: CONFIG_MANAGER_TOKEN,
       parameters: COMMAND_PARAMETERS_TOKEN,
+      selfSignedCertificate: SELF_SIGNED_CERTIFICATE_TOKEN,
     },
   }),
   provide({

package/src/api/start-prod/providers/child-app.ts

@@ -5,11 +5,17 @@ import {
   CONFIG_ENTRY_TOKEN,
   CONFIG_MANAGER_TOKEN,
   PORT_MANAGER_TOKEN,
+  STATIC_SERVER_TOKEN,
 } from '../../../di/tokens';
 import { createConfigManager } from '../../../config/configManager';
 import type { ChildAppConfigEntry } from '../../../typings/configEntry/child-app';
+import { createServer } from '../../start/utils/createServer';
 
 export const childAppProviders: readonly Provider[] = [
+  provide({
+    provide: STATIC_SERVER_TOKEN,
+    useFactory: createServer,
+  }),
   provide({
     provide: CONFIG_MANAGER_TOKEN,
     useFactory: ({ configEntry, parameters, portManager }) =>

package/src/api/start-prod/providers/shared.ts

@@ -6,16 +6,11 @@ import fastifyStatic from '@fastify/static';
 import zlib from 'zlib';
 import { CLOSE_HANDLER_TOKEN, INIT_HANDLER_TOKEN, PROCESS_HANDLER_TOKEN } from '../tokens';
 import { CONFIG_MANAGER_TOKEN, PORT_MANAGER_TOKEN, STATIC_SERVER_TOKEN } from '../../../di/tokens';
-import { createServer } from '../../start/utils/createServer';
 import { stopServer } from '../../start/utils/stopServer';
 import { listenServer } from '../../start/utils/listenServer';
 import { isApplication, isChildApp } from '../../../config/validate';
 
 export const sharedProviders: readonly Provider[] = [
-  provide({
-    provide: STATIC_SERVER_TOKEN,
-    useFactory: createServer,
-  }),
   provide({
     provide: INIT_HANDLER_TOKEN,
     multi: true,

package/src/builder/webpack/devServer/server.ts

@@ -17,6 +17,7 @@ import { ThreadWorkerBridge } from './pool/thread/pool';
 import { createWorkerPool } from './pool/pool';
 import type { SERVER_TOKEN } from '../../../di/tokens';
 import { CLOSE_HANDLER_TOKEN } from '../tokens';
+import { getApplicationUrl } from '../../../utils/getApplicationUrl';
 
 const EXITED_UNEXPECTEDLY = `
 
@@ -59,7 +60,11 @@ export const serverRunner = ({
     const file = `${Object.keys(config.entryPoints.entries())[0]}.js`;
     const filename = path.resolve(config.output.get('path'), file);
     // настоящая ссылка на файл используется для отладки в debug режиме
-    const realFilename = `http://${configManager.staticHost}:${configManager.staticPort}/${configManager.output.server}/${file}`;
+    const realFilename = `${getApplicationUrl({
+      host: configManager.staticHost,
+      port: configManager.staticPort,
+      protocol: configManager.httpProtocol,
+    })}/${configManager.output.server}/${file}`;
     const serverCompiler = compiler.compilers.find((comp) => comp.name === 'server');
 
     if (!serverCompiler) {

package/src/commands/start/command.ts

@@ -111,6 +111,22 @@ export class StartCommand extends CLICommand<Params> {
       transformer: (value: string) => value !== 'false',
       description: 'Enable/disable persistent file cache for used cli builder',
     },
+    {
+      name: '--https',
+      value: '[https]',
+      transformer: (value: string) => value !== 'false',
+      description: 'Enable/disable https protocol for application',
+    },
+    {
+      name: '--httpsKey',
+      value: '[httpsKey]',
+      description: 'Path to https key certificate',
+    },
+    {
+      name: '--httpsCert',
+      value: '[httpsCert]',
+      description: 'Path to https certificate',
+    },
   ];
 
   alias = 's';

package/src/commands/start-prod/command.ts

@@ -85,6 +85,22 @@ export class StartProdCommand extends CLICommand<Params> {
       transformer: (value: string) => value !== 'false',
       description: 'Enable/disable persistent file cache for used cli builder',
     },
+    {
+      name: '--https',
+      value: '[https]',
+      transformer: (value: string) => value !== 'false',
+      description: 'Enable/disable https protocol for application',
+    },
+    {
+      name: '--httpsKey',
+      value: '[httpsKey]',
+      description: 'Path to https key certificate',
+    },
+    {
+      name: '--httpsCert',
+      value: '[httpsCert]',
+      description: 'Path to https certificate',
+    },
   ];
 
   alias = 'sp';

package/src/commands/static/application.ts

@@ -127,7 +127,9 @@ export const staticApp = async (
     handleServerOutput(context.logger, chunk);
   });
 
-  const readinessProbePath = `http://localhost:${envVariables.UTILITY_SERVER_PORT ?? port}/readyz`;
+  const readinessProbePath = `${clientConfigManager.httpProtocol}://localhost:${
+    envVariables.UTILITY_SERVER_PORT ?? port
+  }/readyz`;
 
   await Promise.race([
     server,

package/src/config/configManager.ts

@@ -30,6 +30,7 @@ export interface Settings<E extends Env> {
   trace?: boolean;
   sourceMap?: boolean;
   host?: string;
+  https?: boolean;
   port?: number;
   staticHost?: string;
   staticPort?: number;
@@ -93,6 +94,7 @@ export type ConfigManager<
     withSettings(settings: Settings<E>): ConfigManager<C, E>;
     dehydrate(): [C, Settings<E>];
     assetsPrefix?: string;
+    httpProtocol?: 'https' | 'http';
   };
 
 export const DEFAULT_STATIC_HOST = 'localhost';
@@ -137,6 +139,8 @@ export const createConfigManager = <C extends ConfigEntry = ConfigEntry, E exten
       'unknown',
     trace: false,
     host: '0.0.0.0',
+    https: !!settings.https,
+    httpProtocol: settings.https ? 'https' : 'http',
     profile: false,
     noClientRebuild: false,
     noServerRebuild: false,
@@ -196,10 +200,9 @@ export const createConfigManager = <C extends ConfigEntry = ConfigEntry, E exten
     config.assetsPrefix =
       process.env.ASSETS_PREFIX && process.env.ASSETS_PREFIX !== 'static'
         ? process.env.ASSETS_PREFIX
-        : `http://${config.staticHost}:${config.staticPort}/${config.output.client.replace(
-            /\/$/,
-            ''
-          )}/`;
+        : `${config.httpProtocol}://${config.staticHost}:${
+            config.staticPort
+          }/${config.output.client.replace(/\/$/, '')}/`;
     config.buildPath = resolve(
       rootDir,
       buildType === 'server' ? config.output.server : config.output.client

package/src/di/tokens/server.ts

@@ -4,3 +4,8 @@ import type { StoppableServer } from 'stoppable';
 export const SERVER_TOKEN = createToken<StoppableServer>('server server');
 
 export const STATIC_SERVER_TOKEN = createToken<StoppableServer>('server staticServer');
+
+export const SELF_SIGNED_CERTIFICATE_TOKEN = createToken<{
+  keyPath: string;
+  certificatePath: string;
+}>('self signed certificates token');

package/src/library/webpack/application/client/dev.ts

@@ -22,6 +22,7 @@ import FancyReporter from '../../plugins/WebpackBar/reporters/fancy';
 import { extendEntry } from '../../utils/extendEntry';
 import { extractCssPluginFactory } from '../../blocks/extractCssPlugin';
 import { splitChunksConfig } from './prod/optimization/splitChunks';
+import { getApplicationUrl } from '../../../../utils/getApplicationUrl';
 
 // eslint-disable-next-line max-statements
 export const webpackClientConfig = ({
@@ -66,9 +67,11 @@ export const webpackClientConfig = ({
   config.output
     .path(configManager.buildPath)
     .publicPath(
-      `http://${configManager.staticHost}:${
-        configManager.staticPort
-      }/${configManager.output.client.replace(/\/$/, '')}/`
+      `${getApplicationUrl({
+        host: configManager.staticHost,
+        port: configManager.staticPort,
+        protocol: configManager.httpProtocol,
+      })}/${configManager.output.client.replace(/\/$/, '')}/`
     )
     .filename('[name].js')
     .chunkFilename('[name].chunk.js')

package/src/library/webpack/application/server/dev.ts

@@ -13,6 +13,7 @@ import configResolve from '../../blocks/configResolve';
 import type { UI_SHOW_PROGRESS_TOKEN } from '../../../../di/tokens';
 import sourcemaps from '../../blocks/sourcemaps';
 import FancyReporter from '../../plugins/WebpackBar/reporters/fancy';
+import { getApplicationUrl } from '../../../../utils/getApplicationUrl';
 
 export const webpackServerConfig = ({
   configManager,
@@ -91,9 +92,11 @@ export const webpackServerConfig = ({
     {
       publicPath: process.env.ASSETS_PREFIX
         ? 'process.env.ASSETS_PREFIX'
-        : `"http://${configManager.staticHost}:${
-            configManager.staticPort
-          }/${configManager.output.client.replace(/\/$/, '')}/"`,
+        : `"${getApplicationUrl({
+            host: configManager.staticHost,
+            port: configManager.staticPort,
+            protocol: configManager.httpProtocol,
+          })}/${configManager.output.client.replace(/\/$/, '')}/"`,
     },
   ]);
 

package/src/schema/autogeneratedSchema.json

@@ -1144,23 +1144,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@6849": {
+                        "__@match@6855": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@6851": {
+                        "__@replace@6857": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@6854": {
+                        "__@search@6860": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@6856": {
+                        "__@split@6862": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@6858": {
+                        "__@matchAll@6864": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -1813,23 +1813,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@6849": {
+                        "__@match@6855": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@6851": {
+                        "__@replace@6857": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@6854": {
+                        "__@search@6860": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@6856": {
+                        "__@split@6862": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@6858": {
+                        "__@matchAll@6864": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -2482,23 +2482,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@6849": {
+                        "__@match@6855": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@6851": {
+                        "__@replace@6857": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@6854": {
+                        "__@search@6860": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@6856": {
+                        "__@split@6862": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@6858": {
+                        "__@matchAll@6864": {
                           "type": "object",
                           "additionalProperties": false
                         }

package/src/utils/getApplicationUrl.ts

@@ -0,0 +1,11 @@
+export const getApplicationUrl = ({
+  protocol,
+  host,
+  port,
+}: {
+  protocol: 'https' | 'http';
+  host: string;
+  port: number;
+}) => {
+  return `${protocol}://${host}:${port}`;
+};