@miqro/core 1.3.6 → 1.3.8

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 (125) hide show
  1. package/README.md +38 -96
  2. package/dist/handler/api-router-utils.d.ts +12 -1
  3. package/dist/handler/api-router-utils.js +86 -1
  4. package/dist/handler/api-router-utils.js.map +1 -1
  5. package/dist/handler/api-router.d.ts +29 -2
  6. package/dist/handler/api-router.js +2 -2
  7. package/dist/handler/api-router.js.map +1 -1
  8. package/dist/handler/app.d.ts +2 -1
  9. package/dist/handler/app.js +4 -2
  10. package/dist/handler/app.js.map +1 -1
  11. package/dist/handler/common/context.d.ts +1 -1
  12. package/dist/handler/common/context.js +14 -9
  13. package/dist/handler/common/context.js.map +1 -1
  14. package/dist/handler/common/router-utils.js +60 -5
  15. package/dist/handler/common/router-utils.js.map +1 -1
  16. package/dist/handler/index.d.ts +0 -3
  17. package/dist/handler/index.js +0 -3
  18. package/dist/handler/index.js.map +1 -1
  19. package/dist/handler/middleware/form.js +7 -1
  20. package/dist/handler/middleware/form.js.map +1 -1
  21. package/dist/handler/middleware/group.js +44 -2
  22. package/dist/handler/middleware/group.js.map +1 -1
  23. package/dist/handler/middleware/index.js +2 -6
  24. package/dist/handler/middleware/index.js.map +1 -1
  25. package/dist/handler/middleware/json.js +8 -2
  26. package/dist/handler/middleware/json.js.map +1 -1
  27. package/dist/handler/middleware/text.js +8 -1
  28. package/dist/handler/middleware/text.js.map +1 -1
  29. package/dist/handler/proxy.d.ts +2 -5
  30. package/dist/handler/proxy.js +2 -3
  31. package/dist/handler/proxy.js.map +1 -1
  32. package/dist/index.d.ts +1 -0
  33. package/dist/index.js +1 -0
  34. package/dist/index.js.map +1 -1
  35. package/dist/{util/test → test/common}/app.d.ts +2 -2
  36. package/dist/{util/test → test/common}/app.js +3 -2
  37. package/dist/test/common/app.js.map +1 -0
  38. package/dist/{util/test → test/common}/common.d.ts +0 -0
  39. package/dist/{util/test → test/common}/common.js +0 -0
  40. package/dist/test/common/common.js.map +1 -0
  41. package/dist/{util/test → test/common}/index.d.ts +1 -0
  42. package/dist/{util/test → test/common}/index.js +1 -0
  43. package/dist/test/common/index.js.map +1 -0
  44. package/dist/test/common/runner.d.ts +13 -0
  45. package/dist/test/common/runner.js +92 -0
  46. package/dist/test/common/runner.js.map +1 -0
  47. package/dist/test/index.d.ts +1 -0
  48. package/dist/{handler/response → test}/index.js +1 -3
  49. package/dist/test/index.js.map +1 -0
  50. package/dist/test/main.d.ts +1 -0
  51. package/dist/test/main.js +19 -0
  52. package/dist/test/main.js.map +1 -0
  53. package/dist/util/cli/index.d.ts +1 -1
  54. package/dist/util/error/parsererror.d.ts +2 -1
  55. package/dist/util/error/parsererror.js +5 -1
  56. package/dist/util/error/parsererror.js.map +1 -1
  57. package/dist/util/index.d.ts +0 -1
  58. package/dist/util/index.js +0 -1
  59. package/dist/util/index.js.map +1 -1
  60. package/dist/util/loader/index.d.ts +0 -3
  61. package/dist/util/loader/index.js +2 -9
  62. package/dist/util/loader/index.js.map +1 -1
  63. package/dist/util/request/index.d.ts +1 -1
  64. package/dist/util/request/index.js +1 -3
  65. package/dist/util/request/index.js.map +1 -1
  66. package/dist/util/session/common.d.ts +0 -1
  67. package/dist/util/session/common.js +0 -46
  68. package/dist/util/session/common.js.map +1 -1
  69. package/package.json +6 -11
  70. package/src/handler/api-router-utils.ts +91 -2
  71. package/src/handler/api-router.ts +30 -4
  72. package/src/handler/app.ts +2 -1
  73. package/src/handler/common/context.ts +14 -10
  74. package/src/handler/common/router-utils.ts +199 -144
  75. package/src/handler/index.ts +0 -3
  76. package/src/handler/middleware/form.ts +8 -2
  77. package/src/handler/middleware/group.ts +44 -2
  78. package/src/handler/middleware/index.ts +0 -4
  79. package/src/handler/middleware/json.ts +9 -3
  80. package/src/handler/middleware/text.ts +8 -1
  81. package/src/handler/proxy.ts +3 -8
  82. package/src/index.ts +1 -0
  83. package/src/{util/test → test/common}/app.ts +6 -5
  84. package/src/{util/test → test/common}/common.ts +0 -0
  85. package/src/{util/test → test/common}/index.ts +1 -0
  86. package/src/test/common/runner.ts +97 -0
  87. package/src/test/index.ts +1 -0
  88. package/src/test/main.ts +17 -0
  89. package/src/util/cli/index.ts +1 -1
  90. package/src/util/error/parsererror.ts +6 -1
  91. package/src/util/index.ts +0 -1
  92. package/src/util/loader/index.ts +1 -7
  93. package/src/util/request/index.ts +1 -1
  94. package/src/util/session/common.ts +0 -43
  95. package/tsconfig-test.json +13 -0
  96. package/dist/handler/api-handler.d.ts +0 -29
  97. package/dist/handler/api-handler.js +0 -42
  98. package/dist/handler/api-handler.js.map +0 -1
  99. package/dist/handler/feature-router.d.ts +0 -12
  100. package/dist/handler/feature-router.js +0 -90
  101. package/dist/handler/feature-router.js.map +0 -1
  102. package/dist/handler/response/html.d.ts +0 -10
  103. package/dist/handler/response/html.js +0 -34
  104. package/dist/handler/response/html.js.map +0 -1
  105. package/dist/handler/response/index.d.ts +0 -3
  106. package/dist/handler/response/index.js.map +0 -1
  107. package/dist/handler/response/json.d.ts +0 -2
  108. package/dist/handler/response/json.js +0 -21
  109. package/dist/handler/response/json.js.map +0 -1
  110. package/dist/handler/response/result.d.ts +0 -4
  111. package/dist/handler/response/result.js +0 -46
  112. package/dist/handler/response/result.js.map +0 -1
  113. package/dist/util/client.d.ts +0 -17
  114. package/dist/util/client.js +0 -55
  115. package/dist/util/client.js.map +0 -1
  116. package/dist/util/test/app.js.map +0 -1
  117. package/dist/util/test/common.js.map +0 -1
  118. package/dist/util/test/index.js.map +0 -1
  119. package/src/handler/api-handler.ts +0 -55
  120. package/src/handler/feature-router.ts +0 -92
  121. package/src/handler/response/html.ts +0 -36
  122. package/src/handler/response/index.ts +0 -3
  123. package/src/handler/response/json.ts +0 -19
  124. package/src/handler/response/result.ts +0 -40
  125. package/src/util/client.ts +0 -64
