@steedos/router 3.0.0-beta.2 → 3.0.0-beta.8

package/lib/index.d.ts

@@ -2,12 +2,17 @@ declare class ExpressAppStatic {
     app: any;
     beforeRouter: any;
     router: any;
+    scripts: string;
     constructor();
+    private initClientJsRouter;
     staticRouter: () => any;
     staticApp: () => any;
     staticBeforeRouter: () => any;
+    setClientScripts: (scripts: string) => void;
 }
 export declare const expressApp: ExpressAppStatic;
 export declare const staticRouter: () => any;
 export declare const staticBeforeRouter: () => any;
+export declare const loadRouters: (routers: any) => void;
+export declare const removeRouter: (path: any, methods: any) => void;
 export {};

package/lib/index.js

@@ -1,16 +1,24 @@
 "use strict";
-exports.__esModule = true;
-exports.staticBeforeRouter = exports.staticRouter = exports.expressApp = void 0;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeRouter = exports.loadRouters = exports.staticBeforeRouter = exports.staticRouter = exports.expressApp = void 0;
 var express = require("express");
 var cors = require('cors');
 var compression = require('compression');
 var session = require('express-session');
+var _ = require('lodash');
 var ExpressAppStatic = (function () {
     function ExpressAppStatic() {
         var _this = this;
         this.app = null;
         this.beforeRouter = null;
         this.router = null;
+        this.scripts = '';
+        this.initClientJsRouter = function () {
+            _this.router.get('/client_scripts.js', function (req, res) {
+                res.header('Content-Type', 'application/javascript');
+                res.send(_this.scripts);
+            });
+        };
         this.staticRouter = function () {
             return _this.router;
         };
@@ -20,8 +28,12 @@ var ExpressAppStatic = (function () {
         this.staticBeforeRouter = function () {
             return _this.beforeRouter;
         };
+        this.setClientScripts = function (scripts) {
+            _this.scripts = scripts;
+        };
         this.beforeRouter = express.Router();
         this.router = express.Router();
+        this.initClientJsRouter();
         var app = express();
         app.use(cors({ origin: true, credentials: true }));
         app.use(compression());
@@ -54,4 +66,36 @@ var staticBeforeRouter = function () {
     return exports.expressApp.staticBeforeRouter();
 };
 exports.staticBeforeRouter = staticBeforeRouter;
+var routersApp = (0, exports.staticRouter)();
+var loadRouters = function (routers) {
+    _.each(routers, function (router) {
+        if (router.router.default !== routersApp) {
+            if (router.router.default) {
+                _.each(router.router.default.stack, function (layer) {
+                    routersApp.stack.push(layer);
+                });
+            }
+        }
+    });
+};
+exports.loadRouters = loadRouters;
+var removeRouter = function (path, methods) {
+    routersApp === null || routersApp === void 0 ? void 0 : routersApp.stack.forEach(function (route, i, routes) {
+        if (route.route && route.route.path === path) {
+            if (JSON.stringify(route.route.methods) === JSON.stringify(methods)) {
+                routes.splice(i, 1);
+            }
+        }
+        if (route.handle.stack) {
+            route.handle.stack.forEach(function (_route, i, routes) {
+                if (_route.route && _route.route.path === path) {
+                    if (JSON.stringify(_route.route.methods) === JSON.stringify(methods)) {
+                        routes.splice(i, 1);
+                    }
+                }
+            });
+        }
+    });
+};
+exports.removeRouter = removeRouter;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAOA,IAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC,IAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,IAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAC3C,IAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAE1C;IAII;QAAA,iBAwBC;QA3BD,QAAG,GAAG,IAAI,CAAC;QACX,iBAAY,GAAG,IAAI,CAAC;QACpB,WAAM,GAAG,IAAI,CAAC;QA2BP,iBAAY,GAAG;YAClB,OAAO,KAAI,CAAC,MAAM,CAAC;QACvB,CAAC,CAAA;QAEM,cAAS,GAAG;YACf,OAAO,KAAI,CAAC,GAAG,CAAC;QACpB,CAAC,CAAA;QAEM,uBAAkB,GAAG;YACxB,OAAO,KAAI,CAAC,YAAY,CAAC;QAC7B,CAAC,CAAA;QAnCG,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAE/B,IAAM,GAAG,GAAG,OAAO,EAAE,CAAC;QAC5B,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC,CAAC,CAAA;QAChD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QACjB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;YACZ,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,SAAS;YACvD,MAAM,EAAE,KAAK;YACb,iBAAiB,EAAE,IAAI;YACvB,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE;YACzC,IAAI,EAAE,MAAM;SACf,CAAC,CAAC,CAAA;QACH,IAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAC;YAC5B,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,UAAA,GAAG;gBACxC,IAAI,GAAG;oBACH,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBAC3B,GAAG,CAAC,GAAG,CAAC,KAAI,CAAC,kBAAkB,EAAE,CAAC,CAAA;gBAClC,GAAG,CAAC,GAAG,CAAC,KAAI,CAAC,YAAY,EAAE,CAAC,CAAA;gBAC5B,OAAO,OAAO,CAAC,IAAI,CAAC,iDAA0C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC,CAAC;YACjG,CAAC,CAAC,CAAC;SACN;QACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAaL,uBAAC;AAAD,CAAC,AAzCD,IAyCC;AAEY,QAAA,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAC;AAG1C,IAAM,YAAY,GAAG;IACxB,OAAO,kBAAU,CAAC,YAAY,EAAE,CAAC;AACrC,CAAC,CAAA;AAFY,QAAA,YAAY,gBAExB;AAEM,IAAM,kBAAkB,GAAG;IAC9B,OAAO,kBAAU,CAAC,kBAAkB,EAAE,CAAC;AAC3C,CAAC,CAAA;AAFY,QAAA,kBAAkB,sBAE9B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/router",
   "private": false,
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.8",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -18,5 +18,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74"
+  "gitHead": "723d92765db5342a374c7aacb5b835e69f77ca4b"
 }

package/src/index.ts

@@ -2,21 +2,24 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-15 14:48:43
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-17 11:15:40
+ * @LastEditTime: 2025-02-21 15:58:29
  * @Description: 
  */
 const express = require("express");
 const cors = require('cors');
 const compression = require('compression');
 const session = require('express-session')
+const _ = require('lodash');
 
 class ExpressAppStatic{
     app = null;
     beforeRouter = null;
     router = null;
+    scripts = '';
     constructor(){
         this.beforeRouter = express.Router();
         this.router = express.Router();
+        this.initClientJsRouter();
         // 读取环境变量、配置文件, 启动端口, 控制中间件
         const app = express();
 		app.use(cors({origin: true, credentials: true}))
@@ -40,6 +43,13 @@ class ExpressAppStatic{
         this.app = app;
     }
 
+    private initClientJsRouter = ()=>{
+        this.router.get('/client_scripts.js', (req, res)=>{
+            res.header('Content-Type', 'application/javascript');
+            res.send(this.scripts);
+        });
+    }
+
     public staticRouter = ()=>{
         return this.router;
     }
@@ -51,6 +61,10 @@ class ExpressAppStatic{
     public staticBeforeRouter = ()=>{
         return this.beforeRouter;
     }
+
+    public setClientScripts = (scripts: string)=>{
+        this.scripts = scripts;
+    }
 }
 
 export const expressApp = new ExpressAppStatic();
@@ -64,6 +78,39 @@ export const staticBeforeRouter = ()=>{
     return expressApp.staticBeforeRouter();
 }
 
+const routersApp = staticRouter();
+
+export const loadRouters = (routers)=>{
+    _.each(routers, (router)=>{
+        if(router.router.default !== routersApp){
+            if(router.router.default){
+                _.each(router.router.default.stack, (layer)=>{
+                    routersApp.stack.push(layer)
+                })
+            }
+        }
+    })
+}
+
+export const removeRouter = (path, methods)=>{
+    routersApp?.stack.forEach(function(route,i,routes) {
+        if (route.route && route.route.path === path) {
+            if(JSON.stringify(route.route.methods) === JSON.stringify(methods)){
+                routes.splice(i,1);
+            }
+        }
+        if(route.handle.stack){
+            route.handle.stack.forEach(function(_route,i,routes) {
+                if (_route.route && _route.route.path === path) {
+                    if(JSON.stringify(_route.route.methods) === JSON.stringify(methods)){
+                        routes.splice(i,1);
+                    }
+                }
+            });
+        }
+    });
+}
+
 // setInterval(()=>{
 //     console.log(`expressApp.staticRouter()====>`, expressApp.staticRouter())
 // }, 1000)