@creator.co/wapi 1.2.0-beta6 → 1.2.0-beta8

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 (17) hide show
  1. package/dist/package.json +1 -1
  2. package/dist/src/API/Request.d.ts +1 -0
  3. package/dist/src/API/Request.js +8 -0
  4. package/dist/src/API/Request.js.map +1 -1
  5. package/dist/src/API/Utils.d.ts +0 -1
  6. package/dist/src/API/Utils.js +0 -3
  7. package/dist/src/API/Utils.js.map +1 -1
  8. package/dist/src/Logger/Logger.d.ts +0 -1
  9. package/dist/src/Logger/Logger.js +22 -36
  10. package/dist/src/Logger/Logger.js.map +1 -1
  11. package/dist/src/Server/lib/Server.js +6 -4
  12. package/dist/src/Server/lib/Server.js.map +1 -1
  13. package/package.json +1 -1
  14. package/src/API/Request.ts +9 -0
  15. package/src/API/Utils.ts +0 -3
  16. package/src/Logger/Logger.ts +19 -39
  17. package/src/Server/lib/Server.ts +10 -4
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@creator.co/wapi",
3
- "version": "1.2.0-beta6",
3
+ "version": "1.2.0-beta7",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/dist/src/API/Request.d.ts CHANGED
@@ -17,4 +17,5 @@ export default class Request<T> {
17
17
  getAuthorizationHeader(): string | null;
18
18
  getRequestID(): string;
19
19
  getOriginIP(): string;
20
+ setFixedPathParams(keys: any[], result: any[]): void;
20
21
  }
package/dist/src/API/Request.js CHANGED
@@ -72,6 +72,14 @@ var Request = /** @class */ (function () {
72
72
  var hOrigin = this.getHeader("X-Forwarded-For");
73
73
  return origin ? origin : hOrigin ? hOrigin : "unknow";
74
74
  };
75
+ //ugly fix
76
+ Request.prototype.setFixedPathParams = function (keys, result) {
77
+ var _this = this;
78
+ this.requestEvent.pathParameters = {};
79
+ keys.forEach(function (key, index) {
80
+ return (_this.requestEvent.pathParameters[key.name] = result[index + 1]);
81
+ });
82
+ };
75
83
  return Request;
76
84
  }());
77
85
  exports.default = Request;
