@budibase/server 1.2.48 → 1.2.51

package/dist/utilities/fileSystem/index.js

@@ -250,14 +250,16 @@ exports.getComponentLibraryManifest = (library) => __awaiter(void 0, void 0, voi
         return require(path);
     }
     let resp;
+    let path;
     try {
         // Try to load the manifest from the new file location
-        const path = join(appId, filename);
+        path = join(appId, filename);
         resp = yield retrieve(ObjectStoreBuckets.APPS, path);
     }
     catch (error) {
+        console.error(`component-manifest-objectstore=failed appId=${appId} path=${path}`, error);
         // Fallback to loading it from the old location for old apps
-        const path = join(appId, "node_modules", library, "package", filename);
+        path = join(appId, "node_modules", library, "package", filename);
         resp = yield retrieve(ObjectStoreBuckets.APPS, path);
     }
     if (typeof resp !== "string") {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.48",
+  "version": "1.2.51",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.2.48",
-    "@budibase/client": "^1.2.48",
-    "@budibase/pro": "1.2.47",
-    "@budibase/string-templates": "^1.2.48",
-    "@budibase/types": "^1.2.48",
+    "@budibase/backend-core": "^1.2.51",
+    "@budibase/client": "^1.2.51",
+    "@budibase/pro": "1.2.50",
+    "@budibase/string-templates": "^1.2.51",
+    "@budibase/types": "^1.2.51",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "d2d457d99d5177c5c51347e29a05094de88c6604"
+  "gitHead": "910759bebb2b6430a3284f9d18ecb93ff2114eaf"
 }

package/src/api/controllers/component.js

@@ -3,32 +3,36 @@ const { getComponentLibraryManifest } = require("../../utilities/fileSystem")
 const { getAppDB } = require("@budibase/backend-core/context")
 
 exports.fetchAppComponentDefinitions = async function (ctx) {
-  const db = getAppDB()
-  const app = await db.get(DocumentType.APP_METADATA)
+  try {
+    const db = getAppDB()
+    const app = await db.get(DocumentType.APP_METADATA)
 
-  let componentManifests = await Promise.all(
-    app.componentLibraries.map(async library => {
-      let manifest = await getComponentLibraryManifest(library)
+    let componentManifests = await Promise.all(
+      app.componentLibraries.map(async library => {
+        let manifest = await getComponentLibraryManifest(library)
 
-      return {
-        manifest,
-        library,
-      }
-    })
-  )
-  const definitions = {}
-  for (let { manifest, library } of componentManifests) {
-    for (let key of Object.keys(manifest)) {
-      if (key === "features") {
-        definitions[key] = manifest[key]
-      } else {
-        const fullComponentName = `${library}/${key}`.toLowerCase()
-        definitions[fullComponentName] = {
-          component: fullComponentName,
-          ...manifest[key],
+        return {
+          manifest,
+          library,
+        }
+      })
+    )
+    const definitions = {}
+    for (let { manifest, library } of componentManifests) {
+      for (let key of Object.keys(manifest)) {
+        if (key === "features") {
+          definitions[key] = manifest[key]
+        } else {
+          const fullComponentName = `${library}/${key}`.toLowerCase()
+          definitions[fullComponentName] = {
+            component: fullComponentName,
+            ...manifest[key],
+          }
         }
       }
     }
+    ctx.body = definitions
+  } catch (err) {
+    console.error(`component-definitions=failed`, err)
   }
-  ctx.body = definitions
 }

package/src/events/AutomationEmitter.js

@@ -1,8 +1,10 @@
 const { rowEmission, tableEmission } = require("./utils")
 const mainEmitter = require("./index")
+const env = require("../environment")
 
 // max number of automations that can chain on top of each other
-const MAX_AUTOMATION_CHAIN = 5
+// TODO: in future make this configurable at the automation level
+const MAX_AUTOMATION_CHAIN = env.SELF_HOSTED ? 5 : 0
 
 /**
  * Special emitter which takes the count of automation runs which have occurred and blocks an

package/src/utilities/fileSystem/index.js

@@ -286,13 +286,18 @@ exports.getComponentLibraryManifest = async library => {
   }
 
   let resp
+  let path
   try {
     // Try to load the manifest from the new file location
-    const path = join(appId, filename)
+    path = join(appId, filename)
     resp = await retrieve(ObjectStoreBuckets.APPS, path)
   } catch (error) {
+    console.error(
+      `component-manifest-objectstore=failed appId=${appId} path=${path}`,
+      error
+    )
     // Fallback to loading it from the old location for old apps
-    const path = join(appId, "node_modules", library, "package", filename)
+    path = join(appId, "node_modules", library, "package", filename)
     resp = await retrieve(ObjectStoreBuckets.APPS, path)
   }
   if (typeof resp !== "string") {