Skip to content

Fetch #3

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
nimishsinghal wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fetch #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3226ea
Prefer fetch API over XHR
austinpray Oct 31, 2017
a8f1298
Add dist files
nimishsinghal Nov 17, 2017
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
2 changes: 1 addition & 1 deletion dist/plugins/angular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Raven.js 3.20.0 (e6baafa) | github.com/getsentry/raven-js */
/*! Raven.js 3.20.0 (d3226ea) | github.com/getsentry/raven-js */

/*
* Includes TraceKit
Expand Down
2 changes: 1 addition & 1 deletion dist/plugins/angular.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/plugins/console.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Raven.js 3.20.0 (e6baafa) | github.com/getsentry/raven-js */
/*! Raven.js 3.20.0 (d3226ea) | github.com/getsentry/raven-js */

/*
* Includes TraceKit
Expand Down
2 changes: 1 addition & 1 deletion dist/plugins/console.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/plugins/ember.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Raven.js 3.20.0 (e6baafa) | github.com/getsentry/raven-js */
/*! Raven.js 3.20.0 (d3226ea) | github.com/getsentry/raven-js */

/*
* Includes TraceKit
Expand Down
2 changes: 1 addition & 1 deletion dist/plugins/ember.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/plugins/require.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Raven.js 3.20.0 (e6baafa) | github.com/getsentry/raven-js */
/*! Raven.js 3.20.0 (d3226ea) | github.com/getsentry/raven-js */

/*
* Includes TraceKit
Expand Down
2 changes: 1 addition & 1 deletion dist/plugins/require.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/plugins/vue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Raven.js 3.20.0 (e6baafa) | github.com/getsentry/raven-js */
/*! Raven.js 3.20.0 (d3226ea) | github.com/getsentry/raven-js */

/*
* Includes TraceKit
Expand Down
2 changes: 1 addition & 1 deletion dist/plugins/vue.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 31 additions & 6 deletions dist/raven.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Raven.js 3.20.0 (e6baafa) | github.com/getsentry/raven-js */
/*! Raven.js 3.20.0 (d3226ea) | github.com/getsentry/raven-js */

