Skip to content

Commit

Permalink
[fix dist] socket.io and socket.io-client are vendored for dnode w/ a…
Browse files Browse the repository at this point in the history
… 2nd socket.io client.

The second copy of socket.io-client is used by our node hook and is v0.9.6 . THIS IS INTENTIONAL.
The client version used is substack's version needed for the dnode client, and the one used
by the node hook is the regular kind. It's also a full minor ahead.

AGAIN THIS IS INTENTIONAL PLEASE DON'T CHANGE THESE WITHOUT CAREFUL THOUGHT
  • Loading branch information
jfhbrook committed May 13, 2012
1 parent 1ac66b2 commit 82d1d70
Show file tree
Hide file tree
Showing 195 changed files with 43,633 additions and 9 deletions.
5 changes: 2 additions & 3 deletions lib/hookio/http/proxy.js
Expand Up @@ -11,7 +11,7 @@
*/

module.exports = function () {
var dnode = require('dnode');
var dnode = require('../../../vendor/dnode');

//get hook to connect
var remoteOptions = {
Expand All @@ -25,7 +25,6 @@ module.exports = function () {
var client_name;

client_conn.on('ready', function () {
console.log('client ready');
dnode(function(hook, hook_conn) {
var client_wrapper = this;
remote_hook = hook;
Expand Down Expand Up @@ -59,7 +58,7 @@ module.exports = function () {
remote_hook.hasEvent(event, callback);
};

this.report= function(_hook, cb) {
this.report = function(_hook, cb) {
remote_hook.report(_hook, cb);
};

Expand Down
4 changes: 1 addition & 3 deletions package.json
Expand Up @@ -37,10 +37,8 @@
"prompt": "0.1.x",
"portfinder": "0.2.x",
"weak": "0.2.x",
"socket.io" : "0.8.6",
"socket.io-client" : "https://github.com/substack/socket.io-client/tarball/master",
"socket.io-client" : "0.9.x",
"lazy" : ">=1.0.5 <1.1",
"dnode-protocol" : "0.1.x",
"traverse" : "0.6.x",
"jsonify" : "0.0.x",
"winston": "0.5.10"
Expand Down
2 changes: 1 addition & 1 deletion vendor/dnode-protocol/index.js
Expand Up @@ -138,7 +138,7 @@ var Session = exports.Session = function (id, wrapper) {
if (typeof methods != 'object') {
methods = {};
}

// copy since assignment discards the previous refs
Object.keys(self.remote).forEach(function (key) {
delete self.remote[key];
Expand Down
6 changes: 4 additions & 2 deletions vendor/dnode/browser/index.js
Expand Up @@ -23,10 +23,12 @@ dnode.prototype.connect = function () {
var self = this;
var params = protocol.parseArgs(arguments);
var client = self.proto.create();

var proto = (params.proto || window.location.protocol)
.replace(/:.*/, '') + '://';


var connectTo = proto + (params.host || window.location.host);

var sock = client.socketio = io.connect(
proto + (params.host || window.location.host),
params
Expand Down
2 changes: 2 additions & 0 deletions vendor/socket.io-client/.npmignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

125 changes: 125 additions & 0 deletions vendor/socket.io-client/History.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions vendor/socket.io-client/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 82d1d70

Please sign in to comment.