@budibase/server 2.6.3 → 2.6.5

package/dist/utilities/rowProcessor/map.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TYPE_TRANSFORM_MAP = void 0;
 // @ts-nocheck
 const constants_1 = require("../../constants");
+const backend_core_1 = require("@budibase/backend-core");
 /**
  * A map of how we convert various properties in rows to each other based on the row type.
  */
@@ -69,9 +70,24 @@ exports.TYPE_TRANSFORM_MAP = {
         },
     },
     [constants_1.FieldTypes.ATTACHMENT]: {
-        "": [],
         [null]: [],
         [undefined]: undefined,
+        parse: attachments => {
+            if (typeof attachments === "string") {
+                if (attachments === "") {
+                    return [];
+                }
+                let result;
+                try {
+                    result = JSON.parse(attachments);
+                }
+                catch (e) {
+                    backend_core_1.logging.logAlert("Could not parse attachments", e);
+                }
+                return result;
+            }
+            return attachments;
+        },
     },
     [constants_1.FieldTypes.BOOLEAN]: {
         "": null,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.6.3",
-    "@budibase/client": "^2.6.3",
-    "@budibase/pro": "2.6.2",
-    "@budibase/shared-core": "^2.6.3",
-    "@budibase/string-templates": "^2.6.3",
-    "@budibase/types": "^2.6.3",
+    "@budibase/backend-core": "^2.6.5",
+    "@budibase/client": "^2.6.5",
+    "@budibase/pro": "2.6.4",
+    "@budibase/shared-core": "^2.6.5",
+    "@budibase/string-templates": "^2.6.5",
+    "@budibase/types": "^2.6.5",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -176,5 +176,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "757ae1836ef21b49d42a8f4472285486b3a24a58"
+  "gitHead": "df1d2f33515739050a3f5dee971dfa6c3d711a17"
 }

package/src/api/routes/tests/row.spec.js

@@ -212,6 +212,7 @@ describe("/rows", () => {
           attachmentNull: attachment,
           attachmentUndefined: attachment,
           attachmentEmpty: attachment,
+          attachmentEmptyArrayStr: attachment
         },
       })
 
@@ -239,6 +240,7 @@ describe("/rows", () => {
         attachmentNull: null,
         attachmentUndefined: undefined,
         attachmentEmpty: "",
+        attachmentEmptyArrayStr: "[]",
       }
 
       const id = (await config.createRow(row))._id
@@ -268,6 +270,7 @@ describe("/rows", () => {
       expect(saved.attachmentNull).toEqual([])
       expect(saved.attachmentUndefined).toBe(undefined)
       expect(saved.attachmentEmpty).toEqual([])
+      expect(saved.attachmentEmptyArrayStr).toEqual([])
     })
   })
 

package/src/environment.ts

@@ -34,8 +34,6 @@ function parseIntSafe(number?: string) {
   }
 }
 
-let inThread = false
-
 const environment = {
   // important - prefer app port to generic port
   PORT: process.env.APP_PORT || process.env.PORT,
@@ -95,12 +93,8 @@ const environment = {
   isProd: () => {
     return !isDev()
   },
-  // used to check if already in a thread, don't thread further
-  setInThread: () => {
-    inThread = true
-  },
   isInThread: () => {
-    return inThread
+    return process.env.FORKED_PROCESS
   },
 }
 

package/src/threads/index.ts

@@ -39,6 +39,12 @@ export class Thread {
       const workerOpts: any = {
         autoStart: true,
         maxConcurrentWorkers: this.count,
+        workerOptions: {
+          env: {
+            ...process.env,
+            FORKED_PROCESS: "1",
+          },
+        },
       }
       if (opts.timeoutMs) {
         this.timeoutMs = opts.timeoutMs

package/src/threads/utils.ts

@@ -25,11 +25,9 @@ function makeVariableKey(queryId: string, variable: string) {
 
 export function threadSetup() {
   // don't run this if not threading
-  if (env.isTest() || env.DISABLE_THREADING) {
+  if (env.isTest() || env.DISABLE_THREADING || !env.isInThread()) {
     return
   }
-  // when thread starts, make sure it is recorded
-  env.setInThread()
   db.init()
 }
 

package/src/utilities/rowProcessor/map.ts

@@ -1,5 +1,6 @@
 // @ts-nocheck
 import { FieldTypes } from "../../constants"
+import { logging } from "@budibase/backend-core"
 
 /**
  * A map of how we convert various properties in rows to each other based on the row type.
@@ -67,9 +68,23 @@ export const TYPE_TRANSFORM_MAP: any = {
     },
   },
   [FieldTypes.ATTACHMENT]: {
-    "": [],
     [null]: [],
     [undefined]: undefined,
+    parse: attachments => {
+      if (typeof attachments === "string") {
+        if (attachments === "") {
+          return []
+        }
+        let result
+        try {
+          result = JSON.parse(attachments)
+        } catch (e) {
+          logging.logAlert("Could not parse attachments", e)
+        }
+        return result
+      }
+      return attachments
+    },
   },
   [FieldTypes.BOOLEAN]: {
     "": null,