diff --git a/certs/demo-cert.pem b/certs/demo-cert.pem new file mode 100644 index 0000000..528c263 --- /dev/null +++ b/certs/demo-cert.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIICATCCAWoCCQDiFL1fY1AhrTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB +VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 +cyBQdHkgTHRkMB4XDTE0MDQwOTE3NTEwMVoXDTE0MDUwOTE3NTEwMVowRTELMAkG +A1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0 +IFdpZGdpdHMgUHR5IEx0ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsz4R +9n0olUZBMO0bRskMdIUs9qb1Qol6y5luuacm3xLYjQKZVae3/ZvKNGDt5rV1BJ3V +8al+DXtrKlD65RJRpuD8a+wD3z49MHURxvJdpk9UwS3Chzd8tX0vFiQs9qCGv+Fj +eb5q0G2FVb0LOtYIHSxtBd8NM69YrXWdWYdPyyUCAwEAATANBgkqhkiG9w0BAQUF +AAOBgQBjE1Jf+HvGx3pM75fp+GicENf5k3bGFHU4jitN7TfPjdpgJ2JdW3TEgHn7 +00GF/+zrwGyl8mJdDjuzFR+MwDvyNFgBzRi11cFXOc9zz5Q/BAPe7+ErvvFebTNl +z/ypuYPTWZI0jUI7nByo0jIAwys6jk9eSuZfhU9QRfY65BcxnQ== +-----END CERTIFICATE----- diff --git a/certs/demo-tls-cert-request.pem b/certs/demo-tls-cert-request.pem new file mode 100644 index 0000000..b4cc38d --- /dev/null +++ b/certs/demo-tls-cert-request.pem @@ -0,0 +1,11 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIBhDCB7gIBADBFMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEh +MB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEB +AQUAA4GNADCBiQKBgQCzPhH2fSiVRkEw7RtGyQx0hSz2pvVCiXrLmW65pybfEtiN +AplVp7f9m8o0YO3mtXUEndXxqX4Ne2sqUPrlElGm4Pxr7APfPj0wdRHG8l2mT1TB +LcKHN3y1fS8WJCz2oIa/4WN5vmrQbYVVvQs61ggdLG0F3w0zr1itdZ1Zh0/LJQID +AQABoAAwDQYJKoZIhvcNAQEFBQADgYEAKt0g5rE3re23CWSPpM6HCO1GycTm1emU +h6yyJ0vqpK+rQwupafcjSo3s/AATTmVcO1vsZYaFL4rblJWAkVGwDNZs/qHD1mtJ +w7AQNAAN018Jxw3Z5CGbjCM95jJEQbuaceddhgrL/w/GD8ns1kkEe+PgnKfC/ZAT +OK41JUmJdh8= +-----END CERTIFICATE REQUEST----- diff --git a/certs/demo-tls-private-key.pem b/certs/demo-tls-private-key.pem new file mode 100644 index 0000000..f6c365a --- /dev/null +++ b/certs/demo-tls-private-key.pem @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQCzPhH2fSiVRkEw7RtGyQx0hSz2pvVCiXrLmW65pybfEtiNAplV +p7f9m8o0YO3mtXUEndXxqX4Ne2sqUPrlElGm4Pxr7APfPj0wdRHG8l2mT1TBLcKH +N3y1fS8WJCz2oIa/4WN5vmrQbYVVvQs61ggdLG0F3w0zr1itdZ1Zh0/LJQIDAQAB +AoGADjxOxunX0Es9IDqkoPGUyKhPEuPdtMQgeY0dCyeoYa0of8KGFRR1+3FlFNXh +7yHYQl6awE+60C1OLJUz5/+Vdm5711QhOrX+hmwhEmkDyhXB7urpkgEnuDOmhPjl +d2Xv9yY06lIJjIVd9Q3yiqA7HjJhvpc4xZL8QtRkK4arsz0CQQDcW7XIdAUM4s1G +uXQlHHhBpHsSlUWiWkz9PnGxB3WEa2sX2HOR01D/bHf3NZapU0CTwmuq3kc4orRy +Ye6V2QL/AkEA0DvlAx9gpkAm8sJvUuzsdwnm8Ze+FFYhtOAJc8Op9h6GHB5zQ/Xa +eQqhrN6D6+UwIm6mKDbA/1nDRa3SlKTF2wJBAJQLUV/xAoubvIotgmiEbg678KuV +egkPXfYuA7gJ6NwkRvjoRQzNyfcw6pA9gpEUC6i50Bgl6feU6GKIhQBLogUCQHdw +k3iKC+7wRybhnecr3Kqe9GfJCQ8zJFxSUTmklp2EfposYSMvJuRc08WLUJIDQOvP +GeFhHqyY+SfDf1EhfhcCQAe6m1gLo/fq1yYWTyeEQeCsTKlIBHRsTsNNvQPGzIjy +J/bMz5WLQQT2rk7f1SO1qK8DCTWTeD8WJoMv5HxZBfc= +-----END RSA PRIVATE KEY----- diff --git a/certs/readme.md b/certs/readme.md new file mode 100644 index 0000000..e69de29 diff --git a/lib/socketServer.js b/lib/socketServer.js index 1655c72..9bcbd17 100644 --- a/lib/socketServer.js +++ b/lib/socketServer.js @@ -39,7 +39,7 @@ function emit(socket, type, data){ }; function broadcast(type,data){ - this.log('broadcasting event to all known sockets listening to '.debug, this.path.variable,' : ', ((this.port)?this.port:''), type.data, data); + this.log('broadcasting event to all known sockets listening to '.debug, this.path.variable,' : ', ((this.port)?this.port:''), type, data); if(!data) data=false; @@ -91,7 +91,7 @@ function init(path,config,log,port){ }, start : function(){ if(!this.path){ - console.log('Socket Server Path not specified, refusing to start'.warn); + server.log('Socket Server Path not specified, refusing to start'.warn); return; } @@ -186,8 +186,6 @@ function init(path,config,log,port){ var e=JSON.parse(data.shift()); server.log('received event of : '.debug,e.type.data,e.data); - server.sockets.push(sock); - server.trigger( e.type, e.data, @@ -308,7 +306,8 @@ function init(path,config,log,port){ continue; } - server.log('Socket disconnected'.notice); + server.log(socket.id, 'socket disconnected'.notice); + var deadSocket=socket.id; if(socket) socket.destroy(); @@ -316,7 +315,10 @@ function init(path,config,log,port){ server.sockets.splice(i,1); server.trigger( - 'socket.disconnected' + 'socket.disconnected', + { + id:deadSocket + } ); return; diff --git a/package.json b/package.json index 9e70a80..993d13e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-ipc", - "version": "0.9.16", + "version": "1.0.0", "description": "A nodejs module for local and remote Inter Process Communication (IPC), Neural Networking, and able to facilitate machine learning.", "main": "node-ipc.js", "directories": {