From dc294cf37b8140c884989f2d159b3246de6f0daa Mon Sep 17 00:00:00 2001 From: Adam Lind Date: Wed, 11 Oct 2017 00:09:07 -0400 Subject: [PATCH 1/6] Bind context so we don't get a call to undefined. --- packages/rocketchat-irc/server/server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/rocketchat-irc/server/server.js b/packages/rocketchat-irc/server/server.js index ebfd223f7758..70b23644376c 100644 --- a/packages/rocketchat-irc/server/server.js +++ b/packages/rocketchat-irc/server/server.js @@ -44,6 +44,7 @@ class IrcClient { this.socket.setNoDelay; this.socket.setEncoding('utf-8'); this.socket.setKeepAlive(true); + this.connect = this.connect.bind(this); this.onConnect = bind(this.onConnect); this.onClose = bind(this.onClose); this.onTimeout = bind(this.onTimeout); From 138f2745bc4a73806a0e81f0ce88dfa44c5e8ba6 Mon Sep 17 00:00:00 2001 From: Adam Lind Date: Wed, 11 Oct 2017 23:46:50 -0400 Subject: [PATCH 2/6] Fix bindings. --- packages/rocketchat-irc/server/server.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/rocketchat-irc/server/server.js b/packages/rocketchat-irc/server/server.js index 70b23644376c..b3f472dd9d1e 100644 --- a/packages/rocketchat-irc/server/server.js +++ b/packages/rocketchat-irc/server/server.js @@ -45,10 +45,12 @@ class IrcClient { this.socket.setEncoding('utf-8'); this.socket.setKeepAlive(true); this.connect = this.connect.bind(this); + this.onConnect = this.onConnect.bind(this); this.onConnect = bind(this.onConnect); this.onClose = bind(this.onClose); this.onTimeout = bind(this.onTimeout); this.onError = bind(this.onError); + this.onReceiveRawMessage = this.onReceiveRawMessage.bind(this); this.onReceiveRawMessage = bind(this.onReceiveRawMessage); this.socket.on('data', this.onReceiveRawMessage); this.socket.on('close', this.onClose); From cdc48d32a14307464fa1f2a7e6d8bc400026ebfc Mon Sep 17 00:00:00 2001 From: Adam Lind Date: Thu, 12 Oct 2017 23:20:25 -0400 Subject: [PATCH 3/6] Create regexp's properly. Preferring old style over ES6 syntax. --- packages/rocketchat-irc/server/server.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/rocketchat-irc/server/server.js b/packages/rocketchat-irc/server/server.js index b3f472dd9d1e..95b5d074a4eb 100644 --- a/packages/rocketchat-irc/server/server.js +++ b/packages/rocketchat-irc/server/server.js @@ -61,14 +61,14 @@ class IrcClient { this.receiveMemberListBuf = {}; this.pendingJoinRoomBuf = []; - this.successLoginMessageRegex = /RocketChat.settings.get('IRC_RegEx_successLogin');/; - this.failedLoginMessageRegex = /RocketChat.settings.get('IRC_RegEx_failedLogin');/; - this.receiveMessageRegex = /RocketChat.settings.get('IRC_RegEx_receiveMessage');/; - this.receiveMemberListRegex = /RocketChat.settings.get('IRC_RegEx_receiveMemberList');/; - this.endMemberListRegex = /RocketChat.settings.get('IRC_RegEx_endMemberList');/; - this.addMemberToRoomRegex = /RocketChat.settings.get('IRC_RegEx_addMemberToRoom');/; - this.removeMemberFromRoomRegex = /RocketChat.settings.get('IRC_RegEx_removeMemberFromRoom');/; - this.quitMemberRegex = /RocketChat.settings.get('IRC_RegEx_quitMember');/; + this.successLoginMessageRegex = new RegExp(RocketChat.settings.get('IRC_RegEx_successLogin')); + this.failedLoginMessageRegex = new RegExp(RocketChat.settings.get('IRC_RegEx_failedLogin')); + this.receiveMessageRegex = new RegExp(RocketChat.settings.get('IRC_RegEx_receiveMessage')); + this.receiveMemberListRegex = new RegExp(RocketChat.settings.get('IRC_RegEx_receiveMemberList')); + this.endMemberListRegex = new RegExp(RocketChat.settings.get('IRC_RegEx_endMemberList')); + this.addMemberToRoomRegex = new RegExp(RocketChat.settings.get('IRC_RegEx_addMemberToRoom')); + this.removeMemberFromRoomRegex = new RegExp(RocketChat.settings.get('IRC_RegEx_removeMemberFromRoom')); + this.quitMemberRegex = new RegExp(RocketChat.settings.get('IRC_RegEx_quitMember')); } connect(loginCb) { From cb9c9f11f3a17de44566af77c23c80217aa574aa Mon Sep 17 00:00:00 2001 From: Adam Lind Date: Fri, 13 Oct 2017 01:16:58 -0400 Subject: [PATCH 4/6] Try to get a stable Docker build working with fix. --- .docker/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 40e54c7a30c9..87630688c282 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,17 +1,17 @@ FROM rocketchat/base:4 -ENV RC_VERSION 0.59.0-develop +ENV RC_VERSION 0.59.1.a-irc MAINTAINER buildmaster@rocket.chat RUN set -x \ - && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \ - && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \ + && curl -SLf "https://github.com/Pharserror/Rocket.Chat/releases/download/${RC_VERSION}/Rocket.Chat.tar.gz" -o rocket.chat.tgz \ +# && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \ && mkdir /app \ - && gpg --verify rocket.chat.tgz.asc \ +# && gpg --verify rocket.chat.tgz.asc \ && mkdir -p /app \ && tar -zxf rocket.chat.tgz -C /app \ - && rm rocket.chat.tgz rocket.chat.tgz.asc \ +# && rm rocket.chat.tgz rocket.chat.tgz.asc \ && cd /app/bundle/programs/server \ && npm install \ && npm cache clear \ From a9e662b67e858037bf227f143c250f884fd1bba5 Mon Sep 17 00:00:00 2001 From: Adam Lind Date: Wed, 25 Oct 2017 22:37:23 -0400 Subject: [PATCH 5/6] Revert dockerfile changes. --- .docker/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 87630688c282..ef8a3cd720fc 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,17 +1,17 @@ FROM rocketchat/base:4 -ENV RC_VERSION 0.59.1.a-irc +ENV RC_VERSION 0.59.0 MAINTAINER buildmaster@rocket.chat RUN set -x \ - && curl -SLf "https://github.com/Pharserror/Rocket.Chat/releases/download/${RC_VERSION}/Rocket.Chat.tar.gz" -o rocket.chat.tgz \ -# && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \ + && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \ + && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \ && mkdir /app \ -# && gpg --verify rocket.chat.tgz.asc \ + && gpg --verify rocket.chat.tgz.asc \ && mkdir -p /app \ && tar -zxf rocket.chat.tgz -C /app \ -# && rm rocket.chat.tgz rocket.chat.tgz.asc \ + && rm rocket.chat.tgz rocket.chat.tgz.asc \ && cd /app/bundle/programs/server \ && npm install \ && npm cache clear \ From 83d2cab0cbd052a70abb35d69ff83859116260a4 Mon Sep 17 00:00:00 2001 From: Adam Lind Date: Wed, 25 Oct 2017 22:38:04 -0400 Subject: [PATCH 6/6] Fix version number. --- .docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index ef8a3cd720fc..40e54c7a30c9 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM rocketchat/base:4 -ENV RC_VERSION 0.59.0 +ENV RC_VERSION 0.59.0-develop MAINTAINER buildmaster@rocket.chat