@underpostnet/underpost 2.98.3 → 2.99.0

package/src/cli/deploy.js

@@ -18,12 +18,9 @@ import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
 import dotenv from 'dotenv';
-import UnderpostRootEnv from './env.js';
-import UnderpostCluster from './cluster.js';
 import { timer } from '../client/components/core/CommonJs.js';
 import os from 'node:os';
-import Dns, { getLocalIPv4Address } from '../server/dns.js';
-import UnderpostBaremetal from './baremetal.js';
+import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -35,7 +32,6 @@ const logger = loggerFactory(import.meta);
  * @memberof UnderpostDeploy
  */
 class UnderpostDeploy {
-  static NETWORK = {};
   static API = {
     /**
      * Creates a router configuration for a list of deployments.
@@ -59,12 +55,24 @@ class UnderpostDeploy {
      * @param {string} env - Environment for which the service is being created.
      * @param {number} port - Port number for the service.
      * @param {Array<string>} deploymentVersions - List of deployment versions.
+     * @param {string} serviceId - Custom service name (optional).
+     * @param {Array} pathRewritePolicy - Path rewrite policy (optional).
+     * @param {object} timeoutPolicy - Timeout policy (optional).
+     * @param {object} retryPolicy - Retry policy (optional).
      * @returns {string} - YAML service configuration for the specified deployment.
-     * @param {string} [serviceId] - Custom service name (optional).
-     * @param {Array} [pathRewritePolicy] - Path rewrite policy (optional).
      * @memberof UnderpostDeploy
      */
-    deploymentYamlServiceFactory({ deployId, path, env, port, deploymentVersions, serviceId, pathRewritePolicy }) {
+    deploymentYamlServiceFactory({
+      deployId,
+      path,
+      env,
+      port,
+      deploymentVersions,
+      serviceId,
+      pathRewritePolicy,
+      timeoutPolicy,
+      retryPolicy,
+    }) {
       return `
     - conditions:
         - prefix: ${path}
@@ -79,12 +87,25 @@ class UnderpostDeploy {
           ).join(`
 `)}`
           : ''
+      }${
+        timeoutPolicy
+          ? `\n      timeoutPolicy:\n${timeoutPolicy.response ? `        response: ${timeoutPolicy.response}\n` : ''}${
+              timeoutPolicy.idle ? `        idle: ${timeoutPolicy.idle}\n` : ''
+            }`
+          : ''
+      }${
+        retryPolicy
+          ? `\n      retryPolicy:\n${retryPolicy.count !== undefined ? `        count: ${retryPolicy.count}\n` : ''}${
+              retryPolicy.perTryTimeout ? `        perTryTimeout: ${retryPolicy.perTryTimeout}\n` : ''
+            }`
+          : ''
       }
       enableWebsockets: true
       services:
     ${deploymentVersions
       .map(
-        (version, i) => `    - name: ${serviceId ? serviceId : `${deployId}-${env}-${version}-service`}
+        (version, i) =>
+          `    - name: ${serviceId ? serviceId : `${deployId}-${env}-${version}-service`}
           port: ${port}
           weight: ${i === 0 ? 100 : 0}
     `,
@@ -106,13 +127,12 @@ class UnderpostDeploy {
      * @memberof UnderpostDeploy
      */
     deploymentYamlPartsFactory({ deployId, env, suffix, resources, replicas, image, namespace, volumes, cmd }) {
-      const baseCommand = env === 'development' ? 'node bin' : 'underpost';
       if (!cmd)
         cmd = [
           `npm install -g npm@11.2.0`,
           `npm install -g underpost`,
-          `${baseCommand} secret underpost --create-from-file /etc/config/.env.${env}`,
-          `${baseCommand} start --build --run ${deployId} ${env}`,
+          `underpost secret underpost --create-from-file /etc/config/.env.${env}`,
+          `underpost start --build --run --underpost-quickly-install ${deployId} ${env}`,
         ];
       const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
       if (!volumes)
@@ -164,7 +184,8 @@ ${
             - >
               ${cmd.join(` && `)}
 
-${UnderpostDeploy.API.volumeFactory(volumes.map((v) => ((v.version = `${deployId}-${env}-${suffix}`), v)))
+${Underpost.deploy
+  .volumeFactory(volumes.map((v) => ((v.version = `${deployId}-${env}-${suffix}`), v)))
   .render.split(`\n`)
   .map((l) => '    ' + l)
   .join(`\n`)}
@@ -188,6 +209,14 @@ spec:
      * @param {string} options.replicas - Number of replicas for each deployment.
      * @param {string} options.image - Docker image for the deployment.
      * @param {string} options.namespace - Kubernetes namespace for the deployment.
+     * @param {string} [options.versions] - Comma-separated list of versions to deploy.
+     * @param {string} [options.cmd] - Custom initialization command for deploymentYamlPartsFactory (comma-separated commands).
+     * @param {string} [options.timeoutResponse] - Timeout response setting for the deployment.
+     * @param {string} [options.timeoutIdle] - Timeout idle setting for the deployment.
+     * @param {string} [options.retryCount] - Retry count setting for the deployment.
+     * @param {string} [options.retryPerTryTimeout] - Retry per-try timeout setting for the deployment.
+     * @param {boolean} [options.disableDeploymentProxy] - Whether to disable deployment proxy.
+     * @param {string} [options.traffic] - Traffic status for the deployment.
      * @returns {Promise<void>} - Promise that resolves when the manifest is built.
      * @memberof UnderpostDeploy
      */
@@ -203,7 +232,7 @@ spec:
           deployId,
           JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
         );
-        const router = await UnderpostDeploy.API.routerFactory(deployId, env);
+        const router = await Underpost.deploy.routerFactory(deployId, env);
         const pathPortAssignmentData = await pathPortAssignmentFactory(deployId, router, confServer);
         const { fromPort, toPort } = deployRangePortFactory(router);
         const deploymentVersions = options.versions.split(',');
@@ -215,15 +244,17 @@ spec:
         let deploymentYamlParts = '';
         for (const deploymentVersion of deploymentVersions) {
           deploymentYamlParts += `---
-${UnderpostDeploy.API.deploymentYamlPartsFactory({
-  deployId,
-  env,
-  suffix: deploymentVersion,
-  replicas,
-  image,
-  namespace: options.namespace,
-  cmd: options.cmd ? options.cmd.split(',').map((c) => c.trim()) : undefined,
-}).replace('{{ports}}', buildKindPorts(fromPort, toPort))}
+${Underpost.deploy
+  .deploymentYamlPartsFactory({
+    deployId,
+    env,
+    suffix: deploymentVersion,
+    replicas,
+    image,
+    namespace: options.namespace,
+    cmd: options.cmd ? options.cmd.split(',').map((c) => c.trim()) : undefined,
+  })
+  .replace('{{ports}}', buildKindPorts(fromPort, toPort))}
 `;
         }
         fs.writeFileSync(`./engine-private/conf/${deployId}/build/${env}/deployment.yaml`, deploymentYamlParts, 'utf8');
@@ -236,34 +267,63 @@ ${UnderpostDeploy.API.deploymentYamlPartsFactory({
 
         for (const host of Object.keys(confServer)) {
           if (env === 'production')
-            secretYaml += UnderpostDeploy.API.buildCertManagerCertificate({ host, namespace: options.namespace });
+            secretYaml += Underpost.deploy.buildCertManagerCertificate({ host, namespace: options.namespace });
 
           const pathPortAssignment = pathPortAssignmentData[host];
           // logger.info('', { host, pathPortAssignment });
-          let _proxyYaml = UnderpostDeploy.API.baseProxyYamlFactory({ host, env, options });
+          let _proxyYaml = Underpost.deploy.baseProxyYamlFactory({ host, env, options });
           const deploymentVersions =
             options.traffic && typeof options.traffic === 'string' ? options.traffic.split(',') : ['blue'];
           let proxyRoutes = '';
+          const globalTimeoutPolicy =
+            (options.timeoutResponse && options.timeoutResponse !== '') ||
+            (options.timeoutIdle && options.timeoutIdle !== '')
+              ? {
+                  response: options.timeoutResponse,
+                  idle: options.timeoutIdle,
+                }
+              : undefined;
+          const globalRetryPolicy =
+            options.retryCount ||
+            options.retryCount === 0 ||
+            (options.retryPerTryTimeout && options.retryPerTryTimeout !== '')
+              ? {
+                  count: options.retryCount,
+                  perTryTimeout: options.retryPerTryTimeout,
+                }
+              : undefined;
           if (!options.disableDeploymentProxy)
             for (const conditionObj of pathPortAssignment) {
               const { path, port } = conditionObj;
-              proxyRoutes += UnderpostDeploy.API.deploymentYamlServiceFactory({
+              proxyRoutes += Underpost.deploy.deploymentYamlServiceFactory({
                 path,
                 deployId,
                 env,
                 port,
                 deploymentVersions,
+                timeoutPolicy: globalTimeoutPolicy,
+                retryPolicy: globalRetryPolicy,
               });
             }
           for (const customService of customServices) {
-            const { path: _path, port, serviceId, host: _host, pathRewritePolicy } = customService;
+            const {
+              path: _path,
+              port,
+              serviceId,
+              host: _host,
+              pathRewritePolicy,
+              timeoutPolicy: _timeoutPolicy,
+              retryPolicy: _retryPolicy,
+            } = customService;
             if (host === _host) {
-              proxyRoutes += UnderpostDeploy.API.deploymentYamlServiceFactory({
+              proxyRoutes += Underpost.deploy.deploymentYamlServiceFactory({
                 path: _path,
                 port,
                 serviceId,
                 deploymentVersions,
                 pathRewritePolicy,
+                timeoutPolicy: _timeoutPolicy ? _timeoutPolicy : globalTimeoutPolicy,
+                retryPolicy: _retryPolicy ? _retryPolicy : globalRetryPolicy,
               });
             }
           }
@@ -389,6 +449,10 @@ spec:
      * @param {boolean} options.etcHosts - Whether to display the /etc/hosts file.
      * @param {boolean} options.disableUpdateUnderpostConfig - Whether to disable Underpost config updates.
      * @param {string} [options.namespace] - Kubernetes namespace for the deployment.
+     * @param {string} [options.timeoutResponse] - Timeout response setting for the deployment.
+     * @param {string} [options.timeoutIdle] - Timeout idle setting for the deployment.
+     * @param {string} [options.retryCount] - Retry count setting for the deployment.
+     * @param {string} [options.retryPerTryTimeout] - Retry per-try timeout setting for the deployment.
      * @param {string} [options.kindType] - Type of Kubernetes resource to retrieve information for.
      * @param {number} [options.port] - Port number for exposing the deployment.
      * @param {string} [options.cmd] - Custom initialization command for deploymentYamlPartsFactory (comma-separated commands).
@@ -421,6 +485,10 @@ spec:
         etcHosts: false,
         disableUpdateUnderpostConfig: false,
         namespace: '',
+        timeoutResponse: '',
+        timeoutIdle: '',
+        retryCount: '',
+        retryPerTryTimeout: '',
         kindType: '',
         port: 0,
         cmd: '',
@@ -430,7 +498,7 @@ spec:
       if (!deployList && options.certHosts) {
         for (const host of options.certHosts.split(',')) {
           shellExec(`sudo kubectl apply -f - -n ${namespace} <<EOF
-${UnderpostDeploy.API.buildCertManagerCertificate({ host, namespace })}
+${Underpost.deploy.buildCertManagerCertificate({ host, namespace })}
 EOF`);
         }
         return;
@@ -453,26 +521,26 @@ EOF`);
                 path: instance.path,
                 fromPort: instance.fromPort,
                 toPort: instance.toPort,
-                traffic: UnderpostDeploy.API.getCurrentTraffic(_deployId, { namespace, hostTest: instance.host }),
+                traffic: Underpost.deploy.getCurrentTraffic(_deployId, { namespace, hostTest: instance.host }),
               });
             }
           }
           logger.info('', {
             deployId,
             env,
-            traffic: UnderpostDeploy.API.getCurrentTraffic(deployId, { namespace }),
-            router: await UnderpostDeploy.API.routerFactory(deployId, env),
-            pods: await UnderpostDeploy.API.get(deployId),
+            traffic: Underpost.deploy.getCurrentTraffic(deployId, { namespace }),
+            router: await Underpost.deploy.routerFactory(deployId, env),
+            pods: await Underpost.deploy.get(deployId),
             instances,
           });
         }
