Skip to content

Commit 3d062de

Browse files
committed
Refactoring to use napi modules
- removed native modules - change imports - add napi dependencies for native modules (github link)
1 parent d941f97 commit 3d062de

11 files changed

+8
-398
lines changed

Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
all:
2-
node-gyp configure build
3-
4-
clean:
5-
node-gyp clean
6-
71
autobahn:
82
@NODE_PATH=lib node test/autobahn-test-client.js --host=127.0.0.1 --port=9000
93

binding.gyp

Lines changed: 0 additions & 18 deletions
This file was deleted.

lib/BufferUtil.fallback.js

Lines changed: 0 additions & 52 deletions
This file was deleted.

lib/BufferUtil.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

lib/Validation.fallback.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

lib/Validation.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

lib/WebSocketConnection.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var utils = require('./utils');
1919
var EventEmitter = require('events').EventEmitter;
2020
var WebSocketFrame = require('./WebSocketFrame');
2121
var BufferList = require('../vendor/FastBufferList');
22-
var Validation = require('./Validation').Validation;
22+
var isValidUTF8 = require('utf-8-validate');
2323

2424
// Connected, fully-open, ready to send and receive frames
2525
const STATE_OPEN = 'open';
@@ -542,7 +542,7 @@ WebSocketConnection.prototype.processFrame = function(frame) {
542542
this._debug('-- Text Frame');
543543
if (this.assembleFragments) {
544544
if (frame.fin) {
545-
if (!Validation.isValidUTF8(frame.binaryPayload)) {
545+
if (!isValidUTF8(frame.binaryPayload)) {
546546
this.drop(WebSocketConnection.CLOSE_REASON_INVALID_DATA,
547547
'Invalid UTF-8 Data Received');
548548
return;
@@ -602,7 +602,7 @@ WebSocketConnection.prototype.processFrame = function(frame) {
602602
});
603603
break;
604604
case 0x01: // WebSocketOpcode.TEXT_FRAME
605-
if (!Validation.isValidUTF8(binaryPayload)) {
605+
if (!isValidUTF8(binaryPayload)) {
606606
this.drop(WebSocketConnection.CLOSE_REASON_INVALID_DATA,
607607
'Invalid UTF-8 Data Received');
608608
return;
@@ -684,7 +684,7 @@ WebSocketConnection.prototype.processFrame = function(frame) {
684684

685685
// If there is a textual description in the close frame, extract it.
686686
if (frame.binaryPayload.length > 1) {
687-
if (!Validation.isValidUTF8(frame.binaryPayload)) {
687+
if (!isValidUTF8(frame.binaryPayload)) {
688688
this.drop(WebSocketConnection.CLOSE_REASON_INVALID_DATA,
689689
'Invalid UTF-8 Data Received');
690690
return;

lib/WebSocketFrame.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
***********************************************************************/
1616

17-
var bufferUtil = require('./BufferUtil').BufferUtil;
17+
var bufferUtil = require('bufferutil');
1818

1919
const DECODE_HEADER = 1;
2020
const WAITING_FOR_16_BIT_LENGTH = 2;

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424
},
2525
"homepage": "https://github.com/theturtle32/WebSocket-Node",
2626
"engines": {
27-
"node": ">=0.10.0"
27+
"node": ">=4.8.6"
2828
},
2929
"dependencies": {
30+
"bufferutil": "[email protected]:websockets/bufferutil.git#n-api",
3031
"debug": "^2.2.0",
3132
"nan": "^2.3.3",
3233
"typedarray-to-buffer": "^3.1.2",
34+
"utf-8-validate": "[email protected]:websockets/utf-8-validate.git#n-api",
3335
"yaeti": "^0.0.6"
3436
},
3537
"devDependencies": {
@@ -45,7 +47,6 @@
4547
"verbose": false
4648
},
4749
"scripts": {
48-
"install": "(node-gyp rebuild 2> builderror.log) || (exit 0)",
4950
"test": "faucet test/unit",
5051
"gulp": "gulp"
5152
},

src/bufferutil.cc

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)