underpost 2.7.1 → 2.7.3

package/src/mailer/EmailRender.js

@@ -1,69 +1,69 @@
-import { srcFormatted } from '../server/client-formatted.js';
-import fs from 'fs-extra';
-
-const EmailRender = {
-  style: {
-    body: {
-      'font-family': 'Arial, sans-serif',
-      'background-color': '#f4f4f4',
-      margin: 0,
-      padding: '20px',
-      'min-height': '300px',
-      width: '100%',
-      'max-width': '700px',
-      display: 'block',
-    },
-    '.container': {
-      'max-width': '600px',
-      margin: '0 auto',
-      'background-color': '#ffffff',
-      padding: '20px',
-      'border-radius': '5px',
-      // 'box-shadow': '0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)',
-    },
-    h1: {
-      'font-size': '24px',
-      'margin-bottom': '20px',
-      color: '#333333',
-    },
-    p: {
-      'font-size': '16px',
-      'line-height': 1.5,
-      'margin-bottom': '20px',
-      color: '#666666',
-    },
-    button: {
-      display: 'inline-block',
-      padding: '10px 20px',
-      'background-color': '#007bff',
-      color: '#ffffff',
-      'text-decoration': 'none',
-      'border-radius': '5px',
-      'font-size': '16px',
-    },
-    '.footer': {
-      'text-align': 'center',
-      padding: '20px',
-      'font-size': '14px',
-      color: '#999999',
-    },
-  },
-  renderStyle: function (classObj) {
-    return Object.keys(this.style[classObj])
-      .map((classKey) => ` ${classKey}: ${this.style[classObj][classKey]};`)
-      .join(``);
-  },
-
-  getTemplates: async function (options = { templates: {} }) {
-    const templates = {};
-    for (const templateKey of Object.keys(options.templates)) {
-      const ssrEmailComponent = options.templates[templateKey];
-      let SrrComponent;
-      eval(await srcFormatted(fs.readFileSync(`./src/client/ssr/email-components/${ssrEmailComponent}.js`, 'utf8')));
-      templates[templateKey] = SrrComponent(this, options);
-    }
-    return templates;
-  },
-};
-
-export { EmailRender };
+import { srcFormatted } from '../server/client-formatted.js';
+import fs from 'fs-extra';
+
+const EmailRender = {
+  style: {
+    body: {
+      'font-family': 'Arial, sans-serif',
+      'background-color': '#f4f4f4',
+      margin: 0,
+      padding: '20px',
+      'min-height': '300px',
+      width: '100%',
+      'max-width': '700px',
+      display: 'block',
+    },
+    '.container': {
+      'max-width': '600px',
+      margin: '0 auto',
+      'background-color': '#ffffff',
+      padding: '20px',
+      'border-radius': '5px',
+      // 'box-shadow': '0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)',
+    },
+    h1: {
+      'font-size': '24px',
+      'margin-bottom': '20px',
+      color: '#333333',
+    },
+    p: {
+      'font-size': '16px',
+      'line-height': 1.5,
+      'margin-bottom': '20px',
+      color: '#666666',
+    },
+    button: {
+      display: 'inline-block',
+      padding: '10px 20px',
+      'background-color': '#007bff',
+      color: '#ffffff',
+      'text-decoration': 'none',
+      'border-radius': '5px',
+      'font-size': '16px',
+    },
+    '.footer': {
+      'text-align': 'center',
+      padding: '20px',
+      'font-size': '14px',
+      color: '#999999',
+    },
+  },
+  renderStyle: function (classObj) {
+    return Object.keys(this.style[classObj])
+      .map((classKey) => ` ${classKey}: ${this.style[classObj][classKey]};`)
+      .join(``);
+  },
+
+  getTemplates: async function (options = { templates: {} }) {
+    const templates = {};
+    for (const templateKey of Object.keys(options.templates)) {
+      const ssrEmailComponent = options.templates[templateKey];
+      let SrrComponent;
+      eval(await srcFormatted(fs.readFileSync(`./src/client/ssr/email-components/${ssrEmailComponent}.js`, 'utf8')));
+      templates[templateKey] = SrrComponent(this, options);
+    }
+    return templates;
+  },
+};
+
+export { EmailRender };

