Skip to content

node-phantom calling twice the phantom create callback #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

node-phantom calling twice the phantom create callback #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65b17e0
node-phantom only works with socket io version 0.9.x
apdmatos Jun 15, 2014
2ccadc1
bug fix when connection upgrade was called on socketio
apdmatos Jun 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 28 additions & 23 deletions node-phantom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ module.exports={
cmds[cmdid]={cb:callback};
cmdid++;
}


var connectionSocket = null;
io.sockets.on('connection',function(socket){
socket.on('res',function(response){
// console.log(response);
Expand All @@ -87,57 +88,57 @@ module.exports={
var pageProxy={
open:function(url, callback){
if(callback === undefined){
request(socket, [id, 'pageOpen', url]);
request(connectionSocket, [id, 'pageOpen', url]);
}else{
request(socket, [id, 'pageOpenWithCallback', url], callback);
request(connectionSocket, [id, 'pageOpenWithCallback', url], callback);
}
},
close:function(callback){
request(socket,[id,'pageClose'],callbackOrDummy(callback));
request(connectionSocket,[id,'pageClose'],callbackOrDummy(callback));
},
render:function(filename,callback){
request(socket,[id,'pageRender',filename],callbackOrDummy(callback));
request(connectionSocket,[id,'pageRender',filename],callbackOrDummy(callback));
},
renderBase64:function(extension,callback){
request(socket,[id,'pageRenderBase64',extension],callbackOrDummy(callback));
request(connectionSocket,[id,'pageRenderBase64',extension],callbackOrDummy(callback));
},
injectJs:function(url,callback){
request(socket,[id,'pageInjectJs',url],callbackOrDummy(callback));
request(connectionSocket,[id,'pageInjectJs',url],callbackOrDummy(callback));
},
includeJs:function(url,callback){
request(socket,[id,'pageIncludeJs',url],callbackOrDummy(callback));
request(connectionSocket,[id,'pageIncludeJs',url],callbackOrDummy(callback));
},
sendEvent:function(event,x,y,callback){
request(socket,[id,'pageSendEvent',event,x,y],callbackOrDummy(callback));
request(connectionSocket,[id,'pageSendEvent',event,x,y],callbackOrDummy(callback));
},
uploadFile:function(selector,filename,callback){
request(socket,[id,'pageUploadFile',selector,filename],callbackOrDummy(callback));
request(connectionSocket,[id,'pageUploadFile',selector,filename],callbackOrDummy(callback));
},
evaluate:function(evaluator,callback){
request(socket,[id,'pageEvaluate',evaluator.toString()].concat(Array.prototype.slice.call(arguments,2)),callbackOrDummy(callback));
request(connectionSocket,[id,'pageEvaluate',evaluator.toString()].concat(Array.prototype.slice.call(arguments,2)),callbackOrDummy(callback));
},
evaluateAsync:function(evaluator,callback){
request(socket,[id,'pageEvaluateAsync',evaluator.toString()].concat(Array.prototype.slice.call(arguments,2)),callbackOrDummy(callback));
request(connectionSocket,[id,'pageEvaluateAsync',evaluator.toString()].concat(Array.prototype.slice.call(arguments,2)),callbackOrDummy(callback));
},
set:function(name,value,callback){
request(socket,[id,'pageSet',name,value],callbackOrDummy(callback));
request(connectionSocket,[id,'pageSet',name,value],callbackOrDummy(callback));
},
get:function(name,callback){
request(socket,[id,'pageGet',name],callbackOrDummy(callback));
request(connectionSocket,[id,'pageGet',name],callbackOrDummy(callback));
},
setFn: function(pageCallbackName, fn, callback) {
request(socket, [id, 'pageSetFn', pageCallbackName, fn.toString()], callbackOrDummy(callback));
request(connectionSocket, [id, 'pageSetFn', pageCallbackName, fn.toString()], callbackOrDummy(callback));
},
setViewport: function(viewport, callback) {
request(socket, [id, 'pageSetViewport', viewport.width, viewport.height], callbackOrDummy(callback));
request(connectionSocket, [id, 'pageSetViewport', viewport.width, viewport.height], callbackOrDummy(callback));
}
}
pages[id] = pageProxy;
cmds[cmdId].cb(null,pageProxy);
delete cmds[cmdId];
break;
case 'phantomExited':
request(socket,[0,'exitAck']);
request(connectionSocket,[0,'exitAck']);
server.close();
io.set('client store expiration', 0);
cmds[cmdId].cb();
Expand Down Expand Up @@ -191,25 +192,29 @@ module.exports={
});
var proxy={
createPage:function(callback){
request(socket,[0,'createPage'],callbackOrDummy(callback));
request(connectionSocket,[0,'createPage'],callbackOrDummy(callback));
},
injectJs:function(filename,callback){
request(socket,[0,'injectJs',filename],callbackOrDummy(callback));
request(connectionSocket,[0,'injectJs',filename],callbackOrDummy(callback));
},
addCookie: function(cookie, callback){
request(socket,[0,'addCookie', cookie],callbackOrDummy(callback));
request(connectionSocket,[0,'addCookie', cookie],callbackOrDummy(callback));
},
exit:function(callback){
phantom.removeListener('exit',prematureExitHandler); //an exit is no longer premature now
request(socket,[0,'exit'],callbackOrDummy(callback));
request(connectionSocket,[0,'exit'],callbackOrDummy(callback));
},
on: function(){
phantom.on.apply(phantom, arguments);
},
_phantom: phantom
};

callback(null,proxy);

var executeCallback = !connectionSocket;
connectionSocket = socket;
if(executeCallback) {
callback(null,proxy);
}
});

// An exit event listener that is registered AFTER the phantomjs process
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"test": "mocha"
},
"dependencies": {
"socket.io": ">=0.9.6"
"socket.io": "0.9.x"
},
"devDependencies": {
"mocha": "*",
Expand Down