@steedos/router 2.6.24 → 2.6.25

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.
Files changed (4) hide show
  1. package/lib/index.js +42 -1
  2. package/lib/index.js.map +1 -1
  3. package/package.json +2 -2
  4. package/src/index.ts +39 -3
package/lib/index.js CHANGED
@@ -5,6 +5,47 @@ var express = require("express");
5
5
  var cors = require('cors');
6
6
  var compression = require('compression');
7
7
  var session = require('express-session');
8
+ function parseOrigin(originEnv) {
9
+ if (originEnv === 'true') {
10
+ return true;
11
+ }
12
+ else if (originEnv === 'false') {
13
+ return false;
14
+ }
15
+ else if (/^\/.*\/$/.test(originEnv)) {
16
+ return new RegExp(originEnv.slice(1, -1));
17
+ }
18
+ else if (originEnv.startsWith('[') && originEnv.endsWith(']')) {
19
+ var originsArray = JSON.parse(originEnv);
20
+ return originsArray.map(function (item) {
21
+ if (typeof item === 'string') {
22
+ return item;
23
+ }
24
+ else if (/^\/.*\/$/.test(item)) {
25
+ return new RegExp(item.slice(1, -1));
26
+ }
27
+ else {
28
+ throw new Error('Invalid origin value in array');
29
+ }
30
+ });
31
+ }
32
+ else if (typeof originEnv === 'string') {
33
+ return originEnv;
34
+ }
35
+ else {
36
+ throw new Error('Invalid origin value');
37
+ }
38
+ }
39
+ var originEnv = process.env.STEEDOS_CORS_ORIGIN;
40
+ var origin = true;
41
+ try {
42
+ origin = parseOrigin(originEnv);
43
+ console.log('Parsed origin:', origin);
44
+ }
45
+ catch (error) {
46
+ console.error('Error parsing origin:', error.message);
47
+ }
48
+ console.log("origin----<", origin);
8
49
  var ExpressAppStatic = (function () {
9
50
  function ExpressAppStatic() {
10
51
  var _this = this;
@@ -23,7 +64,7 @@ var ExpressAppStatic = (function () {
23
64
  this.beforeRouter = express.Router();
24
65
  this.router = express.Router();
25
66
  var app = express();
26
- app.use(cors({ origin: true, credentials: true }));
67
+ app.use(cors({ origin: origin, credentials: true }));
27
68
  app.use(compression());
28
69
  app.use(session({
29
70
  secret: process.env.STEEDOS_SESSION_SECRET || 'steedos',
package/lib/index.js.map CHANGED
@@ -1 +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"}
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,CAAC;AAE3C,SAAS,WAAW,CAAC,SAAS;IAC1B,IAAI,SAAS,KAAK,MAAM,EAAE;QACtB,OAAO,IAAI,CAAC;KACf;SAAM,IAAI,SAAS,KAAK,OAAO,EAAE;QAC9B,OAAO,KAAK,CAAC;KAChB;SAAM,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACnC,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7C;SAAM,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC7D,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3C,OAAO,YAAY,CAAC,GAAG,CAAC,UAAA,IAAI;YACxB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBAC1B,OAAO,IAAI,CAAC;aACf;iBAAM,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC9B,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aACxC;iBAAM;gBACH,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;aACpD;QACL,CAAC,CAAC,CAAC;KACN;SAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACtC,OAAO,SAAS,CAAC;KACpB;SAAM;QACH,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KAC3C;AACL,CAAC;AAED,IAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;AAClD,IAAI,MAAM,GAAG,IAAI,CAAC;AAClB,IAAI;IACA,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;CACzC;AAAC,OAAO,KAAK,EAAE;IACZ,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;CACzD;AAED,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;AAElC;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,MAAM,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC,CAAC,CAAA;QAClD,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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@steedos/router",
3
3
  "private": false,
4
- "version": "2.6.24",
4
+ "version": "2.6.25",
5
5
  "description": "",
6
6
  "main": "lib/index.js",
7
7
  "scripts": {
@@ -18,5 +18,5 @@
18
18
  "publishConfig": {
19
19
  "access": "public"
20
20
  },
21
- "gitHead": "b5442f67775005d13963ae52dcc122d1de177fe6"
21
+ "gitHead": "40ef460347a593d88fe849f69eaaa8f181bd12c8"
22
22
  }
package/src/index.ts CHANGED
@@ -2,13 +2,49 @@
2
2
  * @Author: baozhoutao@steedos.com
3
3
  * @Date: 2022-11-15 14:48:43
4
4
  * @LastEditors: baozhoutao@steedos.com
5
- * @LastEditTime: 2022-11-17 11:15:40
5
+ * @LastEditTime: 2024-08-10 15:25:45
6
6
  * @Description:
7
7
  */
8
8
  const express = require("express");
9
9
  const cors = require('cors');
10
10
  const compression = require('compression');
11
- const session = require('express-session')
11
+ const session = require('express-session');
12
+
13
+ function parseOrigin(originEnv) {
14
+ if (originEnv === 'true') {
15
+ return true;
16
+ } else if (originEnv === 'false') {
17
+ return false;
18
+ } else if (/^\/.*\/$/.test(originEnv)) { // 正则表达式检查
19
+ return new RegExp(originEnv.slice(1, -1)); // 去掉两边的斜杠
20
+ } else if (originEnv.startsWith('[') && originEnv.endsWith(']')) { // 数组检查
21
+ const originsArray = JSON.parse(originEnv);
22
+ return originsArray.map(item => {
23
+ if (typeof item === 'string') {
24
+ return item;
25
+ } else if (/^\/.*\/$/.test(item)) {
26
+ return new RegExp(item.slice(1, -1));
27
+ } else {
28
+ throw new Error('Invalid origin value in array');
29
+ }
30
+ });
31
+ } else if (typeof originEnv === 'string') {
32
+ return originEnv;
33
+ } else {
34
+ throw new Error('Invalid origin value');
35
+ }
36
+ }
37
+
38
+ const originEnv = process.env.STEEDOS_CORS_ORIGIN;
39
+ let origin = true;
40
+ try {
41
+ origin = parseOrigin(originEnv);
42
+ console.log('Parsed origin:', origin);
43
+ } catch (error) {
44
+ console.error('Error parsing origin:', error.message);
45
+ }
46
+
47
+ console.log(`origin----<`, origin)
12
48
 
13
49
  class ExpressAppStatic{
14
50
  app = null;
@@ -19,7 +55,7 @@ class ExpressAppStatic{
19
55
  this.router = express.Router();
20
56
  // 读取环境变量、配置文件, 启动端口, 控制中间件
21
57
  const app = express();
22
- app.use(cors({origin: true, credentials: true}))
58
+ app.use(cors({origin: origin, credentials: true}))
23
59
  app.use(compression());
24
60
  app.use(session({
25
61
  secret: process.env.STEEDOS_SESSION_SECRET || 'steedos',