🚨 Throw exception if function already exists in Cloud.define

Author: jysperm

lib/cloud.js

@@ -3,7 +3,7 @@ var debug = require('debug')('AV:LeanEngine');
 var utils = require('./utils');
 
 var Cloud = module.exports = {
-  __code: {}
+  functions: {}
 };
 
 Cloud.define = function(name, options, func) {
@@ -18,7 +18,11 @@ Cloud.define = function(name, options, func) {
     func.fetchUser = false;
   }
 
-  Cloud.__code[name] = func;
+  if (Cloud.functions[name]) {
+    throw new Error(`LeanEngine: ${name} already defined`);
+  } else {
+    Cloud.functions[name] = func;
+  }
 };
 
 var originalCloudRun = AV.Cloud.run;
@@ -55,7 +59,7 @@ Cloud.run = function(name, data, options) {
         }
       });
 
-      Cloud.__code[name](request, response);
+      Cloud.functions[name](request, response);
     });
   }).catch(function(err) {
     console.log('Run function \'' + name + '\' failed with error:', err);
@@ -136,7 +140,12 @@ Cloud.logInByIdAndSessionToken = function(uid, sessionToken, fetchUser, cb) {
 
 function defineClassHook(className, hook, func) {
   debug('define class hook: %s %s', hook, className);
-  Cloud.__code[hook + className] = func;
+
+  if (Cloud.functions[hook + className]) {
+    throw new Error(`LeanEngine: ${hook} of ${className} already defined`);
+  } else {
+    Cloud.functions[hook + className] = func;
+  }
 }
 
 function className(clazz) {

lib/leanengine.js

@@ -91,7 +91,7 @@ function createCloudFunctionRouter(options) {
 
   cloudFunctions.use('/_ops/metadatas', function(req, res) {
     if (req.AV.authMasterKey) {
-      return resp(res, Object.keys(Cloud.__code));
+      return resp(res, Object.keys(Cloud.functions));
     } else {
       return utils.unauthResp(res);
     }
@@ -145,7 +145,7 @@ function createCloudFunctionRouter(options) {
         });
       };
 
-      if (Cloud.__code[splited[1]] && Cloud.__code[splited[1]].fetchUser === false) {
+      if (Cloud.functions[splited[1]] && Cloud.functions[splited[1]].fetchUser === false) {
         handleCloudfunction();
       } else {
         fetchUser(handleCloudfunction);
@@ -239,7 +239,7 @@ var call = function(funcName, params, user, req, options, cb) {
     options = {};
   }
 
-  if (!Cloud.__code[funcName]) {
+  if (!Cloud.functions[funcName]) {
     var err = new Error("LeanEngine not found function named '" + funcName +  "' for app '" + AV.applicationId + "' on " + NODE_ENV + ".");
     err.statusCode = 404;
     return cb(err);
@@ -262,7 +262,7 @@ var call = function(funcName, params, user, req, options, cb) {
       cb(err, result);
     });
 
-    Cloud.__code[funcName](request, response);
+    Cloud.functions[funcName](request, response);
   } catch (err) {
     console.warn('Execute \'' + funcName + '\' failed with error: ' + (err.stack || err));
     err.statusCode = 500;
@@ -271,7 +271,7 @@ var call = function(funcName, params, user, req, options, cb) {
 };
 
 var classHook = function(className, hook, object, user, req, cb) {
-  if (!Cloud.__code[hook + className]) {
+  if (!Cloud.functions[hook + className]) {
     var err = new Error("LeanEngine could not find hook '" + hook + className +  "' for app '" + AV.applicationId + "' on " + NODE_ENV + ".");
     err.statusCode = 404;
     return cb(err);
@@ -297,11 +297,11 @@ var classHook = function(className, hook, object, user, req, cb) {
     if (hook.indexOf('__after_') === 0) {
       setHookMark('__after', obj);
       // after 的 hook 不需要 response 参数，并且请求默认返回 ok
-      Cloud.__code[hook + className](request);
+      Cloud.functions[hook + className](request);
       return cb(null, 'ok');
     } else {
       setHookMark('__before', obj);
-      Cloud.__code[hook + className](request, utils.prepareResponseObject(req.res, function(err) {
+      Cloud.functions[hook + className](request, utils.prepareResponseObject(req.res, function(err) {
         if (err) {
           cb(new Error(err));
         } else if ('__before_delete_for_' === hook) {
@@ -342,7 +342,7 @@ var onVerified = function(req, type, user) {
       req: req
     });
 
-    Cloud.__code['__on_verified_' + type](request);
+    Cloud.functions['__on_verified_' + type](request);
   } catch (err) {
     console.warn('Execute onVerified ' + type + ' failed with error: ' + (err.stack || err));
   }
@@ -364,15 +364,15 @@ var onLogin = function(req, user, cb) {
       }
     });
 
-    Cloud.__code.__on_login__User(request, response);
+    Cloud.functions['__on_login__User'](request, response);
   } catch (err) {
     console.warn('Execute onLogin failed with error: ' + (err.stack || err));
   }
 };
 
 var onCompleteBigQueryJob = function(data) {
   try {
-    Cloud.__code.__on_complete_bigquery_job(null, data);
+    Cloud.functions['__on_complete_bigquery_job'](null, data);
   } catch (err) {
     console.warn('Execute onCompleteBigQueryJob failed with error: ' + (err.stack || err));
   }