@tramvai/cli 3.11.0 → 3.13.0

package/src/api/start/__integration__/start.test.ts

@@ -3,7 +3,6 @@ import supertest from 'supertest';
 import { outputFile } from 'fs-extra';
 import { start } from '@tramvai/cli';
 import type { PromiseType } from 'utility-types';
-import { getPort } from '@tramvai/internal-test-utils/utils/getPort';
 import { getServerUrl } from '@tramvai/test-integration';
 import { initPlaywright } from '@tramvai/test-pw';
 import { createServer } from '../utils/createServer';
@@ -49,16 +48,14 @@ describe('@tramvai/cli start command', () => {
       let startResult: PromiseType<ReturnType<typeof start>>;
 
       beforeAll(async () => {
-        serverPort = await getPort();
-        staticServerPort = await getPort();
-
         startResult = await start({
           rootDir: FIXTURES_DIR,
           target: 'app',
           resolveSymlinks: false,
-          port: serverPort,
-          staticPort: staticServerPort,
         });
+
+        serverPort = getListeningPort(startResult.server);
+        staticServerPort = getListeningPort(startResult.staticServer);
       });
 
       afterAll(() => {
@@ -66,15 +63,6 @@ describe('@tramvai/cli start command', () => {
       });
 
       it('should start application by target', async () => {
-        const { server, staticServer } = startResult;
-
-        expect(server?.address()).toMatchObject({
-          port: serverPort,
-        });
-        expect(staticServer?.address()).toMatchObject({
-          port: staticServerPort,
-        });
-
         const responseServer = await supertestByPort(serverPort).get('/').expect(200);
 
         expect(responseServer.text)
@@ -162,15 +150,10 @@ describe('@tramvai/cli start command', () => {
     });
 
     it('should start application from config', async () => {
-      const serverPort = await getPort();
-      const staticServerPort = await getPort();
-
       const root = resolve(FIXTURES_DIR, 'app');
       const { server, staticServer, close } = await start({
         rootDir: root,
         resolveSymlinks: false,
-        port: serverPort,
-        staticPort: staticServerPort,
         config: {
           name: 'app',
           type: 'application',
@@ -178,12 +161,11 @@ describe('@tramvai/cli start command', () => {
         },
       });
 
-      expect(server?.address()).toMatchObject({
-        port: serverPort,
-      });
-      expect(staticServer?.address()).toMatchObject({
-        port: staticServerPort,
-      });
+      const serverPort = getListeningPort(server);
+      const staticServerPort = getListeningPort(staticServer);
+
+      expect(serverPort).toEqual(expect.any(Number));
+      expect(staticServerPort).toEqual(expect.any(Number));
 
       const responseServer = await supertestByPort(serverPort).get('/').expect(200);
 
@@ -201,39 +183,12 @@ describe('@tramvai/cli start command', () => {
       return close();
     });
 
-    it('should start server on random ports', async () => {
-      const { server, staticServer, close } = await start({
-        rootDir: FIXTURES_DIR,
-        target: 'app',
-        port: 0,
-        staticPort: 0,
-        resolveSymlinks: false,
-      });
-
-      expect(server?.address()).toMatchObject({
-        port: expect.any(Number),
-      });
-      expect(staticServer?.address()).toMatchObject({
-        port: expect.any(Number),
-      });
-
-      await supertestByPort(getListeningPort(server)).get('/').expect(200);
-
-      const testStatic = supertestByPort(getListeningPort(staticServer));
-      await testStatic.get('/dist/client/platform.js').expect(200);
-      await testStatic.get('/dist/server/server.js').expect(200);
-
-      return close();
-    });
-
     // eslint-disable-next-line jest/expect-expect
     it('should allow to exclude bundles from build', async () => {
       let { server, close } = await start({
         rootDir: FIXTURES_DIR,
         target: 'app',
         resolveSymlinks: false,
-        port: 0,
-        staticPort: 0,
       });
 
       let testServer = supertestByPort(getListeningPort(server));
@@ -250,8 +205,6 @@ describe('@tramvai/cli start command', () => {
         target: 'app',
         resolveSymlinks: false,
         onlyBundles: ['main', 'second'],
-        port: 0,
-        staticPort: 0,
       }));
 
       testServer = supertestByPort(getListeningPort(server));
@@ -264,14 +217,12 @@ describe('@tramvai/cli start command', () => {
       return close();
     });
 
-    it('should NOT try to launch app on the next available port if it was provided via config', async () => {
+    it('should NOT try to launch app at the next available port if it was provided via config', async () => {
       const testServerStub = createServer();
       const testStaticServerStub = createServer();
 
-      // To avoid situation when two subsequent calls
-      // of the `detectPortSync` return the same free port.
-      await listenServer(testServerStub, '0.0.0.0', getPort() + 50);
-      await listenServer(testStaticServerStub, '0.0.0.0', getPort());
+      await listenServer(testServerStub, '0.0.0.0', 0);
+      await listenServer(testStaticServerStub, '0.0.0.0', 0);
 
       await expect(
         start({
@@ -285,35 +236,6 @@ describe('@tramvai/cli start command', () => {
 
       return Promise.all([stopServer(testServerStub), stopServer(testStaticServerStub)]);
     });
-
-    it('should try to launch app on the next available port if it was NOT provided via config', async () => {
-      const testServerStub = createServer();
-      const testStaticServerStub = createServer();
-
-      await listenServer(testServerStub, '0.0.0.0', PortManager.DEFAULT_PORT);
-      await listenServer(testStaticServerStub, '0.0.0.0', PortManager.DEFAULT_STATIC_PORT);
-
-      const { server, staticServer, close } = await start({
-        rootDir: FIXTURES_DIR,
-        target: 'app',
-        resolveSymlinks: false,
-      });
-
-      const testServer = supertestByPort(getListeningPort(server));
-      const testStatic = supertestByPort(getListeningPort(staticServer));
-
-      expect(server?.address()).toMatchObject({
-        port: expect.any(Number),
-      });
-      expect(staticServer?.address()).toMatchObject({
-        port: expect.any(Number),
-      });
-
-      await testServer.get('/').expect(200);
-      await testStatic.get('/').expect(404);
-
-      return Promise.all([close(), stopServer(testServerStub), stopServer(testStaticServerStub)]);
-    });
   });
 
   describe('module', () => {
@@ -323,7 +245,6 @@ describe('@tramvai/cli start command', () => {
         rootDir: FIXTURES_DIR,
         target: 'module',
         resolveSymlinks: false,
-        port: 0,
       });
 
       const testStatic = supertestByPort(getListeningPort(staticServer));
@@ -335,22 +256,20 @@ describe('@tramvai/cli start command', () => {
     });
 
     it('should start module by specific config', async () => {
-      const staticServerPort = getPort();
-
       const { staticServer, close } = await start({
         config: {
           type: 'module',
           name: 'module',
           root: resolve(FIXTURES_DIR, 'module'),
         },
-        port: staticServerPort,
+        port: PortManager.DEFAULT_MODULE_STATIC_PORT,
       });
 
       expect(staticServer?.address()).toMatchObject({
-        port: staticServerPort,
+        port: PortManager.DEFAULT_MODULE_STATIC_PORT,
       });
 
-      const testStatic = supertestByPort(staticServerPort);
+      const testStatic = supertestByPort(PortManager.DEFAULT_MODULE_STATIC_PORT);
 
       await testStatic.get('/module/0.1.0/module_server.js').expect(200);
       await testStatic.get('/module/0.1.0/module_client.js').expect(200);

package/src/api/start/providers/application/shared.ts

@@ -54,13 +54,15 @@ export const sharedProviders: readonly Provider[] = [
   provide({
     provide: CLOSE_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({ staticServer }) => {
-      return () => {
+    useFactory: ({ staticServer, portManager }) => {
+      return async () => {
+        await portManager.cleanup();
         return stopServer(staticServer);
       };
     },
     deps: {
       staticServer: STATIC_SERVER_TOKEN,
+      portManager: PORT_MANAGER_TOKEN,
     },
   }),
 ] as const;

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

@@ -23,6 +23,7 @@ export const sharedProviders: readonly Provider[] = [
         appEnv: parameters.env,
         env: 'development',
         port: portManager.port,
+        staticPort: portManager.staticPort,
       }),
     deps: {
       configEntry: CONFIG_ENTRY_TOKEN,
@@ -52,13 +53,15 @@ export const sharedProviders: readonly Provider[] = [
   provide({
     provide: CLOSE_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({ staticServer }) => {
-      return () => {
+    useFactory: ({ staticServer, portManager }) => {
+      return async () => {
+        await portManager.cleanup();
         return stopServer(staticServer);
       };
     },
     deps: {
       staticServer: STATIC_SERVER_TOKEN,
+      portManager: PORT_MANAGER_TOKEN,
     },
   }),
 ] as const;

package/src/api/start/providers/module/shared.ts

@@ -23,6 +23,7 @@ export const sharedProviders: readonly Provider[] = [
         appEnv: parameters.env,
         env: 'development',
         port: portManager.port,
+        staticPort: portManager.staticPort,
       }),
     deps: {
       configEntry: CONFIG_ENTRY_TOKEN,
@@ -52,13 +53,15 @@ export const sharedProviders: readonly Provider[] = [
   provide({
     provide: CLOSE_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({ staticServer }) => {
-      return () => {
+    useFactory: ({ staticServer, portManager }) => {
+      return async () => {
+        await portManager.cleanup();
         return stopServer(staticServer);
       };
     },
     deps: {
       staticServer: STATIC_SERVER_TOKEN,
+      portManager: PORT_MANAGER_TOKEN,
     },
   }),
 ] as const;

package/src/api/start/utils/stopServer.ts

@@ -5,6 +5,7 @@ export const stopServer = async (server: StoppableServer) => {
     server.stop((err) => {
       if (err) {
         reject(err);
+
         return;
       }
 

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

@@ -1,6 +1,6 @@
 import type { Container } from '@tinkoff/dippy';
 import type { Params, Result } from './index';
-import { COMMAND_PARAMETERS_TOKEN, PORT_MANAGER_TOKEN, STATIC_SERVER_TOKEN } from '../../di/tokens';
+import { COMMAND_PARAMETERS_TOKEN, STATIC_SERVER_TOKEN } from '../../di/tokens';
 import {
   INIT_HANDLER_TOKEN,
   CLOSE_HANDLER_TOKEN,
@@ -15,9 +15,6 @@ import { build } from '..';
 
 export const startProdApplication = async (di: Container): Result => {
   const parameters = di.get(COMMAND_PARAMETERS_TOKEN) as Params;
-  const portManager = di.get(PORT_MANAGER_TOKEN);
-
-  await portManager.computeAvailablePorts();
 
   registerProviders(di, [...sharedProviders, ...applicationsProviders]);
 

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

@@ -5,7 +5,7 @@ import fastifyCompress from '@fastify/compress';
 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, STATIC_SERVER_TOKEN } from '../../../di/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';
@@ -82,13 +82,16 @@ export const sharedProviders: readonly Provider[] = [
   provide({
     provide: CLOSE_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({ staticServer }) => {
+    useFactory: ({ staticServer, portManager }) => {
       return async () => {
+        await portManager.cleanup();
+
         return stopServer(staticServer);
       };
     },
     deps: {
       staticServer: STATIC_SERVER_TOKEN,
+      portManager: PORT_MANAGER_TOKEN,
     },
   }),
 ] as const;

package/src/commands/analyze/command.ts

@@ -3,6 +3,7 @@ import { checkApplication } from '../../validators/commands/checkBuild';
 import { checkConfigExists } from '../../validators/commands/checkConfigExists';
 import { checkPwaDependencies } from '../../validators/commands/checkPwaDependencies';
 import { runMigrationsAndCheckVersions } from '../../validators/commands/runMigrationsAndCheckVersions';
+import { checkSwcDependencies } from '../../validators/commands/checkSwcDependencies';
 
 export type Params = {
   target: string;
@@ -49,6 +50,7 @@ class AnalyzeCommand extends CLICommand<Params> {
     checkApplication,
     runMigrationsAndCheckVersions,
     checkPwaDependencies,
+    checkSwcDependencies,
   ];
 
   action(parameters: Params) {

package/src/commands/build/command.ts

@@ -5,6 +5,7 @@ import { checkDependencies } from '../../validators/commands/checkDependencies';
 import { runMigrationsAndCheckVersions } from '../../validators/commands/runMigrationsAndCheckVersions';
 import type { BuildCommand as BuildCommandType } from '../../api/build';
 import { checkPwaDependencies } from '../../validators/commands/checkPwaDependencies';
+import { checkSwcDependencies } from '../../validators/commands/checkSwcDependencies';
 
 export type Params = Parameters<BuildCommandType>[0] & {
   target: string;
@@ -83,6 +84,7 @@ class BuildCommand extends CLICommand<Params> {
     runMigrationsAndCheckVersions,
     checkDependencies,
     checkPwaDependencies,
+    checkSwcDependencies,
   ];
 
   action(parameters: Params) {

package/src/commands/start/command.ts

@@ -5,6 +5,7 @@ import { checkDependencies } from '../../validators/commands/checkDependencies';
 import { runMigrationsAndCheckVersions } from '../../validators/commands/runMigrationsAndCheckVersions';
 import type { StartCommand as StartCommandType } from '../../api/start';
 import { checkPwaDependencies } from '../../validators/commands/checkPwaDependencies';
+import { checkSwcDependencies } from '../../validators/commands/checkSwcDependencies';
 
 export type Params = Parameters<StartCommandType>[0] & {
   target: string;
@@ -120,6 +121,7 @@ export class StartCommand extends CLICommand<Params> {
     runMigrationsAndCheckVersions,
     checkDependencies,
     checkPwaDependencies,
+    checkSwcDependencies,
   ];
 
   action(parameters) {

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

@@ -3,6 +3,7 @@ import { checkConfigExists } from '../../validators/commands/checkConfigExists';
 import { checkApplication } from '../../validators/commands/checkBuild';
 import { runMigrationsAndCheckVersions } from '../../validators/commands/runMigrationsAndCheckVersions';
 import { checkPwaDependencies } from '../../validators/commands/checkPwaDependencies';
+import { checkSwcDependencies } from '../../validators/commands/checkSwcDependencies';
 
 export interface Params {
   target: string;
@@ -93,6 +94,7 @@ export class StartProdCommand extends CLICommand<Params> {
     checkApplication,
     runMigrationsAndCheckVersions,
     checkPwaDependencies,
+    checkSwcDependencies,
   ];
 
   action(parameters: Params) {

package/src/commands/static/application.ts

@@ -26,17 +26,21 @@ export const staticApp = async (
   configEntry: ApplicationConfigEntry,
   options: Params
 ): Promise<CommandResult> => {
-  const network = new PortManager({ configEntry, commandParams: options });
+  const portManager = new PortManager({
+    configEntry,
+    commandParams: options,
+    logger: context.logger,
+  });
 
-  await network.computeAvailablePorts();
+  await portManager.computeAvailablePorts();
 
   const clientConfigManager = createConfigManager<ApplicationConfigEntry>(configEntry, {
     env: 'production',
     ...options,
     buildType: 'client',
     modern: false,
-    port: network.port,
-    staticPort: network.staticPort,
+    port: portManager.port,
+    staticPort: portManager.staticPort,
   });
   const serverConfigManager = clientConfigManager.withSettings({ buildType: 'server' });
 
@@ -193,6 +197,8 @@ export const staticApp = async (
     staticServer.close();
   }
 
+  await portManager.cleanup();
+
   return {
     status: 'ok',
     message: 'application static generate success',

package/src/di/providers/network.ts

@@ -3,6 +3,7 @@ import type { Provider } from '@tinkoff/dippy';
 
 import { COMMAND_PARAMETERS_TOKEN, CONFIG_ENTRY_TOKEN, PORT_MANAGER_TOKEN } from '../tokens';
 import { PortManager } from '../../models/port-manager';
+import { Logger } from '../../models/logger';
 
 export const networkProviders: readonly Provider[] = [
   provide({
@@ -11,6 +12,11 @@ export const networkProviders: readonly Provider[] = [
     deps: {
       configEntry: CONFIG_ENTRY_TOKEN,
       commandParams: COMMAND_PARAMETERS_TOKEN,
+      logger: 'network logger',
     },
   }),
+  provide({
+    provide: 'network logger',
+    useClass: Logger,
+  }),
 ] as const;

package/src/library/swc/__integration__/swc.start.test.ts

@@ -30,8 +30,6 @@ const getModuleCode = (code: string, name: string) => {
 beforeAll(async () => {
   app = await start({
     rootDir: __dirname,
-    port: 0,
-    staticPort: 0,
     strictErrorHandle: true,
     config: {
       name: 'swc-app',