增加 Hook: BigQuery job on complete

lib/leanengine.js

@@ -3,6 +3,7 @@ var connect = require('connect'),
   https = require('https'),
   domain = require('domain'),
   crypto = require('crypto'),
+  version = require('../package.json').version,
   AV = require('./av-extra'),
   utils = require('./utils');
   avosExpressCookieSession = require('./avosExpressCookieSession'),
@@ -34,8 +35,8 @@ AV.Cloud.HttpsRedirect = avosExpressHttpsRedirect(AV);
 // 健康监测 router
 Cloud.use('/__engine/1/ping', function(req, res) {
   res.end(JSON.stringify({
-    "runtime": "nodejs-0.12",
-    "version": "0.1.1"
+    "runtime": "nodejs-" + process.version,
+    "version": version
   }));
 });
 
@@ -213,9 +214,15 @@ Cloud.use('/__engine/1/ping', function(req, res) {
           userObj._finishFetch(req.body.object, true);
           onVerified(split[2], userObj);
           cb(null, 'ok');
+
         } else if (split[1] === '_User' && split[2] === 'onLogin') {
           userObj._finishFetch(req.body.object, true);
           onLogin(userObj, cb);
+
+        } else if (split[1] === 'BigQuery' && split[2] === 'onComplete') {
+          onCompleteBigQueryJob(req.body);
+          cb(null, 'ok');
+
         } else {
           classHook(split[1], hookNameMapping[split[2]], req.body.object, req.AV.user, meta, cb);
         }
@@ -358,6 +365,14 @@ var onLogin = function(user, cb) {
   }
 };
 
+var onCompleteBigQueryJob = function(data) {
+  try {
+    Cloud.__code.__on_complete_bigquery_job(null, data);
+  } catch (err) {
+    console.warn('Execute onCompleteBigQueryJob failed with error: ' + (err.stack || err));
+  }
+}
+
 Cloud.__code = {};
 
 Cloud.define = function(name, func) {
@@ -406,6 +421,15 @@ Cloud.onLogin = function(func) {
   Cloud.define('__on_login__User', func);
 };
 
+
+if (!AV.BigQuery) {
+  AV.BigQuery = {};
+}
+
+AV.BigQuery.on = function(action, func) {
+  Cloud.define('__on_complete_bigquery_job', func);
+};
+
 var logInBySessionToken = function(sessionToken, cb) {
   var user = AV.Object._create("_User");
   user._finishFetch({ session_token: sessionToken });

test/function_test.js

@@ -112,6 +112,14 @@ AV.Cloud.define("userMatching", function(req, res) {
   }, Math.floor((Math.random() * 2000) + 1));
 });
 
+AV.BigQuery.on('end', function(err, result) {
+  assert.deepEqual({
+    "id" : "job id",
+    "status": "OK/ERROR",
+    "message": "当 status 为 ERROR 时的错误消息"
+  }, result);
+})
+
 var sessionToken_admin = config.sessionToken_admin;
 
 describe('functions', function() {
@@ -120,7 +128,7 @@ describe('functions', function() {
     request(AV.Cloud)
       .get('/__engine/1/ping')
       .expect(200)
-      .expect('{"runtime":"nodejs-0.12","version":"0.1.1"}', done);
+      .expect('{"runtime":"nodejs-' + process.version + '","version":"' + require('../package.json').version + '"}', done);
   });
 
   // 测试最基本方法的有效性
@@ -314,14 +322,14 @@ describe('functions', function() {
 
   // 用户串号测试 
   it('user_matching_func', function(done) {
-    this.timeout(20000);
+    this.timeout(30000);
     var count = 0;
     var cb = function(err) {
       if (err != null) {
         throw err;
       }
       count++;
-      if (count === 15) {
+      if (count === 10) {
         return done();
       }
     };
@@ -388,4 +396,17 @@ describe('functions', function() {
       .expect(200, done);
   })
 
+  it('onCompleteBigqueryJob', function(done) {
+    request(AV.Cloud)
+      .post('/1.1/functions/BigQuery/onComplete')
+      .set('X-AVOSCloud-Application-Id', appId)
+      .set('X-AVOSCloud-Application-Key', appKey)
+      .send({
+        id : "job id",
+        status: "OK/ERROR",
+        message: "当 status 为 ERROR 时的错误消息"
+      })
+      .expect(200, done);
+  })
+
 });