Merge branch 'master' of github.com:datapartyjs/dataparty-api into ncc-upgrade

Author: sevenbitbyte

src/sandbox/endpoint-info-sandbox.js

@@ -3,7 +3,13 @@ const Sandbox = require('./sandbox')
 
 class EndpointInfoSandbox extends Sandbox {
   constructor(code, map){
-    super(`  
+    super(`
+
+var self={};
+
+function userCode(){
+  ${code}
+}
 
 module.exports = async ()=>{
 
@@ -16,8 +22,8 @@ module.exports = async ()=>{
   }
 
   try{
-    var self = {}
-    ${code}
+
+    userCode()
 
     return {
       Name: self.Lib.Name,

src/sandbox/middleware-exec-sandbox.js

@@ -5,6 +5,13 @@ class MiddlewareExecSandbox extends Sandbox {
   constructor(code, map, func='run'){
     super(`
 
+var self={};
+
+function userCode(){
+  ${code}
+}
+    
+
 module.exports = async (ctx, static_ctx)=>{
 
   class ErrorError extends Error { 
@@ -16,8 +23,7 @@ module.exports = async (ctx, static_ctx)=>{
   }
 
   try{
-    var self = {}
-    ${code}
+    userCode()
 
     return await self.Lib.${func}(ctx, static_ctx)
   }

src/sandbox/middleware-info-sandbox.js

@@ -5,6 +5,13 @@ class MiddlewareInfoSandbox extends Sandbox {
   constructor(code, map){
     super(`
 
+var self={};
+
+function userCode(){
+  ${code}
+}
+    
+
 module.exports = async ()=>{
 
   class ErrorError extends Error { 
@@ -16,8 +23,7 @@ module.exports = async ()=>{
   }
 
   try{
-    var self = {}
-    ${code}
+    userCode()
 
     return {
       Name: self.Lib.Name,

src/service/service-runner-node.js

@@ -50,7 +50,6 @@ class ServiceRunnerNode {
     this.started = true
 
     const taskMap = Hoek.reach(this.service, 'compiled.tasks')
-    //const endpointsLoading = []
     for(let name in taskMap){
       debug('\t',name)
       await this.loadTask(name)

src/service/service-runner.js

@@ -11,6 +11,7 @@ const EndpointRunner = require('./endpoint-runner')
 const DeltaTime = require('../utils/delta-time')
 
 const Router = require('origin-router').Router
+const Runner = require('@dataparty/tasker').Runner
 
 class ServiceRunner {
 
@@ -33,9 +34,12 @@ class ServiceRunner {
 
     this.middleware = { pre: {}, post: {} }
     this.endpoint = {}
+    this.tasks = {}
 
     this.prefix = prefix
     this.router = router
+    this.taskRunner = new Runner()
+
     this.started = false
   }