@budibase/server 1.0.113 → 1.0.114

package/dist/integrations/queries/sql.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.interpolateSQL = exports.enrichQueryFields = void 0;
+const string_templates_1 = require("@budibase/string-templates");
+const CONST_CHAR_REGEX = new RegExp("'[^']*'", "g");
+function enrichQueryFields(fields, parameters = {}) {
+    const enrichedQuery = Array.isArray(fields) ? [] : {};
+    // enrich the fields with dynamic parameters
+    for (let key of Object.keys(fields)) {
+        if (fields[key] == null) {
+            continue;
+        }
+        if (typeof fields[key] === "object") {
+            // enrich nested fields object
+            enrichedQuery[key] = enrichQueryFields(fields[key], parameters);
+        }
+        else if (typeof fields[key] === "string") {
+            // enrich string value as normal
+            enrichedQuery[key] = string_templates_1.processStringSync(fields[key], parameters, {
+                noEscaping: true,
+                noHelpers: true,
+                escapeNewlines: true,
+            });
+        }
+        else {
+            enrichedQuery[key] = fields[key];
+        }
+    }
+    if (enrichedQuery.json ||
+        enrichedQuery.customData ||
+        enrichedQuery.requestBody) {
+        try {
+            enrichedQuery.json = JSON.parse(enrichedQuery.json ||
+                enrichedQuery.customData ||
+                enrichedQuery.requestBody);
+        }
+        catch (err) {
+            // no json found, ignore
+        }
+        delete enrichedQuery.customData;
+    }
+    return enrichedQuery;
+}
+exports.enrichQueryFields = enrichQueryFields;
+function interpolateSQL(fields, parameters, integration) {
+    let sql = fields.sql;
+    if (!sql || typeof sql !== "string") {
+        return fields;
+    }
+    const bindings = string_templates_1.findHBSBlocks(sql);
+    let variables = [], arrays = [];
+    for (let binding of bindings) {
+        // look for array/list operations in the SQL statement, which will need handled later
+        const listRegexMatch = sql.match(new RegExp(`(in|IN|In|iN)( )+[(]?${binding}[)]?`));
+        // check if the variable was used as part of a string concat e.g. 'Hello {{binding}}'
+        // start by finding all the instances of const character strings
+        const charConstMatch = sql.match(CONST_CHAR_REGEX) || [];
+        // now look within them to see if a binding is used
+        const charConstBindingMatch = charConstMatch.find((string) => string.match(new RegExp(`'[^']*${binding}[^']*'`)));
+        if (charConstBindingMatch) {
+            let [part1, part2] = charConstBindingMatch.split(binding);
+            part1 = `'${part1.substring(1)}'`;
+            part2 = `'${part2.substring(0, part2.length - 1)}'`;
+            sql = sql.replace(charConstBindingMatch, integration.getStringConcat([
+                part1,
+                integration.getBindingIdentifier(),
+                part2,
+            ]));
+        }
+        // generate SQL parameterised array
+        else if (listRegexMatch) {
+            arrays.push(binding);
+            // determine the length of the array
+            const value = enrichQueryFields([binding], parameters)[0]
+                .split(",")
+                .map((val) => val.trim());
+            // build a string like ($1, $2, $3)
+            let replacement = `${Array.apply(null, Array(value.length))
+                .map(() => integration.getBindingIdentifier())
+                .join(",")}`;
+            // check if parentheses are needed
+            if (!listRegexMatch[0].includes(`(${binding})`)) {
+                replacement = `(${replacement})`;
+            }
+            sql = sql.replace(binding, replacement);
+        }
+        else {
+            sql = sql.replace(binding, integration.getBindingIdentifier());
+        }
+        variables.push(binding);
+    }
+    // replicate the knex structure
+    fields.sql = sql;
+    fields.bindings = enrichQueryFields(variables, parameters);
+    // check for arrays in the data
+    let updated = [];
+    for (let i = 0; i < variables.length; i++) {
+        if (arrays.includes(variables[i])) {
+            updated = updated.concat(fields.bindings[i].split(",").map((val) => val.trim()));
+        }
+        else {
+            updated.push(fields.bindings[i]);
+        }
+    }
+    fields.bindings = updated;
+    return fields;
+}
+exports.interpolateSQL = interpolateSQL;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.112",
+    "version": "1.0.113",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -68,9 +68,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.112",
-        "@budibase/client": "^1.0.112",
-        "@budibase/string-templates": "^1.0.112",
+        "@budibase/backend-core": "^1.0.113",
+        "@budibase/client": "^1.0.113",
+        "@budibase/string-templates": "^1.0.113",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/index.js