/*
* Includes TraceKit
Expand Down Expand Up @@ -1946,7 +1946,36 @@ Raven.prototype = {
});
},

/**
* @param {string} opts.url
* @param {Object} opts.auth
* @param {*} opts.data
* @param {Object} opts.options
* @callback opts.onSuccess
* @callback opts.onError
* @private
*/
_makeRequest: function(opts) {
// NOTE: auth is intentionally sent as part of query string (NOT as custom
// HTTP header) so as to avoid preflight CORS requests
var url = opts.url + '?' + urlencode(opts.auth);

// https://github.com/Modernizr/Modernizr/blob/d5f881a4de0d5fc1af85921ce9c7dc3919c6d335/feature-detects/network/fetch.js
if ('fetch' in _window) {
return _window.fetch(url, {
method: 'POST',
body: stringify(opts.data)
}).then(function (response) {
if (!response.ok) {
return opts.onError && opts.onError(new Error('Sentry error code: ' + response.status))
}

opts.onSuccess && opts.onSuccess();
})["catch"](function () {
opts.onError && opts.onError(new Error('Sentry error code: network unavailable'));
})
}

var request = _window.XMLHttpRequest && new _window.XMLHttpRequest();
if (!request) return;

Expand All @@ -1955,8 +1984,6 @@ Raven.prototype = {

if (!hasCORS) return;

var url = opts.url;

if ('withCredentials' in request) {
request.onreadystatechange = function() {
if (request.readyState !== 4) {
Expand Down Expand Up @@ -1988,9 +2015,7 @@ Raven.prototype = {
}
}

// NOTE: auth is intentionally sent as part of query string (NOT as custom
// HTTP header) so as to avoid preflight CORS requests
request.open('POST', url + '?' + urlencode(opts.auth));
request.open('POST', url);
request.send(stringify(opts.data));
},

Expand Down
4 changes: 2 additions & 2 deletions dist/raven.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/raven.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/sri.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"@dist/raven.js": {
"hashes": {
"sha256": "jYF4nOaEwqkTJLU1wOR0i8npVgKRwlqzOTb6l64UnnQ=",
"sha512": "Ub9vUbOIAuiyF0yE7dQZTldjWEMiwU3LuATVQZEo8B8gbwS/Urbkx15y2ScrF/eVSx1VaVY5fLWXZb3iqIonww=="
"sha256": "EiTngLuIugltYrHXAsOVLa/TMwHLfreoWfa+xuyzovo=",
"sha512": "+XagaNhd5ZrzAvQ1lCZhx3IP5kN/VCpE1bLNJUSSUQFNyTOX8KVxA9yV7xat9aa1H7UEL3GIS+s4Qb6t8moNqg=="
},
"type": null,
"integrity": "sha256-jYF4nOaEwqkTJLU1wOR0i8npVgKRwlqzOTb6l64UnnQ= sha512-Ub9vUbOIAuiyF0yE7dQZTldjWEMiwU3LuATVQZEo8B8gbwS/Urbkx15y2ScrF/eVSx1VaVY5fLWXZb3iqIonww==",
"integrity": "sha256-EiTngLuIugltYrHXAsOVLa/TMwHLfreoWfa+xuyzovo= sha512-+XagaNhd5ZrzAvQ1lCZhx3IP5kN/VCpE1bLNJUSSUQFNyTOX8KVxA9yV7xat9aa1H7UEL3GIS+s4Qb6t8moNqg==",
"path": "dist/raven.js"
},
"@dist/raven.min.js": {
"hashes": {
"sha256": "T6xp+8yRcwkUpnayYg/Q4ghOycPeh+ERquJRxW408QU=",
"sha512": "J6EJyBgq/iIJKrjme9c/NGQOcEa63VZDLLP8Zx/D3KcZoS2H65CijyRzRMtozBZjGJlJOEbK/AjYzJH+zzgiyg=="
"sha256": "o/Cf40IrYUZabpGokrC2NU9a5yvmkAY4WUbLi+kjYkE=",
"sha512": "kzaDX7GZ37SYh0zd7/4rzqqVCHFtx/kHV06O8hcJMeo0vthY7PbIHFBnBv6pNm19HfL/Yinq9Le0+WAoNdc48A=="
},
"type": null,
"integrity": "sha256-T6xp+8yRcwkUpnayYg/Q4ghOycPeh+ERquJRxW408QU= sha512-J6EJyBgq/iIJKrjme9c/NGQOcEa63VZDLLP8Zx/D3KcZoS2H65CijyRzRMtozBZjGJlJOEbK/AjYzJH+zzgiyg==",
"integrity": "sha256-o/Cf40IrYUZabpGokrC2NU9a5yvmkAY4WUbLi+kjYkE= sha512-kzaDX7GZ37SYh0zd7/4rzqqVCHFtx/kHV06O8hcJMeo0vthY7PbIHFBnBv6pNm19HfL/Yinq9Le0+WAoNdc48A==",
"path": "dist/raven.min.js"
}
}
35 changes: 30 additions & 5 deletions src/raven.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,7 +1881,36 @@ Raven.prototype = {
});
},

/**
* @param {string} opts.url
* @param {Object} opts.auth
* @param {*} opts.data
* @param {Object} opts.options
* @callback opts.onSuccess
* @callback opts.onError
* @private
*/
_makeRequest: function(opts) {
// NOTE: auth is intentionally sent as part of query string (NOT as custom
// HTTP header) so as to avoid preflight CORS requests
var url = opts.url + '?' + urlencode(opts.auth);

// https://github.com/Modernizr/Modernizr/blob/d5f881a4de0d5fc1af85921ce9c7dc3919c6d335/feature-detects/network/fetch.js
if ('fetch' in _window) {
return _window.fetch(url, {
method: 'POST',
body: stringify(opts.data)
}).then(function (response) {
if (!response.ok) {
return opts.onError && opts.onError(new Error('Sentry error code: ' + response.status))
}

opts.onSuccess && opts.onSuccess();
})["catch"](function () {
opts.onError && opts.onError(new Error('Sentry error code: network unavailable'));
})
}

var request = _window.XMLHttpRequest && new _window.XMLHttpRequest();
if (!request) return;

Expand All @@ -1890,8 +1919,6 @@ Raven.prototype = {

if (!hasCORS) return;

var url = opts.url;

if ('withCredentials' in request) {
request.onreadystatechange = function() {
if (request.readyState !== 4) {
Expand Down Expand Up @@ -1923,9 +1950,7 @@ Raven.prototype = {
}
}

// NOTE: auth is intentionally sent as part of query string (NOT as custom
// HTTP header) so as to avoid preflight CORS requests
request.open('POST', url + '?' + urlencode(opts.auth));
request.open('POST', url);
request.send(stringify(opts.data));
},

Expand Down