@miqro/core 5.0.9 → 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.
package/build/app.d.ts CHANGED
@@ -1,11 +1,13 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
2
  /// <reference types="node" resolution-mode="require"/>
3
3
  /// <reference types="node" resolution-mode="require"/>
4
+ /// <reference types="node" resolution-mode="require"/>
4
5
  import { RequestListener, Server as HttpServer } from "http";
5
6
  import { Router } from "./middleware/router.js";
6
7
  import { Request, Response, RouterOptions } from "./types.js";
7
8
  import { ServerOptions } from "http";
8
9
  import { Duplex } from "stream";
10
+ import { Socket } from "net";
9
11
  export interface AppOptions extends RouterOptions {
10
12
  onUpgrade?: (req: Request, socket: Duplex, head: Buffer) => Promise<void> | void;
11
13
  serverOptions?: ServerOptions<typeof Request, typeof Response>;
@@ -13,6 +15,10 @@ export interface AppOptions extends RouterOptions {
13
15
  export declare class App extends Router {
14
16
  readonly listener: RequestListener<typeof Request, typeof Response>;
15
17
  readonly httpServer: HttpServer<typeof Request, typeof Response>;
18
+ private shouldCloseConnection;
19
+ connections: {
20
+ [key: string]: Socket;
21
+ };
16
22
  constructor(config?: AppOptions);
17
23
  listenSync(...args: any[]): HttpServer<typeof Request, typeof Response>;
18
24
  listen(...args: any[]): Promise<HttpServer<typeof Request, typeof Response>>;
package/build/app.js CHANGED
@@ -1,9 +1,12 @@
1
1
  import { createServer } from "http";
2
2
  import { Router } from "./middleware/router.js";
3
3
  import { routerDefaultLoggerFactory, defaultAppErrorHandler, HTML_HEADERS, STATUS } from "./common.js";
4
+ import { randomUUID } from "crypto";
4
5
  export class App extends Router {
5
6
  constructor(config) {
6
7
  super(config);
8
+ this.shouldCloseConnection = false;
9
+ this.connections = {};
7
10
  if (config?.serverOptions) {
8
11
  this.serverOptions = {
9
12
  ...this.serverOptions,
@@ -19,6 +22,9 @@ export class App extends Router {
19
22
  req.logger = logger;
20
23
  try {
21
24
  req.logger.trace(`request received for [%s]`, req.path);
25
+ if (this.shouldCloseConnection) {
26
+ res.setHeader("Connection", "close");
27
+ }
22
28
  await this.run(req, res);
23
29
  if (!res.headersSent) {
24
30
  await res.asyncEnd({
@@ -56,18 +62,30 @@ export class App extends Router {
56
62
  }
57
63
  };
58
64
  this.httpServer = createServer(this.serverOptions, this.listener);
65
+ this.httpServer.on("connection", (conn) => {
66
+ const key = randomUUID();
67
+ this.connections[key] = conn;
68
+ conn.on('close', () => {
69
+ delete this.connections[key];
70
+ });
71
+ });
59
72
  if (config?.onUpgrade) {
60
- this.httpServer.on("upgrade", function onUpgrade(req, socket, head) {
73
+ this.httpServer.on("upgrade", (req, socket, head) => {
61
74
  try {
62
75
  const logger = loggerFactory(req.uuid, req);
63
76
  try {
64
77
  req.logger = logger;
65
- if (config?.onUpgrade) {
66
- return config.onUpgrade(req, socket, head);
78
+ if (this.shouldCloseConnection) {
79
+ socket.destroy();
67
80
  }
68
81
  else {
69
- socket.end("HTTP/1.1 400 Bad Request");
70
- socket.destroy();
82
+ if (config?.onUpgrade) {
83
+ return config.onUpgrade(req, socket, head);
84
+ }
85
+ else {
86
+ socket.end("HTTP/1.1 400 Bad Request");
87
+ socket.destroy();
88
+ }
71
89
  }
72
90
  }
73
91
  catch (e) {
@@ -85,11 +103,13 @@ export class App extends Router {
85
103
  }
86
104
  }
87
105
  listenSync(...args) {
106
+ this.shouldCloseConnection = false;
88
107
  return this.httpServer.listen(...args);
89
108
  }
90
109
  async listen(...args) {
91
110
  return new Promise((resolve, reject) => {
92
111
  try {
112
+ this.shouldCloseConnection = false;
93
113
  this.httpServer.listen(...args, () => {
94
114
  resolve(this.httpServer);
95
115
  });
@@ -102,6 +122,7 @@ export class App extends Router {
102
122
  async close() {
103
123
  return new Promise((resolve, reject) => {
104
124
  try {
125
+ this.shouldCloseConnection = true;
105
126
  this.httpServer.close((err) => {
106
127
  if (err) {
107
128
  reject(err);
@@ -110,6 +131,10 @@ export class App extends Router {
110
131
  resolve(this.httpServer);
111
132
  }
112
133
  });
134
+ const keys = Object.keys(this.connections);
135
+ for (const key of keys) {
136
+ this.connections[key].destroy();
137
+ }
113
138
  }
114
139
  catch (e) {
115
140
  reject(e);
@@ -117,7 +142,12 @@ export class App extends Router {
117
142
  });
118
143
  }
119
144
  closeSync(cb) {
145
+ this.shouldCloseConnection = true;
120
146
  this.httpServer.close(cb);
147
+ const keys = Object.keys(this.connections);
148
+ for (const key of keys) {
149
+ this.connections[key].destroy();
150
+ }
121
151
  }
122
152
  }
123
153
  export class Server extends App {
package/build/app.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAyC,MAAM,MAAM,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAUvG,MAAM,OAAO,GAAI,SAAQ,MAAM;IAI7B,YAAY,MAAmB;QAC7B,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,MAAM,EAAE,aAAa,EAAE,CAAC;YAC1B,IAAI,CAAC,aAAa,GAAG;gBACnB,GAAG,IAAI,CAAC,aAAa;gBACrB,GAAG,MAAM,CAAC,aAAa;aACxB,CAAC;QACJ,CAAC;QACD,MAAM,YAAY,GAAG,sBAAsB,EAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,0BAA0B,CAAC;QACxH,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;YACpD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC5C,IAAI,CAAC;oBACH,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;oBACpB,IAAI,CAAC;wBACH,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;wBACxD,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;wBACzB,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;4BACrB,MAAM,GAAG,CAAC,QAAQ,CAAC;gCACjB,OAAO,EAAE,YAAY;gCACrB,MAAM,EAAE,MAAM,CAAC,SAAS;gCACxB,IAAI,EAAE,WAAW;6BAClB,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;oBAAC,OAAO,CAAM,EAAE,CAAC;wBAChB,IAAI,CAAC;4BACH,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gCACrB,MAAM,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;gCAChC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;oCACrB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oCACpB,MAAM,GAAG,CAAC,QAAQ,CAAC;wCACjB,OAAO,EAAE,YAAY;wCACrB,MAAM,EAAE,MAAM,CAAC,KAAK;wCACpB,IAAI,EAAE,cAAc;qCACrB,CAAC,CAAC;gCACL,CAAC;4BACH,CAAC;wBACH,CAAC;wBAAC,OAAO,EAAE,EAAE,CAAC;4BACZ,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBACvB,CAAC;oBACH,CAAC;gBACH,CAAC;gBAAC,OAAO,QAAQ,EAAE,CAAC;oBAClB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;YAAC,OAAO,WAAW,EAAE,CAAC;gBACrB,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,YAAY,CAAkC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnG,IAAI,MAAM,EAAE,SAAS,EAAE,CAAC;YACtB,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI;gBAChE,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBAC5C,IAAI,CAAC;wBACH,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;wBACpB,IAAI,MAAM,EAAE,SAAS,EAAE,CAAC;4BACtB,OAAO,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;wBAC7C,CAAC;6BAAM,CAAC;4BACN,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;4BACvC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACnB,CAAC;oBACH,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAChB,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;wBACvC,MAAM,CAAC,OAAO,EAAE,CAAC;oBACnB,CAAC;gBACH,CAAC;gBAAC,OAAO,WAAW,EAAE,CAAC;oBACrB,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;oBAC3B,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;oBACvC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEM,UAAU,CAAC,GAAG,IAAW;QAC9B,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;IACxC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAG,IAAW;QAChC,OAAO,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,IAAI,CAAC;gBACH,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;oBACnC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,OAAO,IAAI,OAAO,CAA8C,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClF,IAAI,CAAC;gBACH,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC5B,IAAI,GAAG,EAAE,CAAC;wBACR,MAAM,CAAC,GAAG,CAAC,CAAC;oBACd,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAC3B,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,SAAS,CAAC,EAAoC;QACnD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,MAAO,SAAQ,GAAG;CAC9B"}
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
package/build/common.d.ts CHANGED
@@ -55,7 +55,7 @@ export declare function getLogger(identifier: string, options?: {
55
55
  }, useCache?: boolean): Logger;
56
56
  export declare function setLoggerFactory(factory: LoggerFactory): LoggerFactory;
57
57
  export declare function getLoggerFactory(): LoggerFactory;
58
- export declare function routerDefaultLoggerFactory(uuid: string, req: IncomingMessage): MinimalLogger;
58
+ export declare function routerDefaultLoggerFactory(uuid: string, req: IncomingMessage): Logger;
59
59
  /**
60
60
  * Error
61
61
  */
package/build/common.js CHANGED
@@ -85,27 +85,27 @@ export class Logger extends EventTarget {
85
85
  }
86
86
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
87
87
  debug(message, ...optionalParams) {
88
- return this.write({ level: "debug", message, optionalParams });
88
+ return this.write({ level: "debug", message, optionalParams, identifier: this.identifier });
89
89
  }
90
90
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
91
91
  error(message, ...optionalParams) {
92
- return this.write({ level: "error", message, optionalParams });
92
+ return this.write({ level: "error", message, optionalParams, identifier: this.identifier });
93
93
  }
94
94
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
95
95
  info(message, ...optionalParams) {
96
- return this.write({ level: "info", message, optionalParams });
96
+ return this.write({ level: "info", message, optionalParams, identifier: this.identifier });
97
97
  }
98
98
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
99
99
  log(message, ...optionalParams) {
100
- return this.write({ level: "info", message, optionalParams });
100
+ return this.write({ level: "info", message, optionalParams, identifier: this.identifier });
101
101
  }
102
102
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
103
103
  trace(message, ...optionalParams) {
104
- return this.write({ level: "trace", message, optionalParams });
104
+ return this.write({ level: "trace", message, optionalParams, identifier: this.identifier });
105
105
  }
106
106
  /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
107
107
  warn(message, ...optionalParams) {
108
- return this.write({ level: "warn", message, optionalParams });
108
+ return this.write({ level: "warn", message, optionalParams, identifier: this.identifier });
109
109
  }
110
110
  }
111
111
  const FILE_TRANSPORT_ENV_VARIABLE = "LOG_FILE";
@@ -249,7 +249,7 @@ export function routerDefaultLoggerFactory(uuid, req) {
249
249
  urlParsingError = e;
250
250
  }
251
251
  const pathToEnv = path.replace(/\//ig, "_").toUpperCase();
252
- const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
252
+ const identifier = `${pathToEnv === "_" ? "" : `${pathToEnv.substring(1)}`}${method.toUpperCase()}`;
253
253
  const upgrade = req.headers.connection?.indexOf("Upgrade") !== -1;
254
254
  const logger = getLogger(identifier, {
255
255
  formatter: (args) => {
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}
package/build/lib.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- export { UnAuthorizedError, BadRequestError, ConfigFileNotFoundError, ForbiddenError, NotFoundError, MethodNotImplementedError, getLogger, Logger, LoggerHandler, loadConfig, loadConfigFile, ConfigPathResolver, checkEnvVariables, checkEnvVariable, getEnvVariable, isFeatureEnabled, } from "./common.js";
2
- export { MinimalLogger, LoggerErrorEvent, LoggerErrorEventInit, Request, Response, normalizePath, WebSocketComplexValidateResult, WebSocketClient, WebSocketServerOptions, GroupPolicy, GroupPolicyGroups, GroupPolicyType, NoTokenSession, Session, SessionHandlerOptions, HandlerWithOptions, MinimalRouter, RouterHandlerOptions, RouterJSONDoc, RouterOptions, RouteJSONDoc, RouteOptions, ParserMode, SchemaProperties, APIRoute, APIRouterOptions, Handler, HandlerResponse, ErrorHandler, newURL } from "./types.js";
1
+ export { routerDefaultLoggerFactory, UnAuthorizedError, BadRequestError, ConfigFileNotFoundError, ForbiddenError, NotFoundError, MethodNotImplementedError, getLogger, Logger, LoggerHandler, setLoggerFactory, DEFAULT_LOGGER_FORMATTER, DEFAULT_LOGGER_TRANSPORTS, ConsoleTransport, FileTransport, LOG_LEVEL_MAP, loadConfig, loadConfigFile, ConfigPathResolver, checkEnvVariables, checkEnvVariable, getEnvVariable, isFeatureEnabled, } from "./common.js";
2
+ export { MinimalLogger, LoggerErrorEvent, LoggerErrorEventInit, Request, Response, normalizePath, WebSocketComplexValidateResult, WebSocketClient, WebSocketServerOptions, GroupPolicy, GroupPolicyGroups, GroupPolicyType, NoTokenSession, Session, SessionHandlerOptions, HandlerWithOptions, MinimalRouter, RouterHandlerOptions, RouterJSONDoc, RouterOptions, RouteJSONDoc, RouteOptions, ParserMode, SchemaProperties, APIRoute, APIRouterOptions, Handler, HandlerResponse, ErrorHandler, newURL, APIRouteSchema, SessionHandlerOptionsSchema, SessionHandlerOptionsOptionsSchema } from "./types.js";
3
3
  export { App, Server, AppOptions } from "./app.js";
4
4
  export { WebSocketServer, ClusterWebSocketServer } from "./websocket.js";
5
5
  export { Router, Static, StaticRouterOptions, Proxy, ProxyRouterOptions, APIRouter } from "./middleware/router.js";
package/build/lib.js CHANGED
@@ -1,5 +1,5 @@
1
- export { UnAuthorizedError, BadRequestError, ConfigFileNotFoundError, ForbiddenError, NotFoundError, MethodNotImplementedError, getLogger, Logger, LoggerHandler, loadConfig, loadConfigFile, ConfigPathResolver, checkEnvVariables, checkEnvVariable, getEnvVariable, isFeatureEnabled, } from "./common.js";
2
- export { LoggerErrorEvent, Request, Response, normalizePath, newURL } from "./types.js";
1
+ export { routerDefaultLoggerFactory, UnAuthorizedError, BadRequestError, ConfigFileNotFoundError, ForbiddenError, NotFoundError, MethodNotImplementedError, getLogger, Logger, LoggerHandler, setLoggerFactory, DEFAULT_LOGGER_FORMATTER, DEFAULT_LOGGER_TRANSPORTS, ConsoleTransport, FileTransport, LOG_LEVEL_MAP, loadConfig, loadConfigFile, ConfigPathResolver, checkEnvVariables, checkEnvVariable, getEnvVariable, isFeatureEnabled, } from "./common.js";
2
+ export { LoggerErrorEvent, Request, Response, normalizePath, newURL, APIRouteSchema, SessionHandlerOptionsSchema, SessionHandlerOptionsOptionsSchema } from "./types.js";
3
3
  export { App, Server } from "./app.js";
4
4
  export { WebSocketServer, ClusterWebSocketServer } from "./websocket.js";
5
5
  export { Router, Static, Proxy, APIRouter } from "./middleware/router.js";
package/build/lib.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,uBAAuB,EACvB,cAAc,EACd,aAAa,EACb,yBAAyB,EACzB,SAAS,EAAE,MAAM,EAAE,aAAa,EAChC,UAAU,EAAE,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,GACtH,MAAM,aAAa,CAAC;AAErB,OAAO,EAEL,gBAAgB,EAEhB,OAAO,EACP,QAAQ,EACR,aAAa,EAwBb,MAAM,EACP,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,GAAG,EACH,MAAM,EAEP,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,eAAe,EACf,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,MAAM,EACN,MAAM,EAEN,KAAK,EAEL,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,YAAY,EAEZ,eAAe,EACf,YAAY,EACZ,IAAI,EAEL,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,cAAc,EACd,kBAAkB,EAElB,qBAAqB,EAEtB,MAAM,yBAAyB,CAAC"}
1
+ {"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,uBAAuB,EACvB,cAAc,EACd,aAAa,EACb,yBAAyB,EACzB,SAAS,EAAE,MAAM,EAAE,aAAa,EAChC,gBAAgB,EAChB,wBAAwB,EACxB,yBAAyB,EACzB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,UAAU,EAAE,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,GACtH,MAAM,aAAa,CAAC;AAErB,OAAO,EAEL,gBAAgB,EAEhB,OAAO,EACP,QAAQ,EACR,aAAa,EAwBb,MAAM,EACN,cAAc,EACd,2BAA2B,EAC3B,kCAAkC,EACnC,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,GAAG,EACH,MAAM,EAEP,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,eAAe,EACf,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,MAAM,EACN,MAAM,EAEN,KAAK,EAEL,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,YAAY,EAEZ,eAAe,EACf,YAAY,EACZ,IAAI,EAEL,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,cAAc,EACd,kBAAkB,EAElB,qBAAqB,EAEtB,MAAM,yBAAyB,CAAC"}
@@ -13,6 +13,7 @@ export declare class Router implements MinimalRouter {
13
13
  readonly listener: RequestListener<typeof Request, typeof Response>;
14
14
  serverOptions: ServerOptions<typeof Request, typeof Response>;
15
15
  constructor(config?: RouterOptions | undefined);
16
+ clear(): void;
16
17
  get(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
17
18
  post(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
18
19
  patch(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
@@ -23,8 +24,8 @@ export declare class Router implements MinimalRouter {
23
24
  catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router;
24
25
  run(req: Request, res: Response, pathTokens?: PathPart[], prePathTokens?: PathPartToken[]): Promise<boolean>;
25
26
  getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
26
- logPaths(logger: MinimalLogger): void;
27
- toString(): string;
27
+ logPaths(logger: MinimalLogger, filter?: (path: string, method: string) => boolean): void;
28
+ toString(filter?: (path: string, method: string) => boolean): string;
28
29
  }
29
30
  declare class RouterHandler {
30
31
  private readonly originalHandler;
@@ -1,5 +1,5 @@
1
1
  import { routerDefaultLoggerFactory } from "../common.js";
2
- import { Request, Response, HandlerWithOptionsSchema, RouterHandlerOptionsSchema, isMinimalRouter, normalizePath, matchTokenizePath, splitPath, tokenizePath, APIRouterOptionsSchema, APIRouteSchema, } from "../types.js";
2
+ import { Request, Response, HandlerWithOptionsSchema, RouterHandlerOptionsSchema, isMinimalRouter, normalizePath, matchTokenizePath, splitPath, tokenizePath, APIRouterOptionsSchema, APIRouteSchema, removeStartingBackSlashes, } from "../types.js";
3
3
  import { SessionHandler, GroupPolicyHandler } from "./session.js";
4
4
  import { DEFAULT_PARSER, assertNotUndefined, ResponseHandler, ResultParser, ParseRequest } from "./body-parser.js";
5
5
  import { request } from "@miqro/request";
@@ -24,6 +24,10 @@ export class Router {
24
24
  await this.run(req, res);
25
25
  };
26
26
  }
27
+ clear() {
28
+ this.handlers.splice(0, this.handlers.length);
29
+ this.errorHandlers.splice(0, this.errorHandlers.length);
30
+ }
27
31
  get(path, handler, options) {
28
32
  return this.use(handler, path, "get", options);
29
33
  }
@@ -105,21 +109,27 @@ export class Router {
105
109
  }
106
110
  return doc;
107
111
  }
108
- logPaths(logger) {
109
- this.toString().split("\n").forEach(l => logger.info(l));
112
+ logPaths(logger, filter) {
113
+ this.toString(filter).split("\n").forEach(l => logger.info(l));
110
114
  }
111
- toString() {
115
+ toString(filter) {
112
116
  let ret = "";
113
117
  const doc = this.getJSONDoc();
114
118
  const paths = Object.keys(doc);
119
+ const tab = " ";
115
120
  for (const path of paths) {
116
121
  if (path) {
117
122
  const pathData = doc[path];
118
123
  const methods = Object.keys(pathData);
119
124
  for (const method of methods) {
120
125
  if (method) {
121
- const methodData = pathData[method];
122
- 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}` : ""}`;
126
+ const show = filter ? filter(path, method) : true;
127
+ if (show) {
128
+ const methodDataList = pathData[method];
129
+ for (const methodData of methodDataList) {
130
+ 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}` : ""}`;
131
+ }
132
+ }
123
133
  }
124
134
  }
125
135
  }
@@ -181,8 +191,9 @@ class RouterHandler {
181
191
  }
182
192
  this.handler = handlers;
183
193
  }
184
- getJSONDoc(doc = {}, prePath = "/") {
185
- const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
194
+ getJSONDoc(doc = {}, prePath = "") {
195
+ const pp = normalizePath(removeStartingBackSlashes(this.path ? this.path : "/"));
196
+ const nPath = pp.length > 1 ? pp.substring(1) : "";
186
197
  const nMethod = this.method ? this.method : "";
187
198
  if (this.isRouter) {
188
199
  const router = this.originalHandler;
@@ -192,11 +203,11 @@ class RouterHandler {
192
203
  if (!doc[`${prePath}${nPath}`]) {
193
204
  doc[`${prePath}${nPath}`] = Object.create(null);
194
205
  }
195
- if (doc[`${prePath}${nPath}`][nMethod]) {
196
- throw new Error("cannot create doc routes override each other");
206
+ if (!doc[`${prePath}${nPath}`][nMethod]) {
207
+ doc[`${prePath}${nPath}`][nMethod] = [];
197
208
  }
198
209
  if (this.options) {
199
- doc[`${prePath}${nPath}`][nMethod] = {
210
+ doc[`${prePath}${nPath}`][nMethod].push({
200
211
  description: this.options.description,
201
212
  name: this.options.name,
202
213
  identifier: this.options.identifier ? this.options.identifier : `${prePath}${nPath}${this.options.name ? this.options.name : ""}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
@@ -208,25 +219,33 @@ class RouterHandler {
208
219
  query: this.options.request.query,
209
220
  } : undefined,
210
221
  response: typeof this.options.response === "boolean" ? this.options.response : this.options.response ? {
211
- body: this.options.response.body
222
+ body: this.options.response.body,
223
+ bodyMode: this.options.response.bodyMode,
224
+ headers: this.options.response.headers,
225
+ headersMode: this.options.response.headersMode,
226
+ middleware: this.options.response.middleware,
227
+ status: this.options.response.status
212
228
  } : undefined
213
- };
229
+ });
214
230
  }
215
231
  else {
216
- doc[`${prePath}${nPath}`][nMethod] = {
232
+ doc[`${prePath}${nPath}`][nMethod].push({
217
233
  description: undefined,
218
234
  name: undefined,
219
235
  identifier: `${prePath}${nPath}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
220
236
  policy: undefined,
221
237
  request: undefined,
222
238
  response: undefined
223
- };
239
+ });
224
240
  }
225
241
  }
226
242
  return doc;
227
243
  }
228
244
  async invoke(req, res, pathTokens, prePathTokens) {
229
245
  for (let i = 0; i < this.handler.length; i++) {
246
+ if (res.headersSent) {
247
+ return false;
248
+ }
230
249
  const h = this.handler[i];
231
250
  if (isMinimalRouter(h)) {
232
251
  //if (h instanceof Router) {
@@ -597,22 +616,38 @@ export async function APIRouter(options, logger) {
597
616
  }
598
617
  const apiName = options.apiName !== undefined ? options.apiName : basename(dirname);
599
618
  const apiPath = options.path !== undefined ? options.path : "";
600
- return await traverseAPIRouteDir(apiName.toUpperCase(), dirname, apiPath, undefined, logger, options.ignore);
619
+ return await traverseAPIRouteDir(apiName.toUpperCase(), dirname, apiPath, undefined, logger, options.ignore, options.loader, options.extensions);
620
+ }
621
+ function isIgnored(f, ignore) {
622
+ if (!ignore) {
623
+ return false;
624
+ }
625
+ for (const i of ignore) {
626
+ if (i instanceof RegExp && i.test(f)) {
627
+ return true;
628
+ }
629
+ else if (i === f) {
630
+ return true;
631
+ }
632
+ }
633
+ return false;
601
634
  }
602
- async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router = new Router(), logger, ignore) {
635
+ const DEFAULTAPIValidExtensions = new Set([".mjsx", ".mts", ".mjs", ".tsx", ".jsx", ".ts", ".js"]);
636
+ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router = new Router(), logger, ignore, importFN, extensions) {
603
637
  if (logger) {
604
638
  logger.trace("loading routes from [%s]", dirname);
605
639
  }
606
- const files = readdirSync(dirname).filter(f => (!ignore || !ignore.includes(f)));
607
- const dirs = files.filter(f => lstatSync(join(dirname, f)).isDirectory());
608
- const methods = files.filter(f => !lstatSync(join(dirname, f)).isDirectory());
640
+ const VALID_EXTENSION = extensions ? new Set(extensions) : DEFAULTAPIValidExtensions;
641
+ const files = readdirSync(dirname).filter(f => !isIgnored(f, ignore));
642
+ const dirs = files.filter(f => statSync(join(dirname, f)).isDirectory());
643
+ const methods = files.filter(f => !statSync(join(dirname, f)).isDirectory());
609
644
  const postFolder = [];
610
645
  for (const f of methods) {
611
646
  const { name, ext } = parse(f);
612
- if (name !== "index" && ((ext === ".ts" || ext === ".js") && name.slice(-2) !== ".d")) {
647
+ if (VALID_EXTENSION.has(ext) && name.slice(-2) !== ".d") {
613
648
  const filePath = join(dirname, f);
614
649
  //console.log("dirname=%s f=%s", dirname, f);
615
- let route = await import(filePath);
650
+ let route = importFN ? await importFN(filePath) : await import(filePath);
616
651
  //if ((route as any).default && (route as any).__esModule === true) {
617
652
  if (route.default) {
618
653
  route = route.default;
@@ -631,14 +666,14 @@ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router
631
666
  };
632
667
  }
633
668
  else {
634
- if (typeof route.method !== "undefined" && ( /*!(route.method instanceof Array) &&*/(typeof route.method !== "string"))) {
669
+ if (typeof route.method !== "undefined" && (!(route.method instanceof Array) && (typeof route.method !== "string"))) {
635
670
  //throw new Error(`${resolve(dirname, name)} doesn't export method as a string or string array`);
636
671
  throw new Error(`${resolve(dirname, name)} doesnt export method as a string`);
637
672
  }
638
673
  else if (typeof route.method !== "undefined") {
639
674
  routeMethod = route.method; //route.method instanceof Array ? route.method : [route.method];
640
675
  }
641
- if (typeof route.path !== "string" && typeof route.path !== "undefined" /* && !(route.path instanceof Array)*/) {
676
+ if (typeof route.path !== "string" && typeof route.path !== "undefined" && route.path !== null && !(route.path instanceof Array)) {
642
677
  //throw new Error(`${resolve(dirname, name)} doesn't export path as a string or a string array`);
643
678
  throw new Error(`${resolve(dirname, name)} doesnt export path as a string`);
644
679
  }
@@ -659,49 +694,52 @@ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router
659
694
  if (route.ignore !== undefined && route.ignore === true) {
660
695
  continue;
661
696
  }
662
- //const paths = route.path instanceof Array ? route.path : route.path === undefined ? [route.method && route.method.indexOf(name as Method) === -1 ? `/${name}` : "/"] : [route.path];
663
- const p = route.path === undefined ? route.method && route.method.indexOf(name) === -1 ? `/${name}` : "/" : route.path;
664
- //for (let i = 0; i < paths.length; i++) {
665
- //const p = paths[i];
666
- if (typeof p !== "string" || !p) {
667
- throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
697
+ //console.dir(route);
698
+ if (route.init) {
699
+ await route.init(route);
668
700
  }
669
- const path = normalizePath(`${basePath}${p && p !== "/" ? `${p}` : p}`);
670
- const subName = (p.charAt(0) === "/" ? p.substring(1) : p).replace(/[^a-z0-9+]+/gi, '_');
671
- const routeName = route.name ? route.name : name;
672
- //const identifier = route.identifier ? route.identifier : getPathIdentifier(path, routeMethod);
673
- /*let newFeatureSubPath = `${featureName}_${route.name ? route.name : name}${routeName !== subName ? `_${subName}` : ""}`.toUpperCase();
674
-
675
- newFeatureSubPath = newFeatureSubPath.length > 1 && newFeatureSubPath.charAt(newFeatureSubPath.length - 1) === "_" ? newFeatureSubPath.substring(0, newFeatureSubPath.length - 1) : newFeatureSubPath;*/
676
- /*if (features[identifier]) {
677
- throw new Error(`${___filePath} feature name collides with ${(features[identifier] as any).___filePath}`)
701
+ //console.dir(route);
702
+ const p = route.path === undefined ?
703
+ route.method && route.method.indexOf(name) === -1 ?
704
+ `${name}` : "/"
705
+ : route.path;
706
+ /*if (p !== null && (typeof p !== "string" && !p)) {
707
+ throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
678
708
  }*/
679
- if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
680
- throw new Error(`invalid feature name ${route.identifier}`);
681
- }
682
- const useCallArgs = [route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
683
- identifier: route.identifier,
684
- apiName: route.apiName,
685
- name: route.name,
686
- description: route.description,
687
- parser: route.parser,
688
- middleware: route.middleware,
689
- session: route.session,
690
- policy: route.policy,
691
- request: route.request,
692
- response: route.response ? route.response : true // ResponseHandler added by default to an APIRoute
693
- }];
694
- if (route.postFolder) {
695
- postFolder.push(useCallArgs);
696
- }
697
- else {
698
- router.use(...useCallArgs);
709
+ const paths = p instanceof Array ? p : [p];
710
+ const methods = routeMethod instanceof Array ? routeMethod : [routeMethod];
711
+ for (const method of methods) {
712
+ for (const pathsP of paths) {
713
+ const path = pathsP === null ? undefined : normalizePath(`${basePath}${pathsP && pathsP !== "/" ? `/${pathsP}` : pathsP}`);
714
+ if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
715
+ throw new Error(`invalid feature name ${route.identifier}`);
716
+ }
717
+ const useCallArgs = [route.handler, path, method !== "use" && method !== "USE" ? method : undefined, {
718
+ identifier: route.identifier,
719
+ apiName: route.apiName,
720
+ name: route.name,
721
+ description: route.description,
722
+ parser: route.parser,
723
+ middleware: route.middleware,
724
+ session: route.session,
725
+ policy: route.policy,
726
+ request: route.request,
727
+ response: route.response !== undefined ? route.response : true // ResponseHandler added by default to an APIRoute
728
+ }];
729
+ //console.dir(useCallArgs);
730
+ if (route.postFolder) {
731
+ postFolder.push(useCallArgs);
732
+ }
733
+ else {
734
+ router.use(...useCallArgs);
735
+ }
736
+ }
699
737
  }
700
738
  }
701
739
  }
702
740
  for (const f of dirs) {
703
741
  const { name } = parse(f);
704
- router = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), join(dirname, f), `${basePath}/${name}`, router, logger, ignore);
742
+ router = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), join(dirname, f), `${basePath}/${name}`, router, logger, ignore, importFN, extensions);
705
743
  }
706
744
  for (const post of postFolder) {
707
745
  router.use(...post);