@@ -1 +1 @@
1
- {"version":3,"file":"parsererror.js","sourceRoot":"","sources":["../../../src/util/error/parsererror.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,MAAa,iBAAkB,SAAQ,kBAAU;IAC/C,YAAY,OAAO,GAAG,aAAa,EAAS,OAAgB;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QAD2B,YAAO,GAAP,OAAO,CAAS;QAE1D,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AALD,8CAKC;AAED,MAAa,eAAgB,SAAQ,iBAAiB;CAAI;AAA1D,0CAA0D"}
1
+ {"version":3,"file":"parsererror.js","sourceRoot":"","sources":["../../../src/util/error/parsererror.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,MAAa,iBAAkB,SAAQ,kBAAU;IAC/C,YAAY,OAAO,GAAG,aAAa,EAAS,OAAgB;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QAD2B,YAAO,GAAP,OAAO,CAAS;QAE1D,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AALD,8CAKC;AAED,MAAa,eAAgB,SAAQ,kBAAU;IAC7C,YAAY,OAAO,GAAG,aAAa;QACjC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CACF;AALD,0CAKC"}
@@ -6,4 +6,3 @@ export * from "./config";
6
6
  export * from "./logger";
7
7
  export * from "./session";
8
8
  export * from "./loader";
9
- export * from "./test";
@@ -18,7 +18,6 @@ __exportStar(require("./config"), exports);
18
18
  __exportStar(require("./logger"), exports);
19
19
  __exportStar(require("./session"), exports);
20
20
  __exportStar(require("./loader"), exports);
21
- __exportStar(require("./test"), exports);
22
21
  //export * from "./uuid";
23
22
  //export * from "./cookie";
24
23
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,yBAAyB;AACzB,2BAA2B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB;AACzB,yBAAyB;AACzB,2BAA2B"}
@@ -1,7 +1,4 @@
1
1
  import { Logger } from "../logger";
2
2
  import { ConfigOutput, LoadConfigOut } from "../config";
3
- import { RequestOptions } from "../request";
4
- export declare const loadConfigString: (envFileContent: string, combined?: ConfigOutput | undefined) => ConfigOutput;
5
- export declare const loadRemoteConfigFile: (options: RequestOptions, logger?: Logger | undefined) => Promise<ConfigOutput>;
6
3
  export declare const loadConfigFile: (envFilePath: string, combined?: ConfigOutput | undefined, logger?: Logger | undefined) => ConfigOutput;
7
4
  export declare const loadConfig: (configDirname?: string, logger?: Logger | undefined) => LoadConfigOut;
@@ -1,11 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.loadConfig = exports.loadConfigFile = exports.loadRemoteConfigFile = exports.loadConfigString = void 0;
3
+ exports.loadConfig = exports.loadConfigFile = void 0;
4
4
  const path_1 = require("path");
5
5
  const fs_1 = require("fs");
6
6
  const config_1 = require("../config");
7
7
  const error_1 = require("../error");
8
- const request_1 = require("../request");
9
8
  const loadConfigString = (envFileContent, combined) => {
10
9
  const ret = {};
11
10
  envFileContent.split("\n")
@@ -26,12 +25,6 @@ const loadConfigString = (envFileContent, combined) => {
26
25
  }
27
26
  return ret;
28
27
  };
29
- exports.loadConfigString = loadConfigString;
30
- const loadRemoteConfigFile = async (options, logger) => {
31
- const { data } = await (0, request_1.request)(options, logger);
32
- return (0, exports.loadConfigString)(data);
33
- };
34
- exports.loadRemoteConfigFile = loadRemoteConfigFile;
35
28
  const loadConfigFile = (envFilePath, combined, logger) => {
36
29
  if (!(0, fs_1.existsSync)(envFilePath)) {
37
30
  throw new error_1.ConfigFileNotFoundError(`config file [${envFilePath}] doesnt exists!`);
@@ -40,7 +33,7 @@ const loadConfigFile = (envFilePath, combined, logger) => {
40
33
  if (logger) {
41
34
  logger.trace(`loading config from [${envFilePath}].`);
42
35
  }
43
- return (0, exports.loadConfigString)((0, fs_1.readFileSync)(envFilePath).toString(), combined);
36
+ return loadConfigString((0, fs_1.readFileSync)(envFilePath).toString(), combined);
44
37
  }
45
38
  };
46
39
  exports.loadConfigFile = loadConfigFile;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/loader/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/loader/index.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
1
  import { Logger } from "../logger";
2
2
  import { RequestOptions, RequestResponse } from "./common";
3
- export { RequestOptions, RequestResponse, ResponseError } from "./common";
3
+ export { RequestOptions, RequestResponse } from "./common";
4
4
  export declare const request: (options: RequestOptions, logger?: Logger | undefined) => Promise<RequestResponse>;
@@ -3,14 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.request = exports.ResponseError = void 0;
6
+ exports.request = void 0;
7
7
  const http_1 = __importDefault(require("http"));
8
8
  const https_1 = __importDefault(require("https"));
9
9
  const common_1 = require("./common");
10
10
  const zlib_1 = require("zlib");
11
11
  const browser_1 = require("../config/browser");
12
- var common_2 = require("./common");
13
- Object.defineProperty(exports, "ResponseError", { enumerable: true, get: function () { return common_2.ResponseError; } });
14
12
  const DEFAULT_USER_AGENT = "curl/7.69.1";
15
13
  const CONTENT_TYPE_HEADER = "Content-Type";
16
14
  const JSON_TYPE = "application/json;charset=utf-8";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/request/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/request/index.ts"],"names":[],"mappings":"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"}
@@ -13,4 +13,3 @@ export interface GroupPolicy {
13
13
  groups: GroupPolicyGroups[];
14
14
  groupPolicy: GroupPolicyType;
15
15
  }
16
- export declare const policyCheck: (session: Session, options: GroupPolicy) => boolean;
@@ -1,49 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.policyCheck = void 0;
4
- const error_1 = require("../error");
5
- const policyCheck = (session, options) => {
6
- switch (options.groupPolicy) {
7
- case "at_least_one":
8
- for (const group of options.groups) {
9
- if (group instanceof Array) {
10
- let ret = true;
11
- for (const g of group) {
12
- if (session.groups.indexOf(g) === -1) {
13
- ret = false;
14
- break;
15
- }
16
- }
17
- if (ret) {
18
- return true;
19
- }
20
- }
21
- else {
22
- if (session.groups.indexOf(group) !== -1) {
23
- return true;
24
- }
25
- }
26
- }
27
- return false;
28
- case "all":
29
- for (const group of options.groups) {
30
- if (group instanceof Array) {
31
- for (const g of group) {
32
- if (session.groups.indexOf(g) === -1) {
33
- return false;
34
- }
35
- }
36
- }
37
- else {
38
- if (session.groups.indexOf(group) === -1) {
39
- return false;
40
- }
41
- }
42
- }
43
- return true;
44
- default:
45
- throw new error_1.ParseOptionsError(`policy [${options.groupPolicy}] not implemented!!`);
46
- }
47
- };
48
- exports.policyCheck = policyCheck;
49
3
  //# sourceMappingURL=common.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/util/session/common.ts"],"names":[],"mappings":";;;AAAA,oCAA6C;AAsBtC,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,OAAoB,EAAW,EAAE;IAC7E,QAAQ,OAAO,CAAC,WAAW,EAAE;QAC3B,KAAK,cAAc;YACjB,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,IAAI,GAAG,GAAG,IAAI,CAAC;oBACf,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,GAAG,GAAG,KAAK,CAAC;4BACZ,MAAM;yBACP;qBACF;oBACD,IAAI,GAAG,EAAE;wBACP,OAAO,IAAI,CAAC;qBACb;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,IAAI,CAAC;qBACb;iBACF;aACF;YACD,OAAO,KAAK,CAAC;QACf,KAAK,KAAK;YACR,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,OAAO,KAAK,CAAC;yBACd;qBACF;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,KAAK,CAAC;qBACd;iBACF;aACF;YACD,OAAO,IAAI,CAAC;QACd;YACE,MAAM,IAAI,yBAAiB,CAAC,WAAW,OAAO,CAAC,WAAW,qBAAqB,CAAC,CAAC;KACpF;AACH,CAAC,CAAC;AAxCW,QAAA,WAAW,eAwCtB"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/util/session/common.ts"],"names":[],"mappings":""}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@miqro/core",
3
- "version": "1.3.6",
3
+ "version": "1.3.8",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -9,9 +9,10 @@
9
9
  "prebuild": "rm -Rf dist/;",
10
10
  "build": "tsc",
11
11
  "coverage": "nyc npm run test",
12
- "test": "LOG_LEVEL=trace NODE_ENV=test mocha -r ts-node/register test/*.test.ts",
13
- "testfile": "LOG_LEVEL=trace NODE_ENV=test mocha -r ts-node/register",
14
- "testname": "LOG_LEVEL=trace NODE_ENV=test mocha -r ts-node/register test/*.test.ts -g ",
12
+ "build:test": "rm -Rf test-dist/; tsc -p tsconfig-test.json",
13
+ "pretest": "npm run build:test",
14
+ "test": "LOG_LEVEL=trace NODE_ENV=test node test-dist/src/test/main.js all test-dist/**/*.test.js",
15
+ "testfile": "npm run pretest && LOG_LEVEL=trace NODE_ENV=test node test-dist/src/test/main.js all ",
15
16
  "lint": "eslint ./src --ext ts",
16
17
  "fixlint": "eslint ./src --ext ts --fix"
17
18
  },
@@ -19,13 +20,7 @@
19
20
  "license": "ISC",
20
21
  "devDependencies": {
21
22
  "@types/node": "^16.7.10",
22
- "@typescript-eslint/eslint-plugin": "^5.3.0",
23
- "@typescript-eslint/parser": "^5.3.0",
24
- "eslint": "^8.2.0",
25
- "mocha": "^9.1.3",
26
- "nyc": "^15.1.0",
27
- "ts-node": "^10.4.0",
28
- "typescript": "^4.4.4"
23
+ "typescript": "^4.5.3"
29
24
  },
30
25
  "engines": {
31
26
  "node": ">=14.0.0",
@@ -2,9 +2,12 @@ import { lstatSync, readdirSync } from "fs";
2
2
  import { join, parse, resolve } from "path";
3
3
  import { Logger } from "../util/logger";
4
4
  import { APIRoute } from "./api-router";
5
- import { Method } from "./common";
6
5
  import { normalizePath } from "./common/tokenize-match";
7
- import { FeatureRouterOptions } from "./feature-router";
6
+ import { SimpleMap } from "../util/parser/common";
7
+ import { isFeatureEnabled } from "../util/config/featuretoggle";
8
+ import { Router } from "./common/router";
9
+ import { Handler, Method } from "./common/context";
10
+ import { RouterHandlerOptions } from "./common/router-utils";
8
11
 
9
12
  export const traverseAPIRouteDir = (
10
13
  featureName: string,
@@ -96,3 +99,89 @@ export const traverseAPIRouteDir = (
96
99
  }
97
100
  return features;
98
101
  };
102
+
103
+ export interface FeatureRouterPathOptions {
104
+ path: string | string[];
105
+ method: Method | Method[];
106
+ handler: Array<Handler> | Handler;
107
+ options?: RouterHandlerOptions;
108
+ }
109
+
110
+ export type FeatureRouterOptions = SimpleMap<FeatureRouterPathOptions>;
111
+
112
+ const FEATURE_ROUTER_METHODS: Method[] = ["get", "post", "put", "delete", "patch", "options"];
113
+
114
+ export const FeatureRouter = (options: FeatureRouterOptions, logger?: Logger): Router => {
115
+ const router: Router = new Router();
116
+ const toSetup = Object.keys(options);
117
+ const enabled: string[] = [];
118
+ const disabled: string[] = [];
119
+ const enabledPaths: SimpleMap<string> = {};
120
+ for (const featureName of toSetup) {
121
+ const handlerOptions = options[featureName];
122
+ if (!handlerOptions) {
123
+ throw new Error(`no handler options for feature [${featureName}]`);
124
+ } else {
125
+ const { path, handler: implementation, method } = handlerOptions;
126
+ if (!method) {
127
+ throw new Error(`no methods for feature [${featureName}]`);
128
+ } else if (!implementation) {
129
+ throw new Error(`no implementation for feature [${featureName}]`);
130
+ } else if (!path) {
131
+ throw new Error(`no path for feature [${featureName}]`);
132
+ } else {
133
+ if (method instanceof Array) {
134
+ for (const m of method) {
135
+ if (FEATURE_ROUTER_METHODS.indexOf(m.toLowerCase() as Method) === -1) {
136
+ throw new Error(`feature [${featureName}] method [${m.toUpperCase()}] not defined! use only [${FEATURE_ROUTER_METHODS.join(",")}]`);
137
+ }
138
+ }
139
+ } else if (FEATURE_ROUTER_METHODS.indexOf(method.toLowerCase() as Method) === -1) {
140
+ throw new Error(`feature [${featureName}] method [${method.toUpperCase()}] not defined! use only [${FEATURE_ROUTER_METHODS.join(",")}]`);
141
+ }
142
+ const methods = method instanceof Array ? method : [method];
143
+ if (isFeatureEnabled(featureName)) {
144
+ if (logger) {
145
+ logger.trace(`feature [${featureName}] enabled`);
146
+ }
147
+ enabled.push(featureName);
148
+ const paths = path instanceof Array ? path : [path];
149
+ for (const nnP of paths) {
150
+ const p = normalizePath(nnP);
151
+ for (const m of methods) {
152
+ if (logger) {
153
+ logger.info("%s", featureName);
154
+ logger.info("\t%s:%s", m.toUpperCase(), p);
155
+ if ((handlerOptions as any).___filePath) {
156
+ logger.info("\t%s", (handlerOptions as any).___filePath);
157
+ }
158
+ }
159
+ if (enabledPaths[`${p}${m}`] !== undefined) {
160
+ throw new Error(`${featureName} collides with feature ${enabledPaths[`${p}${m}`]} on path ${p} method ${m}`)
161
+ }
162
+ enabledPaths[`${p}${m}`] = featureName;
163
+ router.use(implementation, p, m.toLocaleLowerCase() as Method, handlerOptions.options);
164
+ }
165
+ }
166
+ } else {
167
+ if (logger) {
168
+ logger.debug("feature [%s] disabled", featureName);
169
+ }
170
+ disabled.push(featureName);
171
+ }
172
+ }
173
+ }
174
+ }
175
+ if (logger && enabled.length > 0) {
176
+ logger.debug("enabled features [%s]", enabled.join(","));
177
+ }
178
+ if (logger) {
179
+ if (disabled.length > 0) {
180
+ logger.warn("disabled features [%s]", disabled.join(","));
181
+ logger.warn(`to enable them just add the env var <feature>=true`);
182
+ } else {
183
+ logger.debug(`no features disabled`);
184
+ }
185
+ }
186
+ return router;
187
+ };
@@ -1,16 +1,41 @@
1
1
  import { existsSync, lstatSync } from "fs";
2
2
  import { basename } from "path";
3
3
  import { Logger } from "../util";
4
- import { APIHandlerOptions } from "./api-handler";
5
- import { traverseAPIRouteDir } from "./api-router-utils";
4
+ import { traverseAPIRouteDir, FeatureRouter } from "./api-router-utils";
6
5
  import { Router, Method } from "./common";
7
- import { FeatureRouter } from "./feature-router";
6
+ import { GroupPolicy } from "../util/session";
7
+ import { SessionHandlerOptions } from "./middleware/session";
8
+ import { Parser } from "../util/parser";
9
+ import { ParseOptions } from "../util/parser/common";
10
+ import { Handler } from "./common";
8
11
 
9
- export interface APIRoute extends APIHandlerOptions {
12
+ /**
13
+ * # APIRoute
14
+ *
15
+ * src/api/comment/get.js
16
+ * ```typescript
17
+ *import { APIRouter } from "@miqro/core";
18
+ *const route: APIRoute = {
19
+ * ...
20
+ *};
21
+ *export default route;
22
+ * ```
23
+ */
24
+ export interface APIRoute {
10
25
  name?: string;
11
26
  description?: string;
12
27
  method?: Method | Method[];
13
28
  path?: string | string[];
29
+ parser?: Parser;
30
+ headers?: ParseOptions | ParseOptions[];
31
+ query?: ParseOptions | false | ParseOptions[];
32
+ params?: ParseOptions | false | ParseOptions[];
33
+ body?: ParseOptions | false | ParseOptions[];
34
+ result?: ParseOptions | ParseOptions[];
35
+ handler: Array<Handler> | Handler;
36
+ middleware?: Handler[];
37
+ session?: SessionHandlerOptions | Handler;
38
+ policy?: GroupPolicy;
14
39
  }
15
40
 
16
41
  /**
@@ -40,6 +65,7 @@ export interface APIRoute extends APIHandlerOptions {
40
65
  * };
41
66
  * }
42
67
  *}
68
+ *export default route;
43
69
  * ```
44
70
  */
45
71
  export const APIRouter = (options: {
@@ -63,7 +63,7 @@ const STATUS = {
63
63
  UNAUTHORIZED: 401,
64
64
  };
65
65
 
66
- const DefaultErrorHandler = (): ErrorHandler<boolean> => {
66
+ export const DefaultErrorHandler = (): ErrorHandler<boolean> => {
67
67
  return async (e: any, ctx: Context): Promise<boolean> => {
68
68
  if (!e || !e.name || e.name === "Error") {
69
69
  if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
@@ -108,6 +108,7 @@ const DefaultErrorHandler = (): ErrorHandler<boolean> => {
108
108
  });
109
109
  break;
110
110
  case "ParseOptionsError":
111
+ case "BadRequestError":
111
112
  case "SequelizeValidationError":
112
113
  case "SequelizeEagerLoadingError":
113
114
  case "SequelizeUniqueConstraintError":
@@ -30,7 +30,7 @@ export class Context {
30
30
  public readonly cookies: { [name: string]: string }; // a middleware will fill this
31
31
  public query: { [name: string]: string | string[] }; // parseSearchParams will fill this with this.url.searchParams
32
32
  public params: { [name: string]: string | undefined } = {}; // the router will fill this
33
- public buffer: Buffer; // empty buffer. middleware must read it
33
+ public buffer?: Buffer; // empty buffer. middleware must read it
34
34
  public readonly remoteAddress?: string;
35
35
  public body: any; // a middleware will fill this reading the buffer
36
36
  constructor(public readonly req: IncomingMessage, public readonly res: ServerResponse, logger?: Logger) {
@@ -41,7 +41,7 @@ export class Context {
41
41
  this.path = normalizePath(this.url.pathname); // normalized path
42
42
  this.hash = this.url.hash;
43
43
  this.query = parseSearchParams(this.url.searchParams);
44
- this.buffer = Buffer.from("");
44
+ //this.buffer = Buffer.from("");
45
45
  this.remoteAddress = req.socket.remoteAddress;
46
46
  this.cookies = {}; // a middleware will fill
47
47
  this.headers = req.headers;
@@ -102,16 +102,20 @@ export class Context {
102
102
  }): Promise<void> {
103
103
  return new Promise<void>((resolve, reject) => {
104
104
  try {
105
- this.res.statusCode = status;
106
- const keys = Object.keys(headers);
107
- for (const key of keys) {
108
- if (headers[key] !== undefined) {
109
- this.res.setHeader(key, headers[key] as any);
105
+ if (this.res.headersSent) {
106
+ reject(new Error("already ended"));
107
+ } else {
108
+ this.res.statusCode = status;
109
+ const keys = Object.keys(headers);
110
+ for (const key of keys) {
111
+ if (headers[key] !== undefined) {
112
+ this.res.setHeader(key, headers[key] as any);
113
+ }
110
114
  }
115
+ this.res.end(body !== undefined ? String(body) : undefined, () => {
116
+ resolve();
117
+ });
111
118
  }
112
- this.res.end(body !== undefined ? String(body) : undefined, () => {
113
- resolve();
114
- });
115
119
  } catch (e) {
116
120
  reject(e);
117
121
  }