@@ -34,12 +34,14 @@ class Thread {
                 maxConcurrentWorkers: this.count,
             };
             if (opts.timeoutMs) {
+                this.timeoutMs = opts.timeoutMs;
                 workerOpts.maxCallTime = opts.timeoutMs;
             }
             this.workers = workerFarm(workerOpts, typeToFile(type));
         }
     }
     run(data) {
+        const timeoutMs = this.timeoutMs;
         return new Promise((resolve, reject) => {
             let fncToCall;
             // if in test then don't use threading
@@ -50,7 +52,10 @@ class Thread {
                 fncToCall = this.workers;
             }
             fncToCall(data, (err, response) => {
-                if (err) {
+                if (err && err.type === "TimeoutError") {
+                    reject(new Error(`Query response time exceeded ${timeoutMs}ms timeout.`));
+                }
+                else if (err) {
                     reject(err);
                 }
                 else {

package/dist/threads/query.js

@@ -12,10 +12,10 @@ const threadUtils = require("./utils");
 threadUtils.threadSetup();
 const ScriptRunner = require("../utilities/scriptRunner");
 const { integrations } = require("../integrations");
-const { processStringSync, findHBSBlocks, } = require("@budibase/string-templates");
+const { processStringSync } = require("@budibase/string-templates");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const { isSQL } = require("../integrations/utils");
-const CONST_CHAR_REGEX = new RegExp("'[^']*'", "g");
+const { enrichQueryFields, interpolateSQL, } = require("../integrations/queries/sql");
 class QueryRunner {
     constructor(input, flags = { noRecursiveQuery: false }) {
         this.datasource = input.datasource;
@@ -33,67 +33,6 @@ class QueryRunner {
         this.queryResponse = {};
         this.hasRerun = false;
     }
-    interpolateSQL(fields, parameters, integration) {
-        let sql = fields.sql;
-        if (!sql) {
-            return fields;
-        }
-        const bindings = findHBSBlocks(sql);
-        let variables = [], arrays = [];
-        for (let binding of bindings) {
-            // look for array/list operations in the SQL statement, which will need handled later
-            const listRegexMatch = sql.match(new RegExp(`(in|IN|In|iN)( )+[(]?${binding}[)]?`));
-            // check if the variable was used as part of a string concat e.g. 'Hello {{binding}}'
-            // start by finding all the instances of const character strings
-            const charConstMatch = sql.match(CONST_CHAR_REGEX) || [];
-            // now look within them to see if a binding is used
-            const charConstBindingMatch = charConstMatch.find(string => string.match(new RegExp(`'[^']*${binding}[^']*'`)));
-            if (charConstBindingMatch) {
-                let [part1, part2] = charConstBindingMatch.split(binding);
-                part1 = `'${part1.substring(1)}'`;
-                part2 = `'${part2.substring(0, part2.length - 1)}'`;
-                sql = sql.replace(charConstBindingMatch, integration.getStringConcat([
-                    part1,
-                    integration.getBindingIdentifier(),
-                    part2,
-                ]));
-            }
-            // generate SQL parameterised array
-            else if (listRegexMatch) {
-                arrays.push(binding);
-                // determine the length of the array
-                const value = this.enrichQueryFields([binding], parameters)[0].split(",");
-                // build a string like ($1, $2, $3)
-                let replacement = `${Array.apply(null, Array(value.length))
-                    .map(() => integration.getBindingIdentifier())
-                    .join(",")}`;
-                // check if parentheses are needed
-                if (!listRegexMatch[0].includes(`(${binding})`)) {
-                    replacement = `(${replacement})`;
-                }
-                sql = sql.replace(binding, replacement);
-            }
-            else {
-                sql = sql.replace(binding, integration.getBindingIdentifier());
-            }
-            variables.push(binding);
-        }
-        // replicate the knex structure
-        fields.sql = sql;
-        fields.bindings = this.enrichQueryFields(variables, parameters);
-        // check for arrays in the data
-        let updated = [];
-        for (let i = 0; i < variables.length; i++) {
-            if (arrays.includes(variables[i])) {
-                updated = updated.concat(fields.bindings[i].split(","));
-            }
-            else {
-                updated.push(fields.bindings[i]);
-            }
-        }
-        fields.bindings = updated;
-        return fields;
-    }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
             let { datasource, fields, queryVerb, transformer } = this;
@@ -107,10 +46,10 @@ class QueryRunner {
             let query;
             // handle SQL injections by interpolating the variables
             if (isSQL(datasource)) {
-                query = this.interpolateSQL(fields, parameters, integration);
+                query = interpolateSQL(fields, parameters, integration);
             }
             else {
-                query = this.enrichQueryFields(fields, parameters);
+                query = enrichQueryFields(fields, parameters);
             }
             // Add pagination values for REST queries
             if (this.pagination) {
@@ -237,44 +176,6 @@ class QueryRunner {
             return parameters;
         });
     }
-    enrichQueryFields(fields, parameters = {}) {
-        const enrichedQuery = Array.isArray(fields) ? [] : {};
-        // enrich the fields with dynamic parameters
-        for (let key of Object.keys(fields)) {
-            if (fields[key] == null) {
-                continue;
-            }
-            if (typeof fields[key] === "object") {
-                // enrich nested fields object
-                enrichedQuery[key] = this.enrichQueryFields(fields[key], parameters);
-            }
-            else if (typeof fields[key] === "string") {
-                // enrich string value as normal
-                enrichedQuery[key] = processStringSync(fields[key], parameters, {
-                    noEscaping: true,
-                    noHelpers: true,
-                    escapeNewlines: true,
-                });
-            }
-            else {
-                enrichedQuery[key] = fields[key];
-            }
-        }
-        if (enrichedQuery.json ||
-            enrichedQuery.customData ||
-            enrichedQuery.requestBody) {
-            try {
-                enrichedQuery.json = JSON.parse(enrichedQuery.json ||
-                    enrichedQuery.customData ||
-                    enrichedQuery.requestBody);
-            }
-            catch (err) {
-                // no json found, ignore
-            }
-            delete enrichedQuery.customData;
-        }
-        return enrichedQuery;
-    }
 }
 module.exports = (input, callback) => {
     doInAppContext(input.appId, () => {