Refactoring to use ws napi modules

- removed native modules - change imports - add napi dependencies for native modules
NomicFoundation · Dec 10, 2019 · 481144a · 481144a
1 parent 1f7ffba
commit 481144a
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 399 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,3 @@
-all:
-	node-gyp configure build
-
-clean:
-	node-gyp clean
-
 autobahn:
 	@NODE_PATH=lib node test/autobahn-test-client.js --host=127.0.0.1 --port=9000
 

diff --git a/binding.gyp b/binding.gyp
diff --git a/lib/BufferUtil.fallback.js b/lib/BufferUtil.fallback.js
diff --git a/lib/BufferUtil.js b/lib/BufferUtil.js
diff --git a/lib/Validation.fallback.js b/lib/Validation.fallback.js
diff --git a/lib/Validation.js b/lib/Validation.js
diff --git a/lib/WebSocketConnection.js b/lib/WebSocketConnection.js
@@ -19,7 +19,7 @@ var utils = require('./utils');
 var EventEmitter = require('events').EventEmitter;
 var WebSocketFrame = require('./WebSocketFrame');
 var BufferList = require('../vendor/FastBufferList');
-var Validation = require('./Validation').Validation;
+var isValidUTF8 = require('utf-8-validate');
 var bufferAllocUnsafe = utils.bufferAllocUnsafe;
 var bufferFromString = utils.bufferFromString;
 
@@ -544,7 +544,7 @@ WebSocketConnection.prototype.processFrame = function(frame) {
             this._debug('-- Text Frame');
             if (this.assembleFragments) {
                 if (frame.fin) {
-                    if (!Validation.isValidUTF8(frame.binaryPayload)) {
+                    if (!isValidUTF8(frame.binaryPayload)) {
                         this.drop(WebSocketConnection.CLOSE_REASON_INVALID_DATA,
                           'Invalid UTF-8 Data Received');
                         return;
@@ -604,7 +604,7 @@ WebSocketConnection.prototype.processFrame = function(frame) {
                             });
                             break;
                         case 0x01: // WebSocketOpcode.TEXT_FRAME
-                            if (!Validation.isValidUTF8(binaryPayload)) {
+                            if (!isValidUTF8(binaryPayload)) {
                                 this.drop(WebSocketConnection.CLOSE_REASON_INVALID_DATA,
                                   'Invalid UTF-8 Data Received');
                                 return;
@@ -686,7 +686,7 @@ WebSocketConnection.prototype.processFrame = function(frame) {
 
             // If there is a textual description in the close frame, extract it.
             if (frame.binaryPayload.length > 1) {
-                if (!Validation.isValidUTF8(frame.binaryPayload)) {
+                if (!isValidUTF8(frame.binaryPayload)) {
                     this.drop(WebSocketConnection.CLOSE_REASON_INVALID_DATA,
                       'Invalid UTF-8 Data Received');
                     return;

diff --git a/lib/WebSocketFrame.js b/lib/WebSocketFrame.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  ***********************************************************************/
 
-var bufferUtil = require('./BufferUtil').BufferUtil;
+var bufferUtil = require('bufferutil');
 var bufferAllocUnsafe = require('./utils').bufferAllocUnsafe;
 
 const DECODE_HEADER = 1;

diff --git a/package.json b/package.json
@@ -24,13 +24,14 @@
   },
   "homepage": "https://github.com/theturtle32/WebSocket-Node",
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=4.0.0"
   },
   "dependencies": {
+    "bufferutil": "^4.0.1",
     "debug": "^2.2.0",
     "es5-ext": "^0.10.50",
-    "nan": "^2.14.0",
     "typedarray-to-buffer": "^3.1.5",
+    "utf-8-validate": "^5.0.2",
     "yaeti": "^0.0.6"
   },
   "devDependencies": {
@@ -46,7 +47,6 @@
     "verbose": false
   },
   "scripts": {
-    "install": "(node-gyp rebuild 2> builderror.log) || (exit 0)",
     "test": "faucet test/unit",
     "gulp": "gulp"
   },

diff --git a/src/bufferutil.cc b/src/bufferutil.cc