fa-mcp-sdk 0.2.87 → 0.2.95

package/bin/fa-mcp.js

@@ -13,6 +13,7 @@ const PRINT_FILLED = true;
 
 const hl = (v) => chalk.bgGreen.black(v);
 const hly = (v) => chalk.bgYellow.black(v);
+const hp = (paramName) => ` [${chalk.magenta(paramName)}]`;
 const formatDefaultValue = (v) => (v ? ` (default: ${hl(v)})` : '');
 const OPTIONAL = chalk.gray(' (optional)');
 const FROM_CONFIG = chalk.gray(' (from config)');
@@ -20,7 +21,7 @@ const trim = (s) => String(s || '').trim();
 
 const printFilled = (paramName, paramValue) => {
   if (PRINT_FILLED) {
-    console.log(`   ${paramName}: ${hl(paramValue)}`);
+    console.log(`  ${hp(paramName)}: ${hl(paramValue)}`);
   }
 };
 
@@ -46,7 +47,7 @@ const getAsk = () => {
     optional: (title, paramName, defaultValue, example = undefined) => new Promise(resolve => {
       const defaultText = formatDefaultValue(defaultValue);
       example = example ? ` (example: ${example})` : '';
-      const prompt = `${title} [${paramName}]${defaultText}${example}${OPTIONAL}: `;
+      const prompt = `${title}${hp(paramName)}${defaultText}${example}${OPTIONAL}: `;
       rl.question(prompt, (v) => {
         resolve(trim(v) || trim(defaultValue));
       });
@@ -57,8 +58,8 @@ const getAsk = () => {
       const y = isTrue ? `${hl('y')}` : 'y';
       const n = isTrue ? 'n' : `${hl('n')}`;
 
-      paramName = paramName ? ` [${paramName}]` : '';
-      const prompt = `${title}${paramName} (${y}/${n}): `;
+      const hpn = paramName ? hp(paramName) : '';
+      const prompt = `${title}${hpn} (${y}/${n}): `;
       while (true) {
         const answer = await yn_(prompt, defaultValue === 'true' ? 'y' : 'n');
         if (answer === 'y' || answer === 'n') {
@@ -171,6 +172,13 @@ class MCPGenerator {
         defaultValue: '',
         title: 'Domain name for nginx configuration',
       },
+      {
+        name: 'ssl-wildcard.conf.rel.path',
+        defaultValue: 'snippets/ssl-wildcard.conf',
+        title: `The relative path to the nginx configuration file 
+in the /etc/nginx folder that specifies the SSL 
+certificate's public and private keys`,
+      },
 
       {
         name: 'webServer.auth.enabled',
@@ -201,8 +209,9 @@ class MCPGenerator {
         name: 'NODE_ENV',
       },
       {
-        skip: true,
         name: 'SERVICE_INSTANCE',
+        defaultValue: '',
+        title: 'Suffix of the service name in Consul and process manager',
       },
       {
         skip: true,
@@ -213,6 +222,17 @@ class MCPGenerator {
         defaultValue: '',
         title: 'Maintainer url',
       },
+      {
+        name: 'logger.useFileLogger',
+        defaultValue: '',
+        title: 'Whether to check MCP name in the token',
+      },
+      {
+        skip: true,
+        name: 'logger.dir',
+        defaultValue: '',
+        title: 'Absolute path to the folder where logs will be written',
+      },
     ];
   }
 
@@ -430,14 +450,28 @@ class MCPGenerator {
           value = await ask.optional(title, name, defaultValue);
           if (value) {
             // Auto-generate upstream from mcp.domain by replacing dots with dashes
-            config['upstream'] = value.replace(/\./g, '-');
+            config.upstream = value.replace(/\./g, '-');
           }
           continue;
 
         case 'maintainerUrl':
           value = await ask.optional(title, name, defaultValue);
           if (value) {
-            config['maintainerHtml'] = `<a href="${value}" target="_blank" rel="noopener" class="clickable">Support</a>`;
+            config.maintainerHtml = `<a href="${value}" target="_blank" rel="noopener" class="clickable">Support</a>`;
+          }
+          continue;
+        case 'logger.useFileLogger':
+          const enabled = await ask.yn(title, name, defaultValue);
+          config[name] = String(enabled);
+          if (enabled) {
+            const nm = 'logger.dir';
+            const p = this.optionalParams.find(({ name: n }) => n === nm);
+            value = await ask.optional(p.title, nm, config[nm] || p.defaultValue);
+            if (value) {
+              config[nm] = value;
+            }
+          } else {
+            config[nm] = '';
           }
           continue;
         default:
@@ -518,6 +552,11 @@ class MCPGenerator {
     // Loop until configuration is confirmed
     while (!confirmed) {
       await this.collectConfigData(configProxy, isRetry);
+
+      // Set NODE_ENV and PM2_NAMESPACE based on isProduction
+      config.NODE_ENV = config.isProduction === 'true' ? 'production' : 'development';
+      config.PM2_NAMESPACE = config.isProduction === 'true' ? 'prod' : 'dev';
+
       confirmed = await this.confirmConfiguration(config);
 
       if (!confirmed) {

package/cli-template/.env.example

@@ -1,6 +1,4 @@
 SERVICE_NAME={{project.name}}
-# Used as an alternate service name when using systemd
-SERVICE_NAME_ALT={{project.name}}
 NODE_ENV={{NODE_ENV}}
 # Used for PM2
 SERVICE_INSTANCE={{SERVICE_INSTANCE}}

package/cli-template/config/_local.yaml

@@ -15,7 +15,7 @@ consul:
       token: '{{consul.agent.reg.token}}'
   service:
     enable: {{consul.service.enable}} # true - Allows registration of the service with the consul
-    instance: 'instance-0' # This value will be specified as a suffix in the id of the service
+    instance: '{{SERVICE_INSTANCE}}' # This value will be specified as a suffix in the id of the service
   envCode: # Used to generate the service ID
     prod: '{{consul.envCode.prod}}' # Production environment code
     dev: '{{consul.envCode.dev}}' # Development environment code
@@ -35,7 +35,9 @@ db:
 
 logger:
   level: info
-  useFileLogger: true # To use or not to use logging to a file
+  useFileLogger: {{logger.useFileLogger}} # To use or not to use logging to a file
+  # Absolute path to the folder where logs will be written. Default <proj_root>/../logs
+  dir: '{{logger.dir}}'
 
 mcp:
   transportType: http # 'stdio' or 'http'

package/cli-template/config/custom-environment-variables.yaml

@@ -11,6 +11,7 @@ db:
 logger:
   level: LOGGER_LEVEL
   useFileLogger: LOGGER_USE_FILE_LOGGER
+  dir: LOGGER_DIR
 
 mcp:
   transportType: MCP_TRANSPORT_TYPE

package/cli-template/config/default.yaml

@@ -15,6 +15,7 @@ consul:
     timeout: '5s'
     deregistercriticalserviceafter: '3m'
   agent:
+    # Credentials for getting information about services in the DEV DC
     dev:
       dc: '{{consul.agent.dev.dc}}'
       host: '{{consul.agent.dev.host}}'
@@ -22,6 +23,7 @@ consul:
       secure: true
       # Token for getting information about DEV services
       token: '***'
+    # Credentials for getting information about services in the PROD DC
     prd:
       dc: '{{consul.agent.prd.dc}}'
       host: '{{consul.agent.prd.host}}'
@@ -29,8 +31,10 @@ consul:
       secure: true
       # Token for obtaining information about PROD services
       token: '***'
+    # Credentials for registering the service with Consul
     reg:
-      host: null # The host of the consul agent where the service will be registered. If not specified, the server on which the service is running is used
+      # The host of the consul agent where the service will be registered. If not specified, the server on which the service is running is used
+      host: null
       port: 8500
       secure: false
       # Token for registering the service in the consul agent
@@ -38,7 +42,7 @@ consul:
   service:
     enable: {{consul.service.enable}} # true - Allows registration of the service with the consul
     name: <name> # <name> will be replaced by <package.json>.name at initialization
-    instance: 'instance-0' # This value will be specified as a suffix in the id of the service
+    instance: '{{SERVICE_INSTANCE}}' # This value will be specified as a suffix in the id of the service
     version: <version> # <version> will be replaced by <package.json>.version at initialization
     description: <description> # <description> will be replaced by <package.json>.description at initialization
     tags: [] # If null or empty array - Will be pulled up from package.keywords at initialization
@@ -63,7 +67,9 @@ db:
 
 logger:
   level: info
-  useFileLogger: true # To use or not to use logging to a file
+  useFileLogger: {{logger.useFileLogger}} # To use or not to use logging to a file
+  # Absolute path to the folder where logs will be written. Default <proj_root>/../logs
+  dir: '{{logger.dir}}'
 
 mcp:
   transportType: http # stdio | http
@@ -77,12 +83,17 @@ mcp:
 
 swagger:
   servers:  # An array of servers that will be added to swagger docs
-    - url: http://localhost:{{port}}
-      description: "Development server (localhost)"
-    - url: http://0.0.0.0:{{port}}
-      description: "Development server (all interfaces)"
+    # - url: http://localhost:9020
+    #   description: "Development server (localhost)"
+    # - url: http://0.0.0.0:9020
+    #   description: "Development server (all interfaces)"
+    # - url: http://<prod_server_host_or_ip>:{{port}}
+    #   description: "PROD server"
+    - url: https://{{mcp.domain}}
+      description: "PROD server"
 
-uiColor:  # Font color of the header and a number of interface elements on the ABOUT page
+uiColor:
+  # Font color of the header and a number of interface elements on the ABOUT page
   primary: '#0f65dc'
 
 webServer:

package/cli-template/deploy/{mcp-template.com.conf → NGINX/sites-enabled/mcp-template.com.conf}

@@ -40,7 +40,7 @@ server {
     }
 
     listen 443 ssl http2;
-    include snippets/ssl-wildcard-finam-ru.conf;
+    include {{ssl-wildcard.conf.rel.path}};
     include snippets/ssl-params.conf;
     ssl_protocols  TLSv1.3;
 }

package/cli-template/deploy/NGINX/snippets/ssl-params.conf

@@ -0,0 +1,18 @@
+ssl_protocols TLSv1.2;
+ssl_prefer_server_ciphers on;
+ssl_dhparam /etc/nginx/dhparam.pem;
+ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
+ssl_ecdh_curve secp384r1; # Requires nginx >= 1.1.0
+ssl_session_timeout  10m;
+ssl_session_cache shared:SSL:10m;
+ssl_session_tickets off; # Requires nginx >= 1.5.9
+ssl_stapling off; # Requires nginx >= 1.3.7
+ssl_stapling_verify on; # Requires nginx => 1.3.7
+resolver 8.8.8.8 8.8.4.4 valid=300s;
+resolver_timeout 5s;
+# Disable strict transport security for now. You can uncomment the following
+# line if you understand the implications.
+# add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
+add_header X-Frame-Options DENY;
+add_header X-Content-Type-Options nosniff;
+add_header X-XSS-Protection "1; mode=block";

package/cli-template/deploy/NGINX/snippets/ssl-wildcard.conf

@@ -0,0 +1,3 @@
+# Provide the correct paths to the certificate and private key
+ssl_certificate /etc/nginx/cert/wildcard.crt;
+ssl_certificate_key /etc/nginx/cert/wildcard.key;