stimulsoft-data-adapter 2022.1.5 → 2022.2.2

package/FirebirdAdapter.js

@@ -1,14 +1,14 @@
 /*
 Stimulsoft.Reports.JS
-Version: 2022.1.5
-Build date: 2022.01.27
+Version: 2022.2.2
+Build date: 2022.03.29
 License: https://www.stimulsoft.com/en/licensing/reports
 */
 exports.process = function (command, onResult) {
     var end = function (result) {
         try {
             if (db) db.detach();
-            result.adapterVersion = "2022.1.5";
+            result.adapterVersion = "2022.2.2";
             onResult(result);
         }
         catch (e) {

package/MSSQLAdapter.js

@@ -1,14 +1,14 @@
 /*
 Stimulsoft.Reports.JS
-Version: 2022.1.5
-Build date: 2022.01.27
+Version: 2022.2.2
+Build date: 2022.03.29
 License: https://www.stimulsoft.com/en/licensing/reports
 */
 exports.process = function (command, onResult) {
     var end = function (result) {
         try {
             if (connection) connection.close();
-            result.adapterVersion = "2022.1.5";
+            result.adapterVersion = "2022.2.2";
             onResult(result);
         }
         catch (e) {

package/MySQLAdapter.js

@@ -1,7 +1,7 @@
 /*
 Stimulsoft.Reports.JS
-Version: 2022.1.5
-Build date: 2022.01.27
+Version: 2022.2.2
+Build date: 2022.03.29
 License: https://www.stimulsoft.com/en/licensing/reports
 */
 exports.process = function (command, onResult) {
@@ -10,7 +10,7 @@ exports.process = function (command, onResult) {
             if (connection) {
                 connection.end();
             }
-            result.adapterVersion = "2022.1.5";
+            result.adapterVersion = "2022.2.2";
             onResult(result);
         }
         catch (e) {

package/PostgreSQLAdapter.js

@@ -1,14 +1,14 @@
 /*
 Stimulsoft.Reports.JS
-Version: 2022.1.5
-Build date: 2022.01.27
+Version: 2022.2.2
+Build date: 2022.03.29
 License: https://www.stimulsoft.com/en/licensing/reports
 */
 exports.process = function (command, onResult) {
     var end = function (result) {
         try {
             if (client) client.end();
-            result.adapterVersion = "2022.1.5";
+            result.adapterVersion = "2022.2.2";
             onResult(result);
         }
         catch (e) {

package/README.md

@@ -18,4 +18,4 @@ StiOptions.WebServer.url = "http://localhost:9615";
 
 In the app.js file, you can change all parameters passed from the JS client-side.
 
-A [sample](https://github.com/stimulsoft/Samples-JS/tree/master/Node.js/04.%20Start%20SQL%20Adapters%20from%20Http%20Server) shows how to run an adapter.
+A [sample](https://github.com/stimulsoft/Samples-JS/tree/master/Node.js/Starting%20SQL%20adapters%20from%20the%20HTTP%20server) shows how to run an adapter.

package/index.js

@@ -0,0 +1,138 @@
+/*
+Stimulsoft.Reports.JS
+Version: 2022.2.2
+Build date: 2022.03.29
+License: https://www.stimulsoft.com/en/licensing/reports
+*/
+
+function getCommand(data) {
+    var encryptResult = false;
+    if (typeof data === "string" && !data.startsWith("{")) {
+        data = Buffer.from(data.replace(/[A-Za-z]/g, function (c) {
+            return String.fromCharCode(c.charCodeAt(0) + (c.toUpperCase() <= "M" ? 13 : -13));
+        }), "base64").toString("ascii");
+        encryptResult = true;
+    }
+
+    var command = JSON.parse(data.toString());
+    command.encryptResult = encryptResult;
+    return command;
+}
+
+function process(command, onResult) {
+    if (typeof command !== "object") command = getCommand(command);
+
+    var onProcessHandler = onProcess.bind(null, onResult, command.encryptResult);
+
+    if (command.command === "GetSupportedAdapters") {
+        onProcessHandler({ success: true, types: ["MySQL", "MS SQL", "Firebird", "PostgreSQL"] });
+    } else {
+        command.queryString = applyQueryParameters(command.queryString, command.parameters, command.escapeQueryParameters);
+
+        if (command.database == "MySQL") {
+            var MySQLAdapter = require('./MySQLAdapter');
+            MySQLAdapter.process(command, onProcessHandler);
+        }
+        else if (command.database == "Firebird") {
+            var FirebirdAdapter = require('./FirebirdAdapter');
+            FirebirdAdapter.process(command, onProcessHandler);
+        }
+        else if (command.database == "MS SQL") {
+            var MSSQLAdapter = require('./MSSQLAdapter');
+            MSSQLAdapter.process(command, onProcessHandler);
+        }
+        else if (command.database == "PostgreSQL") {
+            var PostgreSQLAdapter = require('./PostgreSQLAdapter');
+            PostgreSQLAdapter.process(command, onProcessHandler);
+        }
+        else onProcessHandler({ success: false, notice: "Database '" + command.database + "' not supported!" });
+    }
+}
+
+function applyQueryParameters(baseSqlCommand, parameters, escapeQueryParameters) {
+    if (baseSqlCommand == null || baseSqlCommand.indexOf("@") < 0) return baseSqlCommand;
+
+    var result = "";
+    while (baseSqlCommand.indexOf("@") >= 0 && parameters != null && parameters.length > 0) {
+        result += baseSqlCommand.substring(0, baseSqlCommand.indexOf("@"));
+        baseSqlCommand = baseSqlCommand.substring(baseSqlCommand.indexOf("@") + 1);
+
+        var parameterName = "";
+
+        while (baseSqlCommand.length > 0) {
+            var char = baseSqlCommand.charAt(0);
+            if (char.length === 1 && char.match(/[a-zA-Z0-9_-]/i)) {
+                parameterName += char;
+                baseSqlCommand = baseSqlCommand.substring(1);
+            }
+            else break;
+        }
+
+        var parameter = parameters.find(parameter => parameter.name.toLowerCase() == parameterName.toLowerCase());
+        if (parameter) {
+            if (parameter.typeGroup != "number") {
+                if (escapeQueryParameters)
+                    result += "'" + parameter.value.toString().replace(/\\/gi, "\\\\").replace(/\'/gi, "\\\'").replace(/\"/gi, "\\\"") + "'";
+                else
+                    result += "'" + parameter.value.toString() + "'";
+            }
+            else
+                result += parameter.value.toString();
+        }
+        else
+            result += "@" + parameterName;
+    }
+
+    return result + baseSqlCommand;
+}
+
+function getResponse(result) {
+    let encryptData = result.encryptData;
+    delete result.encryptData;
+
+    result = JSON.stringify(result);
+    if (encryptData) {
+        result = Buffer.from(result).toString("base64").replace(/[A-Za-z]/g, function (c) {
+            return String.fromCharCode(c.charCodeAt(0) + (c.toUpperCase() <= "M" ? 13 : -13));
+        });
+    }
+
+    return result
+}
+function onProcess(onResult, encryptData, result) {
+    result.handlerVersion = "2022.2.2";
+    result.checkVersion = true;
+    result.encryptData = encryptData;
+    onResult(result);
+}
+
+module.exports = { getCommand, process };
+
+if (require.main === module) {
+    var http = require('http');
+    var accept = function (request, response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
+        response.setHeader("Cache-Control", "no-cache");
+
+        var data = "";
+        request.on('data', function (buffer) {
+            data += buffer;
+        });
+
+        request.on('end', function () {
+            var command = getCommand(data);
+            process(command, function (result) {
+                var responseData = getResponse(result);
+                response.end(responseData);
+            });
+        });
+    }
+
+    console.log("The DataAdapter run on port 9615");
+    console.log("To use, on the client side, you need to specify the URL of this host that handles requests:");
+    console.log("StiOptions.WebServer.url = \"http://localhost:9615\"");
+    http.createServer(accept).listen(9615);
+}
+

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "stimulsoft-data-adapter",
-    "version": "2022.1.5",
+    "version": "2022.2.2",
     "description": "Nodejs data adapter for Stimulsoft Reports.JS",
-    "main": "app.js",
+    "main": "index.js",
     "scripts": {
-        "start": "node app.js"
+        "start": "node index.js"
     },
     "repository": {
         "type": "git",
@@ -20,11 +20,10 @@
     "files": [
         "package.json",
         "README.md",
-        "app.js",
+        "index.js",
         "FirebirdAdapter.js",
         "MSSQLAdapter.js",
         "MySQLAdapter.js",
-        "OracleAdapter.js",
         "PostgreSQLAdapter.js"
     ],
     "author": {
@@ -47,4 +46,4 @@
     ],
     "license": "Closed Source",
     "homepage": "https://github.com/stimulsoft/DataAdapters.JS/tree/main/NodejsDataAdapters"
-}
+}

package/app.js

@@ -1,89 +0,0 @@
-/*
-Stimulsoft.Reports.JS
-Version: 2022.1.5
-Build date: 2022.01.27
-License: https://www.stimulsoft.com/en/licensing/reports
-*/
-var http = require('http');
-var MySQLAdapter = require('./MySQLAdapter');
-var FirebirdAdapter = require('./FirebirdAdapter');
-var MSSQLAdapter = require('./MSSQLAdapter');
-var PostgreSQLAdapter = require('./PostgreSQLAdapter');
-
-var connectionStringBuilder;
-var response;
-function accept(req, res) {
-    response = res;
-    response.setHeader("Access-Control-Allow-Origin", "*");
-    response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-    response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
-    response.setHeader("Cache-Control", "no-cache");
-
-    var data = "";
-    req.on('data', function (buffer) {
-        data += buffer;
-    });
-
-    req.on('end', function () {
-        if (data.indexOf("{") != 0) {
-            data = Buffer.from(data.replace(/[A-Za-z]/g, function (c) {
-                return String.fromCharCode(c.charCodeAt(0) + (c.toUpperCase() <= "M" ? 13 : -13));
-            }), "base64").toString("ascii");
-
-        }
-
-        command = JSON.parse(data.toString());
-
-        command.queryString = applyQueryParameters(command.queryString, command.parameters, command.escapeQueryParameters);
-
-        if (command.database == "MySQL") MySQLAdapter.process(command, onProcess);
-        else if (command.database == "Firebird") FirebirdAdapter.process(command, onProcess);
-        else if (command.database == "MS SQL") MSSQLAdapter.process(command, onProcess);
-        else if (command.database == "PostgreSQL") PostgreSQLAdapter.process(command, onProcess);
-        else onResult({ success: false, notice: "Database '" + command.database + "' not supported!" });
-    });
-}
-
-var applyQueryParameters = function (baseSqlCommand, parameters, escapeQueryParameters) {
-    if (baseSqlCommand == null || baseSqlCommand.indexOf("@") < 0) return baseSqlCommand;
-
-    var result = "";
-    while (baseSqlCommand.indexOf("@") >= 0 && parameters != null && parameters.length > 0) {
-        result += baseSqlCommand.substring(0, baseSqlCommand.indexOf("@"));
-        baseSqlCommand = baseSqlCommand.substring(baseSqlCommand.indexOf("@") + 1);
-
-        var parameterName = "";
-
-        while (baseSqlCommand.length > 0) {
-            var char = baseSqlCommand.charAt(0);
-            if (char.length === 1 && char.match(/[a-zA-Z0-9_-]/i)) {
-                parameterName += char;
-                baseSqlCommand = baseSqlCommand.substring(1);
-            }
-            else break;
-        }
-
-        var parameter = parameters.find(parameter => parameter.name.toLowerCase() == parameterName.toLowerCase());
-        if (parameter) {
-            if (parameter.typeGroup != "number") {
-                if (escapeQueryParameters)
-                    result += "'" + parameter.value.toString().replace(/\\/gi, "\\\\").replace(/\'/gi, "\\\'").replace(/\"/gi, "\\\"") + "'";
-                else
-                    result += "'" + parameter.value.toString() + "'";
-            }
-            else
-                result += parameter.value.toString();
-        }
-        else
-            result += "@" + parameterName;
-    }
-
-    return result + baseSqlCommand;
-}
-
-var onProcess = function (result) {
-    result.handlerVersion = "2022.1.5";
-    response.end(JSON.stringify(result));
-}
-
-http.createServer(accept).listen(9615);