Port method and path fixes - can overwrite autogenerated routes - sticks to its http methods (#10)

* added method & headers to apply/improve port spec

* limit service ports to their portSpec http methods

* make a port path validation

* replace the port path only if methods match

* execute port only if path is provided and matches

* fix priorities, custom over autogenerated

* execution speed fix - includes over new Regexp

* specPortMethods is null - "".includes error

Co-authored-by: vi-ssc <[email protected]>

Author: quesurifn

src/adapters/controllers/post-invoke-port.js

@@ -13,6 +13,9 @@ export default function anyInvokePortFactory (invokePort) {
       const result = await invokePort({
         port: httpRequest.params.port,
         args: httpRequest.body,
+        method: httpRequest.method,
+        headers: httpRequest.headers,
+        path: httpRequest.path,
         id: httpRequest.params.id || null
       })
 

src/aegis.js

@@ -96,11 +96,13 @@ const router = {
           if (ctrl.ports) {
             for (const portName in ctrl.ports) {
               const port = ctrl.ports[portName]
+              const specPortMethods = port?.methods?.join('|') || ""
+
               if (port.path) {
                 routeOverrides.set(port.path, portName)
               }
 
-              if (checkAllowedMethods(ctrl, method)) {
+              if (checkAllowedMethods(ctrl, method) && (!port.methods || (specPortMethods.includes(method.toLowerCase()))) ) {
                 routes.set(port.path || path(ctrl.endpoint), {
                   [method]: adapter(ctrl.fn)
                 })
@@ -131,6 +133,8 @@ const router = {
 }
 
 function makeRoutes () {
+  router.adminRoute(getConfig, http)
+  router.userRoutes(getRoutes)
   router.autoRoutes(endpoint, 'get', liveUpdate, http)
   router.autoRoutes(endpoint, 'get', getModels, http)
   router.autoRoutes(endpoint, 'post', postModels, http)
@@ -146,8 +150,6 @@ function makeRoutes () {
   router.autoRoutes(endpointPortId, 'patch', anyInvokePorts, http, true)
   router.autoRoutes(endpointPortId, 'delete', anyInvokePorts, http, true)
   router.autoRoutes(endpointPortId, 'get', anyInvokePorts, http, true)
-  router.adminRoute(getConfig, http)
-  router.userRoutes(getRoutes)
   console.log(routes)
 }
 

src/domain/use-cases/invoke-port.js

@@ -33,23 +33,22 @@ export default function makeInvokePort ({
   }
   /**
    *
-   * @param {{id:string,model:import('..').Model,args:string[],port:string}} input
+   * @param {{id:String,model:import('..').Model,args:String[],port:String,method:String,headers:Array}} input
    * @returns
    */
   return async function invokePort (input) {
     if (isMainThread) {
       return threadpool.runJob(invokePort.name, input, modelName)
     } else {
       try {
-        let { id = null, port = null} = input;
+        let { id = null, port = null, method, path } = input;
         const service = await findModelService(id)
         if (!service) {
           throw new Error('could not find a service associated with given id')
         } 
 
+        const specPorts = service.getPorts();
         if(!port) {
-          const specPorts = service.getPorts();
-          const path = context['requestContext'].getStore().get('path');
           for(const p of Object.entries(specPorts)) {
             if(!p[1].path) {
               continue;
@@ -68,6 +67,14 @@ export default function makeInvokePort ({
           throw new Error('the port or record ID is invalid')
         }
 
+        const specPortMethods = specPorts[port]?.methods.join('|').toLowerCase();
+        if (specPortMethods && !(specPortMethods.includes(method.toLowerCase()))) {
+          throw new Error('invalid method for given port');
+        }
+        if (specPorts[port]?.path && !pathsMatch(specPorts[port].path, path)) {
+          throw new Error('invalid path for given port');
+        }
+
         return await service[port](input)
       } catch (error) {
         return AppError(error)