-        const interfaceName = Dns.getDefaultNetworkInterface();
+        const interfaceName = Underpost.dns.getDefaultNetworkInterface();
         logger.info('Machine', {
           hostname: os.hostname(),
-          arch: UnderpostBaremetal.API.getHostArch(),
-          ipv4Public: await Dns.getPublicIp(),
-          ipv4Local: getLocalIPv4Address(),
-          resources: UnderpostCluster.API.getResourcesCapacity(options.node),
+          arch: Underpost.baremetal.getHostArch(),
+          ipv4Public: await Underpost.dns.getPublicIp(),
+          ipv4Local: Underpost.dns.getLocalIPv4Address(),
+          resources: Underpost.cluster.getResourcesCapacity(options.node),
           defaultInterfaceName: interfaceName,
           defaultInterfaceInfo: os.networkInterfaces()[interfaceName],
         });
@@ -484,16 +552,16 @@ EOF`);
         getDataDeploy({
           buildSingleReplica: true,
         });
-      if (options.buildManifest === true) await UnderpostDeploy.API.buildManifest(deployList, env, options);
+      if (options.buildManifest === true) await Underpost.deploy.buildManifest(deployList, env, options);
       if (options.infoRouter === true || options.buildManifest === true) {
-        logger.info('router', await UnderpostDeploy.API.routerFactory(deployList, env));
+        logger.info('router', await Underpost.deploy.routerFactory(deployList, env));
         return;
       }
-      if (!options.disableUpdateUnderpostConfig) UnderpostDeploy.API.configMap(env);
+      if (!options.disableUpdateUnderpostConfig) Underpost.deploy.configMap(env);
       let renderHosts = '';
       let etcHosts = [];
       if (options.restoreHosts === true) {
-        const factoryResult = UnderpostDeploy.API.etcHostFactory(etcHosts);
+        const factoryResult = Underpost.deploy.etcHostFactory(etcHosts);
         renderHosts = factoryResult.renderHosts;
         logger.info(renderHosts);
         return;
@@ -504,7 +572,7 @@ EOF`);
         if (!deployId) continue;
         if (options.expose === true) {
           const kindType = options.kindType ? options.kindType : 'svc';
-          const svc = UnderpostDeploy.API.get(deployId, kindType)[0];
+          const svc = Underpost.deploy.get(deployId, kindType)[0];
           const port = options.port
             ? options.port
             : kindType !== 'svc'
@@ -535,7 +603,7 @@ EOF`);
             );
             if (!options.disableUpdateVolume)
               for (const volume of confVolume)
-                UnderpostDeploy.API.deployVolume(volume, {
+                Underpost.deploy.deployVolume(volume, {
                   deployId,
                   env,
                   version,
@@ -547,7 +615,7 @@ EOF`);
         for (const host of Object.keys(confServer)) {
           if (!options.disableUpdateProxy) {
             shellExec(`sudo kubectl delete HTTPProxy ${host} -n ${namespace} --ignore-not-found`);
-            if (UnderpostDeploy.API.isValidTLSContext({ host, env, options }))
+            if (Underpost.deploy.isValidTLSContext({ host, env, options }))
               shellExec(`sudo kubectl delete Certificate ${host} -n ${namespace} --ignore-not-found`);
           }
           if (!options.remove) etcHosts.push(host);
@@ -564,12 +632,12 @@ EOF`);
           if (!options.disableUpdateProxy)
             shellExec(`sudo kubectl apply -f ./${manifestsPath}/proxy.yaml -n ${namespace}`);
 
-          if (UnderpostDeploy.API.isValidTLSContext({ host: Object.keys(confServer)[0], env, options }))
+          if (Underpost.deploy.isValidTLSContext({ host: Object.keys(confServer)[0], env, options }))
             shellExec(`sudo kubectl apply -f ./${manifestsPath}/secret.yaml -n ${namespace}`);
         }
       }
       if (options.etcHosts === true) {
-        const factoryResult = UnderpostDeploy.API.etcHostFactory(etcHosts);
+        const factoryResult = Underpost.deploy.etcHostFactory(etcHosts);
         renderHosts = factoryResult.renderHosts;
       }
       if (renderHosts)
@@ -667,7 +735,7 @@ EOF`);
      */
     async checkDeploymentReadyStatus(deployId, env, traffic, ignoresNames = [], namespace = 'default') {
       const cmd = `underpost config get container-status`;
-      const pods = UnderpostDeploy.API.get(`${deployId}-${env}-${traffic}`, 'pods', namespace);
+      const pods = Underpost.deploy.get(`${deployId}-${env}-${traffic}`, 'pods', namespace);
       const readyPods = [];
       const notReadyPods = [];
       for (const pod of pods) {
@@ -711,14 +779,35 @@ EOF`);
      * @param {string} targetTraffic - Target traffic status for the deployment.
      * @param {number} replicas - Number of replicas for the deployment.
      * @param {string} [namespace='default'] - Kubernetes namespace for the deployment.
+     * @param {object} options - Options for the traffic switch.
+     * @param {string} options.timeoutResponse - Timeout response setting for the deployment.
+     * @param {string} options.timeoutIdle - Timeout idle setting for the deployment.
+     * @param {string} options.retryCount - Retry count setting for the deployment.
+     * @param {string} options.retryPerTryTimeout - Retry per-try timeout setting for the deployment.
      * @memberof UnderpostDeploy
      */
-    switchTraffic(deployId, env, targetTraffic, replicas = 1, namespace = 'default') {
-      UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, targetTraffic);
+    switchTraffic(
+      deployId,
+      env,
+      targetTraffic,
+      replicas = 1,
+      namespace = 'default',
+      options = {
+        timeoutResponse: '',
+        timeoutIdle: '',
+        retryCount: '',
+        retryPerTryTimeout: '',
+      },
+    ) {
+      const timeoutFlags = Underpost.deploy.timeoutFlagsFactory(options);
+
       shellExec(
-        `node bin deploy --info-router --build-manifest --traffic ${targetTraffic} --replicas ${replicas} --namespace ${namespace} ${deployId} ${env}`,
+        `node bin deploy --info-router --build-manifest --traffic ${targetTraffic} --replicas ${replicas} --namespace ${namespace}${timeoutFlags} ${deployId} ${env}`,
       );
+
       shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml -n ${namespace}`);
+
+      Underpost.env.set(`${deployId}-${env}-traffic`, targetTraffic);
     },
 
     /**
@@ -767,7 +856,7 @@ EOF`);
       shellExec(`kubectl delete pvc ${pvcId} -n ${namespace} --ignore-not-found`);
       shellExec(`kubectl delete pv ${pvId} --ignore-not-found`);
       shellExec(`kubectl apply -f - -n ${namespace} <<EOF
-${UnderpostDeploy.API.persistentVolumeFactory({
+${Underpost.deploy.persistentVolumeFactory({
   hostPath: rootVolumeHostPath,
   pvcId,
 })}
@@ -934,13 +1023,7 @@ ${renderHosts}`,
           );
           break;
         }
-        result = await UnderpostDeploy.API.checkDeploymentReadyStatus(
-          deployId,
-          env,
-          targetTraffic,
-          ignorePods,
-          namespace,
-        );
+        result = await Underpost.deploy.checkDeploymentReadyStatus(deployId, env, targetTraffic, ignorePods, namespace);
         if (result.ready === true) {
           readyOk++;
           logger.info(`${iteratorTag} | Deployment ready. Verification number: ${readyOk}`);
@@ -1137,7 +1220,7 @@ ${renderHosts}`,
     ) => {
       if (resources) {
         if (resources.resourceTemplateId)
-          return UnderpostDeploy.API.resourcesTemplate[resources.resourceTemplateId].resources;
+          return Underpost.deploy.resourcesTemplate[resources.resourceTemplateId].resources;
         if (resources.requestsMemory && resources.requestsCpu && resources.limitsMemory && resources.limitsCpu)
           return {
             requests: {
@@ -1152,6 +1235,25 @@ ${renderHosts}`,
       }
       return undefined;
     },
+
+    /**
+     * Generates timeout flags string for deployment commands.
+     * @param {object} options - Options containing timeout settings.
+     * @param {string|number} [options.timeoutResponse] - Timeout response value.
+     * @param {string|number} [options.timeoutIdle] - Timeout idle value.
+     * @param {string|number} [options.retryCount] - Retry count value.
+     * @param {string|number} [options.retryPerTryTimeout] - Retry per try timeout value.
+     * @returns {string} The timeout flags string.
+     * @memberof UnderpostDeploy
+     */
+    timeoutFlagsFactory: (options = {}) => {
+      return (
+        `${options.timeoutResponse ? ` --timeout-response ${options.timeoutResponse}` : ''}` +
+        `${options.timeoutIdle ? ` --timeout-idle ${options.timeoutIdle}` : ''}` +
+        `${options.retryCount || options.retryCount === 0 ? ` --retry-count ${options.retryCount}` : ''}` +
+        `${options.retryPerTryTimeout ? ` --retry-per-try-timeout ${options.retryPerTryTimeout}` : ''}`
+      );
+    },
   };
 }
 

