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

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@creator.co/wapi",
-    "version": "1.2.0-beta6",
+    "version": "1.2.0-beta7",
     "description": "",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package/dist/src/API/Request.d.ts

@@ -17,4 +17,5 @@ export default class Request<T> {
     getAuthorizationHeader(): string | null;
     getRequestID(): string;
     getOriginIP(): string;
+    setFixedPathParams(keys: any[], result: any[]): void;
 }

package/dist/src/API/Request.js

@@ -72,6 +72,14 @@ var Request = /** @class */ (function () {
         var hOrigin = this.getHeader("X-Forwarded-For");
         return origin ? origin : hOrigin ? hOrigin : "unknow";
     };
+    //ugly fix
+    Request.prototype.setFixedPathParams = function (keys, result) {
+        var _this = this;
+        this.requestEvent.pathParameters = {};
+        keys.forEach(function (key, index) {
+            return (_this.requestEvent.pathParameters[key.name] = result[index + 1]);
+        });
+    };
     return Request;
 }());
 exports.default = Request;

package/dist/src/API/Request.js.map

@@ -1 +1 @@
-{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/API/Request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/API/Request.ts"],"names":[],"mappings":";;AAEA,iCAA2B;AAE3B,EAAE;AACF;IAGE,iBAAY,YAA6B,EAAE,OAAgB,EAAE,MAAc;QACzE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QAC3D,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3D,CAAC;IACD,OAAO;IACA,oCAAkB,GAAzB,UAA0B,SAAiB;QACzC,IAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QACzC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;IACxE,CAAC;IACM,+BAAa,GAApB,UAAqB,SAAiB;QACpC,OAAO,eAAK,CAAC,2BAA2B,CACtC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EACvC,SAAS,CACV,CAAA;IACH,CAAC;IACD,QAAQ;IACD,2BAAS,GAAhB,UAAiB,UAAkB;QACjC,OAAO,eAAK,CAAC,2BAA2B,CACtC,IAAI,CAAC,YAAY,CAAC,OAAO,EACzB,UAAU,CACX,CAAA;IACH,CAAC;IACD,gBAAgB;IACT,iCAAe,GAAtB,UAAuB,QAAgB;QACrC,OAAO,eAAK,CAAC,2BAA2B,CACtC,IAAI,CAAC,YAAY,CAAC,cAAc,EAChC,QAAQ,CACT,CAAA;IACH,CAAC;IACD,YAAY;IACL,mCAAiB,GAAxB,UAAyB,SAAiB;QACxC,IAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;QACxC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;IACxE,CAAC;IACM,8BAAY,GAAnB,UAAoB,SAAiB;QACnC,OAAO,eAAK,CAAC,2BAA2B,CACtC,IAAI,CAAC,YAAY,CAAC,cAAc,EAChC,SAAS,CACV,CAAA;IACH,CAAC;IACD,MAAM;IACC,yBAAO,GAAd;QACE,IAAI,CAAC,GAAQ,IAAI,CAAA;QACjB,IAAI;YACF,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAA;YAC1B,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,YAAY,MAAM;gBAC9C,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAW,CAAC,CAAA;SAC9B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAA;SACtD;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IACM,yBAAO,GAAd;QACE,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAA;IAC/B,CAAC;IACM,2BAAS,GAAhB;QACE,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,CAAA;IACrC,CAAC;IACM,+BAAa,GAApB;QACE,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CAAA;IACzC,CAAC;IAED,WAAW;IACJ,wCAAsB,GAA7B;QACE,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;IACxC,CAAC;IACM,8BAAY,GAAnB;QACE,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAA;QAC/D,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc;YACrC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,SAAS;YAC5C,CAAC,CAAC,SAAS,CAAA;IACf,CAAC;IACM,6BAAW,GAAlB;;QACE,IAAM,MAAM,GAAG,MAAA,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,0CAAE,QAAQ,CAAA;QACzD,IAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;QACjD,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAA;IACvD,CAAC;IAED,UAAU;IACH,oCAAkB,GAAzB,UAA0B,IAAW,EAAE,MAAa;QAApD,iBAMC;QALC,IAAI,CAAC,YAAY,CAAC,cAAc,GAAG,EAAE,CAAA;QACrC,IAAI,CAAC,OAAO,CACV,UAAC,GAAG,EAAE,KAAK;YACT,OAAA,CAAC,KAAI,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAAhE,CAAgE,CACnE,CAAA;IACH,CAAC;IACH,cAAC;AAAD,CAAC,AA3FD,IA2FC"}

package/dist/src/Server/lib/Server.js

@@ -79,7 +79,7 @@ var Server = /** @class */ (function () {
                                         case 1:
                                             if (!!_b.done) return [3 /*break*/, 4];
                                             route = _b.value;
-                                            handler = Server.routeMatches(route.path, route.method, event);
+                                            handler = Server.routeMatches(route.path, route.method, transaction);
                                             if (!handler) return [3 /*break*/, 3];
                                             transaction.logger.log("Router accepted route:", route.path);
                                             // Validate input
@@ -121,13 +121,15 @@ var Server = /** @class */ (function () {
         });
     };
     // Helper function to match route
-    Server.routeMatches = function (routePath, routeMethod, event) {
-        var path = event.path;
+    Server.routeMatches = function (routePath, routeMethod, transaction) {
+        var path = transaction.request.getPath();
         var keys = [];
         var result = pathToRegexp(routePath, keys).exec(path);
         if (result) {
-            var reqMethod = event.httpMethod;
+            var reqMethod = transaction.request.getMethod();
             if (reqMethod.toLowerCase() == routeMethod.toLowerCase()) {
+                //Fix path params on proxy
+                transaction.request.setFixedPathParams(keys, result);
                 return true;
             }
         }

package/dist/src/Server/lib/Server.js.map

@@ -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"}
+{"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

@@ -1,6 +1,6 @@
 {
   "name": "@creator.co/wapi",
-  "version": "1.2.0-beta7",
+  "version": "1.2.0-beta8",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/API/Request.ts

@@ -85,4 +85,13 @@ export default class Request<T> {
     const hOrigin = this.getHeader("X-Forwarded-For")
     return origin ? origin : hOrigin ? hOrigin : "unknow"
   }
+
+  //ugly fix
+  public setFixedPathParams(keys: any[], result: any[]): void {
+    this.requestEvent.pathParameters = {}
+    keys.forEach(
+      (key, index) =>
+        (this.requestEvent.pathParameters[key.name] = result[index + 1]),
+    )
+  }
 }

package/src/Server/lib/Server.ts

@@ -26,7 +26,11 @@ export default class Server {
       async (transaction) => {
         for (const route of config.routes) {
           // Check for possible paths
-          const handler = Server.routeMatches(route.path, route.method, event)
+          const handler = Server.routeMatches(
+            route.path,
+            route.method,
+            transaction,
+          )
           if (handler) {
             transaction.logger.log("Router accepted route:", route.path)
             // Validate input
@@ -51,14 +55,16 @@ export default class Server {
   private static routeMatches(
     routePath: string,
     routeMethod: string,
-    event: APIGatewayProxyEvent,
+    transaction: Transaction,
   ): boolean {
-    const path = event.path
+    const path = transaction.request.getPath()
     const keys = []
     const result = pathToRegexp(routePath, keys).exec(path)
     if (result) {
-      const reqMethod = event.httpMethod
+      const reqMethod = transaction.request.getMethod()
       if (reqMethod.toLowerCase() == routeMethod.toLowerCase()) {
+        //Fix path params on proxy
+        transaction.request.setFixedPathParams(keys, result)
         return true
       }
     }