Skip to content

If options is supplied and has a headers property, make sure to pass through the custom headers. #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rrrhys wants to merge 4 commits into
base: master
Choose a base branch
from
Open

If options is supplied and has a headers property, make sure to pass through the custom headers. #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b6722d
If options is supplied and has a headers property, make sure to pass …
rrrhys Nov 14, 2018
bbc92df
Update readme.md
rrrhys Jun 27, 2019
47362a2
Update stream.js
rrrhys Jun 27, 2019
09ee0a7
Update package.json
rrrhys Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "websocket-stream",
"version": "5.1.2",
"version": "5.1.3",
"license": "BSD-2-Clause",
"description": "Use websockets with the node streams API. Works in browser and node",
"scripts": {
Expand All @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "git+ssh://git@github.com/maxogden/websocket-stream.git"
"url": "git+ssh://git@github.com/rrrhys/websocket-stream.git"
},
"keywords": [
"websocket",
Expand Down Expand Up @@ -43,9 +43,9 @@
"ws": "./ws-fallback.js"
},
"bugs": {
"url": "https://github.com/maxogden/websocket-stream/issues"
"url": "https://github.com/rrrhys/websocket-stream/issues"
},
"homepage": "https://github.com/maxogden/websocket-stream#readme",
"homepage": "https://github.com/rrrhys/websocket-stream#readme",
"main": "index.js",
"author": ""
"author": "Original code is Max Ogden."
}
8 changes: 7 additions & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# websocket-stream

[![NPM](https://nodei.co/npm/websocket-stream.png?global=true)](https://nodei.co/npm/websocket-stream/)
### Changes made to this repository

I'm using this repo for mqtt in a react-native mobile app.

It sends the aws custom authoriser headers that the original lib does not.



Use HTML5 [websockets](https://developer.mozilla.org/en-US/docs/WebSockets) using the Node Streams API.

Expand Down
7 changes: 5 additions & 2 deletions stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ function WebSocketStream(target, protocols, options) {
var stream, socket

var isBrowser = process.title === 'browser'
var isReactNative = process.title === 'reactnative'
var isNative = !!global.WebSocket
var socketWrite = isBrowser ? socketWriteBrowser : socketWriteNode
var socketWrite = isBrowser || isReactNative ? socketWriteBrowser : socketWriteNode

if (protocols && !Array.isArray(protocols) && 'object' === typeof protocols) {
// accept the "options" Object as the 2nd argument
Expand Down Expand Up @@ -60,7 +61,9 @@ function WebSocketStream(target, protocols, options) {
} else {
// special constructor treatment for native websockets in browsers, see
// https://github.com/maxogden/websocket-stream/issues/82
if (isNative && isBrowser) {
// additionally, if options is supplied and contains headers property, keep initialise with protocols & options
let hasAdditionalHeaders = !!(options && options.headers);
if (isNative && isBrowser && !hasAdditionalHeaders) {
socket = new WS(target, protocols)
} else {
socket = new WS(target, protocols, options)
Expand Down