fix: delete app management with module and use trunk

nodefony · Jan 27, 2024 · f6b28b2 · f6b28b2
1 parent 6097e60
commit f6b28b2
Show file tree

Hide file tree

Showing 50 changed files with 14,211 additions and 2,947 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@
 dist/
 node_modules/
 tmp/
-config/certificates
+nodefony/config/certificates
 
 # Ignore les fichiers générés par TypeScript
 *.tsbuildinfo

diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/index.ts b/app/index.ts
diff --git a/app/package.json b/app/package.json
diff --git a/app/src/nodefony/config/config.ts b/app/src/nodefony/config/config.ts
diff --git a/app/types.d.ts b/app/types.d.ts
diff --git a/bin/generateCertificates.sh b/bin/generateCertificates.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # inspired by https://jamielinux.com/docs/openssl-certificate-authority/index.html
 
-ROOT_DIR="./config/certificates"
-CONF_DIR="./config/openssl"
+ROOT_DIR="./nodefony/config/certificates"
+CONF_DIR="./nodefony/config/openssl"
 mkdir -p $ROOT_DIR
 mkdir -p $ROOT_DIR/{client,server,ca}
 

diff --git a/index.ts b/index.ts
@@ -0,0 +1,32 @@
+import { Kernel, Module } from "nodefony";
+import config from "./nodefony/config/config";
+import http from "@nodefony/http";
+import security from "@nodefony/security";
+import { fileURLToPath } from "url";
+
+class App extends Module {
+  constructor(kernel: Kernel) {
+    super("app", kernel, fileURLToPath(import.meta.url), config);
+    kernel?.use(http);
+    kernel?.use(security);
+  }
+
+  // async onStart(): Promise<this> {
+  //   this.log(`MODULE ${this.name} START`, "DEBUG");
+  //   return this;
+  // }
+  // async onRegister(): Promise<this> {
+  //   this.log(`MODULE ${this.name} REGISTER`, "DEBUG");
+  //   return this;
+  // }
+  // async onBoot(): Promise<this> {
+  //   this.log(`MODULE ${this.name} BOOT`, "DEBUG");
+  //   return this;
+  // }
+  // async onReady(): Promise<this> {
+  //   this.log(`MODULE ${this.name} READY`, "DEBUG");
+  //   return this;
+  // }
+}
+
+export default App;
diff --git a/config/config.js → nodefony/config/config.ts b/config/config.js → nodefony/config/config.ts
@@ -28,6 +28,9 @@ const certificats = {
   options: {
     rejectUnauthorized: true,
   },
+  key: "",
+  cert: "",
+  ca: "",
 };
 let CDN = null;
 let statics = true;
@@ -36,23 +39,26 @@ let documentation = true;
 let unitTest = true;
 let domainCheck = false;
 
-switch (kernel.appEnvironment) {
+switch (kernel?.environment) {
   case "production":
   case "development":
   default:
     certificats.key = path.resolve(
+      "nodefony",
       "config",
       "certificates",
       "server",
       "privkey.pem"
     );
     certificats.cert = path.resolve(
+      "nodefony",
       "config",
       "certificates",
       "server",
       "fullchain.pem"
     );
     certificats.ca = path.resolve(
+      "nodefony",
       "config",
       "certificates",
       "ca",
@@ -67,7 +73,7 @@ switch (kernel.appEnvironment) {
 }
 
 export default {
-  domain: "0.0.0.0", // "0.0.0.0" "selectAuto"
+  domain: "localhost", // "0.0.0.0" "selectAuto"
   domainAlias: ["^127.0.0.1$", "^localhost$"],
   domainCheck,
   servers: {
@@ -92,15 +98,15 @@ export default {
   /**
    * SERVERS
    */
-  servers: {
-    statics,
-    protocol: "2.0", //  2.0 || 1.1
-    http: true,
-    https: true,
-    ws: true,
-    wss: true,
-    certificats,
-  },
+  // servers: {
+  //   statics,
+  //   protocol: "2.0", //  2.0 || 1.1
+  //   http: true,
+  //   https: true,
+  //   ws: true,
+  //   wss: true,
+  //   certificats,
+  // },
 
   /**
    * DEV SERVER

diff --git a/config/openssl/ca/openssl.cnf → nodefony/config/openssl/ca/openssl.cnf b/config/openssl/ca/openssl.cnf → nodefony/config/openssl/ca/openssl.cnf
@@ -6,7 +6,7 @@
 
 [ default ]
 ca                      = nodefony-ca				# CA name
-dir                     = ./config/certificates			# Top dir
+dir                     = ./nodefony/config/certificates			# Top dir
 
 # The next part of the configuration file is used by the openssl req command.
 # It defines the CA's key pair, its DN, and the desired extensions for the CA

diff --git a/config/openssl/ca_intermediate/openssl.cnf → ...onfig/openssl/ca_intermediate/openssl.cnf b/config/openssl/ca_intermediate/openssl.cnf → ...onfig/openssl/ca_intermediate/openssl.cnf
@@ -6,7 +6,7 @@
 
 [ default ]
 ca                      = nodefony-ca				# CA name
-dir                     = ./config/certificates			# Top dir
+dir                     = ./nodefony/config/certificates			# Top dir
 
 # The next part of the configuration file is used by the openssl req command.
 # It defines the CA's key pair, its DN, and the desired extensions for the CA