@adobe/acc-js-sdk 1.1.3 → 1.1.4

package/CHANGELOG.md

@@ -5,6 +5,15 @@ This is a node.js SDK for Campaign API. It exposes the Campaign API exactly like
 
 # Changelog 
 
+## Version 1.1.4
+_2022/06/xx_
+
+* Added `application.version` which returns the server version in the format major.minor.servicePack (ex: 8.2.10)
+* Added the ability to push down parameters to the SOAP and transport layers. See the pushDown section of the readme file.
+* The pushDown mechanism can be used to simply overwrite the request timeout, either globally or at the method level
+* Publicly export the HttpError class so that custom transports can be written more safely. A failure during transport should return an HttpError object
+* By default, the SOAP method name is now added in the URLs for better troubleshooting
+
 ## Version 1.1.3
 _2022/05/30_
 
@@ -15,6 +24,10 @@ _2022/05/30_
 * Document how to set the password of an external account
 * By default, SDK will send additional HTTP headers to help troubleshooting and usage tracking
 * Add the ability to pass extra HTTP headers to API calls, either globally (to all HTTP headers), or locally, i.e. for a specific method
+* Remove .vscode folder from the sources
+* Example for xtkBuilder.installPackage API
+* For APIs which have parameters of type DOMElement and which are called using XML, support passing either a DOMElement or a DOMDocument
+
 
 ## Version 1.1.2
 _2022/03/22_

package/README.md

@@ -133,6 +133,8 @@ charset|UTF-8|The charset encoding used for http requests. In version 1.1.1 and
 extraHttpHeaders|[string]:string|An optional dictionary (key/value pairs) of extra HTTP headers to pass to all API calls.
 clientApp|string|An optional string describing the name and version of the SDK client application. It will be passed to the server in the ACC-SDK-Client-App HTTP header
 noSDKHeaders|boolean|Can be set to disable passing ACC-SDK-* HTTP headers to the server
+noMethodInURL|boolean|Can be set to true to remove the method name from the URL
+timeout|number|Can be used to set the APIs call timeout (in ms)
 ```js
 const connectionParameters = sdk.ConnectionParameters.ofUserAndPassword(
                                     "https://myInstance.campaign.adobe.com", 
@@ -189,8 +191,8 @@ If you want to use the SDK client-side in a web page returned by Campaign, you c
 For this scenario, the `ofSecurityToken` function can be used. Pass it a security token (usually available as document.__securitytoken), and the SDK will let the browser handle the session token (cookie) for you.
 
 ```html
-    <script src="acc-sdk.js"></script>
-    <script>
+<script src="acc-sdk.js"></script>
+<script>
         (async () => {
             try {
                 const sdk = document.accSDK;
@@ -204,8 +206,8 @@ For this scenario, the `ofSecurityToken` function can be used. Pass it a securit
                 console.error(ex);
             }
         })();
