underpost 2.8.78 → 2.8.82
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/ghpkg.yml +23 -21
- package/.github/workflows/npmpkg.yml +16 -11
- package/.github/workflows/pwa-microservices-template.page.yml +12 -3
- package/.github/workflows/pwa-microservices-template.test.yml +20 -17
- package/.vscode/extensions.json +1 -2
- package/.vscode/settings.json +3 -0
- package/Dockerfile +14 -33
- package/README.md +25 -24
- package/bin/db.js +1 -0
- package/bin/deploy.js +91 -796
- package/bin/vs.js +10 -3
- package/cli.md +340 -191
- package/conf.js +4 -0
- package/docker-compose.yml +1 -1
- package/manifests/deployment/dd-template-development/deployment.yaml +167 -0
- package/manifests/deployment/dd-template-development/proxy.yaml +46 -0
- package/manifests/lxd/lxd-admin-profile.yaml +17 -0
- package/manifests/lxd/lxd-preseed.yaml +30 -0
- package/manifests/lxd/underpost-setup.sh +163 -0
- package/manifests/maas/device-scan.sh +43 -0
- package/manifests/maas/lxd-preseed.yaml +32 -0
- package/manifests/maas/maas-setup.sh +120 -0
- package/manifests/maas/nat-iptables.sh +26 -0
- package/manifests/mariadb/statefulset.yaml +2 -1
- package/manifests/mariadb/storage-class.yaml +10 -0
- package/manifests/mongodb-4.4/service-deployment.yaml +2 -2
- package/manifests/valkey/service.yaml +3 -9
- package/manifests/valkey/statefulset.yaml +10 -12
- package/package.json +1 -1
- package/src/cli/baremetal.js +1248 -0
- package/src/cli/cloud-init.js +528 -0
- package/src/cli/cluster.js +459 -232
- package/src/cli/deploy.js +34 -10
- package/src/cli/env.js +2 -2
- package/src/cli/image.js +57 -9
- package/src/cli/index.js +256 -218
- package/src/cli/lxd.js +380 -4
- package/src/index.js +40 -14
- package/src/runtime/lampp/Dockerfile +41 -47
- package/src/server/conf.js +58 -0
- package/src/server/logger.js +3 -3
- package/src/server/runtime.js +1 -6
- package/src/server/ssl.js +1 -12
- package/src/server/valkey.js +3 -3
- package/supervisord-openssh-server.conf +0 -5
package/src/server/conf.js
CHANGED
|
@@ -1171,6 +1171,63 @@ const writeEnv = (envPath, envObj) =>
|
|
|
1171
1171
|
'utf8',
|
|
1172
1172
|
);
|
|
1173
1173
|
|
|
1174
|
+
const buildCliDoc = (program) => {
|
|
1175
|
+
let md = shellExec(`node bin help`, { silent: true, stdout: true }).split('Options:');
|
|
1176
|
+
const baseOptions =
|
|
1177
|
+
`## ${md[0].split(`\n`)[2]}
|
|
1178
|
+
|
|
1179
|
+
### Usage: ` +
|
|
1180
|
+
'`' +
|
|
1181
|
+
md[0].split(`\n`)[0].split('Usage: ')[1] +
|
|
1182
|
+
'`' +
|
|
1183
|
+
`
|
|
1184
|
+
` +
|
|
1185
|
+
'```\n Options:' +
|
|
1186
|
+
md[1] +
|
|
1187
|
+
' \n```';
|
|
1188
|
+
md =
|
|
1189
|
+
baseOptions +
|
|
1190
|
+
`
|
|
1191
|
+
|
|
1192
|
+
## Commands:
|
|
1193
|
+
`;
|
|
1194
|
+
program.commands.map((o) => {
|
|
1195
|
+
md +=
|
|
1196
|
+
`
|
|
1197
|
+
|
|
1198
|
+
` +
|
|
1199
|
+
'### `' +
|
|
1200
|
+
o._name +
|
|
1201
|
+
'` :' +
|
|
1202
|
+
`
|
|
1203
|
+
` +
|
|
1204
|
+
'```\n ' +
|
|
1205
|
+
shellExec(`node bin help ${o._name}`, { silent: true, stdout: true }) +
|
|
1206
|
+
' \n```' +
|
|
1207
|
+
`
|
|
1208
|
+
`;
|
|
1209
|
+
});
|
|
1210
|
+
fs.writeFileSync(`./src/client/public/nexodev/docs/references/Command Line Interface.md`, md, 'utf8');
|
|
1211
|
+
fs.writeFileSync(`./cli.md`, md, 'utf8');
|
|
1212
|
+
const readmeSplit = `pwa-microservices-template</a>`;
|
|
1213
|
+
const readme = fs.readFileSync(`./README.md`, 'utf8').split(readmeSplit);
|
|
1214
|
+
fs.writeFileSync(
|
|
1215
|
+
'./README.md',
|
|
1216
|
+
readme[0] +
|
|
1217
|
+
readmeSplit +
|
|
1218
|
+
`
|
|
1219
|
+
|
|
1220
|
+
` +
|
|
1221
|
+
baseOptions +
|
|
1222
|
+
`
|
|
1223
|
+
|
|
1224
|
+
<a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
|
|
1225
|
+
|
|
1226
|
+
`,
|
|
1227
|
+
'utf8',
|
|
1228
|
+
);
|
|
1229
|
+
};
|
|
1230
|
+
|
|
1174
1231
|
export {
|
|
1175
1232
|
Cmd,
|
|
1176
1233
|
Config,
|
|
@@ -1214,4 +1271,5 @@ export {
|
|
|
1214
1271
|
deployRangePortFactory,
|
|
1215
1272
|
awaitDeployMonitor,
|
|
1216
1273
|
rebuildConfFactory,
|
|
1274
|
+
buildCliDoc,
|
|
1217
1275
|
};
|
package/src/server/logger.js
CHANGED
|
@@ -176,7 +176,7 @@ const loggerMiddleware = (meta = { url: '' }) => {
|
|
|
176
176
|
);
|
|
177
177
|
};
|
|
178
178
|
|
|
179
|
-
const
|
|
179
|
+
const underpostASCII = () => `
|
|
180
180
|
|
|
181
181
|
██╗░░░██╗███╗░░██╗██████╗░███████╗██████╗░██████╗░░█████╗░░██████╗████████╗
|
|
182
182
|
██║░░░██║████╗░██║██╔══██╗██╔════╝██╔══██╗██╔══██╗██╔══██╗██╔════╝╚══██╔══╝
|
|
@@ -188,10 +188,10 @@ const underpostASCI = () => `
|
|
|
188
188
|
|
|
189
189
|
const actionInitLog = () =>
|
|
190
190
|
console.log(
|
|
191
|
-
|
|
191
|
+
underpostASCII() +
|
|
192
192
|
`
|
|
193
193
|
https://www.nexodev.org/docs
|
|
194
194
|
`,
|
|
195
195
|
);
|
|
196
196
|
|
|
197
|
-
export { loggerFactory, loggerMiddleware, setUpInfo,
|
|
197
|
+
export { loggerFactory, loggerMiddleware, setUpInfo, underpostASCII, actionInitLog };
|
package/src/server/runtime.js
CHANGED
|
@@ -251,11 +251,6 @@ const buildRuntime = async () => {
|
|
|
251
251
|
return next();
|
|
252
252
|
});
|
|
253
253
|
|
|
254
|
-
// https://github.com/prometheus/prometheus/blob/main/documentation/examples/prometheus.yml
|
|
255
|
-
// https://github.com/grafana/grafana/tree/main/conf
|
|
256
|
-
// https://medium.com/@diego.coder/monitoreo-de-aplicaciones-con-node-js-grafana-y-prometheus-afd2b33e3f91
|
|
257
|
-
// for grafana prometheus server: host.docker.internal:9090
|
|
258
|
-
|
|
259
254
|
app.use((req, res, next) => {
|
|
260
255
|
requestCounter.inc({
|
|
261
256
|
instance: `${host}:${port}${path}`,
|
|
@@ -366,7 +361,7 @@ const buildRuntime = async () => {
|
|
|
366
361
|
if (db && apis) await DataBaseProvider.load({ apis, host, path, db });
|
|
367
362
|
|
|
368
363
|
// valkey server
|
|
369
|
-
await createValkeyConnection({ host, path }, valkey);
|
|
364
|
+
if (valkey) await createValkeyConnection({ host, path }, valkey);
|
|
370
365
|
|
|
371
366
|
if (mailer) {
|
|
372
367
|
const mailerSsrConf = confSSR[getCapVariableName(client)];
|
package/src/server/ssl.js
CHANGED
|
@@ -106,15 +106,4 @@ const sslRedirectMiddleware = (req, res, port, proxyRouter) => {
|
|
|
106
106
|
return res.status(302).redirect(sslRedirectUrl);
|
|
107
107
|
};
|
|
108
108
|
|
|
109
|
-
|
|
110
|
-
switch (process.platform) {
|
|
111
|
-
case 'win32':
|
|
112
|
-
break;
|
|
113
|
-
case 'linux':
|
|
114
|
-
break;
|
|
115
|
-
default:
|
|
116
|
-
break;
|
|
117
|
-
}
|
|
118
|
-
};
|
|
119
|
-
|
|
120
|
-
export { buildSSL, buildSecureContext, validateSecureContext, createSslServer, sslRedirectMiddleware, installCertbot };
|
|
109
|
+
export { buildSSL, buildSecureContext, validateSecureContext, createSslServer, sslRedirectMiddleware };
|
package/src/server/valkey.js
CHANGED
|
@@ -34,14 +34,14 @@ const selectDtoFactory = (payload, select) => {
|
|
|
34
34
|
const valkeyClientFactory = async (options) => {
|
|
35
35
|
const valkey = new Valkey({
|
|
36
36
|
// port: 6379,
|
|
37
|
-
// host: 'service
|
|
37
|
+
// host: 'valkey-service.default.svc.cluster.local',
|
|
38
38
|
port: options?.port ? options.port : undefined,
|
|
39
|
-
host: options?.
|
|
39
|
+
host: options?.host ? options.host : undefined,
|
|
40
40
|
retryStrategy: (attempt) => {
|
|
41
41
|
if (attempt === 1) {
|
|
42
42
|
valkey.disconnect();
|
|
43
43
|
valkeyEnabled = false;
|
|
44
|
-
logger.warn('Valkey service not enabled', { valkeyEnabled });
|
|
44
|
+
logger.warn('Valkey service not enabled', { ...options, valkeyEnabled });
|
|
45
45
|
return;
|
|
46
46
|
}
|
|
47
47
|
return 1000; // 1 second interval attempt
|