serverless-serve - npm Package Compare versions

Comparing version 1.3.0 to 1.4.0

index.js

 'use strict';
 
-module.exports = function(SPlugin, serverlessPath) {
+module.exports = function(ServerlessPlugin, serverlessPath) {
   const path = require( 'path' ),
@@ -12,3 +12,3 @@ SUtils = require( path.join( serverlessPath, 'utils' ) ),
 
-  class Serve extends SPlugin {
+  class Serve extends ServerlessPlugin {
     constructor(S) {
@@ -45,3 +45,3 @@ super(S);
     registerHooks() {
-      return Promise.resolve();
+      return BbPromise.resolve();
     }
@@ -80,3 +80,3 @@
       this.app.use( function(req, res, next){
-        res.header( 'Access-Control-Allow-Methods', 'GET,PUT,HEAD,POST,DELETE,OPTIONS' );
+        res.header( 'Access-Control-Allow-Methods', 'GET,PUT,HEAD,PATCH,POST,DELETE,OPTIONS' );
         res.header( 'Access-Control-Allow-Headers', 'Authorization,Content-Type,x-amz-date,x-amz-security-token' );
@@ -101,123 +101,138 @@
       let _this = this;
+      let functions = this.S.state.getFunctions();
 
       _this.handlers = {};
 
-      return SUtils.getFunctions( '.' ).then( function(functions){
-        functions.forEach(function(fun) {
-          //{ custom: { excludePatterns: [], envVars: [] },
-          //  handler: 'modules/hw1/hello/handler.handler',
-          //    timeout: 6,
-          //  memorySize: 1024,
-          //  endpoints:
-          //  [ { path: 'hw1/hello',
-          //    method: 'GET',
-          //    authorizationType: 'none',
-          //    apiKeyRequired: false,
-          //    requestParameters: {},
-          //    requestTemplates: [Object],
-          //    responses: [Object] } ],
-          //    name: 'Hw1Hello',
-          //  module:
-          //  { name: 'hw1',
-          //    version: '0.0.1',
-          //    profile: 'aws-0',
-          //    location: 'https://github.com/...',
-          //    author: '',
-          //    description: '',
-          //    custom: {},
-          //    cloudFormation: { lambdaIamPolicyDocumentStatements: [], resources: {} },
-          //    runtime: 'nodejs',
-          //      pathModule: 'back/modules/hw1' },
-          //  pathFunction: 'back/modules/hw1/hello' }
+      return functions.forEach(function(fun) {
+        /*
+        _config:
+          { component: 'node',
+            module: 'homepage',
+            function: 'index',
+            sPath: 'node/homepage/index',
+            fullPath: '/path/to/some/serverless/project/node/homepage/index' },
+        name: 'index',
+        handler: 'homepage/index/handler.handler',
+        runtime: 'nodejs',
+        timeout: 6,
+        memorySize: 1024,
+        custom: { excludePatterns: [], envVars: [] },
+        endpoints:
+         [ ServerlessEndpoint {
+             _S: [Object],
+             _config: [Object],
+             path: 'homepage/index',
+             method: 'GET',
+             authorizationType: 'none',
+             apiKeyRequired: false,
+             requestParameters: {},
+             requestTemplates: [Object],
+             responses: [Object] } ] }
+       */
 
-          if( fun.module.runtime == 'nodejs' ) {
-            let handlerParts = fun.handler.split('/').pop().split('.');
-            let handlerPath = path.join( _this.S._projectRootPath, fun.pathFunction, handlerParts[0] + '.js' );
-            let handler;
+        if( fun.runtime == 'nodejs' ) {
+          let handlerParts = fun.handler.split('/').pop().split('.');
+          let handlerPath = path.join(fun._config.fullPath, handlerParts[0] + '.js');
+          let handler;
 
-            _this.handlers[ fun.name ] = {
-              path: handlerPath,
-              handler: handlerParts[ 1 ],
-              definition: fun
-            };
+          _this.handlers[ fun.handler ] = {
+            path: handlerPath,
+            handler: handlerParts[ 1 ],
+            definition: fun
+          };
 
-            fun.endpoints.forEach(function(endpoint){
-              let epath = endpoint.path;
-              let cfPath = _this.evt.prefix + epath;
+          fun.endpoints.forEach(function(endpoint){
+            let epath = endpoint.path;
+            let cfPath = _this.evt.prefix + epath;
 
-              if( cfPath[ 0 ] != '/' ) {
-                cfPath = '/' + cfPath;
-              }
+            if( cfPath[ 0 ] != '/' ) {
+              cfPath = '/' + cfPath;
+            }
 
-              // In worst case we have two slashes at the end (one from prefix, one from "/" lambda mount point)
-              while( (cfPath.length > 1) && (cfPath[ cfPath.length - 1 ] == '/') ){
-                cfPath = cfPath.substr( cfPath.length - 1 );
-              }
+            // In worst case we have two slashes at the end (one from prefix, one from "/" lambda mount point)
+            while( (cfPath.length > 1) && (cfPath[ cfPath.length - 1 ] == '/') ){
+              cfPath = cfPath.substr( cfPath.length - 1 );
+            }
 
-              let cfPathParts = cfPath.split( '/' );
-              cfPathParts = cfPathParts.map(function(part){
-                if( part.length > 0 ) {
-                  if( (part[ 0 ] == '{') && (part[ part.length - 1 ] == '}') ) {
-                    return( ":" + part.substr( 1, part.length - 2 ) );
-                  }
+            let cfPathParts = cfPath.split( '/' );
+            cfPathParts = cfPathParts.map(function(part){
+              if( part.length > 0 ) {
+                if( (part[ 0 ] == '{') && (part[ part.length - 1 ] == '}') ) {
+                  return( ":" + part.substr( 1, part.length - 2 ) );
                 }
-                return( part );
-              });
-              if( process.env.DEBUG ) {
-                SCli.log( "Route: " + endpoint.method + " " + cfPath );
               }
+              return( part );
+            });
+            if( process.env.DEBUG ) {
+              SCli.log( "Route: " + endpoint.method + " " + cfPath );
+            }
 
-              _this.app[ endpoint.method.toLocaleLowerCase() ]( cfPathParts.join('/'), function(req, res, next){
-                SCli.log("Serving: " + endpoint.method + " " + cfPath);
+            _this.app[ endpoint.method.toLocaleLowerCase() ]( cfPathParts.join('/'), function(req, res, next){
+              SCli.log("Serving: " + endpoint.method + " " + cfPath);
 
-                let result = new BbPromise(function(resolve, reject) {
+              let result = new BbPromise(function(resolve, reject) {
 
-                  let event = {};
-                  let prop;
+                let event = {};
+                let prop;
 
-                  for( prop in req.body ) {
-                    if( req.body.hasOwnProperty( prop ) ){
-                      event[ prop ] = req.body[ prop ];
-                    }
+                for( prop in req.body ) {
+                  if( req.body.hasOwnProperty( prop ) ){
+                    event[ prop ] = req.body[ prop ];
                   }
+                }
 
-                  for( prop in req.params ) {
-                    if( req.params.hasOwnProperty( prop ) ){
-                      event[ prop ] = req.params[ prop ];
-                    }
+                for( prop in req.params ) {
+                  if( req.params.hasOwnProperty( prop ) ){
+                    event[ prop ] = req.params[ prop ];
                   }
+                }
 
-                  for( prop in req.query ) {
-                    if( req.query.hasOwnProperty( prop ) ){
-                      event[ prop ] = req.query[ prop ];
-                    }
+                for( prop in req.query ) {
+                  if( req.query.hasOwnProperty( prop ) ){
+                    event[ prop ] = req.query[ prop ];
                   }
+                }
 
-                  if( !handler ) {
-                    try {
-                      handler = require( handlerPath )[handlerParts[1]];
-                    } catch( e ) {
-                      SCli.log( "Unable to load " + handlerPath + ": " + e );
-                      throw e ;
-                    }
+                if( !handler ) {
+                  try {
+                    handler = require( handlerPath )[handlerParts[1]];
+                  } catch( e ) {
+                    SCli.log( "Unable to load " + handlerPath + ": " + e );
+                    throw e ;
                   }
-                  handler(event, context( fun.name, function(err, result) {
-                    if (err) {
-                      SCli.log(err);
-                      return reject(err);
-                    }
-                    resolve(result);
-                  }));
-                });
+                }
+                handler(event, context( fun.name, function(err, result) {
+                  let response;
 
-                result.then(function(r){
-                  res.send(r);
-                }, function(err){
-                  SCli.log(err);
-                  res.sendStatus(500);
-                });
-              } );
-            });
-          }
-        })
+                  if (err) {
+                    Object.keys(endpoint.responses).forEach(key => {
+                      if (!response && key != 'default' && JSON.stringify(err).match(key)) {
+                        response = endpoint.responses[key];
+                      };
+                    });
+
+                    result = {
+                      errorMessage: err
+                    };
+                  }
+
+                  response = response || endpoint.responses['default'];
+
+                  resolve(Object.assign({
+                    result: result
+                  }, response));
+                }));
+              });
+
+              result.then(function(r){
+                SCli.log(`[${r.statusCode}] ${JSON.stringify(r.result, null, 4)}`);
+                res.status(r.statusCode);
+                res.send(r.result);
+              }, function(err){
+                SCli.log(err);
+                res.sendStatus(500);
+              });
+            } );
+          });
+        }
       });
@@ -244,3 +259,3 @@ }
 
-      return this.S.validateProject()
+      return this.S.init()
         .bind(_this)
@@ -247,0 +262,0 @@ .then(_this._createApp)

package.json

 {
   "name": "serverless-serve",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "engines": {
@@ -5,0 +5,0 @@ "node": ">=4.0"

No alert changes

Improved metrics

Total package byte prevSize

11584

increased by2.08%

Lines of code

227

increased by5.09%

No dependency changes