From d4af4c90057b19fd642dd1f110171bca0662fe28 Mon Sep 17 00:00:00 2001 From: Akhil Kedia Date: Tue, 1 Aug 2017 15:54:57 +0900 Subject: [PATCH] [Follow-Redirects-Iotjs] Ran JSLint and fixed License These commits have already been merged in the github enterprise repo node-red-iotjs. Change-Id: I9a720ce9c4f5c61b04d269fef7ee329f41a4640d Signed-off-by: Akhil Kedia --- iotjs_modules/follow-redirects-iotjs/LICENSE | 219 ++++++++++++++++++ .../follow-redirects-iotjs/README.md | 26 ++- iotjs_modules/follow-redirects-iotjs/index.js | 65 +++--- .../follow-redirects-iotjs/package.json | 4 +- 4 files changed, 272 insertions(+), 42 deletions(-) create mode 100644 iotjs_modules/follow-redirects-iotjs/LICENSE diff --git a/iotjs_modules/follow-redirects-iotjs/LICENSE b/iotjs_modules/follow-redirects-iotjs/LICENSE new file mode 100644 index 0000000..c692697 --- /dev/null +++ b/iotjs_modules/follow-redirects-iotjs/LICENSE @@ -0,0 +1,219 @@ +Copyright 2017-present Samsung Electronics Co., Ltd. and other contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + +-------- + + Copyright follow-redirects-iotjs contributors. All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + + + This license applies to parts of '*.js' files in '/', implementing + follow-redirects compatible API, originating from the + https://github.com/olalonde/follow-redirects repository: + diff --git a/iotjs_modules/follow-redirects-iotjs/README.md b/iotjs_modules/follow-redirects-iotjs/README.md index 6454660..ce4d897 100644 --- a/iotjs_modules/follow-redirects-iotjs/README.md +++ b/iotjs_modules/follow-redirects-iotjs/README.md @@ -1,8 +1,8 @@ -## Follow Redirects +# Follow Redirects IoT.js Drop-in replacement for [IoT.js](http://iotjs.net/)' `http` and `https` that automatically follows redirects. -`follow-redirects` provides [request](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTP.md#httprequestoptions-callback) and [get](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTP.md#httpgetoptions-callback) methods that behave identically to those found on the native IoT.js' [http](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTP.md) and [https](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTPS.md) modules, with the exception that they will seamlessly follow redirects. +`follow-redirects-iotjs` provides [request](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTP.md#httprequestoptions-callback) and [get](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTP.md#httpgetoptions-callback) methods that behave identically to those found on the native IoT.js' [http](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTP.md) and [https](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTPS.md) modules, with the exception that they will seamlessly follow redirects. ```javascript var http = require('follow-redirects-iotjs').http; @@ -42,11 +42,13 @@ https.request({ ``` ## Options + ### Global options -Global options are set directly on the `follow-redirects` module: + +Global options are set directly on the `follow-redirects-iotjs` module: ```javascript -var followRedirects = require('follow-redirects'); +var followRedirects = require('follow-redirects-iotjs'); followRedirects.maxRedirects = 10; ``` @@ -54,13 +56,13 @@ The following global options are supported: - `maxRedirects` (default: `21`) – sets the maximum number of allowed redirects; if exceeded, an error will be emitted. - ### Per-request options + Per-request options are set by passing an `options` object: ```javascript var url = require('url'); -var followRedirects = require('follow-redirects'); +var followRedirects = require('follow-redirects-iotjs'); options = { host: 'bit.ly', @@ -74,6 +76,7 @@ http.request(options); In addition to the [standard HTTP](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTP.md) and [HTTPS options](https://github.com/Samsung/iotjs/blob/master/docs/api/IoT.js-API-HTTPS.md), the following per-request options are supported: + - `followRedirects` (default: `true`) – whether redirects should be followed. - `maxRedirects` (default: `21`) – sets the maximum number of allowed redirects; if exceeded, an error will be emitted. @@ -81,13 +84,20 @@ the following per-request options are supported: Pull Requests are always welcome. Please [file an issue](https://github.com/akhilkedia/iotjs-follow-redirects/issues) detailing your proposal before you invest your valuable time. -## Authors +## Author - Akhil Kedia (akhil.kedia@samsung.com) + +## Original Authors + +This project originates from and implements an API compatible with [follow-redirects](https://github.com/olalonde/follow-redirects), whose original authors are - + - Olivier Lalonde (olalonde@gmail.com) - James Talmage (james@talmage.io) - [Ruben Verborgh](https://ruben.verborgh.org/) +Original License - MIT: [http://olalonde.mit-license.org](http://olalonde.mit-license.org) + ## License -MIT: [http://olalonde.mit-license.org](http://olalonde.mit-license.org) +`follow-redirects-iotjs` is Open Source software under the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0). Complete license and copyright information can be found within the code. diff --git a/iotjs_modules/follow-redirects-iotjs/index.js b/iotjs_modules/follow-redirects-iotjs/index.js index 7fd5134..e560f8c 100644 --- a/iotjs_modules/follow-redirects-iotjs/index.js +++ b/iotjs_modules/follow-redirects-iotjs/index.js @@ -25,11 +25,11 @@ var Writable = require('stream').Writable; var nativeProtocols = { 'http:': http, - 'https:': https + 'https:': https, }; var schemes = {}; var exports = module.exports = { - maxRedirects: 21 + maxRedirects: 21, }; // RFC7231§4.2.1: Of the request methods defined by this specification, @@ -38,7 +38,7 @@ var safeMethods = { GET: true, HEAD: true, OPTIONS: true, - TRACE: true + TRACE: true, }; // Create handlers that pass events from native requests @@ -85,15 +85,15 @@ RedirectableRequest.prototype._performRequest = function() { var request = this._currentRequest = nativeProtocol.request(this._options, this._onNativeResponse); - //We know protocol will already be set here from wrappedProtocol.request - var protocol = this._options.protocol; + // We know protocol will already be set here from wrappedProtocol.request + protocol = this._options.protocol; var host = this._options.host = this._options.hostname || this._options.host || '127.0.0.1'; var path = this._options.path || '/'; - //Set Port based on protocol + // Set Port based on protocol var port = 443; - if (protocol == 'https:') { + if (protocol === 'https:') { port = this._options.port = this._options.port || 443; } else { port = this._options.port = this._options.port || 80; @@ -169,7 +169,7 @@ RedirectableRequest.prototype._processResponse = function(response) { } } - //Resolve the (possibly relative) URL wrt the Base url + // Resolve the (possibly relative) URL wrt the Base url this._options = urlResolve(this._options, this._currentUrl, location); this._isRedirect = true; @@ -211,7 +211,7 @@ RedirectableRequest.prototype.setTimeout = function(timeout, callback) { RedirectableRequest.prototype.write = function(data, callback) { this._currentRequest.write(data, callback); this._bufferedWrites.push({ - data: data + data: data, }); }; @@ -220,7 +220,7 @@ RedirectableRequest.prototype.end = function(data, callback) { this._currentRequest.end(data, callback); if (data) { this._bufferedWrites.push({ - data: data + data: data, }); } }; @@ -233,7 +233,6 @@ Object.keys(nativeProtocols).forEach(function(protocol) { // Executes an HTTP request, following redirects wrappedProtocol.request = function(options, callback) { - if (!options) { options = {}; } @@ -264,7 +263,7 @@ Object.keys(nativeProtocols).forEach(function(protocol) { // RFC3986§5.2: an algorithm for converting a URI reference // that might be relative to a given base URI into the parsed components // of the reference's target. The components can then be recomposed -urlResolve = function(options, currentUrl, location){ +function urlResolve(options, currentUrl, location) { var baseUrl = urlParse(currentUrl); var redirUrl = urlParse(location); var targetUrl = urlTransform(baseUrl, redirUrl); @@ -275,9 +274,9 @@ urlResolve = function(options, currentUrl, location){ // by a single colon (":") character. delete options.port; if (targetUrl.authority) { - var lastColon = targetUrl.authority.lastIndexOf(":"); - if (lastColon != -1) { - var port = parseInt(targetUrl.authority.substring(lastColon+1)); + var lastColon = targetUrl.authority.lastIndexOf(':'); + if (lastColon !== -1) { + var port = parseInt(targetUrl.authority.substring(lastColon + 1)); if (!isNaN(port)) { host = targetUrl.authority.substring(0, lastColon); // RFC3986§7.2: Applications should prevent dereference of a URI that @@ -294,30 +293,30 @@ urlResolve = function(options, currentUrl, location){ // RFC3968§5.3 Parsed URI components can be recomposed to obtain the // corresponding URI reference string... if (!targetUrl.query) { - targetUrl.query=''; + targetUrl.query = ''; } else { targetUrl.query = '?' + targetUrl.query; } if (!targetUrl.fragment) { - targetUrl.fragment=''; + targetUrl.fragment = ''; } else { targetUrl.fragment = '#' + targetUrl.fragment; } options.path = targetUrl.path + targetUrl.query + targetUrl.fragment; - if (targetUrl.scheme != 'http:' && targetUrl.scheme != 'https:') { + if (targetUrl.scheme !== 'http:' && targetUrl.scheme !== 'https:') { console.log('Incorrect scheme in the request. Defaulting to base scheme'); options.protocol = baseUrl.scheme; } else { options.protocol = targetUrl.scheme; } return options; -}; +} // RFC3968§5.2.2 For each URI reference (R), the following pseudocode describes // an algorithm for transforming R into its target URI (T) -urlTransform = function(base, redir) { +function urlTransform(base, redir) { var trans = {}; - if (redir.scheme == base.scheme) { + if (redir.scheme === base.scheme) { redir.scheme = null; } @@ -332,7 +331,7 @@ urlTransform = function(base, redir) { trans.path = urlRemoveDot(redir.path); trans.query = redir.query; } else { - if (redir.path == "") { + if (!redir.path) { trans.path = base.path; if (redir.query) { trans.query = redir.query; @@ -340,7 +339,7 @@ urlTransform = function(base, redir) { trans.query = base.query; } } else { - if (redir.path.charAt(0) == "/") { + if (redir.path.charAt(0) === '/') { trans.path = urlRemoveDot(redir.path); } else { trans.path = urlMerge(base.path, redir.path); @@ -360,8 +359,9 @@ urlTransform = function(base, redir) { // breaking-down a well-formed URI reference into its components. // ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? // 12 3 4 5 6 7 8 9 -urlParse = function(location){ +function urlParse(location) { var redirOptions = {}; + // eslint-disable-next-line var urlRegex = /^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?/g; var m = urlRegex.exec(location); @@ -372,7 +372,7 @@ urlParse = function(location){ redirOptions.fragment = m[9]; return redirOptions; -}; +} // RFC3968§5.2.4 routine for // interpreting and removing the special "." and ".." complete path @@ -380,7 +380,7 @@ urlParse = function(location){ // extracted from a reference, whether or not the path was relative, in // order to remove any invalid or extraneous dot-segments prior to // forming the target URI -urlRemoveDot = function(path){ +function urlRemoveDot(path) { var rval = ''; if (path.indexOf('/') === 0) { rval = '/'; @@ -407,19 +407,20 @@ urlRemoveDot = function(path){ output.push(input.shift()); } return rval + output.join('/'); -}; +} // RFC3968§5.2.3 The pseudocode above refers to a "merge" routine for merging a // relative-path reference with the path of the base URI. -urlMerge = function(basePath, redirPath){ +function urlMerge(basePath, redirPath) { if (!basePath) { - return "/"+redirPath; + return '/' + redirPath; } else { - var lastSlash = basePath.lastIndexOf("/"); - if (lastSlash == -1) { + var lastSlash = basePath.lastIndexOf('/'); + if (lastSlash === -1) { return redirPath; } else { - return basePath.substring(0, lastSlash+1) + redirPath; + return basePath.substring(0, lastSlash + 1) + redirPath; } } } + diff --git a/iotjs_modules/follow-redirects-iotjs/package.json b/iotjs_modules/follow-redirects-iotjs/package.json index b6cb374..4562b46 100644 --- a/iotjs_modules/follow-redirects-iotjs/package.json +++ b/iotjs_modules/follow-redirects-iotjs/package.json @@ -31,5 +31,5 @@ "email": "akhil.kedia@samsung.com", "url": "https://github.com/akhilkedia" }, - "license": "MIT" -} + "license": "Apache 2.0" +} \ No newline at end of file -- 2.34.1