package/src/mailer/MailerProvider.js

@@ -1,96 +1,96 @@
-import nodemailer from 'nodemailer';
-import { loggerFactory } from '../server/logger.js';
-import { EmailRender } from './EmailRender.js';
-
-const logger = loggerFactory(import.meta);
-
-const MailerProvider = {
-  instance: {},
-  load: async function (
-    options = {
-      id: '',
-      meta: 'mailer',
-      sender: {
-        email: '',
-        name: '',
-      },
-      transport: {
-        host: '', // smtp host
-        port: 587,
-        secure: false, // true for 465, false for other ports
-        auth: {
-          user: '', // generated ethereal user
-          pass: '', // generated ethereal password
-        },
-      },
-      host: '',
-      path: '',
-      templates: ['SsrTemplate'],
-    },
-  ) {
-    try {
-      const { id } = options;
-      // Generate test SMTP service account from ethereal.email
-      // Only needed if you don't have a real mail account for testing
-      // let testAccount = await nodemailer.createTestAccount();
-
-      // create reusable transporter object using the default SMTP transport
-      const transporter = nodemailer.createTransport(options.transport);
-
-      // console.log('load logger', { url: options.meta });
-      this.instance[id] = {
-        ...options,
-        transporter,
-        templates: await EmailRender.getTemplates(options),
-      };
-
-      return this.instance[id];
-    } catch (error) {
-      logger.error(error, error.stack);
-      return undefined;
-    }
-  },
-  send: async function (
-    options = {
-      id: '',
-      sendOptions: {
-        from: '"Fred Foo 👻" <foo@example.com>', // sender address
-        to: 'bar@example.com, baz@example.com', // list of receivers
-        subject: 'Hello ✔', // Subject line
-        text: 'Hello world?', // plain text body
-        html: '<b>Hello world?</b>', // html body
-        attachments: [
-          {
-            filename: 'logo.png',
-            path: `./logo.png`,
-            cid: 'logo', // <img src='cid:logo'>
-          },
-        ],
-      },
-    },
-  ) {
-    try {
-      const { id, sendOptions } = options;
-      if (!sendOptions.from) sendOptions.from = `${this.instance[id].sender.name} <${this.instance[id].sender.email}>`;
-
-      // send mail with defined transport object
-      const info = await this.instance[id].transporter.sendMail(sendOptions);
-
-      // console.log('Message sent: %s', info.messageId);
-      // logger.info('Message sent', info);
-
-      // Message sent: <b658f8ca-6296-ccf4-8306-87d57a0b4321@example.com>
-
-      // Preview only available when sending through an Ethereal account
-      // console.log("Preview URL: %s", nodemailer.getTestMessageUrl(info));
-      // Preview URL: https://ethereal.email/message/WaQKMgKddxQDoou...
-
-      return info;
-    } catch (error) {
-      logger.error(error, error.stack);
-      return undefined;
-    }
-  },
-};
-
-export { MailerProvider };
+import nodemailer from 'nodemailer';
+import { loggerFactory } from '../server/logger.js';
+import { EmailRender } from './EmailRender.js';
+
+const logger = loggerFactory(import.meta);
+
+const MailerProvider = {
+  instance: {},
+  load: async function (
+    options = {
+      id: '',
+      meta: 'mailer',
+      sender: {
+        email: '',
+        name: '',
+      },
+      transport: {
+        host: '', // smtp host
+        port: 587,
+        secure: false, // true for 465, false for other ports
+        auth: {
+          user: '', // generated ethereal user
+          pass: '', // generated ethereal password
+        },
+      },
+      host: '',
+      path: '',
+      templates: ['SsrTemplate'],
+    },
+  ) {
+    try {
+      const { id } = options;
+      // Generate test SMTP service account from ethereal.email
+      // Only needed if you don't have a real mail account for testing
+      // let testAccount = await nodemailer.createTestAccount();
+
+      // create reusable transporter object using the default SMTP transport
+      const transporter = nodemailer.createTransport(options.transport);
+
+      // console.log('load logger', { url: options.meta });
+      this.instance[id] = {
+        ...options,
+        transporter,
+        templates: await EmailRender.getTemplates(options),
+      };
+
+      return this.instance[id];
+    } catch (error) {
+      logger.error(error, error.stack);
+      return undefined;
+    }
+  },
+  send: async function (
+    options = {
+      id: '',
+      sendOptions: {
+        from: '"Fred Foo 👻" <foo@example.com>', // sender address
+        to: 'bar@example.com, baz@example.com', // list of receivers
+        subject: 'Hello ✔', // Subject line
+        text: 'Hello world?', // plain text body
+        html: '<b>Hello world?</b>', // html body
+        attachments: [
+          {
+            filename: 'logo.png',
+            path: `./logo.png`,
+            cid: 'logo', // <img src='cid:logo'>
+          },
+        ],
+      },
+    },
+  ) {
+    try {
+      const { id, sendOptions } = options;
+      if (!sendOptions.from) sendOptions.from = `${this.instance[id].sender.name} <${this.instance[id].sender.email}>`;
+
+      // send mail with defined transport object
+      const info = await this.instance[id].transporter.sendMail(sendOptions);
+
+      // console.log('Message sent: %s', info.messageId);
+      // logger.info('Message sent', info);
+
+      // Message sent: <b658f8ca-6296-ccf4-8306-87d57a0b4321@example.com>
+
+      // Preview only available when sending through an Ethereal account
+      // console.log("Preview URL: %s", nodemailer.getTestMessageUrl(info));
+      // Preview URL: https://ethereal.email/message/WaQKMgKddxQDoou...
+
+      return info;
+    } catch (error) {
+      logger.error(error, error.stack);
+      return undefined;
+    }
+  },
+};
+
+export { MailerProvider };

