backend-core-bm 1.0.0 → 1.0.4

package/Addon/workerAuth.js

@@ -0,0 +1,6 @@
+module.exports = (reqKey, reqValue) => {
+  return (req, res, next) => {
+    if (req.headers[reqKey] != reqValue) res.status(403).send("Forbidden");
+    return next();
+  };
+};

package/core.js

@@ -62,7 +62,7 @@ un.textEncryptBase64 = (text, encrypting = true) => {
  * normalize path, also replace ~ with $home
  */
 un.filePathNormalize = (...path) =>
-  u.stringReplace(paths.normalize(paths.join(...path)), { "~": process.env.HOME, "\\\\\\\\": "/", "\\\\": "/" });
+  u.stringReplace(paths.normalize(paths.join(...path)), { "^~": process.env.HOME, "\\\\\\\\": "/", "\\\\": "/" });
 
 un.filePathFull = (...path) => paths.resolve(...path);
 
@@ -120,10 +120,11 @@ un.fileMkdirTouch = (path, recursive = true) => {
   });
 };
 
-un.fileMove = async (source, target, mkdir = true, overwrite = true) => {
+un.fileMove = async (source, target, mkdir = true, overwrite = true, onlyCopy = false) => {
   source = un.filePathNormalize(source);
   target = un.filePathNormalize(target);
   if (mkdir) fse.mkdirpSync(paths.dirname(target));
+  if (onlyCopy) return fse.copySync(source, target, { overwrite });
   return fse.moveSync(source, target, { overwrite });
 };
 

package/framework.js

@@ -7,6 +7,7 @@ const loggerHandle = require("./Addon/loggerHandle");
 const secretHandle = require("./Addon/secretHandle");
 const envHandle = require("./Addon/envHandle");
 const mwHandle = require("./Addon/middleware");
+const workerAuth = require("./Addon/workerAuth");
 require("./typedef");
 
 module.exports = class Framework {
@@ -46,12 +47,17 @@ module.exports = class Framework {
           logger: un.filePathNormalize(__dirname, "../../Logger"),
           secret: un.filePathNormalize(__dirname, "../../Personal"),
         },
+        router: {},
+        oauth: {
+          enable: false,
+          reqKey: "workerauth",
+          reqValue: un.uuid(),
+        },
         secret: {
           filename: "config.js",
-          keys: ["master", "listen"],
+          keys: ["master", "listen", "oauth"],
           additional: {},
         },
-        router: {},
       },
       config
     );
@@ -117,6 +123,7 @@ module.exports = class Framework {
     });
 
     task.add("requests", async () => {
+      if (this.config.oauth.enable) this.app.use(workerAuth(this.config.oauth.reqKey, this.config.oauth.reqValue));
       for (let i in this.config.router) this.app.all(i, mwHandle(this.logger, this.config.router[i]));
 
       this.app.use((error, req, res, next) => {
@@ -131,9 +138,10 @@ module.exports = class Framework {
     });
 
     task.add("listening", async () => {
-      this.server = this.app.listen(this.config.listen, () =>
-        this.logger.info(`server listen on http port ${this.config.listen}`)
-      );
+      let infomsg = `Listening on port ${this.config.listen}`;
+      if (this.config.oauth.enable)
+        infomsg += ` oauth key: ${this.config.oauth.reqKey} value: ${this.config.oauth.reqValue}`;
+      this.server = this.app.listen(this.config.listen, () => this.logger.info(infomsg));
     });
 
     task.add("pre-terminate", () => {

package/index.js

@@ -1,4 +1,5 @@
 const un = require("./core.js");
 const Framework = require("./framework");
+const typedef = () => require("./typedef");
 
-module.exports = { un, Framework };
+module.exports = { un, Framework, typedef };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-core-bm",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "main": "index.js",
   "description": "utils",
   "scripts": {
@@ -25,7 +25,7 @@
     "colors": "^1.4.0",
     "download": "^6.2.5",
     "express": "^4.17.1",
-    "fs-extra": "^9.0.1",
+    "fs-extra": "^10.0.0",
     "html-entities": "^1.3.1",
     "iconv-lite": "^0.6.2",
     "readdirp": "^3.4.0",

package/typedef.js

@@ -9,4 +9,5 @@
  * @property {{devOverride:true, type : "on" | "off" | "bunyan-dev" | "bunyan", bunyan : { name : string, baseLevel: "trace" | "debug" | "info" | "warn" | "error" | "fatal" }}} logger
  * @property {{logger:string, secret:string}} directories
  * @property {{filename: string, keys: string[], additional: {}}} secret
+ * @property {{enable:false, reqKey: string, reqValue: string}} oauth
  */