May be add some modifications

amb4eg commented 11 years ago

Thanks for nice the module, am using in my project but i had to make a few changes in router.js

1) exception handling on client side now work correctly 2) exec context on server side now has request response session objects. 3) server side function has err callback parameter

my version router.js

var vPath = require('path'),
    route = exports;

route.processRoute = function(req, resp, path){
    var root = process.env.PWD,
        files = req.files,
        data = req.body,
        callback,
        so,
        upload = false,
        d = [],
        reduce,
        rLen,
        cp,
        batch = [],
        x,
        i;

    //process after we return from DX method
    var finalCallback = function(batch){
        var str = JSON.stringify(batch, 'utf8');
        if(reduce === 0){
            if (upload) {
                resp.writeHead(200, {'Content-type': 'text/html'});
                resp.end('<html><body><textarea>' + str + '</textarea></body></html>');
            } else {
                resp.writeHead(200, {'Content-type': 'application/json'});
                resp.end(str);
            }
        }
    };

    if(data instanceof Array){
        d = data;
    }else{
        d.push(data);
    }

    reduce = d.length;
    try{
        for(i = 0, rLen = d.length;  i < rLen; i++){
            so = d[i];

            if (so.extAction) {
                cp = copyObject(so);
                so.action = so.extAction;
                so.method = so.extMethod;
                so.tid = so.extTID;
                so.type = so.extType;
                so.isUpload = upload = so.extUpload === "true";

                delete cp.extAction;
                delete cp.extType;
                delete cp.extMethod;
                delete cp.extTID;
                delete cp.extUpload;
            }

            callback = function(so){
                return function(err,result){
                    if(err)
                    {
                        var ebatch = so;
                        ebatch['type'] = 'exception';
                        ebatch['message'] = err.message;
                        if(global.DEBUG == true)
                        {
                            ebatch['where'] = err.stack;
                        }

                        batch.push(ebatch);
                        reduce--;
                        finalCallback(batch);
                    }  else
                    {

                        var packet = {
                            type: 'rpc',
                            tid: so.tid,
                            action: so.action,
                            method: so.method,
                            result: result
                        };

                        batch.push(packet);
                        reduce--;
                        finalCallback(batch);
                    }
                }
            }.apply(null, [so]);

            x = require(vPath.join(root, path, so.action));

            if(!so.data){
                so.data = [];
            }

            if(cp){
                so.data.push(cp);
            }

            if(upload === true){
                so.data.push(files);
            }

            so.data.push(callback);
            //so.data.push(req); // Session support

            x[so.method].apply({request : req, response : resp, session : req.session} , so.data);
        }
    }catch(e) {

            var ebatch = so;
            ebatch['type'] = 'exception';
            ebatch['message'] = e.message;
          if(global.DEBUG == true)
          {
            ebatch['where'] = e.stack;
          }

            var str = JSON.stringify(ebatch, 'utf8');
            resp.writeHead(200, {'Content-type': 'application/json'});
            resp.end(str);
            //console.log(e);

    }
};

function copyObject(obj) {
    var newObj = {};
    for (var key in obj) {
        newObj[key] = obj[key];
    }
    return newObj;
}

kgrieger commented 11 years ago

Thanks for sharing your code amb4eg, I really appreciate it! I was trying to add the request object myself, but I couldn't figure it out.

amb4eg commented 11 years ago

I'm add event paramter in callback function now work event message handling I use it in direct polling methods...

var vPath = require('path'),
    route = exports;

route.processRoute = function(req, resp, path){
    var root = process.env.PWD,
        files = req.files,
        data = req.body,
        callback,
        so,
        upload = false,
        d = [],
        reduce,
        rLen,
        cp,
        batch = [],
        x,
        i;

    //process after we return from DX method
    var finalCallback = function(batch){
        var str = JSON.stringify(batch, 'utf8');
        if(reduce === 0){
            if (upload) {
                resp.writeHead(200, {'Content-type': 'text/html'});
                resp.end('<html><body><textarea>' + str + '</textarea></body></html>');
            } else {
                resp.writeHead(200, {'Content-type': 'application/json'});
                resp.end(str);
            }
        }
    };

    if(data instanceof Array){
        d = data;
    }else{
        d.push(data);
    }

    reduce = d.length;
    try{
        for(i = 0, rLen = d.length;  i < rLen; i++){
            so = d[i];

            if (so.extAction) {
                cp = copyObject(so);
                so.action = so.extAction;
                so.method = so.extMethod;
                so.tid = so.extTID;
                so.type = so.extType;
                so.isUpload = upload = so.extUpload === "true";

                delete cp.extAction;
                delete cp.extType;
                delete cp.extMethod;
                delete cp.extTID;
                delete cp.extUpload;
            }

            callback = function(so){
                return function(err,result,event){
                    if(event)
                    {
                        var packet = {
                            type: 'event',
                            tid: so.tid,
                            action: so.action,
                            method: so.method,
                            result: result,
                            data: event
                        };

                        batch.push(packet);
                        reduce--;
                        finalCallback(batch);

                    } else
                    {
                        if(err)
                        {
                            var ebatch = so;
                            ebatch['type'] = 'exception';
                            ebatch['message'] = err.message;
                            if(global.DEBUG == true)
                            {
                                ebatch['where'] = err.stack;
                            }

                            batch.push(ebatch);
                            reduce--;
                            finalCallback(batch);
                        }  else
                        {

                            var packet = {
                                type: 'rpc',
                                tid: so.tid,
                                action: so.action,
                                method: so.method,
                                result: result
                            };

                            batch.push(packet);
                            reduce--;
                            finalCallback(batch);
                        }
                    }
                }
            }.apply(null, [so]);

            x = require(vPath.join(root, path, so.action));

            if(!so.data){
                so.data = [];
            }

            if(cp){
                so.data.push(cp);
            }

            if(upload === true){
                so.data.push(files);
            }

            so.data.push(callback);
            //so.data.push(req); // Session support

            x[so.method].apply({request : req, response : resp, session : req.session} , so.data);
        }
    }catch(e) {

            var ebatch = so;
            ebatch['type'] = 'exception';
            ebatch['message'] = e.message;
          if(global.DEBUG == true)
          {
            ebatch['where'] = e.stack;
          }

            var str = JSON.stringify(ebatch, 'utf8');
            resp.writeHead(200, {'Content-type': 'application/json'});
            resp.end(str);
            //console.log(e);

    }
};

function copyObject(obj) {
    var newObj = {};
    for (var key in obj) {
        newObj[key] = obj[key];
    }
    return newObj;
}

jurisv commented 11 years ago

0.9.8 has Error handling, events, and session support.

jurisv / nodejs.extdirect

May be add some modifications #2