package/src/proxy.js

@@ -1,22 +1,22 @@
-'use strict';
-
-// https://nodejs.org/api
-// https://expressjs.com/en/4x/api.html
-
-import dotenv from 'dotenv';
-import { loggerFactory } from './server/logger.js';
-import { buildProxy } from './server/proxy.js';
-import { ProcessController } from './server/process.js';
-import { Config } from './server/conf.js';
-
-dotenv.config();
-
-await Config.build();
-
-const logger = loggerFactory(import.meta);
-
-await logger.setUpInfo();
-
-await buildProxy();
-
-ProcessController.init(logger);
+'use strict';
+
+// https://nodejs.org/api
+// https://expressjs.com/en/4x/api.html
+
+import dotenv from 'dotenv';
+import { loggerFactory } from './server/logger.js';
+import { buildProxy } from './server/proxy.js';
+import { ProcessController } from './server/process.js';
+import { Config } from './server/conf.js';
+
+dotenv.config();
+
+await Config.build();
+
+const logger = loggerFactory(import.meta);
+
+await logger.setUpInfo();
+
+await buildProxy();
+
+ProcessController.init(logger);

package/src/runtime/lampp/Lampp.js

@@ -1,44 +1,115 @@
-import fs from 'fs-extra';
-import { network } from '../../server/network.js';
-import { shellExec } from '../../server/process.js';
-import { timer } from '../../client/components/core/CommonJs.js';
-
-const Lampp = {
-  ports: [],
-  initService: async function (options = { daemon: false }) {
-    let cmd;
-    // linux
-    fs.writeFileSync(`/opt/lampp/apache2/conf/httpd.conf`, this.router || '', 'utf8');
-    cmd = `sudo /opt/lampp/lampp stop`;
-    shellExec(cmd);
-    await network.port.portClean(3306);
-    for (const port of this.ports) await network.port.portClean(port);
-    cmd = `sudo /opt/lampp/lampp start`;
-    if (this.router) fs.writeFileSync(`./tmp/lampp-router.conf`, this.router, 'utf-8');
-    shellExec(cmd, { async: true });
-    if (options && options.daemon) this.daemon();
-  },
-  daemon: async function () {
-    await timer(1000 * 60 * 2); // 2 minutes
-    for (const port of this.ports) {
-      const [portStatus] = await network.port.status([port]);
-      if (!portStatus.open) return await this.initService();
-    }
-    this.daemon();
-  },
-  enabled: () => fs.existsSync(`/opt/lampp/apache2/conf/httpd.conf`),
-  appendRouter: function (render) {
-    if (!this.router) {
-      if (fs.existsSync(`./tmp/lampp-router.conf`))
-        return (this.router = fs.readFileSync(`./tmp/lampp-router.conf`, 'utf-8')) + render;
-      return (this.router = render);
-    }
-    return (this.router += render);
-  },
-  removeRouter: function () {
-    this.router = undefined;
-    if (fs.existsSync(`./tmp/lampp-router.conf`)) fs.rmSync(`./tmp/lampp-router.conf`);
-  },
-};
-
-export { Lampp };
+import fs from 'fs-extra';
+import { network } from '../../server/network.js';
+import { shellCd, shellExec } from '../../server/process.js';
+import { timer } from '../../client/components/core/CommonJs.js';
+import { loggerFactory } from '../../server/logger.js';
+
+const logger = loggerFactory(import.meta);
+
+const Lampp = {
+  ports: [],
+  initService: async function (options = { daemon: false }) {
+    let cmd;
+    // linux
+    fs.writeFileSync(`/opt/lampp/apache2/conf/httpd.conf`, this.router || '', 'utf8');
+    cmd = `sudo /opt/lampp/lampp stop`;
+    if (!fs.readFileSync(`/opt/lampp/etc/httpd.conf`, 'utf8').match(`# Listen 80`))
+      fs.writeFileSync(
+        `/opt/lampp/etc/httpd.conf`,
+        fs.readFileSync(`/opt/lampp/etc/httpd.conf`, 'utf8').replace(`Listen 80`, `# Listen 80`),
+        'utf8',
+      );
+    if (!fs.readFileSync(`/opt/lampp/etc/extra/httpd-ssl.conf`, 'utf8').match(`# Listen 443`))
+      fs.writeFileSync(
+        `/opt/lampp/etc/extra/httpd-ssl.conf`,
+        fs.readFileSync(`/opt/lampp/etc/extra/httpd-ssl.conf`, 'utf8').replace(`Listen 443`, `# Listen 443`),
+        'utf8',
+      );
+    if (!fs.readFileSync(`/opt/lampp/lampp`, 'utf8').match(`testport 443 && false`))
+      fs.writeFileSync(
+        `/opt/lampp/lampp`,
+        fs.readFileSync(`/opt/lampp/lampp`, 'utf8').replace(`testport 443`, `testport 443 && false`),
+        'utf8',
+      );
+    if (!fs.readFileSync(`/opt/lampp/lampp`, 'utf8').match(`testport 80 && false`))
+      fs.writeFileSync(
+        `/opt/lampp/lampp`,
+        fs.readFileSync(`/opt/lampp/lampp`, 'utf8').replace(`testport 80`, `testport 80 && false`),
+        'utf8',
+      );
+
+    shellExec(cmd);
+    await network.port.portClean(3306);
+    for (const port of this.ports) await network.port.portClean(port);
+    cmd = `sudo /opt/lampp/lampp start`;
+    if (this.router) fs.writeFileSync(`./tmp/lampp-router.conf`, this.router, 'utf-8');
+    shellExec(cmd, { async: true });
+    if (options && options.daemon) this.daemon();
+  },
+  daemon: async function () {
+    await timer(1000 * 60 * 2); // 2 minutes
+    for (const port of this.ports) {
+      const [portStatus] = await network.port.status([port]);
+      if (!portStatus.open) return await this.initService();
+    }
+    this.daemon();
+  },
+  enabled: () => fs.existsSync(`/opt/lampp/apache2/conf/httpd.conf`),
+  appendRouter: function (render) {
+    if (!this.router) {
+      if (fs.existsSync(`./tmp/lampp-router.conf`))
+        return (this.router = fs.readFileSync(`./tmp/lampp-router.conf`, 'utf-8')) + render;
+      return (this.router = render);
+    }
+    return (this.router += render);
+  },
+  removeRouter: function () {
+    this.router = undefined;
+    if (fs.existsSync(`./tmp/lampp-router.conf`)) fs.rmSync(`./tmp/lampp-router.conf`);
+  },
+  install: async function () {
+    switch (process.platform) {
+      case 'linux':
+        {
+          if (!fs.existsSync(`./engine-private/setup`)) fs.mkdirSync(`./engine-private/setup`, { recursive: true });
+
+          shellCd(`./engine-private/setup`);
+
+          if (!process.argv.includes(`server`)) {
+            shellExec(
+              `curl -Lo xampp-linux-installer.run https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/7.4.30/xampp-linux-x64-7.4.30-1-installer.run?from_af=true`,
+            );
+            shellExec(`sudo chmod +x xampp-linux-installer.run`);
+            shellExec(
+              `sudo ./xampp-linux-installer.run --mode unattended && \\` +
+                `ln -sf /opt/lampp/lampp /usr/bin/lampp && \\` +
+                `sed -i.bak s'/Require local/Require all granted/g' /opt/lampp/etc/extra/httpd-xampp.conf && \\` +
+                `sed -i.bak s'/display_errors=Off/display_errors=On/g' /opt/lampp/etc/php.ini && \\` +
+                `mkdir /opt/lampp/apache2/conf.d && \\` +
+                `echo "IncludeOptional /opt/lampp/apache2/conf.d/*.conf" >> /opt/lampp/etc/httpd.conf && \\` +
+                `mkdir /www && \\` +
+                `ln -s /www /opt/lampp/htdocs`,
+            );
+
+            if (fs.existsSync(`/opt/lampp/logs/access_log`))
+              fs.copySync(`/opt/lampp/logs/access_log`, `/opt/lampp/logs/access.log`);
+            if (fs.existsSync(`/opt/lampp/logs/error_log`))
+              fs.copySync(`/opt/lampp/logs/error_log`, `/opt/lampp/logs/error.log`);
+            if (fs.existsSync(`/opt/lampp/logs/php_error_log`))
+              fs.copySync(`/opt/lampp/logs/php_error_log`, `/opt/lampp/logs/php_error.log`);
+            if (fs.existsSync(`/opt/lampp/logs/ssl_request_log`))
+              fs.copySync(`/opt/lampp/logs/ssl_request_log`, `/opt/lampp/logs/ssl_request.log`);
+          }
+
+          await Lampp.initService({ daemon: true });
+        }
+
+        break;
+
+      default:
+        break;
+    }
+  },
+};
+
+export { Lampp };

