underpost 2.7.7 → 2.7.9

package/src/server/runtime.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'fs-extra';
 import express from 'express';
 import cors from 'cors';
 import dotenv from 'dotenv';
@@ -18,13 +18,14 @@ import { DataBaseProvider } from '../db/DataBaseProvider.js';
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { createPeerServer } from './peer.js';
 import { Lampp } from '../runtime/lampp/Lampp.js';
+import { getDeployId } from './conf.js';
 
 dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
 const buildRuntime = async () => {
-  const deployId = `${process.argv[3] ? process.argv[3] : 'default'}`;
+  const deployId = getDeployId();
 
   const collectDefaultMetrics = promClient.collectDefaultMetrics;
   collectDefaultMetrics();
@@ -95,6 +96,7 @@ export PATH=$PATH:/opt/lampp/bin`,
         runtime,
         client,
         meta: import.meta,
+        apis,
       };
 
       let redirectUrl;
@@ -114,10 +116,10 @@ export PATH=$PATH:/opt/lampp/bin`,
         Listen ${port}
 
         <VirtualHost *:${port}>    
-            DocumentRoot "${directory ? directory.replace(path, '/') : `${getRootDirectory()}${rootHostPath}`}"
+            DocumentRoot "${directory ? directory : `${getRootDirectory()}${rootHostPath}`}"
             ServerName ${host}:${port}
 
-            <Directory "${directory ? directory.replace(path, '/') : `${getRootDirectory()}${rootHostPath}`}">
+            <Directory "${directory ? directory : `${getRootDirectory()}${rootHostPath}`}">
               Options Indexes FollowSymLinks MultiViews
               AllowOverride All
               Require all granted
@@ -134,6 +136,13 @@ export PATH=$PATH:/opt/lampp/bin`,
                   : ''
               }
 
+            ErrorDocument 400 ${path === '/' ? '' : path}/400.html
+            ErrorDocument 404 ${path === '/' ? '' : path}/400.html
+            ErrorDocument 500 ${path === '/' ? '' : path}/500.html
+            ErrorDocument 502 ${path === '/' ? '' : path}/500.html
+            ErrorDocument 503 ${path === '/' ? '' : path}/500.html
+            ErrorDocument 504 ${path === '/' ? '' : path}/500.html
+
           </VirtualHost>
             
                           `);
@@ -196,10 +205,10 @@ export PATH=$PATH:/opt/lampp/bin`,
         Listen ${port}
 
         <VirtualHost *:${port}>    
-            DocumentRoot "${directory ? directory.replace(path, '/') : `${getRootDirectory()}${rootHostPath}`}"
+            DocumentRoot "${directory ? directory : `${getRootDirectory()}${rootHostPath}`}"
             ServerName ${host}:${port}
 
-            <Directory "${directory ? directory.replace(path, '/') : `${getRootDirectory()}${rootHostPath}`}">
+            <Directory "${directory ? directory : `${getRootDirectory()}${rootHostPath}`}">
               Options Indexes FollowSymLinks MultiViews
               AllowOverride All
               Require all granted
@@ -216,6 +225,13 @@ export PATH=$PATH:/opt/lampp/bin`,
                 : ''
             }
 
+            ErrorDocument 400 ${path === '/' ? '' : path}/400.html
+            ErrorDocument 404 ${path === '/' ? '' : path}/400.html
+            ErrorDocument 500 ${path === '/' ? '' : path}/500.html
+            ErrorDocument 502 ${path === '/' ? '' : path}/500.html
+            ErrorDocument 503 ${path === '/' ? '' : path}/500.html
+            ErrorDocument 504 ${path === '/' ? '' : path}/500.html
+
           </VirtualHost>
             
                           `);
@@ -369,13 +385,16 @@ export PATH=$PATH:/opt/lampp/bin`,
                 app.use(`${apiPath}/${api}`, router);
               })();
           }
-
           app.use(function (req, res, next) {
-            res.status(404).send('Sorry cant find that!');
+            const path404 = `${directory ? directory : `${getRootDirectory()}${rootHostPath}`}/404.html`;
+            if (fs.existsSync(path404)) return res.status(404).sendFile(path404);
+            else res.status(404).send('Sorry cant find that!');
           });
 
           app.use(function (err, req, res, next) {
             logger.error(err, err.stack);
+            const path500 = `${directory ? directory : `${getRootDirectory()}${rootHostPath}`}/500.html`;
+            if (fs.existsSync(path500)) return res.status(500).sendFile(path500);
             res.status(500).send('Something broke!');
           });
 

package/.github/workflows/test.yml

