From 0f1dd87abc5ad2c91f68007f4033651eb9b7d00d Mon Sep 17 00:00:00 2001 From: Jehy Date: Mon, 23 Jul 2018 13:53:57 +0300 Subject: [PATCH 1/6] add package-lock to ignores --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index aacf0c0..43e1e76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules/ p.js -*.svclog \ No newline at end of file +*.svclog +package-lock.json From c14f859eb3876b999251d54545f35431c981e8ed Mon Sep 17 00:00:00 2001 From: Jehy Date: Mon, 23 Jul 2018 13:54:32 +0300 Subject: [PATCH 2/6] fix typo (no closing bracket) --- lib/ws.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ws.js b/lib/ws.js index 082b1c4..7fe851b 100644 --- a/lib/ws.js +++ b/lib/ws.js @@ -49,8 +49,8 @@ function addAttachment(ctx, property, xpath, file, contentType) { , doc = new Dom().parseFromString(prop) , elem = select(doc, xpath)[0]; var content; - - if (Buffer.isBuffer(file) content = file.toString("base64"); + + if (Buffer.isBuffer(file)) content = file.toString("base64"); else content = fs.readFileSync(file).toString("base64") utils.setElementValue(doc, elem, content) From ddb8856c640844d065001fd02a2a109d111aa34e Mon Sep 17 00:00:00 2001 From: Jehy Date: Mon, 23 Jul 2018 13:55:04 +0300 Subject: [PATCH 3/6] add variable declarations to work in strict mode --- lib/xpath.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/xpath.js b/lib/xpath.js index 2230a71..38b09d4 100644 --- a/lib/xpath.js +++ b/lib/xpath.js @@ -3274,7 +3274,7 @@ NamespaceResolver.prototype.getNamespace = function(prefix, n) { // Functions ///////////////////////////////////////////////////////////////// -Functions = new Object(); +var Functions = new Object(); Functions.last = function() { var c = arguments[0]; @@ -3645,7 +3645,7 @@ Functions.round = function() { // Utilities ///////////////////////////////////////////////////////////////// -Utilities = new Object(); +var Utilities = new Object(); Utilities.splitQName = function(qn) { var i = qn.indexOf(":"); @@ -4286,4 +4286,4 @@ function SelectNodes(doc, xpath) return res.toArray(); } -exports.SelectNodes = SelectNodes; \ No newline at end of file +exports.SelectNodes = SelectNodes; From 342313c91c14647716ecd0584e0780dd6add254a Mon Sep 17 00:00:00 2001 From: Jehy Date: Mon, 23 Jul 2018 13:56:11 +0300 Subject: [PATCH 4/6] format package.json --- package.json | 77 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index a8d71ea..48d012d 100644 --- a/package.json +++ b/package.json @@ -1,30 +1,47 @@ -{ - "name": "ws.js", - "version": "2.0.23", - "description": "WS-* implementation for node", - "engines": { "node": ">=0.4.0" }, - "author": "Yaron Naveh (yaronn01@gmail.com, http://webservices20.blogspot.com/)", - "dependencies": { - "bufferjs": ">= 1.0.2", - "formidable": "=1.1.1", - "request": ">=2.9.100", - "xmldom": "=0.1.7", - "dateformat": ">=1.0.2-1.2.3", - "xml-crypto": ">=0.0.4" - }, - "devDependencies": { - "nodeunit": ">=0.6.4" - }, - "repository" : { - "type":"git", - "url":"https://github.com/yaronn/ws.js.git" }, - "main": "./index.js", - "scripts": { - "test": "nodeunit ./test/unit ./test/unit/client ./test/integration/client/signature.js" - }, - "directories": { "lib": "./lib" }, - "keywords": ["ws-security", "mtom", "ws-addressing", "ws-star", "ws-*", "web service standards", "wsdl", "soap"], - "licenses": [{ - "type" : "MIT License", - "url" : "http://www.opensource.org/licenses/mit-license.php" }] -} +{ + "name": "ws.js", + "version": "2.0.23", + "description": "WS-* implementation for node", + "engines": { + "node": ">=0.4.0" + }, + "author": "Yaron Naveh (yaronn01@gmail.com, http://webservices20.blogspot.com/)", + "dependencies": { + "bufferjs": ">= 1.0.2", + "formidable": "=1.1.1", + "request": ">=2.9.100", + "xmldom": "=0.1.7", + "dateformat": ">=1.0.2-1.2.3", + "xml-crypto": ">=0.0.4" + }, + "devDependencies": { + "nodeunit": ">=0.6.4" + }, + "repository": { + "type": "git", + "url": "https://github.com/yaronn/ws.js.git" + }, + "main": "./index.js", + "scripts": { + "test": "nodeunit ./test/unit ./test/unit/client ./test/integration/client/signature.js" + }, + "directories": { + "lib": "./lib" + }, + "keywords": [ + "ws-security", + "mtom", + "ws-addressing", + "ws-star", + "ws-*", + "web service standards", + "wsdl", + "soap" + ], + "licenses": [ + { + "type": "MIT License", + "url": "http://www.opensource.org/licenses/mit-license.php" + } + ] +} From 7e87260cdf484c56add78ba0bf00c47cf2a7e7f3 Mon Sep 17 00:00:00 2001 From: Jehy Date: Mon, 23 Jul 2018 13:58:48 +0300 Subject: [PATCH 5/6] bump package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48d012d..fb25f9a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ws.js", - "version": "2.0.23", + "version": "2.0.24", "description": "WS-* implementation for node", "engines": { "node": ">=0.4.0" From e9cff6ae87bf385b1bbf01ec8462f3a06e9a2956 Mon Sep 17 00:00:00 2001 From: Jehy Date: Mon, 23 Jul 2018 14:23:29 +0300 Subject: [PATCH 6/6] fix xmldom version to pass at least some tests --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index fb25f9a..56603dd 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,11 @@ "author": "Yaron Naveh (yaronn01@gmail.com, http://webservices20.blogspot.com/)", "dependencies": { "bufferjs": ">= 1.0.2", + "dateformat": ">=1.0.2-1.2.3", "formidable": "=1.1.1", "request": ">=2.9.100", - "xmldom": "=0.1.7", - "dateformat": ">=1.0.2-1.2.3", - "xml-crypto": ">=0.0.4" + "xml-crypto": ">=0.0.4", + "xmldom": "0.1.19" }, "devDependencies": { "nodeunit": ">=0.6.4"