@miqro/core 5.0.10 → 5.0.11

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.
@@ -19,10 +19,18 @@ export class WebSocketServer {
19
19
  const clients = this.clients.values();
20
20
  for (const client of clients) {
21
21
  if (fromUUID === undefined || client.uuid !== fromUUID) {
22
- tR.push(this.writeTo(client.uuid, data));
22
+ tR.push(new Promise(async (resolve, reject) => {
23
+ try {
24
+ await this.writeTo(client.uuid, data);
25
+ resolve();
26
+ }
27
+ catch (e) {
28
+ reject(e);
29
+ }
30
+ }));
23
31
  }
24
32
  }
25
- await Promise.all(tR);
33
+ await Promise.allSettled(tR);
26
34
  }
27
35
  async writeTo(clientUUID, data) {
28
36
  const client = this.clients.get(clientUUID);
@@ -31,8 +39,15 @@ export class WebSocketServer {
31
39
  }
32
40
  return new Promise((resolve, reject) => {
33
41
  try {
34
- client.req.socket.write(createFrame(data), function SocketWriteCallback(err) {
42
+ client.req.socket.write(createFrame(data), (err) => {
35
43
  if (err) {
44
+ try {
45
+ client.req.socket.destroy(err);
46
+ }
47
+ catch (e) {
48
+ console.error(e);
49
+ }
50
+ this.clients.delete(clientUUID);
36
51
  reject(err);
37
52
  }
38
53
  else {
@@ -41,6 +56,13 @@ export class WebSocketServer {
41
56
  });
42
57
  }
43
58
  catch (e) {
59
+ try {
60
+ client.req.socket.destroy();
61
+ }
62
+ catch (e) {
63
+ console.error(e);
64
+ }
65
+ this.clients.delete(clientUUID);
44
66
  reject(e);
45
67
  }
46
68
  });
@@ -109,6 +131,18 @@ export class WebSocketServer {
109
131
  }
110
132
  }
111
133
  });
134
+ socket.on("error", (error) => {
135
+ req.logger.debug("upgraded connection error!");
136
+ req.logger.error(error);
137
+ if (this.options.onError) {
138
+ try {
139
+ this.options.onError(client, error);
140
+ }
141
+ catch (e) {
142
+ req.logger.error(e);
143
+ }
144
+ }
145
+ });
112
146
  socket.on("end", () => {
113
147
  req.logger.debug("upgraded connection disconnected!");
114
148
  this.clients.delete(uuid);
@@ -150,6 +184,19 @@ export class ClusterWebSocketServer extends WebSocketServer {
150
184
  return options.validate ? options.validate(req) : true;
151
185
  }
152
186
  },
187
+ onError: (req, error) => {
188
+ if (process.send) {
189
+ process.send({
190
+ type: ClusterWebSocketServerMessageType,
191
+ action: "error",
192
+ clientUUID: req.uuid,
193
+ errorMessage: error.message
194
+ });
195
+ }
196
+ if (options.onError) {
197
+ options.onError(req, error);
198
+ }
199
+ },
153
200
  onConnection: (req) => {
154
201
  if (process.send) {
155
202
  process.send({
@@ -181,41 +228,46 @@ export class ClusterWebSocketServer extends WebSocketServer {
181
228
  }
182
229
  ClusterWebSocketServer.instance = this;
183
230
  if (process.send) {
184
- process.on("message", (data) => {
185
- const msg = data;
186
- if (msg &&
187
- msg.type === ClusterWebSocketServerMessageType &&
188
- msg.action) {
189
- // receive message from cluster workers
190
- switch (msg.action) {
191
- case "connection":
192
- if (!msg.clientUUID) {
193
- throw new Error(`action [${msg.action}] without clientUUID`);
194
- }
195
- this.remoteClients.add(msg.clientUUID);
196
- break;
197
- case "disconnection":
198
- if (!msg.clientUUID) {
199
- throw new Error(`action [${msg.action}] without clientUUID`);
231
+ process.on("message", async (data) => {
232
+ try {
233
+ const msg = data;
234
+ if (msg &&
235
+ msg.type === ClusterWebSocketServerMessageType &&
236
+ msg.action) {
237
+ // receive message from cluster workers
238
+ switch (msg.action) {
239
+ case "connection":
240
+ if (!msg.clientUUID) {
241
+ throw new Error(`action [${msg.action}] without clientUUID`);
242
+ }
243
+ this.remoteClients.add(msg.clientUUID);
244
+ break;
245
+ case "disconnection":
246
+ if (!msg.clientUUID) {
247
+ throw new Error(`action [${msg.action}] without clientUUID`);
248
+ }
249
+ this.remoteClients.delete(msg.clientUUID);
250
+ break;
251
+ case "sendMessage": {
252
+ const payload = String(msg.payload);
253
+ if (!msg.clientUUID) {
254
+ // broadcast to local clients
255
+ await super.broadcast(payload, msg.fromUUID);
256
+ }
257
+ else if (this.isConnected(msg.clientUUID)) {
258
+ // write if local client
259
+ await super.writeTo(msg.clientUUID, payload);
260
+ }
261
+ break;
200
262
  }
201
- this.remoteClients.delete(msg.clientUUID);
202
- break;
203
- case "sendMessage": {
204
- const payload = String(msg.payload);
205
- if (!msg.clientUUID) {
206
- // broadcast to local clients
207
- super.broadcast(payload, msg.fromUUID);
208
- }
209
- else if (this.isConnected(msg.clientUUID)) {
210
- // write if local client
211
- super.writeTo(msg.clientUUID, payload);
212
- }
213
- break;
263
+ default:
264
+ throw new Error(`action [${msg.action}] not supported`);
214
265
  }
215
- default:
216
- throw new Error(`action [${msg.action}] not supported`);
217
266
  }
218
267
  }
268
+ catch (e) {
269
+ console.error(e);
270
+ }
219
271
  });
220
272
  }
221
273
  }
@@ -228,7 +280,7 @@ export class ClusterWebSocketServer extends WebSocketServer {
228
280
  fromUUID
229
281
  });
230
282
  }
231
- super.broadcast(payload, fromUUID);
283
+ return super.broadcast(payload, fromUUID);
232
284
  }
233
285
  async writeTo(clientUUID, payload) {
234
286
  if (this.remoteClients.has(clientUUID)) {
@@ -246,7 +298,7 @@ export class ClusterWebSocketServer extends WebSocketServer {
246
298
  // due to the implementation of isUUIDValid depends on this.remoteClients to be sync there can be two clients registered with the same UUID in the cluster
247
299
  if (this.clients.has(clientUUID)) {
248
300
  // write to local client
249
- super.writeTo(clientUUID, payload);
301
+ return super.writeTo(clientUUID, payload);
250
302
  }
251
303
  }
252
304
  isUUIDValid(uuid) {
@@ -1 +1 @@
1
- {"version":3,"file":"websocket.js","sourceRoot":"","sources":["../src/websocket.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"websocket.js","sourceRoot":"","sources":["../src/websocket.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@miqro/core",
3
- "version": "5.0.10",
3
+ "version": "5.0.11",
4
4
  "type": "module",
5
5
  "description": "",
6
6
  "main": "build/lib.js",
@@ -26,7 +26,7 @@
26
26
  "npm": ">=6.0.0"
27
27
  },
28
28
  "dependencies": {
29
- "@miqro/parser": "^2.0.3",
29
+ "@miqro/parser": "^2.0.4",
30
30
  "@miqro/request": "^0.2.3",
31
31
  "cookie": "0.6.0"
32
32
  }
package/src/app.ts CHANGED
@@ -4,6 +4,8 @@ import { routerDefaultLoggerFactory, defaultAppErrorHandler, HTML_HEADERS, STATU
4
4
  import { Request, Response, RouterOptions } from "./types.js";
5
5
  import { ServerOptions } from "http";
6
6
  import { Duplex } from "stream";
7
+ import { randomUUID } from "crypto";
8
+ import { Socket } from "net";
7
9
 
8
10
  export interface AppOptions extends RouterOptions {
9
11
  onUpgrade?: (req: Request, socket: Duplex, head: Buffer) => Promise<void> | void;
@@ -13,6 +15,8 @@ export interface AppOptions extends RouterOptions {
13
15
  export class App extends Router {
14
16
  public readonly listener: RequestListener<typeof Request, typeof Response>;
15
17
  public readonly httpServer: HttpServer<typeof Request, typeof Response>;
18
+ private shouldCloseConnection: boolean = false;
19
+ public connections: { [key: string]: Socket } = {};
16
20
 
17
21
  constructor(config?: AppOptions) {
18
22
  super(config);
@@ -31,6 +35,9 @@ export class App extends Router {
31
35
  req.logger = logger;
32
36
  try {
33
37
  req.logger.trace(`request received for [%s]`, req.path);
38
+ if (this.shouldCloseConnection) {
39
+ res.setHeader("Connection", "close");
40
+ }
34
41
  await this.run(req, res);
35
42
  if (!res.headersSent) {
36
43
  await res.asyncEnd({
@@ -64,17 +71,29 @@ export class App extends Router {
64
71
  }
65
72
  };
66
73
  this.httpServer = createServer<typeof Request, typeof Response>(this.serverOptions, this.listener);
74
+
75
+ this.httpServer.on("connection", (conn) => {
76
+ const key = randomUUID();
77
+ this.connections[key] = conn;
78
+ conn.on('close', () => {
79
+ delete this.connections[key];
80
+ });
81
+ });
67
82
  if (config?.onUpgrade) {
68
- this.httpServer.on("upgrade", function onUpgrade(req, socket, head) {
83
+ this.httpServer.on("upgrade", (req, socket, head) => {
69
84
  try {
70
85
  const logger = loggerFactory(req.uuid, req);
71
86
  try {
72
87
  req.logger = logger;
73
- if (config?.onUpgrade) {
74
- return config.onUpgrade(req, socket, head);
75
- } else {
76
- socket.end("HTTP/1.1 400 Bad Request");
88
+ if (this.shouldCloseConnection) {
77
89
  socket.destroy();
90
+ } else {
91
+ if (config?.onUpgrade) {
92
+ return config.onUpgrade(req, socket, head);
93
+ } else {
94
+ socket.end("HTTP/1.1 400 Bad Request");
95
+ socket.destroy();
96
+ }
78
97
  }
79
98
  } catch (e) {
80
99
  logger.error(e);
@@ -91,12 +110,14 @@ export class App extends Router {
91
110
  }
92
111
 
93
112
  public listenSync(...args: any[]): HttpServer<typeof Request, typeof Response> {
113
+ this.shouldCloseConnection = false;
94
114
  return this.httpServer.listen(...args)
95
115
  }
96
116
 
97
117
  public async listen(...args: any[]): Promise<HttpServer<typeof Request, typeof Response>> {
98
118
  return new Promise<HttpServer>((resolve, reject) => {
99
119
  try {
120
+ this.shouldCloseConnection = false;
100
121
  this.httpServer.listen(...args, () => {
101
122
  resolve(this.httpServer);
102
123
  });
@@ -109,6 +130,7 @@ export class App extends Router {
109
130
  public async close(): Promise<HttpServer<typeof Request, typeof Response>> {
110
131
  return new Promise<HttpServer<typeof Request, typeof Response>>((resolve, reject) => {
111
132
  try {
133
+ this.shouldCloseConnection = true;
112
134
  this.httpServer.close((err) => {
113
135
  if (err) {
114
136
  reject(err);
@@ -116,6 +138,10 @@ export class App extends Router {
116
138
  resolve(this.httpServer);
117
139
  }
118
140
  });
141
+ const keys = Object.keys(this.connections);
142
+ for (const key of keys) {
143
+ this.connections[key].destroy();
144
+ }
119
145
  } catch (e) {
120
146
  reject(e);
121
147
  }
@@ -123,7 +149,12 @@ export class App extends Router {
123
149
  }
124
150
 
125
151
  public closeSync(cb: (err: Error | undefined) => void): void {
152
+ this.shouldCloseConnection = true;
126
153
  this.httpServer.close(cb);
154
+ const keys = Object.keys(this.connections);
155
+ for (const key of keys) {
156
+ this.connections[key].destroy();
157
+ }
127
158
  }
128
159
  }
129
160
 
package/src/common.ts CHANGED
@@ -99,32 +99,32 @@ export class Logger extends EventTarget implements Logger {
99
99
 
100
100
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
101
101
  public debug(message?: any, ...optionalParams: any[]): void {
102
- return this.write({ level: "debug", message, optionalParams });
102
+ return this.write({ level: "debug", message, optionalParams, identifier: this.identifier });
103
103
  }
104
104
 
105
105
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
106
106
  public error(message?: any, ...optionalParams: any[]): void {
107
- return this.write({ level: "error", message, optionalParams });
107
+ return this.write({ level: "error", message, optionalParams, identifier: this.identifier });
108
108
  }
109
109
 
110
110
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
111
111
  public info(message?: any, ...optionalParams: any[]): void {
112
- return this.write({ level: "info", message, optionalParams });
112
+ return this.write({ level: "info", message, optionalParams, identifier: this.identifier });
113
113
  }
114
114
 
115
115
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
116
116
  public log(message?: any, ...optionalParams: any[]): void {
117
- return this.write({ level: "info", message, optionalParams });
117
+ return this.write({ level: "info", message, optionalParams, identifier: this.identifier });
118
118
  }
119
119
 
120
120
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
121
121
  public trace(message?: any, ...optionalParams: any[]): void {
122
- return this.write({ level: "trace", message, optionalParams });
122
+ return this.write({ level: "trace", message, optionalParams, identifier: this.identifier });
123
123
  }
124
124
 
125
125
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
126
126
  public warn(message?: any, ...optionalParams: any[]): void {
127
- return this.write({ level: "warn", message, optionalParams });
127
+ return this.write({ level: "warn", message, optionalParams, identifier: this.identifier });
128
128
  }
129
129
  }
130
130
 
@@ -259,7 +259,7 @@ export function getLoggerFactory(): LoggerFactory {
259
259
  }
260
260
  };
261
261
 
262
- export function routerDefaultLoggerFactory(uuid: string, req: IncomingMessage): MinimalLogger {
262
+ export function routerDefaultLoggerFactory(uuid: string, req: IncomingMessage): Logger {
263
263
  let path = "";
264
264
  let query = "";
265
265
  let urlParsingError;
@@ -275,7 +275,7 @@ export function routerDefaultLoggerFactory(uuid: string, req: IncomingMessage):
275
275
  urlParsingError = e;
276
276
  }
277
277
  const pathToEnv = path.replace(/\//ig, "_").toUpperCase();
278
- const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
278
+ const identifier = `${pathToEnv === "_" ? "" : `${pathToEnv.substring(1)}`}${method.toUpperCase()}`;
279
279
  const upgrade = req.headers.connection?.indexOf("Upgrade") !== -1;
280
280
 
281
281
  const logger = getLogger(identifier, {
package/src/lib.ts CHANGED
@@ -1,5 +1,6 @@
1
1
 
2
2
  export {
3
+ routerDefaultLoggerFactory,
3
4
  UnAuthorizedError,
4
5
  BadRequestError,
5
6
  ConfigFileNotFoundError,
@@ -7,6 +8,12 @@ export {
7
8
  NotFoundError,
8
9
  MethodNotImplementedError,
9
10
  getLogger, Logger, LoggerHandler,
11
+ setLoggerFactory,
12
+ DEFAULT_LOGGER_FORMATTER,
13
+ DEFAULT_LOGGER_TRANSPORTS,
14
+ ConsoleTransport,
15
+ FileTransport,
16
+ LOG_LEVEL_MAP,
10
17
  loadConfig, loadConfigFile, ConfigPathResolver, checkEnvVariables, checkEnvVariable, getEnvVariable, isFeatureEnabled,
11
18
  } from "./common.js";
12
19
 
@@ -40,7 +47,10 @@ export {
40
47
  Handler,
41
48
  HandlerResponse,
42
49
  ErrorHandler,
43
- newURL
50
+ newURL,
51
+ APIRouteSchema,
52
+ SessionHandlerOptionsSchema,
53
+ SessionHandlerOptionsOptionsSchema
44
54
  } from "./types.js";
45
55
 
46
56
  export {
@@ -36,7 +36,7 @@ import { ServerOptions } from "http";
36
36
  import { SessionHandler, GroupPolicyHandler } from "./session.js";
37
37
  import { DEFAULT_PARSER, assertNotUndefined, ResponseHandler, ResultParser, ParseRequest } from "./body-parser.js";
38
38
  import { RequestOptions, request } from "@miqro/request";
39
- import { existsSync, lstatSync, readFileSync, readdirSync, statSync } from "fs";
39
+ import { existsSync, fstatSync, lstatSync, readFileSync, readdirSync, statSync } from "fs";
40
40
  import { basename, extname, join, parse, resolve } from "path";
41
41
 
42
42
  /**
@@ -61,6 +61,11 @@ export class Router implements MinimalRouter {
61
61
  };
62
62
  }
63
63
 
64
+ public clear() {
65
+ this.handlers.splice(0, this.handlers.length);
66
+ this.errorHandlers.splice(0, this.errorHandlers.length);
67
+ }
68
+
64
69
  public get(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router {
65
70
  return this.use(handler, path, "get", options);
66
71
  }
@@ -150,14 +155,15 @@ export class Router implements MinimalRouter {
150
155
  return doc;
151
156
  }
152
157
 
153
- public logPaths(logger: MinimalLogger): void {
154
- this.toString().split("\n").forEach(l => logger.info(l));
158
+ public logPaths(logger: MinimalLogger, filter?: (path: string, method: string) => boolean): void {
159
+ this.toString(filter).split("\n").forEach(l => logger.info(l));
155
160
  }
156
161
 
157
- public toString(): string {
162
+ public toString(filter?: (path: string, method: string) => boolean): string {
158
163
  let ret = "";
159
164
  const doc = this.getJSONDoc();
160
165
  const paths = Object.keys(doc);
166
+ const tab = " ";
161
167
 
162
168
  for (const path of paths) {
163
169
  if (path) {
@@ -167,9 +173,12 @@ export class Router implements MinimalRouter {
167
173
 
168
174
  for (const method of methods) {
169
175
  if (method) {
170
- const methodDataList = pathData[method];
171
- for (const methodData of methodDataList) {
172
- ret += `${ret === "" ? "" : "\n"}${String(method).toUpperCase()}:${path}\n\t${methodData.identifier}${methodData.name ? `\n\t\t${methodData.name}` : ""}${methodData.description ? `\n\t\t${methodData.description}` : ""}`;
176
+ const show = filter ? filter(path, method) : true;
177
+ if (show) {
178
+ const methodDataList = pathData[method];
179
+ for (const methodData of methodDataList) {
180
+ ret += `${ret === "" ? "" : "\n"}${String(method).toUpperCase()}:${path}\n${tab}${methodData.identifier}${methodData.name ? `\n${tab}${tab}${methodData.name}` : ""}${methodData.description ? `\n${tab}${tab}${methodData.description}` : ""}`;
181
+ }
173
182
  }
174
183
  }
175
184
  }
@@ -739,7 +748,7 @@ export async function APIRouter(options: APIRouterOptions, logger?: Logger): Pro
739
748
  }
740
749
  const apiName = options.apiName !== undefined ? options.apiName : basename(dirname);
741
750
  const apiPath = options.path !== undefined ? options.path : "";
742
- return await traverseAPIRouteDir(apiName.toUpperCase(), dirname, apiPath, undefined, logger, options.ignore);
751
+ return await traverseAPIRouteDir(apiName.toUpperCase(), dirname, apiPath, undefined, logger, options.ignore, options.loader, options.extensions);
743
752
  }
744
753
 
745
754
  type UseCallArg = [Handler | Handler[] | MinimalRouter, string | undefined, Method | undefined, RouterHandlerOptions];
@@ -758,26 +767,29 @@ function isIgnored(f: string, ignore?: Array<string | RegExp>): boolean {
758
767
  return false;
759
768
  }
760
769
 
770
+ const DEFAULTAPIValidExtensions = new Set([".mjsx", ".mts", ".mjs", ".tsx", ".jsx", ".ts", ".js"]);
771
+
761
772
  async function traverseAPIRouteDir(
762
773
  featureName: string,
763
774
  dirname: string,
764
775
  basePath = "/",
765
- router: Router = new Router(), logger?: Logger, ignore?: Array<string | RegExp>): Promise<Router> {
776
+ router: Router = new Router(), logger?: Logger, ignore?: Array<string | RegExp>, importFN?: (path: string) => Promise<any>, extensions?: string[]): Promise<Router> {
766
777
  if (logger) {
767
778
  logger.trace("loading routes from [%s]", dirname);
768
779
  }
780
+ const VALID_EXTENSION = extensions ? new Set(extensions) : DEFAULTAPIValidExtensions;
769
781
  const files = readdirSync(dirname).filter(f => !isIgnored(f, ignore));
770
- const dirs = files.filter(f => lstatSync(join(dirname, f)).isDirectory());
771
- const methods = files.filter(f => !lstatSync(join(dirname, f)).isDirectory());
782
+ const dirs = files.filter(f => statSync(join(dirname, f)).isDirectory());
783
+ const methods = files.filter(f => !statSync(join(dirname, f)).isDirectory());
772
784
 
773
785
  const postFolder: UseCallArg[] = [];
774
786
 
775
787
  for (const f of methods) {
776
788
  const { name, ext } = parse(f);
777
- if (name !== "index" && ((ext === ".ts" || ext === ".js") && name.slice(-2) !== ".d")) {
789
+ if (VALID_EXTENSION.has(ext) && name.slice(-2) !== ".d") {
778
790
  const filePath = join(dirname, f);
779
791
  //console.log("dirname=%s f=%s", dirname, f);
780
- let route: APIRoute = await import(filePath);
792
+ let route: APIRoute = importFN ? await importFN(filePath) : await import(filePath);
781
793
  //if ((route as any).default && (route as any).__esModule === true) {
782
794
  if ((route as any).default) {
783
795
  route = (route as any).default;
@@ -789,19 +801,19 @@ async function traverseAPIRouteDir(
789
801
  //const ___filePath = filePath + ext;
790
802
  const ___filePath = filePath;
791
803
  //let routeMethods: Method[] = [name] as Method[];
792
- let routeMethod: Method | "use" | "USE" = name as Method;
804
+ let routeMethod: Method[] | Method | "use" | "USE" = name as Method;
793
805
  if (typeof route === "function") {
794
806
  route = {
795
807
  handler: route
796
808
  } as any;
797
809
  } else {
798
- if (typeof route.method !== "undefined" && (/*!(route.method instanceof Array) &&*/ (typeof route.method !== "string"))) {
810
+ if (typeof route.method !== "undefined" && (!(route.method instanceof Array) && (typeof route.method !== "string"))) {
799
811
  //throw new Error(`${resolve(dirname, name)} doesn't export method as a string or string array`);
800
812
  throw new Error(`${resolve(dirname, name)} doesnt export method as a string`);
801
813
  } else if (typeof route.method !== "undefined") {
802
814
  routeMethod = route.method;//route.method instanceof Array ? route.method : [route.method];
803
815
  }
804
- if (typeof route.path !== "string" && typeof route.path !== "undefined" && route.path !== null/* && !(route.path instanceof Array)*/) {
816
+ if (typeof route.path !== "string" && typeof route.path !== "undefined" && route.path !== null && !(route.path instanceof Array)) {
805
817
  //throw new Error(`${resolve(dirname, name)} doesn't export path as a string or a string array`);
806
818
  throw new Error(`${resolve(dirname, name)} doesnt export path as a string`);
807
819
  }
@@ -821,37 +833,54 @@ async function traverseAPIRouteDir(
821
833
  if (route.ignore !== undefined && route.ignore === true) {
822
834
  continue;
823
835
  }
824
- const p = route.path === undefined ? route.method && route.method.indexOf(name as Method) === -1 ? `/${name}` : "/" : route.path;
825
- if (p !== null && (typeof p !== "string" || !p)) {
826
- throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
836
+ //console.dir(route);
837
+ if (route.init) {
838
+ await route.init(route);
827
839
  }
828
- const path = p === null ? undefined : normalizePath(`${basePath}${p && p !== "/" ? `${p}` : p}`)
840
+ //console.dir(route);
841
+ const p = route.path === undefined ?
842
+ route.method && route.method.indexOf(name as Method) === -1 ?
843
+ `${name}` : "/"
844
+ : route.path;
829
845
 
830
- if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
831
- throw new Error(`invalid feature name ${route.identifier}`);
832
- }
833
- const useCallArgs: UseCallArg = [route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
834
- identifier: route.identifier,
835
- apiName: route.apiName,
836
- name: route.name,
837
- description: route.description,
838
- parser: route.parser,
839
- middleware: route.middleware,
840
- session: route.session,
841
- policy: route.policy,
842
- request: route.request,
843
- response: route.response !== undefined ? route.response : true // ResponseHandler added by default to an APIRoute
844
- }];
845
- if (route.postFolder) {
846
- postFolder.push(useCallArgs);
847
- } else {
848
- router.use(...useCallArgs);
846
+ /*if (p !== null && (typeof p !== "string" && !p)) {
847
+ throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
848
+ }*/
849
+ const paths = p instanceof Array ? p : [p];
850
+ const methods = routeMethod instanceof Array ? routeMethod : [routeMethod];
851
+
852
+ for (const method of methods) {
853
+ for (const pathsP of paths) {
854
+ const path = pathsP === null ? undefined : normalizePath(`${basePath}${pathsP && pathsP !== "/" ? `/${pathsP}` : pathsP}`)
855
+
856
+ if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
857
+ throw new Error(`invalid feature name ${route.identifier}`);
858
+ }
859
+ const useCallArgs: UseCallArg = [route.handler, path, method !== "use" && method !== "USE" ? method : undefined, {
860
+ identifier: route.identifier,
861
+ apiName: route.apiName,
862
+ name: route.name,
863
+ description: route.description,
864
+ parser: route.parser,
865
+ middleware: route.middleware,
866
+ session: route.session,
867
+ policy: route.policy,
868
+ request: route.request,
869
+ response: route.response !== undefined ? route.response : true // ResponseHandler added by default to an APIRoute
870
+ }];
871
+ //console.dir(useCallArgs);
872
+ if (route.postFolder) {
873
+ postFolder.push(useCallArgs);
874
+ } else {
875
+ router.use(...useCallArgs);
876
+ }
877
+ }
849
878
  }
850
879
  }
851
880
  }
852
881
  for (const f of dirs) {
853
882
  const { name } = parse(f);
854
- router = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), join(dirname, f), `${basePath}/${name}`, router, logger, ignore);
883
+ router = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), join(dirname, f), `${basePath}/${name}`, router, logger, ignore, importFN, extensions);
855
884
  }
856
885
  for (const post of postFolder) {
857
886
  router.use(...post);