package/src/runtime/nginx/Nginx.js

@@ -1,3 +1,3 @@
-const Nginx = {};
-
-export { Nginx };
+const Nginx = {};
+
+export { Nginx };

package/src/runtime/xampp/Xampp.js

@@ -1,49 +1,49 @@
-import fs from 'fs-extra';
-import { network } from '../../server/network.js';
-import { shellExec } from '../../server/process.js';
-import { timer } from '../../client/components/core/CommonJs.js';
-
-const Xampp = {
-  ports: [],
-  initService: async function (options = { daemon: false }) {
-    let cmd;
-    // windows
-    fs.writeFileSync(
-      `C:/xampp/apache/conf/httpd.conf`,
-      fs.readFileSync(`C:/xampp/apache/conf/httpd.template.conf`, 'utf8').replace(`Listen 80`, ``),
-      'utf8',
-    );
-    fs.writeFileSync(`C:/xampp/apache/conf/extra/httpd-ssl.conf`, this.router || '', 'utf8');
-    cmd = `C:/xampp/xampp_stop.exe`;
-    shellExec(cmd);
-    await network.port.portClean(3306);
-    for (const port of this.ports) await network.port.portClean(port);
-    cmd = `C:/xampp/xampp_start.exe`;
-    if (this.router) fs.writeFileSync(`./tmp/xampp-router.conf`, this.router, 'utf-8');
-    shellExec(cmd);
-    if (options && options.daemon) this.daemon();
-  },
-  daemon: async function () {
-    await timer(1000 * 60 * 2); // 2 minutes
-    for (const port of this.ports) {
-      const [portStatus] = await network.port.status([port]);
-      if (!portStatus.open) return await this.initService();
-    }
-    this.daemon();
-  },
-  enabled: () => fs.existsSync(`C:/xampp/apache/conf/httpd.conf`),
-  appendRouter: function (render) {
-    if (!this.router) {
-      if (fs.existsSync(`./tmp/xampp-router.conf`))
-        return (this.router = fs.readFileSync(`./tmp/xampp-router.conf`, 'utf-8')) + render;
-      return (this.router = render);
-    }
-    return (this.router += render);
-  },
-  removeRouter: function () {
-    this.router = undefined;
-    if (fs.existsSync(`./tmp/xampp-router.conf`)) fs.rmSync(`./tmp/xampp-router.conf`);
-  },
-};
-
-export { Xampp };
+import fs from 'fs-extra';
+import { network } from '../../server/network.js';
+import { shellExec } from '../../server/process.js';
+import { timer } from '../../client/components/core/CommonJs.js';
+
+const Xampp = {
+  ports: [],
+  initService: async function (options = { daemon: false }) {
+    let cmd;
+    // windows
+    fs.writeFileSync(
+      `C:/xampp/apache/conf/httpd.conf`,
+      fs.readFileSync(`C:/xampp/apache/conf/httpd.template.conf`, 'utf8').replace(`Listen 80`, ``),
+      'utf8',
+    );
+    fs.writeFileSync(`C:/xampp/apache/conf/extra/httpd-ssl.conf`, this.router || '', 'utf8');
+    cmd = `C:/xampp/xampp_stop.exe`;
+    shellExec(cmd);
+    await network.port.portClean(3306);
+    for (const port of this.ports) await network.port.portClean(port);
+    cmd = `C:/xampp/xampp_start.exe`;
+    if (this.router) fs.writeFileSync(`./tmp/xampp-router.conf`, this.router, 'utf-8');
+    shellExec(cmd);
+    if (options && options.daemon) this.daemon();
+  },
+  daemon: async function () {
+    await timer(1000 * 60 * 2); // 2 minutes
+    for (const port of this.ports) {
+      const [portStatus] = await network.port.status([port]);
+      if (!portStatus.open) return await this.initService();
+    }
+    this.daemon();
+  },
+  enabled: () => fs.existsSync(`C:/xampp/apache/conf/httpd.conf`),
+  appendRouter: function (render) {
+    if (!this.router) {
+      if (fs.existsSync(`./tmp/xampp-router.conf`))
+        return (this.router = fs.readFileSync(`./tmp/xampp-router.conf`, 'utf-8')) + render;
+      return (this.router = render);
+    }
+    return (this.router += render);
+  },
+  removeRouter: function () {
+    this.router = undefined;
+    if (fs.existsSync(`./tmp/xampp-router.conf`)) fs.rmSync(`./tmp/xampp-router.conf`);
+  },
+};
+
+export { Xampp };