@budibase/server 1.0.110 → 1.0.113

package/dist/utilities/index.js

@@ -17,6 +17,7 @@ const { getAppDB } = require("@budibase/backend-core/context");
 const BB_CDN = "https://cdn.budi.live";
 exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms));
 exports.isDev = env.isDev;
+exports.NUMBER_REGEX = /^[+-]?([0-9]*[.])?[0-9]+$/g;
 exports.removeFromArray = (array, element) => {
     const index = array.indexOf(element);
     if (index !== -1) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.110",
+  "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.110",
-    "@budibase/client": "^1.0.110",
-    "@budibase/string-templates": "^1.0.110",
+    "@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",
@@ -174,5 +174,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "ab4d4debdcad262c24959bd90e6b4d8688a1e6ac"
+  "gitHead": "20852c30cca5054eb7ef8bacdb91343a56be0d30"
 }

package/src/environment.js

@@ -24,6 +24,12 @@ if (!LOADED && isDev() && !isTest()) {
   LOADED = true
 }
 
+function parseIntSafe(number) {
+  if (number) {
+    return parseInt(number)
+  }
+}
+
 let inThread = false
 
 module.exports = {
@@ -62,6 +68,7 @@ module.exports = {
   SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
   DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT,
   POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
+  QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT),
   // old - to remove
   CLIENT_ID: process.env.CLIENT_ID,
   BUDIBASE_DIR: process.env.BUDIBASE_DIR,
@@ -71,7 +78,6 @@ module.exports = {
   DEPLOYMENT_CREDENTIALS_URL: process.env.DEPLOYMENT_CREDENTIALS_URL,
   ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
   DISABLE_THREADING: process.env.DISABLE_THREADING,
-  QUERY_THREAD_TIMEOUT: process.env.QUERY_THREAD_TIMEOUT,
   SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
   _set(key, value) {
     process.env[key] = value

package/src/integrations/dynamodb.ts

@@ -131,11 +131,12 @@ module DynamoModule {
 
     constructor(config: DynamoDBConfig) {
       this.config = config
-      if (!this.config.endpoint) {
+      if (this.config.endpoint && !this.config.endpoint.includes("localhost")) {
         this.connect()
       }
       let options = {
         correctClockSkew: true,
+        region: this.config.region || AWS_REGION,
         endpoint: config.endpoint ? config.endpoint : undefined,
       }
       this.client = new AWS.DynamoDB.DocumentClient(options)

package/src/integrations/mysql.ts

@@ -15,6 +15,7 @@ import {
 } from "./utils"
 import { DatasourcePlus } from "./base/datasourcePlus"
 import dayjs from "dayjs"
+const { NUMBER_REGEX } = require("../utilities")
 
 module MySQLModule {
   const mysql = require("mysql2/promise")
@@ -87,7 +88,7 @@ module MySQLModule {
       if (typeof binding !== "string") {
         continue
       }
-      const matches = binding.match(/^\d*$/g)
+      const matches = binding.match(NUMBER_REGEX)
       // check if number first
       if (matches && matches[0] !== "" && !isNaN(Number(matches[0]))) {
         bindings[i] = parseFloat(binding)

package/src/utilities/index.js

@@ -11,6 +11,8 @@ exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms))
 
 exports.isDev = env.isDev
 
+exports.NUMBER_REGEX = /^[+-]?([0-9]*[.])?[0-9]+$/g
+
 exports.removeFromArray = (array, element) => {
   const index = array.indexOf(element)
   if (index !== -1) {