-    </script>
-    </body>
+</script>
+</body>
 </html>
 ```
 
@@ -320,7 +322,8 @@ The Simple JSON format works like this:
 
 The XML root element tag is determined by the SDK as it's generating the XML, usually from the current schema name.
 
-* XML: `<root/>`
+* XML: `<root/>
+`
 * JSON: `{}`
 
 XML attributes are mapped to JSON attributes with the same name, whose litteral value can be a string, number, or boolean. There's no "@" sign in the JSON attribute name.
@@ -357,7 +360,9 @@ Text of a child element
 * Alternative JSON: `{ item: { $: "Hello" } }`
 
 If an element contains both text, and children, you need to use the alternative `$` syntax
-* XML: `<root><item>Hello<child id="1"/></item></root>`
+* XML: `<root><item>Hello<child id="1"/>
+</item>
+</root>`
 * JSON: `{ item: { $: "Hello", child: { id:1 } }`
 
 
@@ -510,8 +515,8 @@ const DomUtil = client.DomUtil;
 Create DOM from XML string:
 ```js
 const doc = DomUtil.parse(`<root>
-      <one/>
-    </root>`);
+<one/>
+</root>`);
 ```
 
 Writes a DOM document or element as a string:
@@ -582,12 +587,12 @@ const json = DomUtil.toJSON(documentOrElement, "BadgerFish");
 Many Campaign APIs take arguments which are DOM documents or DOM elements. For example, the nms:delivery#DeployTriggerMessages first argument is a DOMElement which is supposed to be a `<where>` clause used as a condition to select Message Center deliveries to publish.
 
 ```xml
-    <method name="DeployTriggerMessages" static="true">
-      <parameters>
-        <param inout="in" name="deliveries" type="DOMElement"/>
-        <param inout="in" name="localPublish" type="boolean"/>
-      </parameters>
-    </method>
+<method name="DeployTriggerMessages" static="true">
+<parameters>
+<param inout="in" name="deliveries" type="DOMElement"/>
+<param inout="in" name="localPublish" type="boolean"/>
+</parameters>
+</method>
 ```
 
 For example, one would want to use the following condition to republish a particular delivery
@@ -603,7 +608,7 @@ For example, one would want to use the following condition to republish a partic
 The JSON object corresponds to the following XML
 ```xml
 <where>
-    <condition expr="@internalName='DM23'"/>
+<condition expr="@internalName='DM23'"/>
 </where>
 ```
 
@@ -757,6 +762,49 @@ const query = client.NLWS
 await query.executeQuery();
 ```
 
+## Timeouts
+
+By default, the SDK has a timeout of 5s when running in a node.js environment, and uses the browser defaults when run inside a browser (using the fetch API).
+
+It is possible to overwrite the transport layer (see `The Transport Protocol` and use your own code to make and configure HTTP requests) to tune the timeout value. It is a bit cumbersome though.
+
+Instead, you can use the `timeout` parameter, and set it either globally, as a connection parameter, or even at the API call level but using the `PushDown` mechanism described below.
+
+Sets a timeout of 10s gloally
+```js
+const connectionParameters = sdk.ConnectionParameters.ofUserAndPassword(
+                                    "https://myInstance.campaign.adobe.com", 
+                                    "admin", "admin",
+                                    { timeout: 10000 });
+```
+
+Override the timeout to 1 min for a particular API call
+```js
+NLWS.xml.pushDown({ timeout: 60000 }).xtkBuilder.installPackage(dom);
+```
+
+## Pushdown mechanism
+The Pushdown mechanism can be used to push down variables to the transport layer. A common use case it to pass a custom timeout value down to the transport layer.
+
+The pushed down parameters are passed as a second parameter to the transport function. This parameter will contain all the connection parameters as well as any parameter that you can push down at the API call level. API call pushdowns can override default pushdowns.
+
+Any key/value pairs can be pushed down. This example pushes down the timeout and foo variables to the transport layer.
+```js
+NLWS.xml.pushDown({ timeout: 60000, foo: 'bar' }).xtkBuilder.installPackage(dom);
+```
+
+## Troubleshooting
+In the version 1.1.4 of the SDK, we are automatically adding the SOAP method name in the URL in order to simplify troubleshooting. Normally, all SOAP method calls are make to the soaprouter.jsp endpoint, which makes it difficult to understand which actual API call is being made.
+In fact the SOAP call name is available via the SOAPAction HTTP header, but it's usually not immediatelly visible.
+
+The SOAP calls URLs are now formed like this: `http://acc-sdk:8080/nl/jsp/soaprouter.jsp?xtk:queryDef#ExecuteQuery` where the SOAP method name is added as a query parameter. Campaign server ignores this parameter.
+
+This can be disabled using the `noMethodInURL` connection parameter
+
+const connectionParameters = sdk.ConnectionParameters.ofUserAndPassword(
+                                    "https://myInstance.campaign.adobe.com", 
+                                    "admin", "admin",
+                                    { noMethodInURL: true });
 
 
 # Samples
@@ -982,12 +1030,16 @@ The transport protocol defines
 - What is the corresponding response
 - How errors are handled
 
-The transport protocol exports a single asynchronous function `request` which takes a `Request` literal object with the following attributes. Note that it matches axios requests.
+The transport protocol exports a single asynchronous function `request` which takes two parameters.
+
+The first parameter is the request object with the following attributes. Note that it matches axios requests.
 * `method` is the HTTP verb
 * `url` is the URL to call
 * `headers` is an object containing key value pairs with http headers and their values
 * `data` is the request payload
 
+The second parameter is an set of additional parameters that have been pushed down to the transport layer (see the `Pushdown` paragraph for more details). In particular, the `timeout` parameter should be honored by the transport layer.
+
 If the request is successful, a promise is returned with the result payload, as a string.
 
 If the request fails, the promise is rejected with an error object with class `HttpError`, a litteral with the following attributes:
@@ -995,7 +1047,7 @@ If the request fails, the promise is rejected with an error object with class `H
 * `statusText` is the HTTP status text coming with the error
 * `data` is the response data, if any
 
-For proper error handling by the ACC SDK, it's important that the actual class of returned objects is names "HttpError"
+For proper error handling by the ACC SDK, it's important that the actual class of returned objects is named "HttpError"
 
 The transport can be overriden by using the `client.setTransport` call and passing it a transport function, i.e. an async function which
 * Takes a `Request` object litteral as a parameter
@@ -1052,14 +1104,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
 xmlns:ns="http://xml.apache.org/xml-soap">
 <SOAP-ENV:Header>
-    <Cookie>__sessiontoken=***</Cookie>
-    <X-Security-Token>***</X-Security-Token>
+<Cookie>__sessiontoken=***</Cookie>
+<X-Security-Token>***</X-Security-Token>
 </SOAP-ENV:Header>
 <SOAP-ENV:Body>
-    <m:GetOption xmlns:m="urn:xtk:session" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-        <sessiontoken xsi:type="xsd:string">***</sessiontoken>
-        <name xsi:type="xsd:string">XtkDatabaseId</name>
-    </m:GetOption>
+<m:GetOption xmlns:m="urn:xtk:session" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+<sessiontoken xsi:type="xsd:string">***</sessiontoken>
+<name xsi:type="xsd:string">XtkDatabaseId</name>
+</m:GetOption>
 </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>
 
@@ -1069,10 +1121,10 @@ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
 xmlns:ns='urn:xtk:session'
 xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
 <SOAP-ENV:Body>
-    <GetOptionResponse xmlns='urn:xtk:session' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
-        <pstrValue xsi:type='xsd:string'>uFE80000000000000F1FA913DD7CC7C4804BA419F</pstrValue>
-        <pbtType xsi:type='xsd:byte'>6</pbtType>
-    </GetOptionResponse>
+<GetOptionResponse xmlns='urn:xtk:session' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+<pstrValue xsi:type='xsd:string'>uFE80000000000000F1FA913DD7CC7C4804BA419F</pstrValue>
+<pbtType xsi:type='xsd:byte'>6</pbtType>
+</GetOptionResponse>
 </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>
 `````
@@ -1461,6 +1513,7 @@ The `application` object can be obtained from a client, and will mimmic the Camp
 | Attribute/Method | Description |
 |---|---|
 | **buildNumber** | The server build number
+| **version** | In SDK version 1.1.4 and above, returns the server version formatted as major.minor.servicePack (ex: 8.2.10)
 | **instanceName** | The name of the Campaign instance
 | **operator** | Information about the current operator (i.e. logged user), of class `CurrentLogin`
 | **packages** | List of installed packages, as an array of strings

package/compile.js

@@ -38,8 +38,8 @@ var resources = [
     { name: "./optionCache.js" },
     { name: "./soap.js" },
     { name: "./crypto.js" },
-    { name: "./testUtil.js" },
     { name: "./application.js" },
+    { name: "./testUtil.js" },
     { name: "./client.js" },
     { name: "./index.js" },
 ];

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@adobe/acc-js-sdk",
-      "version": "1.1.3",
+      "version": "1.1.4",
       "license": "ISC",
       "dependencies": {
         "axios": "^0.25.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "ACC Javascript SDK",
   "main": "src/index.js",
   "homepage": "https://github.com/adobe/acc-js-sdk#readme",

package/samples/011 - basics - packages.js

@@ -0,0 +1,60 @@
+/*
+Copyright 2020 Adobe. All rights reserved.
+This file is licensed to you 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 REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+const { DomUtil } = require('../src/domUtil.js');
+const sdk = require('../src/index.js');
+const utils = require("./utils.js");
+
+
+/**
+ * This sample illustrates how to generate and import packages
+ */
+
+( async () => {
+
+  await utils.sample({
+    title: "Testing generating and importing packages",
+    labels: [ "Basics", "Packages", "xtk:builder", "InstallPackage" ],
+    description: `The xtkBuilder.installPackage() can be used to import packages`,
+    code: async() => {
+      return await utils.logon(async (client, NLWS) => {
+        console.log(`Generating package with an option named AccJsSdk`);
+        const doc =  sdk.DomUtil.newDocument('pkgDesc');
+        const package = doc.createElement('package');
+        doc.documentElement.appendChild(package);
+        package.setAttribute('namespace', 'cus');
+        package.setAttribute('name', 'sdk');
+        package.setAttribute('buildNumber', '*');
+        package.setAttribute('buildVersion', '*');
+        package.setAttribute('label', 'Test package for ACC JS SDK');
+        package.setAttribute('vendor', 'acc-js-sdk');
+        
+        const entities = doc.createElement('entities');
+        package.appendChild(entities);
+        entities.setAttribute('schema', 'xtk:option');
+      
+        const option = doc.createElement('option');
+        option.setAttribute('name', 'AccJsSdk');
+        option.setAttribute('dataType', '6');
+        const version = client.application.version;
+        option.setAttribute('stringValue', JSON.stringify(version));
+        entities.appendChild(option);
+      
+        // Install package. The package is in XML format and we set the timeout to 5 mins to prevent any issues
+        console.log(`Installing package`, DomUtil.toXMLString(doc));
+        await NLWS.xml.pushDown({ timeout: 5*60*1000 }).xtkBuilder.installPackage(doc);      
+        console.log(`Package installed`);
+      });
+    }
+  });
+
+})();
+

package/src/application.js

@@ -1207,23 +1207,30 @@ class Application {
              * The server build number
              * @type {string}
              */
-        this.buildNumber = EntityAccessor.getAttributeAsString(serverInfo, "buildNumber");
+            this.buildNumber = EntityAccessor.getAttributeAsString(serverInfo, "buildNumber");
+            /**
+             * The server version, formatted as major.minor.servicePack (ex: 8.2.10)
+             * @type {string}
+             */
+            this.version = EntityAccessor.getAttributeAsString(serverInfo, "majNumber") + "." +
+                           EntityAccessor.getAttributeAsString(serverInfo, "minNumber") + "." +
+                           EntityAccessor.getAttributeAsString(serverInfo, "servicePack");
             /**
              * The Campaign instance name
              * @type {string}
              */
-        this.instanceName = EntityAccessor.getAttributeAsString(serverInfo, "instanceName");
+            this.instanceName = EntityAccessor.getAttributeAsString(serverInfo, "instanceName");
             const userInfo = EntityAccessor.getElement(info, "userInfo");
             /**
              * The logged operator
              * @type {Campaign.CurrentLogin}
              */
-        this.operator = new CurrentLogin(userInfo);
+            this.operator = new CurrentLogin(userInfo);
             /**
              * The list of installed packages
              * @type {string[]}
              */
-        this.packages = [];
+            this.packages = [];
             for (var p of EntityAccessor.getChildElements(userInfo, "installed-package")) {
             this.packages.push(`${EntityAccessor.getAttributeAsString(p, "namespace")}:${EntityAccessor.getAttributeAsString(p, "name")}`);
             }

package/src/client.js

@@ -105,13 +105,13 @@ const xtkObjectHandler = {
  * @private
  * @memberof Campaign
  */
-const clientHandler = (representation, headers) => {
+const clientHandler = (representation, headers, pushDownOptions) => {
     return {
         get: function(client, namespace) {
 
             // Force XML or JSON representation (NLWS.xml or NLWS.json)
-            if (namespace == "xml") return new Proxy(client, clientHandler("xml", headers));
-            if (namespace == "json") return new Proxy(client, clientHandler("SimpleJson", headers));
+            if (namespace == "xml") return new Proxy(client, clientHandler("xml", headers, pushDownOptions));
+            if (namespace == "json") return new Proxy(client, clientHandler("SimpleJson", headers, pushDownOptions));
 
             // Override HTTP headers (NLWS.headers({...}))
             // Unlike NLWS.xml or NLWS.json, NLWS.headers returns a function. This function takes key/value
@@ -123,16 +123,30 @@ const clientHandler = (representation, headers) => {
                 const newHeaders = {};
                 if (headers) for (let h in headers) newHeaders[h] = headers[h];
                 if (methodHeaders) for (let h in methodHeaders) newHeaders[h] = methodHeaders[h];
-                return new Proxy(client, clientHandler(representation, newHeaders));
+                return new Proxy(client, clientHandler(representation, newHeaders, pushDownOptions));
+            };
+
+            // Pushes down addition options to the SOAP and transport layers
+            if (namespace == "pushDown") return (methodPushDownOptions) => {
+                // Build of copy of the pushDownOptions in order to accomodate
+                // chained calls, such as NLWS.pushDown(...).pushDown(...)
+                const newPushDownOptions = {};
+                if (pushDownOptions) for (let h in pushDownOptions) newPushDownOptions[h] = pushDownOptions[h];
+                if (methodPushDownOptions) for (let h in methodPushDownOptions) newPushDownOptions[h] = methodPushDownOptions[h];
+                return new Proxy(client, clientHandler(representation, headers, newPushDownOptions));
             };
 
             return new Proxy({ client:client, namespace:namespace}, {
                 get: function(callContext, methodName) {
                     callContext.representation = representation;
                     callContext.headers = callContext.headers || client._connectionParameters._options.extraHttpHeaders;
+                    callContext.pushDownOptions = {};
                     if (headers) {
                         for (let h in headers) callContext.headers[h] = headers[h];
                     }
+                    if (pushDownOptions) {
+                        for (let h in pushDownOptions) callContext.pushDownOptions[h] = pushDownOptions[h];
+                    }
 
                     if (methodName == ".") return callContext;
 
@@ -270,6 +284,8 @@ class Credentials {
     * @property {{ name:string, value:string}} extraHttpHeaders - optional key/value pair of HTTP header (will override any other headers)
     * @property {string} clientApp - optional name/version of the application client of the SDK. This will be passed in HTTP headers for troubleshooting
     * @property {boolean} noSDKHeaders - set to disable "ACC-SDK" HTTP headers
+    * @property {boolean} noMethodInURL - Can be set to true to remove the method name from the URL
+    * @property {number} timeout - Can be set to change the HTTP call timeout. Value is passed in ms.
     * @memberOf Campaign
  */
  
@@ -291,7 +307,7 @@ class ConnectionParameters {
     constructor(endpoint, credentials, options) {
         // this._options will be populated with the data from "options" and with
         // default values. But the "options" parameter will not be modified
-        this._options = {};
+        this._options = Object.assign({}, options);
 
         // Default value
         if (options === undefined || options === null)
@@ -340,6 +356,7 @@ class ConnectionParameters {
         }
         this._options.clientApp = options.clientApp;
         this._options.noSDKHeaders = !!options.noSDKHeaders;
+        this._options.noMethodInURL = !!options.noMethodInURL;
     }
 
     /**
@@ -716,10 +733,11 @@ class Client {
      * @return {SOAP.SoapMethodCall} a SoapMethodCall which have been initialized with security tokens... and to which the method
      * parameters should be set
      */
-    _prepareSoapCall(urn, method, internal, extraHttpHeaders) {
+    _prepareSoapCall(urn, method, internal, extraHttpHeaders, pushDownOptions) {
         const soapCall = new SoapMethodCall(this._transport, urn, method, 
                                             this._sessionToken, this._securityToken, 
-                                            this._getUserAgentString(), this._connectionParameters._options.charset,
+                                            this._getUserAgentString(),
+                                            Object.assign({}, this._connectionParameters._options, pushDownOptions),
                                             extraHttpHeaders);
         soapCall.internal = !!internal;
         return soapCall;
@@ -1162,7 +1180,7 @@ class Client {
         // console.log(method.toXMLString());
 
         var urn = that._methodCache.getSoapUrn(schemaId, methodName);
-        var soapCall = that._prepareSoapCall(urn, methodName, false, callContext.headers);
+        var soapCall = that._prepareSoapCall(urn, methodName, false, callContext.headers, callContext.pushDownOptions);
 
         // If method is called with one parameter which is a function, then we assume it's a hook: the function will return
         // the actual list of parameters
@@ -1234,7 +1252,7 @@ class Client {
                         if (type == "DOMDocument")
                             soapCall.writeDocument(paramName, xmlValue);
                         else
-                            soapCall.writeElement(paramName, xmlValue.documentElement);
+                            soapCall.writeElement(paramName, xmlValue);
                     }
                     else
                         throw CampaignException.BAD_SOAP_PARAMETER(soapCall, paramName, paramValue, `Unsupported parameter type '${type}' for parameter '${paramName}' of method '${methodName}' of schema '${schemaId}`);

package/src/index.js

@@ -23,7 +23,8 @@ const DomUtil = require('./domUtil.js').DomUtil;
 const XtkCaster = require('./xtkCaster.js').XtkCaster;
 const { Client, Credentials, ConnectionParameters } = require('./client.js');
 const request = require('./transport.js').request;
-const { TestUtil } = require('./testUtil');
+const { TestUtil } = require('./testUtil.js');
+const { HttpError } = require('./transport.js');
 
 /**
  * Get/Set the transport function (defaults to Axios). This function is used for testing / mocking the transport layer.
@@ -210,6 +211,7 @@ sdk.XtkCaster = XtkCaster;
 sdk.Credentials = Credentials;
 sdk.DomUtil = DomUtil;
 sdk.ConnectionParameters = ConnectionParameters;
+sdk.HttpError = HttpError;
 
 // Public exports
 module.exports = sdk;

package/src/soap.js

@@ -78,14 +78,15 @@ const NS_XSD = "http://www.w3.org/2001/XMLSchema";
  * @param {string} sessionToken Campaign session token
  * @param {string} securityToken  Campaign security token
  * @param {string} userAgentString The user agent string to use for HTTP requests
- * @param {string} charset The charset encoding used for http requests, usually UTF-8
+ * @param {string} pushDownOptions Options to push down to the request (comes from connectionParameters._options)
  * @param {{ name:string, value:string}} extraHttpHeaders key/value pair of HTTP header (will override any other headers)
  * @memberof SOAP
  */
 class SoapMethodCall {
     
-    constructor(transport, urn, methodName, sessionToken, securityToken, userAgentString, charset, extraHttpHeaders) {
+    constructor(transport, urn, methodName, sessionToken, securityToken, userAgentString, pushDownOptions, extraHttpHeaders) {
         this.request = undefined;       // The HTTP request (object litteral passed to the transport layer)
+        this.requestOptions = undefined;
         this.response = undefined;      // The HTTP response object (in case of success)
 
         // Current URN and method (for error reporting)
@@ -102,7 +103,8 @@ class SoapMethodCall {
         this._sessionToken = sessionToken || "";
         this._securityToken = securityToken || "";
         this._userAgentString = userAgentString;
-        this._charset = charset || "";
+        this._pushDownOptions = pushDownOptions || {};
+        this._charset = this._pushDownOptions.charset || '';
         this._extraHttpHeaders = extraHttpHeaders || {};
 
         // THe SOAP call being built
@@ -289,6 +291,7 @@ class SoapMethodCall {
     writeElement(tag, element) {
         const node = this._addNode(tag, "ns:Element", null, SOAP_ENCODING_XML);
         if (element !== null && element !== undefined) {
+            if (element.nodeType === 9) element = element.documentElement;
             const child = this._doc.importNode(element, true);
             node.appendChild(child);
         }
@@ -517,7 +520,7 @@ class SoapMethodCall {
      * @param {string} url is the Campaign SOAP endpoint (soaprouter.jsp)
      * @returns {Object} an options object describing the HTTP request, with cookies, headers and body
      */
-    _createHTTPRequest(url) {
+    _createHTTPRequest(url, requestOptions) {
 
         const headers = {
             'Content-type': `application/soap+xml${this._charset ? ";charset=" + this._charset : ""}`,
@@ -533,23 +536,24 @@ class SoapMethodCall {
             if (this.internal) headers["ACC-SDK-Call-Internal"] = "1";
         }
 
-        const options = {
+        const request = {
             url: url,
             method: 'POST',
             headers: headers,
             data: DomUtil.toXMLString(this._doc)
         };
         if (this._sessionToken)
-            options.headers.Cookie = '__sessiontoken=' + this._sessionToken;
+            request.headers.Cookie = '__sessiontoken=' + this._sessionToken;
         if (this._userAgentString)
-            options.headers['User-Agent'] = this._userAgentString;
+            request.headers['User-Agent'] = this._userAgentString;
 
         // Override http headers with custom headers
         for (let h in this._extraHttpHeaders) {
-            options.headers[h] = this._extraHttpHeaders[h];
+            request.headers[h] = this._extraHttpHeaders[h];
         }
 
-        return options;
+        const extraOptions = Object.assign({}, this._pushDownOptions, requestOptions);
+        return [ request, extraOptions ];
     }
     
     /**
@@ -595,9 +599,11 @@ class SoapMethodCall {
             sessionTokenElem.textContent = this._sessionToken;
             this._method.prepend(sessionTokenElem);
         }
-        const options = this._createHTTPRequest(url);
+        const noMethodInURL = !!this._pushDownOptions.noMethodInURL;
+        const actualUrl = noMethodInURL ? url : `${url}?${this.urn}#${this.methodName}`;
+
         // Prepare request and empty response objects
-        this.request = options;
+        [this.request, this.requestOptions] = this._createHTTPRequest(actualUrl);
         this.response = undefined;
     }
 
@@ -610,7 +616,7 @@ class SoapMethodCall {
      */
     async execute() {
         const that = this;
-        const promise = this._transport(this.request);
+        const promise = this._transport(this.request, this.requestOptions);
         return promise.then(function(body) {
             if (body.indexOf(`XSV-350008`) != -1)
                 throw CampaignException.SESSION_EXPIRED();

package/src/testUtil.js

@@ -1,4 +1,4 @@
-const { DomUtil } = require("./domUtil");
+const { DomUtil } = require("./domUtil.js");
 
 /*
 Copyright 2022 Adobe. All rights reserved.
@@ -14,7 +14,7 @@ governing permissions and limitations under the License.
 (function() {
 "use strict";    
   
-const { newSchema } = require("./application");
+const { newSchema } = require("./application.js");
 
 /**********************************************************************************
  * 

package/src/transport.js

@@ -14,13 +14,27 @@ governing permissions and limitations under the License.
 
 const { Util } = require('./util.js');
 
+/**
+ * @memberof Utils
+ * @class
+ * @constructor
+ */
 class HttpError {
+  /* Encapsulates an error from an HTTP call
+    * @param {string|number} statusCode - The Http status code
+    * @param {string?} statusText - The Http status text corresponding to the error code
+    * @param {any?} data - The payload of the HTTP response, which usually contains details about the error
+  */
   constructor(statusCode, statusText, data) {
       this.statusCode = statusCode;
       this.statusText = statusText || "";
       this.data = data;
   }
 
+  /**
+   * Returns a short description of the error
+   * @returns {string} a short descrption of the error
+   */
   toString() {
     return `${this.statusCode}${this.statusText ? " " + this.statusText : ""}`;
   }
@@ -52,13 +66,14 @@ if (!Util.isBrowser()) {
    * - request
    */
 
-  const request = (options) => {
+   const request = (options, requestOptions) => {
+    requestOptions = requestOptions || {};
     const request = {
       method: options.method || "GET",
       url: options.url,
       headers: options.headers,
       data: options.data,
-      timeout: 5000,
+      timeout: requestOptions.timeout || 5000,
     };
     return axios(request)
     .then((response) => {

package/test/application.test.js

@@ -2108,6 +2108,7 @@ describe('Application', () => {
             const application = client.application;
             expect(application).not.toBeNull();
             expect(application.buildNumber).toBeUndefined();
+            expect(application.version).toBeUndefined();
             expect(application.instanceName).toBeUndefined();
             expect(application.operator).toBeUndefined();
             expect(application.package).toBeUndefined();
@@ -2145,4 +2146,14 @@ describe('Application', () => {
             expect(schema2).toBeNull();
         });
     });
+
+    describe("Version", () => {
+        it("Should get proper version information", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+            expect(client.application.buildNumber).toBe('9219');
+            expect(client.application.version).toBe('6.7.0');
+        })
+    })
 });

package/test/client.test.js

@@ -25,7 +25,6 @@ const { HttpError } = require('../src/transport.js');
 const { Cipher } = require('../src/crypto.js');
 const { EntityAccessor } = require('../src/entityAccessor.js');
 
-
 describe('ACC Client', function () {
 
     describe('Init', function () {
@@ -2281,17 +2280,19 @@ describe('ACC Client', function () {
         });
 
         it("Should ignore protocol for local storage root key", async () => {
+            const version = sdk.getSDKVersion().version; // "${version}" or similar
+
             var connectionParameters = sdk.ConnectionParameters.ofUserAndPassword("http://acc-sdk:8080", "admin", "admin", {});
             var client = await sdk.init(connectionParameters);
-            expect(client._optionCache._storage._rootKey).toBe("acc.js.sdk.1.1.3.acc-sdk:8080.cache.OptionCache$");
+            expect(client._optionCache._storage._rootKey).toBe(`acc.js.sdk.${version}.acc-sdk:8080.cache.OptionCache$`);
 
             connectionParameters = sdk.ConnectionParameters.ofUserAndPassword("https://acc-sdk:8080", "admin", "admin", {});
             client = await sdk.init(connectionParameters);
-            expect(client._optionCache._storage._rootKey).toBe("acc.js.sdk.1.1.3.acc-sdk:8080.cache.OptionCache$");
+            expect(client._optionCache._storage._rootKey).toBe(`acc.js.sdk.${version}.acc-sdk:8080.cache.OptionCache$`);
 
             connectionParameters = sdk.ConnectionParameters.ofUserAndPassword("acc-sdk:8080", "admin", "admin", {});
             client = await sdk.init(connectionParameters);
-            expect(client._optionCache._storage._rootKey).toBe("acc.js.sdk.1.1.3.acc-sdk:8080.cache.OptionCache$");
+            expect(client._optionCache._storage._rootKey).toBe(`acc.js.sdk.${version}.acc-sdk:8080.cache.OptionCache$`);
         })
 
         it("Should support no storage", async () => {
@@ -2803,4 +2804,85 @@ describe('ACC Client', function () {
             });
         });
     });
+
+    describe("Pushdown parameters", () => {
+        it("Should push down custom parameters", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_QUERY_EXECUTE_RESPONSE);
+            const queryDef = {
+                "schema": "nms:extAccount",
+                "operation": "select",
+                "select": {
+                    "node": [
+                        { "expr": "@id" },
+                        { "expr": "@name" }
+                    ]
+                }
+            };
+            // Pushing down the foo=bar attributes
+            const query = client.NLWS.pushDown({'foo': 'bar'}).xtkQueryDef.create(queryDef);
+            await query.executeQuery();
+            const lastCall = client._transport.mock.calls[client._transport.mock.calls.length-1];
+            expect(lastCall[0].url).toBe("http://acc-sdk:8080/nl/jsp/soaprouter.jsp?xtk:queryDef#ExecuteQuery");
+            expect(lastCall[1].charset).toBe("UTF-8");
+            expect(lastCall[1].foo).toBe("bar");
+        });
+
+        it("Should push down custom parameters defined at the connection level", async () => {
+            const client = await Mock.makeClient({ 'cnxDefault': 3, 'foo': 'foo' });
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_QUERY_EXECUTE_RESPONSE);
+            const queryDef = {
+                "schema": "nms:extAccount",
+                "operation": "select",
+                "select": {
+                    "node": [
+                        { "expr": "@id" },
+                        { "expr": "@name" }
+                    ]
+                }
+            };
+            // Pushing down the foo=bar attributes (should overload the "foo" set in connecion parameters)
+            const query = client.NLWS.pushDown({'foo': 'bar'}).xtkQueryDef.create(queryDef);
+            await query.executeQuery();
+            const lastCall = client._transport.mock.calls[client._transport.mock.calls.length-1];
+            expect(lastCall[0].url).toBe("http://acc-sdk:8080/nl/jsp/soaprouter.jsp?xtk:queryDef#ExecuteQuery");
+            expect(lastCall[1].charset).toBe("UTF-8");
+            expect(lastCall[1].foo).toBe("bar");
+            expect(lastCall[1].cnxDefault).toBe(3);
+        });
+
+        it("Should chain push options", async () => {
+            const client = await Mock.makeClient({ 'cnxDefault': 3, 'foo': 'foo' });
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_QUERY_EXECUTE_RESPONSE);
+            const queryDef = {
+                "schema": "nms:extAccount",
+                "operation": "select",
+                "select": {
+                    "node": [
+                        { "expr": "@id" },
+                        { "expr": "@name" }
+                    ]
+                }
+            };
+            // Supports multiple calls to pushDown. each one overrides the previous in case of duplicate key
+            // Also supports undefined
+            const query = client.NLWS.pushDown({'foo': 'bar'}).pushDown().pushDown({'foo': 'fu', x: 2 }).xtkQueryDef.create(queryDef);
+            await query.executeQuery();
+            const lastCall = client._transport.mock.calls[client._transport.mock.calls.length-1];
+            expect(lastCall[0].url).toBe("http://acc-sdk:8080/nl/jsp/soaprouter.jsp?xtk:queryDef#ExecuteQuery");
+            expect(lastCall[1].charset).toBe("UTF-8");
+            expect(lastCall[1].foo).toBe("fu");
+            expect(lastCall[1].cnxDefault).toBe(3);
+            expect(lastCall[1].x).toBe(2);
+        });
+    });
 });

package/test/soap.test.js

@@ -25,8 +25,8 @@ const sdk = require('../src/index.js');
 
 const URL = "https://soap-test/nl/jsp/soaprouter.jsp";
 
-function makeSoapMethodCall(transport, urn, methodName, sessionToken, securityToken, userAgentString, optionalCharset, charset, extraHttpHeaders) {
-    const call = new SoapMethodCall(transport, urn, methodName, sessionToken, securityToken, userAgentString, optionalCharset, charset, extraHttpHeaders);
+function makeSoapMethodCall(transport, urn, methodName, sessionToken, securityToken, userAgentString, pushDownOptions, extraHttpHeaders) {
+    const call = new SoapMethodCall(transport, urn, methodName, sessionToken, securityToken, userAgentString, pushDownOptions, extraHttpHeaders);
     return call;
 }
 
@@ -145,7 +145,7 @@ describe('SOAP', function() {
 
         it('Should build an mostly empty SOAP call', function() {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Empty");        // no auth
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             assert.equal(request.url, URL);
             assert.equal(request.method, "POST");
             assert.equal(request.headers["Content-type"], "application/soap+xml");
@@ -161,7 +161,7 @@ describe('SOAP', function() {
 
         it('Should have set authentication tokens', function() {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Empty", "$session$", "$security$");
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             assert.equal(request.headers["X-Security-Token"], "$security$", "Security token matches");
             assert.equal(request.headers["Cookie"], "__sessiontoken=$session$", "Session token matches");
             const env = DomUtil.parse(request.data).documentElement;
@@ -176,7 +176,7 @@ describe('SOAP', function() {
             const expected = [ "false", "false", "false", "true", "true", "true", "false", "true", "false"];
             for (var i=0; i<values.length; i++)
                 call.writeBoolean(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Boolean");
@@ -191,7 +191,7 @@ describe('SOAP', function() {
             const expected = [ "0", "0", "0", "1", "2", "-3", "1", "0", "0", "7", "127", "12", "100", "5", "6", "-5", "-6"];
             for (var i=0; i<values.length; i++)
                 call.writeByte(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Byte");
@@ -206,7 +206,7 @@ describe('SOAP', function() {
             const expected = [ "0", "0", "0", "1", "2", "-3", "1", "0", "0", "7", "500", "12", "100", "5", "6", "-5", "-6"];
             for (var i=0; i<values.length; i++)
                 call.writeShort(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Short");
@@ -221,7 +221,7 @@ describe('SOAP', function() {
             const expected = [ "0", "0", "0", "1", "2", "-3", "1", "0", "0", "7", "500", "12", "100", "5", "6", "-5", "-6"];
             for (var i=0; i<values.length; i++)
                 call.writeLong(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Long");
@@ -236,7 +236,7 @@ describe('SOAP', function() {
             const expected = [ "0", "0", "0", "1", "2", "-3", "1", "0", "0", "7", "500", "12"];
             for (var i=0; i<values.length; i++)
                 call.writeInt64(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Int64");
@@ -251,7 +251,7 @@ describe('SOAP', function() {
             const expected = [ "0", "0", "0", "1", "2", "-3", "1", "0", "0", "7", "500", "12", "100", "5.1", "5.9", "-5.1", "-5.9"];
             for (var i=0; i<values.length; i++)
                 call.writeFloat(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Float");
@@ -266,7 +266,7 @@ describe('SOAP', function() {
             const expected = [ "0", "0", "0", "1", "2", "-3", "1", "0", "0", "7", "500", "12", "100", "5.1", "5.9", "-5.1", "-5.9"];
             for (var i=0; i<values.length; i++)
                 call.writeDouble(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Double");
@@ -281,7 +281,7 @@ describe('SOAP', function() {
             const expected = [ "", "", "0", "1", "2", "-3", "true", "false", "", "7", "500", "12", "1.e2", "5.1", "5.9", "-5.1", "-5.9", "Hello", "<>\""];
             for (var i=0; i<values.length; i++)
                 call.writeString(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:String");
@@ -299,7 +299,7 @@ describe('SOAP', function() {
             const expected = [ "", "", "2020-12-31T12:34:56.789Z", "2020-12-31T12:34:56.789Z", "2020-12-31T00:00:00.000Z"];
             for (var i=0; i<values.length; i++)
                 call.writeTimestamp(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Timestamp");
@@ -317,7 +317,7 @@ describe('SOAP', function() {
             const expected = [ "", "", "2020-12-31T00:00:00.000Z", "2020-12-31T00:00:00.000Z", "2020-12-31T00:00:00.000Z"];
             for (var i=0; i<values.length; i++)
                 call.writeDate(`p${i}`, values[i]);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Date");
@@ -332,7 +332,7 @@ describe('SOAP', function() {
 
             const call = makeSoapMethodCall(undefined, "xtk:session", "Element", "$session$", "$security$");
             call.writeElement("p", element);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Element");
@@ -348,7 +348,7 @@ describe('SOAP', function() {
             const element = call.createElement("root");
             element.setAttribute("att", "Hello");
             call.writeElement("p", element);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Element");
@@ -362,7 +362,7 @@ describe('SOAP', function() {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Element", "$session$", "$security$");
             call.writeElement("p", null);
             call.writeElement("q", undefined);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Element");
@@ -378,7 +378,7 @@ describe('SOAP', function() {
 
             const call = makeSoapMethodCall(undefined, "xtk:session", "Document", "$session$", "$security$");
             call.writeDocument("p", doc);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Document");
@@ -394,7 +394,7 @@ describe('SOAP', function() {
 
             const call = makeSoapMethodCall(undefined, "xtk:session", "Document", "$session$", "$security$");
             call.writeDocument("p", doc.documentElement);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Document");
@@ -408,7 +408,7 @@ describe('SOAP', function() {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Document", "$session$", "$security$");
             call.writeDocument("p", null);
             call.writeDocument("q", undefined);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             const env = DomUtil.parse(request.data).documentElement;
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Document");
@@ -704,14 +704,14 @@ describe('SOAP', function() {
 
         it("Should support no encoding", function() {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Empty");
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             assert.equal(request.url, URL);
             assert.equal(request.headers["Content-type"], "application/soap+xml");
         });
 
         it("Should support UTF-8 encoding", function() {
-            const call = makeSoapMethodCall(undefined, "xtk:session", "Empty", undefined, undefined, undefined, "UTF-8");
-            const request = call._createHTTPRequest(URL);
+            const call = makeSoapMethodCall(undefined, "xtk:session", "Empty", undefined, undefined, undefined, { charset: "UTF-8" });
+            const [ request ] = call._createHTTPRequest(URL);
             assert.equal(request.url, URL);
             assert.equal(request.headers["Content-type"], "application/soap+xml;charset=UTF-8");
         });
@@ -723,7 +723,7 @@ describe('SOAP', function() {
             expect(client._connectionParameters._options.charset).toBe('UTF-8');
             const soapCall = client._prepareSoapCall("xtk:persist", "GetEntityIfMoreRecent", true);
             expect (soapCall._charset).toBe('UTF-8');
-            const request = soapCall._createHTTPRequest(URL);
+            const [ request ] = soapCall._createHTTPRequest(URL);
             assert.equal(request.headers["Content-type"], "application/soap+xml;charset=UTF-8");
         })
 
@@ -734,7 +734,7 @@ describe('SOAP', function() {
             expect(client._connectionParameters._options.charset).toBe('');
             const soapCall = client._prepareSoapCall("xtk:persist", "GetEntityIfMoreRecent", true);
             expect (soapCall._charset).toBe('');
-            const request = soapCall._createHTTPRequest(URL);
+            const [ request ] = soapCall._createHTTPRequest(URL);
             assert.equal(request.headers["Content-type"], "application/soap+xml");
         })
 
@@ -745,7 +745,7 @@ describe('SOAP', function() {
             expect(client._connectionParameters._options.charset).toBe('ISO-8859-1');
             const soapCall = client._prepareSoapCall("xtk:persist", "GetEntityIfMoreRecent", true);
             expect (soapCall._charset).toBe('ISO-8859-1');
-            const request = soapCall._createHTTPRequest(URL);
+            const [ request ] = soapCall._createHTTPRequest(URL);
             assert.equal(request.headers["Content-type"], "application/soap+xml;charset=ISO-8859-1");
         })
     });
@@ -833,7 +833,7 @@ describe("Campaign exception", () => {
 
         it("Should have HTTP request", () => {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Date", "$session$", "$security$");
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             assert.equal(request.url, URL);
         })
 
@@ -842,13 +842,13 @@ describe("Campaign exception", () => {
     describe("User agent", () => {
         it("Should set user agent", () => {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Date", "$session$", "$security$", "My User Agent");
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             expect(request.headers['User-Agent']).toBe("My User Agent");
         })
 
         it("Should support no user agent", () => {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Date", "$session$", "$security$", undefined);
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             expect(request.headers['User-Agent']).toBeUndefined();
         })
     })
@@ -869,7 +869,7 @@ describe("Campaign exception", () => {
     describe('Extra Http headers', () => {
         it("Should take additional headers", () => {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Date", "$session$", "$security$", "My User Agent", undefined, { 'X-ACC-UI-Version': '1.0' });
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             expect(request.headers['User-Agent']).toBe("My User Agent");
             expect(request.headers['X-ACC-UI-Version']).toBe("1.0");
             expect(request.headers['SoapAction']).toBe("xtk:session#Date");
@@ -877,12 +877,26 @@ describe("Campaign exception", () => {
 
         it("Should override default headers headers", () => {
             const call = makeSoapMethodCall(undefined, "xtk:session", "Date", "$session$", "$security$", "My User Agent", undefined, { 'X-ACC-UI-Version': '1.0', 'SoapAction': 'My soap action' });
-            const request = call._createHTTPRequest(URL);
+            const [ request ] = call._createHTTPRequest(URL);
             expect(request.headers['User-Agent']).toBe("My User Agent");
             expect(request.headers['X-ACC-UI-Version']).toBe("1.0");
             expect(request.headers['SoapAction']).toBe("My soap action");
         });
     });
 
+    describe('Adding method name in the URL', () => {
+        it("Should add the method name by default in the URL", () => {
+            const call = makeSoapMethodCall(undefined, "xtk:session", "Empty", "$session$", "$security$");
+            call.finalize(URL);
+            expect(call.request.url).toBe("https://soap-test/nl/jsp/soaprouter.jsp?xtk:session#Empty");
+        });
+
+        it("Should be able to disable adding the method name by default in the URL", () => {
+            const call = makeSoapMethodCall(undefined, "xtk:session", "Empty", "$session$", "$security$", undefined, { noMethodInURL: true });
+            call.finalize(URL);
+            expect(call.request.url).toBe("https://soap-test/nl/jsp/soaprouter.jsp");
+        });
+    });
+
 });
 

package/.vscode/launch.json

@@ -1,22 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Jest Current File",
-            "program": "${workspaceFolder}/node_modules/.bin/jest",
-            "args": ["${relativeFile}"],
-            "console": "integratedTerminal",
-            "internalConsoleOptions": "neverOpen",
-            "windows": {
-              "program": "${workspaceFolder}/node_modules/jest/bin/jest",
-            }
-          }
-
-
-    ]
-}