package/src/cli/env.js

@@ -25,15 +25,30 @@ class UnderpostRootEnv {
      * @description Sets an environment variable in the underpost root environment.
      * @param {string} key - The key of the environment variable to set.
      * @param {string} value - The value of the environment variable to set.
+     * @param {object} options - Options for setting the environment variable.
+     * @param {string} [options.deployId=''] - Deployment ID associated with the environment variable.
+     * @param {boolean} [options.build=false] - If true, triggers a build after setting the environment variable.
      * @memberof UnderpostEnv
      */
-    set(key, value) {
+    set(key, value, options = { deployId: '', build: false }) {
+      const _set = (envPath, key, value) => {
+        let env = {};
+        if (fs.existsSync(envPath)) env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
+        env[key] = value;
+        writeEnv(envPath, env);
+      };
+      if (options.build) {
+        const deployIdList = options.deployId
+          ? [options.deployId]
+          : fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',');
+        for (const deployId of deployIdList)
+          for (const envFile of ['test', 'development', 'production'])
+            _set(`./engine-private/conf/${deployId}/.env.${envFile}`, key, value);
+        return;
+      }
       const exeRootPath = `${getNpmRootPath()}/underpost`;
       const envPath = `${exeRootPath}/.env`;
-      let env = {};
-      if (fs.existsSync(envPath)) env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-      env[key] = value;
-      writeEnv(envPath, env);
+      _set(envPath, key, value);
     },
     /**
      * @method delete

package/src/cli/fs.js

@@ -11,8 +11,8 @@ import AdmZip from 'adm-zip';
 import * as dir from 'path';
 import fs from 'fs-extra';
 import Downloader from '../server/downloader.js';
-import UnderpostRepository from './repository.js';
 import { shellExec } from '../server/process.js';
+import Underpost from '../index.js';
 dotenv.config();
 
 const logger = loggerFactory(import.meta);
@@ -93,12 +93,12 @@ class UnderpostFileStorage {
         storageFilePath: '',
       },
     ) {
-      const { storage, storageConf } = UnderpostFileStorage.API.getStorageConf(options);
-      const deleteFiles = options.pull === true ? [] : UnderpostRepository.API.getDeleteFiles(path);
+      const { storage, storageConf } = Underpost.fs.getStorageConf(options);
+      const deleteFiles = options.pull === true ? [] : Underpost.repo.getDeleteFiles(path);
       for (const relativePath of deleteFiles) {
         const _path = path + '/' + relativePath;
         if (_path in storage) {
-          await UnderpostFileStorage.API.delete(_path);
+          await Underpost.fs.delete(_path);
           delete storage[_path];
         }
       }
@@ -106,27 +106,25 @@ class UnderpostFileStorage {
         for (const _path of Object.keys(storage)) {
           if (!fs.existsSync(_path) || options.force === true) {
             if (options.force === true && fs.existsSync(_path)) fs.removeSync(_path);
-            await UnderpostFileStorage.API.pull(_path, options);
+            await Underpost.fs.pull(_path, options);
           } else logger.warn(`Pull path already exists`, _path);
         }
         shellExec(`cd ${path} && git init && git add . && git commit -m "Base pull state"`);
       } else {
         const files =
-          options.git === true
-            ? UnderpostRepository.API.getChangedFiles(path)
-            : await fs.readdir(path, { recursive: true });
+          options.git === true ? Underpost.repo.getChangedFiles(path) : await fs.readdir(path, { recursive: true });
         for (const relativePath of files) {
           const _path = path + '/' + relativePath;
           if (fs.statSync(_path).isDirectory()) {
             if (options.pull === true && !fs.existsSync(_path)) fs.mkdirSync(_path, { recursive: true });
             continue;
           } else if (!(_path in storage) || options.force === true) {
-            await UnderpostFileStorage.API.upload(_path, options);
+            await Underpost.fs.upload(_path, options);
             if (storage) storage[_path] = {};
           } else logger.warn('File already exists', _path);
         }
       }
-      UnderpostFileStorage.API.writeStorageConf(storage, storageConf);
+      Underpost.fs.writeStorageConf(storage, storageConf);
       if (options.git === true) {
         shellExec(`cd ${path} && git add .`);
         shellExec(`underpost cmt ${path} feat`);
@@ -152,10 +150,10 @@ class UnderpostFileStorage {
       options = { rm: false, recursive: false, deployId: '', force: false, pull: false, git: false },
     ) {
       if (options.recursive === true || options.git === true)
-        return await UnderpostFileStorage.API.recursiveCallback(path, options);
-      if (options.pull === true) return await UnderpostFileStorage.API.pull(path, options);
-      if (options.rm === true) return await UnderpostFileStorage.API.delete(path, options);
-      return await UnderpostFileStorage.API.upload(path, options);
+        return await Underpost.fs.recursiveCallback(path, options);
+      if (options.pull === true) return await Underpost.fs.pull(path, options);
+      if (options.rm === true) return await Underpost.fs.delete(path, options);
+      return await Underpost.fs.upload(path, options);
     },
     /**
      * @method upload
@@ -171,9 +169,9 @@ class UnderpostFileStorage {
       path,
       options = { rm: false, recursive: false, deployId: '', force: false, pull: false, storageFilePath: '' },
     ) {
-      UnderpostFileStorage.API.cloudinaryConfig();
-      const { storage, storageConf } = UnderpostFileStorage.API.getStorageConf(options);
-      // path = UnderpostFileStorage.API.file2Zip(path);
+      Underpost.fs.cloudinaryConfig();
+      const { storage, storageConf } = Underpost.fs.getStorageConf(options);
+      // path = Underpost.fs.file2Zip(path);
       const uploadResult = await cloudinary.uploader
         .upload(path, {
           public_id: path,
@@ -185,7 +183,7 @@ class UnderpostFileStorage {
         });
       logger.info('upload result', uploadResult);
       if (storage) storage[path] = {};
-      UnderpostFileStorage.API.writeStorageConf(storage, storageConf);
+      Underpost.fs.writeStorageConf(storage, storageConf);
       return uploadResult;
     },
     /**
@@ -196,7 +194,7 @@ class UnderpostFileStorage {
      * @memberof UnderpostFileStorage
      */
     async pull(path) {
-      UnderpostFileStorage.API.cloudinaryConfig();
+      Underpost.fs.cloudinaryConfig();
       const folder = dir.dirname(path);
       if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true });
       const downloadResult = await cloudinary.utils.download_archive_url({
@@ -205,11 +203,11 @@ class UnderpostFileStorage {
       });
       logger.info('download result', downloadResult);
       await Downloader.downloadFile(downloadResult, path + '.zip');
-      path = UnderpostFileStorage.API.zip2File(path + '.zip');
+      path = Underpost.fs.zip2File(path + '.zip');
       fs.removeSync(path + '.zip');
     },
     async delete(path) {
-      UnderpostFileStorage.API.cloudinaryConfig();
+      Underpost.fs.cloudinaryConfig();
       const deleteResult = await cloudinary.api
         .delete_resources([path], { type: 'upload', resource_type: 'raw' })
         .catch((error) => {