@@ -1,80 +0,0 @@
-name: Test
-on:
-  push:
-    branches: ['master']
-  pull_request:
-    branches: ['master']
-jobs:
-  test:
-    name: Node ${{ matrix.node }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        node-version: [21.x]
-        os: [ubuntu-latest]
-      #  os: [ubuntu-latest, windows-latest]
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v3
-
-      - name: Set Node.js version
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node }}
-
-      - name: Get npm root
-        run: sudo npm root -g
-
-      - name: Install underpost cli
-        run: sudo npm install -g underpost
-
-      - name: Run test
-        run: sudo underpost test
-
-      # for travis
-      # - name: Run coveralls
-      #   run: npm run coveralls # nyc npm run test --reporter=text-lcov | coveralls -v
-
-      # - name: Test token
-      #   run: echo "${{ secrets.COVERALLS_REPO_TOKEN }}"
-
-      # - name: Coveralls
-      #   uses: coverallsapp/github-action@master
-      #   with:
-      #     github-token: ${{ secrets.GITHUB_TOKEN }}
-      #     flag-name: ${{matrix.os}}-node-${{ matrix.node }}
-      #     parallel: true
-
-      # - name: Coveralls
-      #   uses: coverallsapp/github-action@master
-      #   with:
-      #     github-token: ${{ secrets.GITHUB_TOKEN }}
-      #     path-to-lcov: '/usr/local/lib/node_modules/underpost/coverage/lcov.info'
-      #   env:
-      #     COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-      #     COVERALLS_GIT_BRANCH: "${{ github.ref }}"
-
-      # - name: Coveralls
-      #   run: node ./node_modules/coveralls-next/bin/coveralls.js # cat ./coverage/lcov.info |
-      #   env:
-      #     COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-      #     COVERALLS_SERVICE_NAME: CI-pipeline
-      #     COVERALLS_SERVICE_JOB_ID: ${{github.run_id}}
-      #     COVERALLS_SERVICE_JOB_NUMBER: ${{github.run_number}}
-      #     COVERALLS_FLAG_NAME: ${{matrix.os}}-node-${{ matrix.node }}
-      #     COVERALLS_PARALLEL: true
-      #     NODE_COVERALLS_DEBUG: 1
-  # finish:
-  #   needs: test
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Clone repository
-  #       uses: actions/checkout@v2
-
-  #     - name: Coveralls Finished
-  #       run: |
-  #         curl -kv -d 'payload[build_num]=${{github.run_id}}&payload[status]=done' https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}
-  #       env:
-  #         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-  #         COVERALLS_GIT_BRANCH: '${{ github.ref }}'

package/src/client/ssr/head-components/Microdata.js

@@ -1,11 +0,0 @@
-SrrComponent = ({ microdata }) => html`
-  ${microdata
-    .map(
-      (jsonld) => html`
-        <script type="application/ld+json">
-          ${JSON.stringify(jsonld, null, 4)}
-        </script>
-      `,
-    )
-    .join(` `)}
-`;

package/src/cron.js

@@ -1,30 +0,0 @@
-'use strict';
-
-// https://nodejs.org/api
-// https://expressjs.com/en/4x/api.html
-
-import dotenv from 'dotenv';
-import { loggerFactory } from './server/logger.js';
-import { Dns } from './server/dns.js';
-import { ProcessController } from './server/process.js';
-import { Config } from './server/conf.js';
-import { BackUpManagement } from './server/backup.js';
-import { CronManagement } from './server/cron.js';
-
-dotenv.config();
-
-await Config.build();
-
-const logger = loggerFactory(import.meta);
-
-await logger.setUpInfo();
-
-// every minutes
-CronManagement.add('ip', '* * * * *', await Dns.InitIpDaemon());
-
-// every day at 1 am
-CronManagement.add('backup', '0 1 * * *', await BackUpManagement.Init());
-
-await CronManagement.init();
-
-ProcessController.init(logger);

package/src/server/cron.js

@@ -1,35 +0,0 @@
-import cron from 'node-cron';
-import { loggerFactory } from './logger.js';
-
-const logger = loggerFactory(import.meta);
-
-const CronManagement = {
-  data: {},
-  init: function () {
-    // verify tokens
-    // https://github.com/settings/tokens
-    for (const cronKey of Object.keys(this.data)) {
-      if (this.data[cronKey].valid) {
-        this.data[cronKey].task.start();
-        logger.info(`Cron task "${this.data[cronKey].name}" started`);
-      } else {
-        logger.error(
-          `Invalid cron expression "${this.data[cronKey].expression}" for task "${this.data[cronKey].name}"`,
-        );
-      }
-    }
-  },
-  add: function (name = 'task', expression = '* * * * *', callback = async () => null) {
-    const args = { name, expression, valid: cron.validate(expression) };
-    this.data[name] = {
-      ...args,
-      task: cron.schedule(expression, callback, {
-        scheduled: false,
-        timezone: process.env.TIME_ZONE || 'America/New_York',
-        name,
-      }),
-    };
-  },
-};
-
-export { CronManagement };