package/dist/src/API/Request.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/API/Request.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/API/Request.ts"],"names":[],"mappings":"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"}
package/dist/src/API/Utils.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  export default class Utils {
2
2
  static isHybridlessContainer(): boolean;
3
- static toDoubleDigit(str: string | number): string;
4
3
  static isValidString(string: string): boolean;
5
4
  static parseIntNullIfNaN(string: string): number | null;
6
5
  static parseObjectNullIfEmpty(string: string): any | null;
package/dist/src/API/Utils.js CHANGED
@@ -6,9 +6,6 @@ var Utils = /** @class */ (function () {
6
6
  Utils.isHybridlessContainer = function () {
7
7
  return !!process.env.HYBRIDLESS_RUNTIME;
8
8
  };
9
- Utils.toDoubleDigit = function (str) {
10
- return String("0" + str).slice(-2);
11
- };
12
9
  Utils.isValidString = function (string) {
13
10
  return (string === null || string === void 0 ? void 0 : string.length) > 0 && !Array.isArray(string);
14
11
  };
package/dist/src/API/Utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/API/Utils.ts"],"names":[],"mappings":";;AAAA;IAAA;IAyCA,CAAC;IAxCe,2BAAqB,GAAnC;QACE,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IACzC,CAAC;IACa,mBAAa,GAA3B,UAA4B,GAAoB;QAC9C,OAAO,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IACpC,CAAC;IACa,mBAAa,GAA3B,UAA4B,MAAc;QACxC,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACrD,CAAC;IACa,uBAAiB,GAA/B,UAAgC,MAAc;QAC5C,IAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC1B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,CAAC;IACa,4BAAsB,GAApC,UAAqC,MAAc;QACjD,IAAI,CAAC,GAAG,IAAI,CAAA;QACZ,IAAI;YACF,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YACtB,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC;gBAAE,CAAC,GAAG,IAAI,CAAA;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,WAAW;SACZ;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IACa,mBAAa,GAA3B,UAA4B,MAAc;QACxC,IAAI,SAAS,GAAG,GAAG,CAAA;QACnB,IAAI;YACF,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAA;SAClD;QACD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IACa,iCAA2B,GAAzC,UAA0C,GAAQ,EAAE,GAAW;QAC7D,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,IAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAC1C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,EAArC,CAAqC,CAC7C,CAAA;QACD,IAAI,cAAc,IAAI,cAAc,IAAI,EAAE;YAAE,OAAO,GAAG,CAAC,cAAc,CAAC,CAAA;QACtE,OAAO,IAAI,CAAA;IACb,CAAC;IACH,YAAC;AAAD,CAAC,AAzCD,IAyCC"}
1
+ {"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/API/Utils.ts"],"names":[],"mappings":";;AAAA;IAAA;IAsCA,CAAC;IArCe,2BAAqB,GAAnC;QACE,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IACzC,CAAC;IACa,mBAAa,GAA3B,UAA4B,MAAc;QACxC,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACrD,CAAC;IACa,uBAAiB,GAA/B,UAAgC,MAAc;QAC5C,IAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC1B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,CAAC;IACa,4BAAsB,GAApC,UAAqC,MAAc;QACjD,IAAI,CAAC,GAAG,IAAI,CAAA;QACZ,IAAI;YACF,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YACtB,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC;gBAAE,CAAC,GAAG,IAAI,CAAA;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,WAAW;SACZ;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IACa,mBAAa,GAA3B,UAA4B,MAAc;QACxC,IAAI,SAAS,GAAG,GAAG,CAAA;QACnB,IAAI;YACF,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAA;SAClD;QACD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IACa,iCAA2B,GAAzC,UAA0C,GAAQ,EAAE,GAAW;QAC7D,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,IAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAC1C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,EAArC,CAAqC,CAC7C,CAAA;QACD,IAAI,cAAc,IAAI,cAAc,IAAI,EAAE;YAAE,OAAO,GAAG,CAAC,cAAc,CAAC,CAAA;QACtE,OAAO,IAAI,CAAA;IACb,CAAC;IACH,YAAC;AAAD,CAAC,AAtCD,IAsCC"}
package/dist/src/Logger/Logger.d.ts CHANGED
@@ -25,7 +25,6 @@ export default class Logger {
25
25
  cleanUp(): void;
26
26
  flushLogs(): Promise<void>;
27
27
  private _setupBindings;
28
- private _timestamp;
29
28
  private _formattedLog;
30
29
  private _callerName;
31
30
  private _processLog;
package/dist/src/Logger/Logger.js CHANGED
@@ -106,49 +106,49 @@ var Logger = /** @class */ (function () {
106
106
  for (var _i = 0; _i < arguments.length; _i++) {
107
107
  args[_i] = arguments[_i];
108
108
  }
109
- this._processLog(false, LOG_LEVELS.DEBUG, args);
109
+ this._processLog(LOG_LEVELS.DEBUG, args);
110
110
  };
111
111
  Logger.prototype.log = function () {
112
112
  var args = [];
113
113
  for (var _i = 0; _i < arguments.length; _i++) {
114
114
  args[_i] = arguments[_i];
115
115
  }
116
- this._processLog(false, LOG_LEVELS.INFO, args);
116
+ this._processLog(LOG_LEVELS.INFO, args);
117
117
  };
118
118
  Logger.prototype.info = function () {
119
119
  var args = [];
120
120
  for (var _i = 0; _i < arguments.length; _i++) {
121
121
  args[_i] = arguments[_i];
122
122
  }
123
- this._processLog(false, LOG_LEVELS.INFO, args);
123
+ this._processLog(LOG_LEVELS.INFO, args);
124
124
  };
125
125
  Logger.prototype.warning = function () {
126
126
  var args = [];
127
127
  for (var _i = 0; _i < arguments.length; _i++) {
128
128
  args[_i] = arguments[_i];
129
129
  }
130
- this._processLog(false, LOG_LEVELS.WARN, args);
130
+ this._processLog(LOG_LEVELS.WARN, args);
131
131
  };
132
132
  Logger.prototype.warn = function () {
133
133
  var args = [];
134
134
  for (var _i = 0; _i < arguments.length; _i++) {
135
135
  args[_i] = arguments[_i];
136
136
  }
137
- this._processLog(false, LOG_LEVELS.WARN, args);
137
+ this._processLog(LOG_LEVELS.WARN, args);
138
138
  };
139
139
  Logger.prototype.error = function () {
140
140
  var args = [];
141
141
  for (var _i = 0; _i < arguments.length; _i++) {
142
142
  args[_i] = arguments[_i];
143
143
  }
144
- this._processLog(false, LOG_LEVELS.ERROR, args);
144
+ this._processLog(LOG_LEVELS.ERROR, args);
145
145
  };
146
146
  Logger.prototype.exception = function (exception) {
147
147
  var args = [];
148
148
  for (var _i = 1; _i < arguments.length; _i++) {
149
149
  args[_i - 1] = arguments[_i];
150
150
  }
151
- this._exception(false, exception, args);
151
+ this._exception(exception, args);
152
152
  };
153
153
  //
154
154
  Logger.prototype.cleanUp = function () { };
@@ -166,35 +166,35 @@ var Logger = /** @class */ (function () {
166
166
  for (var _i = 0; _i < arguments.length; _i++) {
167
167
  args[_i] = arguments[_i];
168
168
  }
169
- return _this._processLog(true, LOG_LEVELS.DEBUG, args);
169
+ return _this._processLog(LOG_LEVELS.DEBUG, args);
170
170
  },
171
171
  log: function () {
172
172
  var args = [];
173
173
  for (var _i = 0; _i < arguments.length; _i++) {
174
174
  args[_i] = arguments[_i];
175
175
  }
176
- return _this._processLog(true, LOG_LEVELS.INFO, args);
176
+ return _this._processLog(LOG_LEVELS.INFO, args);
177
177
  },
178
178
  info: function () {
179
179
  var args = [];
180
180
  for (var _i = 0; _i < arguments.length; _i++) {
181
181
  args[_i] = arguments[_i];
182
182
  }
183
- return _this._processLog(true, LOG_LEVELS.INFO, args);
183
+ return _this._processLog(LOG_LEVELS.INFO, args);
184
184
  },
185
185
  warn: function () {
186
186
  var args = [];
187
187
  for (var _i = 0; _i < arguments.length; _i++) {
188
188
  args[_i] = arguments[_i];
189
189
  }
190
- return _this._processLog(true, LOG_LEVELS.WARN, args);
190
+ return _this._processLog(LOG_LEVELS.WARN, args);
191
191
  },
192
192
  error: function () {
193
193
  var args = [];
194
194
  for (var _i = 0; _i < arguments.length; _i++) {
195
195
  args[_i] = arguments[_i];
196
196
  }
197
- return _this._processLog(true, LOG_LEVELS.ERROR, args);
197
+ return _this._processLog(LOG_LEVELS.ERROR, args);
198
198
  },
199
199
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
200
200
  // @ts-ignore
@@ -203,35 +203,21 @@ var Logger = /** @class */ (function () {
203
203
  for (var _i = 0; _i < arguments.length; _i++) {
204
204
  args[_i] = arguments[_i];
205
205
  }
206
- return _this._processLog(true, LOG_LEVELS.WARN, args);
206
+ return _this._processLog(false, LOG_LEVELS.WARN, args);
207
207
  },
208
208
  exception: function (exception) {
209
209
  var args = [];
210
210
  for (var _i = 1; _i < arguments.length; _i++) {
211
211
  args[_i - 1] = arguments[_i];
212
212
  }
213
- return _this._exception(true, exception, args);
213
+ return _this._exception(exception, args);
214
214
  },
215
215
  };
216
216
  };
217
217
  /* Formatters */
218
- Logger.prototype._timestamp = function () {
219
- var d = new Date();
220
- return ([
221
- Utils_1.default.toDoubleDigit(d.getMonth() + 1),
222
- Utils_1.default.toDoubleDigit(d.getDate()),
223
- d.getFullYear(),
224
- ].join("/") +
225
- " " +
226
- [
227
- Utils_1.default.toDoubleDigit(d.getHours()),
228
- Utils_1.default.toDoubleDigit(d.getMinutes()),
229
- Utils_1.default.toDoubleDigit(d.getSeconds()),
230
- ].join(":"));
231
- };
232
- Logger.prototype._formattedLog = function (level, msg, caller, isRaw) {
218
+ Logger.prototype._formattedLog = function (level, msg, caller) {
233
219
  if (Utils_1.default.isHybridlessContainer() && this._transactionID) {
234
- return ((isRaw ? "" : " ".concat(this._transactionID)) +
220
+ return (" ".concat(this._transactionID) +
235
221
  " [".concat(level.toString(), "] [").concat(caller, "] ").concat(msg
236
222
  .map(this._suppressSensitiveInfo)
237
223
  .join(" ")));
@@ -256,7 +242,7 @@ var Logger = /** @class */ (function () {
256
242
  return "";
257
243
  };
258
244
  /* Helpers (core functionality) */
259
- Logger.prototype._processLog = function (isRaw, level, args) {
245
+ Logger.prototype._processLog = function (level, args) {
260
246
  var e_1, _a;
261
247
  if (level < this._LOG_LEVEL)
262
248
  return;
@@ -280,13 +266,13 @@ var Logger = /** @class */ (function () {
280
266
  }
281
267
  //push into logs stack
282
268
  // todo: improve error stack
283
- this._pushLog(level, this._formattedLog(level, msg, this._callerName(3), isRaw));
269
+ this._pushLog(level, this._formattedLog(level, msg, this._callerName(3)));
284
270
  };
285
- Logger.prototype._exception = function (isRaw, exception) {
271
+ Logger.prototype._exception = function (exception) {
286
272
  var e_2, _a;
287
273
  var args = [];
288
- for (var _i = 2; _i < arguments.length; _i++) {
289
- args[_i - 2] = arguments[_i];
274
+ for (var _i = 1; _i < arguments.length; _i++) {
275
+ args[_i - 1] = arguments[_i];
290
276
  }
291
277
  //format message
292
278
  var msg = [];
@@ -310,7 +296,7 @@ var Logger = /** @class */ (function () {
310
296
  if (exception.stack)
311
297
  msg.push(exception.stack); //push Exeception stack at the end
312
298
  //push into logs stack
313
- this._pushLog(LOG_LEVELS.ERROR, this._formattedLog(LOG_LEVELS.ERROR, msg, this._callerName(3), isRaw));
299
+ this._pushLog(LOG_LEVELS.ERROR, this._formattedLog(LOG_LEVELS.ERROR, msg, this._callerName(3)));
314
300
  };
315
301
  Logger.prototype._pushLog = function (level, fMsg) {
316
302
  // push into logs stack
package/dist/src/Logger/Logger.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/Logger/Logger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/Logger/Logger.ts"],"names":[],"mappings":"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"}
package/dist/src/Server/lib/Server.js CHANGED
@@ -79,7 +79,7 @@ var Server = /** @class */ (function () {
79
79
  case 1:
80
80
  if (!!_b.done) return [3 /*break*/, 4];
81
81
  route = _b.value;
82
- handler = Server.routeMatches(route.path, route.method, event);
82
+ handler = Server.routeMatches(route.path, route.method, transaction);
83
83
  if (!handler) return [3 /*break*/, 3];
84
84
  transaction.logger.log("Router accepted route:", route.path);
85
85
  // Validate input
@@ -121,13 +121,15 @@ var Server = /** @class */ (function () {
121
121
  });
122
122
  };
123
123
  // Helper function to match route
124
- Server.routeMatches = function (routePath, routeMethod, event) {
125
- var path = event.path;
124
+ Server.routeMatches = function (routePath, routeMethod, transaction) {
125
+ var path = transaction.request.getPath();
126
126
  var keys = [];
127
127
  var result = pathToRegexp(routePath, keys).exec(path);
128
128
  if (result) {
129
- var reqMethod = event.httpMethod;
129
+ var reqMethod = transaction.request.getMethod();
130
130
  if (reqMethod.toLowerCase() == routeMethod.toLowerCase()) {
131
+ //Fix path params on proxy
132
+ transaction.request.setFixedPathParams(keys, result);
131
133
  return true;
132
134
  }
133
135
  }
package/dist/src/Server/lib/Server.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../../src/Server/lib/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA8C;AAE9C,+CAAyC;AACzC,2DAAqD;AACrD,wDAAkD;AAGlD;IAEE,gBAAY,MAAoB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAEM,0BAAS,GAAhB;QACE,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAEY,sCAAqB,GAAlC,UACE,KAA2B,EAC3B,OAAgB;;;;;;;wBAEV,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;wBAC1B,mBAAmB;wBACnB,qBAAM,IAAI,qBAAW,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CACnD,UAAO,WAAW;;;;;;;4CACI,KAAA,SAAA,MAAM,CAAC,MAAM,CAAA;;;;4CAAtB,KAAK;4CAER,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;iDAChE,OAAO,EAAP,wBAAO;4CACT,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;4CAC5D,iBAAiB;4CACjB,IAAI,KAAK,CAAC,WAAW,EAAE;gDACf,cAAc,GAAG,mBAAS,CAAC,cAAc,CAC7C,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,EAC7B,KAAK,CAAC,WAAW,CAClB,CAAA;gDACD,IAAI,cAAc,IAAI,cAAc,YAAY,kBAAQ;oDACtD,sBAAO,cAAc,EAAA;6CACxB;4CAEM,qBAAM,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAA;;wCADvC,4BAA4B;wCAC5B,sBAAO,SAAgC,EAAA;;;;;;;;;;;;;;;;wCAG3C,mBAAmB;wCACnB,sBAAO,IAAI,kBAAQ,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,EAAA;;;iCACtD,CACF,EAAA;;wBAxBD,mBAAmB;wBACnB,SAuBC,CAAA;;;;;KACF;IACD,iCAAiC;IAClB,mBAAY,GAA3B,UACE,SAAiB,EACjB,WAAmB,EACnB,KAA2B;QAE3B,IAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;QACvB,IAAM,IAAI,GAAG,EAAE,CAAA;QACf,IAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvD,IAAI,MAAM,EAAE;YACV,IAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAA;YAClC,IAAI,SAAS,CAAC,WAAW,EAAE,IAAI,WAAW,CAAC,WAAW,EAAE,EAAE;gBACxD,OAAO,IAAI,CAAA;aACZ;SACF;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IACH,aAAC;AAAD,CAAC,AA1DD,IA0DC"}
1
+ {"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../../src/Server/lib/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA8C;AAE9C,+CAAyC;AACzC,2DAAqD;AACrD,wDAAkD;AAGlD;IAEE,gBAAY,MAAoB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAEM,0BAAS,GAAhB;QACE,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAEY,sCAAqB,GAAlC,UACE,KAA2B,EAC3B,OAAgB;;;;;;;wBAEV,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;wBAC1B,mBAAmB;wBACnB,qBAAM,IAAI,qBAAW,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CACnD,UAAO,WAAW;;;;;;;4CACI,KAAA,SAAA,MAAM,CAAC,MAAM,CAAA;;;;4CAAtB,KAAK;4CAER,OAAO,GAAG,MAAM,CAAC,YAAY,CACjC,KAAK,CAAC,IAAI,EACV,KAAK,CAAC,MAAM,EACZ,WAAW,CACZ,CAAA;iDACG,OAAO,EAAP,wBAAO;4CACT,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;4CAC5D,iBAAiB;4CACjB,IAAI,KAAK,CAAC,WAAW,EAAE;gDACf,cAAc,GAAG,mBAAS,CAAC,cAAc,CAC7C,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,EAC7B,KAAK,CAAC,WAAW,CAClB,CAAA;gDACD,IAAI,cAAc,IAAI,cAAc,YAAY,kBAAQ;oDACtD,sBAAO,cAAc,EAAA;6CACxB;4CAEM,qBAAM,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAA;;wCADvC,4BAA4B;wCAC5B,sBAAO,SAAgC,EAAA;;;;;;;;;;;;;;;;wCAG3C,mBAAmB;wCACnB,sBAAO,IAAI,kBAAQ,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,EAAA;;;iCACtD,CACF,EAAA;;wBA5BD,mBAAmB;wBACnB,SA2BC,CAAA;;;;;KACF;IACD,iCAAiC;IAClB,mBAAY,GAA3B,UACE,SAAiB,EACjB,WAAmB,EACnB,WAAwB;QAExB,IAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;QAC1C,IAAM,IAAI,GAAG,EAAE,CAAA;QACf,IAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvD,IAAI,MAAM,EAAE;YACV,IAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,CAAA;YACjD,IAAI,SAAS,CAAC,WAAW,EAAE,IAAI,WAAW,CAAC,WAAW,EAAE,EAAE;gBACxD,0BAA0B;gBAC1B,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBACpD,OAAO,IAAI,CAAA;aACZ;SACF;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IACH,aAAC;AAAD,CAAC,AAhED,IAgEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@creator.co/wapi",
3
- "version": "1.2.0-beta6",
3
+ "version": "1.2.0-beta8",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/API/Request.ts CHANGED
@@ -85,4 +85,13 @@ export default class Request<T> {
85
85
  const hOrigin = this.getHeader("X-Forwarded-For")
86
86
  return origin ? origin : hOrigin ? hOrigin : "unknow"
87
87
  }
88
+
89
+ //ugly fix
90
+ public setFixedPathParams(keys: any[], result: any[]): void {
91
+ this.requestEvent.pathParameters = {}
92
+ keys.forEach(
93
+ (key, index) =>
94
+ (this.requestEvent.pathParameters[key.name] = result[index + 1]),
95
+ )
96
+ }
88
97
  }
package/src/API/Utils.ts CHANGED
@@ -2,9 +2,6 @@ export default class Utils {
2
2
  public static isHybridlessContainer(): boolean {
3
3
  return !!process.env.HYBRIDLESS_RUNTIME
4
4
  }
5
- public static toDoubleDigit(str: string | number): string {
6
- return String("0" + str).slice(-2)
7
- }
8
5
  public static isValidString(string: string): boolean {
9
6
  return string?.length > 0 && !Array.isArray(string)
10
7
  }
package/src/Logger/Logger.ts CHANGED
@@ -64,25 +64,25 @@ export default class Logger {
64
64
 
65
65
  //Public
66
66
  debug(...args) {
67
- this._processLog(false, LOG_LEVELS.DEBUG, args)
67
+ this._processLog(LOG_LEVELS.DEBUG, args)
68
68
  }
69
69
  log(...args) {
70
- this._processLog(false, LOG_LEVELS.INFO, args)
70
+ this._processLog(LOG_LEVELS.INFO, args)
71
71
  }
72
72
  info(...args) {
73
- this._processLog(false, LOG_LEVELS.INFO, args)
73
+ this._processLog(LOG_LEVELS.INFO, args)
74
74
  }
75
75
  warning(...args) {
76
- this._processLog(false, LOG_LEVELS.WARN, args)
76
+ this._processLog(LOG_LEVELS.WARN, args)
77
77
  }
78
78
  warn(...args) {
79
- this._processLog(false, LOG_LEVELS.WARN, args)
79
+ this._processLog(LOG_LEVELS.WARN, args)
80
80
  }
81
81
  error(...args) {
82
- this._processLog(false, LOG_LEVELS.ERROR, args)
82
+ this._processLog(LOG_LEVELS.ERROR, args)
83
83
  }
84
84
  exception(exception, ...args) {
85
- this._exception(false, exception, args)
85
+ this._exception(exception, args)
86
86
  }
87
87
  //
88
88
  cleanUp() {}
@@ -91,44 +91,27 @@ export default class Logger {
91
91
  //initialization
92
92
  private _setupBindings(): void {
93
93
  global.console = {
94
- debug: (...args) => this._processLog(true, LOG_LEVELS.DEBUG, args),
95
- log: (...args) => this._processLog(true, LOG_LEVELS.INFO, args),
96
- info: (...args) => this._processLog(true, LOG_LEVELS.INFO, args),
97
- warn: (...args) => this._processLog(true, LOG_LEVELS.WARN, args),
98
- error: (...args) => this._processLog(true, LOG_LEVELS.ERROR, args),
94
+ debug: (...args) => this._processLog(LOG_LEVELS.DEBUG, args),
95
+ log: (...args) => this._processLog(LOG_LEVELS.INFO, args),
96
+ info: (...args) => this._processLog(LOG_LEVELS.INFO, args),
97
+ warn: (...args) => this._processLog(LOG_LEVELS.WARN, args),
98
+ error: (...args) => this._processLog(LOG_LEVELS.ERROR, args),
99
99
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
100
100
  // @ts-ignore
101
- warning: (...args) => this._processLog(true, LOG_LEVELS.WARN, args),
102
- exception: (exception, ...args) => this._exception(true, exception, args),
101
+ warning: (...args) => this._processLog(false, LOG_LEVELS.WARN, args),
102
+ exception: (exception, ...args) => this._exception(exception, args),
103
103
  }
104
104
  }
105
105
 
106
106
  /* Formatters */
107
- private _timestamp(): string {
108
- const d = new Date()
109
- return (
110
- [
111
- Utils.toDoubleDigit(d.getMonth() + 1),
112
- Utils.toDoubleDigit(d.getDate()),
113
- d.getFullYear(),
114
- ].join("/") +
115
- " " +
116
- [
117
- Utils.toDoubleDigit(d.getHours()),
118
- Utils.toDoubleDigit(d.getMinutes()),
119
- Utils.toDoubleDigit(d.getSeconds()),
120
- ].join(":")
121
- )
122
- }
123
107
  private _formattedLog(
124
108
  level: LOG_LEVELS,
125
109
  msg: Array<string>,
126
110
  caller: string,
127
- isRaw: boolean,
128
111
  ): string {
129
112
  if (Utils.isHybridlessContainer() && this._transactionID) {
130
113
  return (
131
- (isRaw ? "" : ` ${this._transactionID}`) +
114
+ ` ${this._transactionID}` +
132
115
  ` [${level.toString()}] [${caller}] ${msg
133
116
  .map(this._suppressSensitiveInfo)
134
117
  .join(" ")}`
@@ -152,7 +135,7 @@ export default class Logger {
152
135
  return ""
153
136
  }
154
137
  /* Helpers (core functionality) */
155
- private _processLog(isRaw: boolean, level: LOG_LEVELS, args: any): void {
138
+ private _processLog(level: LOG_LEVELS, args: any): void {
156
139
  if (level < this._LOG_LEVEL) return
157
140
  //get args
158
141
  const msg: Array<string> = []
@@ -165,12 +148,9 @@ export default class Logger {
165
148
  }
166
149
  //push into logs stack
167
150
  // todo: improve error stack
168
- this._pushLog(
169
- level,
170
- this._formattedLog(level, msg, this._callerName(3), isRaw),
171
- )
151
+ this._pushLog(level, this._formattedLog(level, msg, this._callerName(3)))
172
152
  }
173
- private _exception(isRaw: boolean, exception: Error, ...args): void {
153
+ private _exception(exception: Error, ...args): void {
174
154
  //format message
175
155
  const msg: Array<string> = []
176
156
  //push exeception
@@ -181,7 +161,7 @@ export default class Logger {
181
161
  //push into logs stack
182
162
  this._pushLog(
183
163
  LOG_LEVELS.ERROR,
184
- this._formattedLog(LOG_LEVELS.ERROR, msg, this._callerName(3), isRaw),
164
+ this._formattedLog(LOG_LEVELS.ERROR, msg, this._callerName(3)),
185
165
  )
186
166
  }
187
167
  private _pushLog(level: LOG_LEVELS, fMsg: string): void {
package/src/Server/lib/Server.ts CHANGED
@@ -26,7 +26,11 @@ export default class Server {
26
26
  async (transaction) => {
27
27
  for (const route of config.routes) {
28
28
  // Check for possible paths
29
- const handler = Server.routeMatches(route.path, route.method, event)
29
+ const handler = Server.routeMatches(
30
+ route.path,
31
+ route.method,
32
+ transaction,
33
+ )
30
34
  if (handler) {
31
35
  transaction.logger.log("Router accepted route:", route.path)
32
36
  // Validate input
@@ -51,14 +55,16 @@ export default class Server {
51
55
  private static routeMatches(
52
56
  routePath: string,
53
57
  routeMethod: string,
54
- event: APIGatewayProxyEvent,
58
+ transaction: Transaction,
55
59
  ): boolean {
56
- const path = event.path
60
+ const path = transaction.request.getPath()
57
61
  const keys = []
58
62
  const result = pathToRegexp(routePath, keys).exec(path)
59
63
  if (result) {
60
- const reqMethod = event.httpMethod
64
+ const reqMethod = transaction.request.getMethod()
61
65
  if (reqMethod.toLowerCase() == routeMethod.toLowerCase()) {
66
+ //Fix path params on proxy
67
+ transaction.request.setFixedPathParams(keys, result)
62
68
  return true
63
69
  }
64
70
  }