update version 0.6.22

Author: khanh2906

lib/handlers/initProject.js

@@ -180,7 +180,7 @@ function runInstallInCurrentDir(projectPath, packageManager) {
 			cmd = "yarn install";
 			break;
 		case "pnpm":
-			cmd = "pnpm init";
+			cmd = "pnpm install";
 			break;
 	}
 

lib/stubs/template/.env.example

@@ -9,7 +9,7 @@ APP_ASSET=http://localhost:3000
 APP_URL=http://localhost:3000
 # UV_THREADPOOL_SIZE=6
 USE_SOCKET=false
-
+BAMIMI_VER=0.6.22
 
 # Auth
 COOKIE_SECRET=

lib/stubs/template/package.json

@@ -1,9 +1,9 @@
 {
   "name": "bamimi",
-  "version": "0.6.21",
+  "version": "0.6.22",
   "description": "Power framework for nodejs",
   "main": "src/server.js",
-  "bamimiVersion": "0.6.21",
+  "bamimiVersion": "0.6.22",
   "bin": {
     "bamimi-enjoy-": "./dist/routes/cli/index.js",
     "bamimi-enjoy-dev": "./src/routes/cli/index.js"
@@ -98,7 +98,6 @@
     "jest": "^29.4.3",
     "nodemon": "^3.1.4",
     "ncp": "^2.0.0",
-    "open": "^10.1.0",
     "sequelize-cli": "^6.6.2",
     "supertest": "^6.3.3",
     "typescript": "^5.5.4",

lib/stubs/template/src/bootstrap/index.js

@@ -6,10 +6,7 @@ const express = require("express"),
     path = require("path"),
     { createServer } = require("node:http"),
     socket = require("@knfs-tech/bamimi-socket.io"),
-    server = createServer(app),
-    session = require("express-session"),
-    fs = require('fs-extra'),
-    flash = require("express-flash");
+    server = createServer(app);
 
 
 const jobOnMain = require("@iKernel/job/onMain");
@@ -26,17 +23,6 @@ require("@iKernel/log")(app);
  */
 app.use("/public", express.static(path.resolve(__dirname, "./../public"), { maxAge: configs.app.staticCacheTime }));
 
-/**
- * **********************************
- * Set up common middleware before
- * **********************************
- */
-app.use(session({
-    secret: configs.app.name,
-    resave: false,
-    saveUninitialized: true
-}));
-app.use(flash());
 
 /**
  * **********************************
@@ -93,14 +79,12 @@ if (configs.socket.use) {
 
 
 server.listen(configs.app.server.port, async function () {
-    console.log("listening on port " + configs.app.server.port);
-    if (process.env.NODE_ENV === "development") {
-        const uuPath = path.join(__dirname, './../../.unused');
-
-        if (fs.existsSync(uuPath)) {
-            const open = require("open")
-            await open.default(`http://localhost:${configs.app.server.port}`);
-            await fs.remove(uuPath)
-        }
+    const protocol = configs.app.server.ssl ? "https" : "http";
+    const info = {
+        BAMIMI: process.env.BAMIMI_VER,
+        NODE: process.version,
+        ENV: process.env.NODE_ENV,
+        URL: `${protocol}://${configs.app.server.host}:${configs.app.server.port}`,
     }
+    console.table(info)
 });

lib/stubs/template/src/configs/auth.js

@@ -14,7 +14,9 @@ module.exports = {
         credentials: false
     },
     session: {
-        secret: process.env.SESSION_SECRET || "SESSION_SECRET"
+        secret: process.env.SESSION_SECRET || "SESSION_SECRET",
+        resave: false,
+        saveUninitialized: true
     },
     cookie: {
         secret: process.env.COOKIE_SECRET || "COOKIE_SECRET"

lib/stubs/template/src/kernel/index.js

@@ -6,6 +6,8 @@ const cors = require("cors")
 const authConfig = require("@iConfigs/auth")
 const security = require("@iApp/http/middleware/security.mid")
 const csrf = require("@knfs-tech/csrf");
+const session = require("express-session");
+const flash = require("express-flash");
 
 exports.middleware = {
     common: {
@@ -28,8 +30,29 @@ exports.middleware = {
              */
             bodyParser.urlencoded({ limit: '2mb', parameterLimit: 100, extended: true }),
             bodyParser.json({ limit: '2mb' }),
-            cookieParser(),
+            /**
+             * Session Handle
+             */
+            session(authConfig.session),
+            cookieParser(authConfig.cookie.secret),
             security(),
+            /**
+             * CSRF handle
+             */
+            csrf.generate({
+                tokenLength: 24,
+                protectCondition: (req) => {
+                    return req.method === 'POST' || req.method === 'PUT' || req.method === 'PATCH' || req.method === 'DELETE'
+                },
+                storage: {
+                    type: csrf.CONSTANT.STORAGE.COOKIE,
+                    options: {
+                        httpOnly: true,
+                        maxAge: 1 * 24 * 60 * 60 * 1000, // 1days
+                        secure: process.env.NODE_ENV === 'production' ? true : false
+                    }
+                }
+            }),
         ],
         after: [
             /**
@@ -39,9 +62,7 @@ exports.middleware = {
              * ***********************************************
              */
             /**
-             * **********************************
              * Error handle
-             * **********************************
              */
             async (err, req, res, next) => {
                 if (process.env.NODE_ENV != "development") {
@@ -73,25 +94,17 @@ exports.middleware = {
             req.reqType = 'web'
             next();
         },
+        /**
+         * ****************************
+         * FLASH SESSION
+         * ****************************
+         */
+        flash(),
         /**
          * ****************************
          * CSRF
          * ****************************
          */
-        csrf.generate({
-            tokenLength: 24,
-            protectCondition: (req) => {
-                return req.method === 'GET' || req.method === 'POST' || req.method === 'PUT' || req.method === 'DELETE'
-            },
-            storage: {
-                type: csrf.CONSTANT.STORAGE.COOKIE,
-                options: {
-                    httpOnly: true,
-                    maxAge: 1 * 24 * 60 * 60 * 1000, // 1days
-                    secure: process.env.NODE_ENV === 'production' ? true : false
-                }
-            }
-        }),
         csrf.setTokenLocalsParam,
         /**
          * ****************************

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knfs-tech/bamimi-cli",
-  "version": "0.6.21",
+  "version": "0.6.22",
   "description": "Command line of Bamimi framework",
   "bin": {
     "bamimi-cli": "./bin/cli.js"