@underpostnet/underpost 2.96.0 → 2.97.0

package/src/index.js

@@ -36,7 +36,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.96.0';
+  static version = 'v2.97.0';
   /**
    * Repository cli API
    * @static
@@ -193,6 +193,7 @@ export {
   UnderpostRootEnv,
   UnderpostFileStorage,
   UnderpostImage,
+  UnderpostStatic,
   UnderpostLxd,
   UnderpostMonitor,
   UnderpostRepository,

package/src/server/dns.js

@@ -36,7 +36,9 @@ class Dns {
   static async getPublicIp() {
     return await new Promise(async (resolve) => {
       try {
-        return axios.get('https://api.ipify.org').then((response) => resolve(response.data));
+        return axios
+          .get(process.env.HTTP_PLAIN_IP_URL ? process.env.HTTP_PLAIN_IP_URL : 'https://api.ipify.org')
+          .then((response) => resolve(response.data));
       } catch (error) {
         logger.error('Error fetching public IP:', { error: error.message, stack: error.stack });
         return resolve(null);
@@ -403,6 +405,7 @@ class Dns {
    * @property {boolean} [options.banEgressClear=false] - Clear all banned egress IPs.
    * @property {boolean} [options.banBothAdd=false] - Ban IPs from both ingress and egress.
    * @property {boolean} [options.banBothRemove=false] - Unban IPs from both ingress and egress.
+   * @property {boolean} [options.dhcp=false] - Get local DHCP IP instead of public IP.
    * @property {boolean} [options.copy=false] - Copy the public IP to clipboard.
    * @return {Promise<string|void>} The public IP if no ban/unban action is taken.
    */
@@ -420,6 +423,7 @@ class Dns {
       banBothAdd: false,
       banBothRemove: false,
       copy: false,
+      dhcp: false,
     },
   ) {
     const ipList = ips
@@ -468,7 +472,9 @@ class Dns {
       });
     }
 
-    const ip = await Dns.getPublicIp();
+    let ip;
+    if (options.dhcp) ip = Dns.getLocalIPv4Address();
+    else ip = await Dns.getPublicIp();
     if (options.copy) return pbcopy(ip);
     console.log(ip);
     return ip;

package/src/server/start.js

@@ -117,20 +117,27 @@ class UnderpostStartUp {
      * @param {Object} options - Options for the deployment.
      * @param {boolean} options.build - Whether to build the deployment.
      * @param {boolean} options.run - Whether to run the deployment.
+     * @param {boolean} options.underpostQuicklyInstall - Whether to use underpost quickly install.
      */
-    async callback(deployId = 'dd-default', env = 'development', options = { build: false, run: false }) {
+    async callback(
+      deployId = 'dd-default',
+      env = 'development',
+      options = { build: false, run: false, underpostQuicklyInstall: false },
+    ) {
       UnderpostRootEnv.API.set('container-status', `${deployId}-${env}-build-deployment`);
-      if (options.build === true) await UnderpostStartUp.API.build(deployId, env);
+      if (options.build === true) await UnderpostStartUp.API.build(deployId, env, options);
       UnderpostRootEnv.API.set('container-status', `${deployId}-${env}-initializing-deployment`);
-      if (options.run === true) await UnderpostStartUp.API.run(deployId, env);
+      if (options.run === true) await UnderpostStartUp.API.run(deployId, env, options);
     },
     /**
      * Run itc-scripts and builds client bundle.
      * @param {string} deployId - The ID of the deployment.
      * @param {string} env - The environment of the deployment.
+     * @param {Object} options - Options for the build.
+     * @param {boolean} options.underpostQuicklyInstall - Whether to use underpost quickly install.
      * @memberof UnderpostStartUp
      */
-    async build(deployId = 'dd-default', env = 'development') {
+    async build(deployId = 'dd-default', env = 'development', options = { underpostQuicklyInstall: false }) {
       const buildBasePath = `/home/dd`;
       const repoName = `engine-${deployId.split('-')[1]}`;
       shellExec(`cd ${buildBasePath} && underpost clone ${process.env.GITHUB_USERNAME}/${repoName}`);
@@ -140,7 +147,7 @@ class UnderpostStartUp {
       shellExec(`cd ${buildBasePath}/engine && underpost clone ${process.env.GITHUB_USERNAME}/${repoName}-private`);
       shellExec(`cd ${buildBasePath}/engine && sudo mv ./${repoName}-private ./engine-private`);
       shellCd(`${buildBasePath}/engine`);
-      shellExec(`npm install`);
+      shellExec(options?.underpostQuicklyInstall ? `underpost install` : `npm install`);
       shellExec(`node bin/deploy conf ${deployId} ${env}`);
       if (fs.existsSync('./engine-private/itc-scripts')) {
         const itcScripts = await fs.readdir('./engine-private/itc-scripts');
@@ -153,9 +160,10 @@ class UnderpostStartUp {
      * Runs a deployment.
      * @param {string} deployId - The ID of the deployment.
      * @param {string} env - The environment of the deployment.
+     * @param {Object} options - Options for the run.
      * @memberof UnderpostStartUp
      */
-    async run(deployId = 'dd-default', env = 'development') {
+    async run(deployId = 'dd-default', env = 'development', options = {}) {
       const runCmd = env === 'production' ? 'run prod-img' : 'run dev-img';
       if (fs.existsSync(`./engine-private/replica`)) {
         const replicas = await fs.readdir(`./engine-private/replica`);

package/manifests/mariadb/config.yaml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: mariadb-config
-data:
-  my.cnf: | # bind-address=0.0.0.0
-    [mysqld]
-    default_storage_engine=InnoDB
-    innodb_file_per_table=1
-    max_connections=1000

package/manifests/mariadb/secret.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mariadb-secret
-type: Opaque
-data:
-  password:
-  username: