@budibase/worker 1.0.172 → 1.0.174

package/Dockerfile

@@ -10,6 +10,7 @@ WORKDIR /app
 # copy files and install dependencies
 COPY . ./
 RUN yarn
+RUN yarn global add pm2
 
 EXPOSE 4001
 
@@ -17,4 +18,5 @@ EXPOSE 4001
 # due to this causing yarn to stop installing dev dependencies
 # which are actually needed to get this environment up and running
 ENV NODE_ENV=production
-CMD ["yarn", "run:docker"]
+ENV CLUSTER_MODE=${CLUSTER_MODE}
+CMD ["./docker_run.sh"]

package/docker_run.sh

@@ -0,0 +1,5 @@
+if [[ -z $CLUSTER_MODE ]]; then
+  yarn run:docker
+else
+  yarn run:docker:cluster
+fi

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.172",
+  "version": "1.0.174",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -15,6 +15,7 @@
     "build": "rimraf dist/ && tsc",
     "postbuild": "copyfiles -u 1 src/**/*.hbs dist/",
     "run:docker": "node dist/index.js",
+    "run:docker:cluster": "pm2-runtime start pm2.config.js",
     "build:docker": "docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
     "dev:builder": "npm run dev:stack:init && nodemon",
@@ -31,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.172",
-    "@budibase/pro": "1.0.171",
-    "@budibase/string-templates": "^1.0.172",
+    "@budibase/backend-core": "^1.0.174",
+    "@budibase/pro": "1.0.173",
+    "@budibase/string-templates": "^1.0.174",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",
@@ -89,5 +90,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "6af7e640852d273f757db5aee21e1794850bb612"
+  "gitHead": "7771898ed6c0d9b904eb5d754f07cab60f15c394"
 }

package/pm2.config.js

@@ -0,0 +1,9 @@
+module.exports = {
+  apps: [
+    {
+      script: "./dist/index.js",
+      instances: "max",
+      exec_mode: "cluster",
+    },
+  ],
+}

package/src/api/controllers/global/configs.js

@@ -17,7 +17,6 @@ const { googleCallbackUrl, oidcCallbackUrl } = require("./auth")
 const {
   withCache,
   CacheKeys,
-  TTL,
   bustCache,
 } = require("@budibase/backend-core/cache")
 
@@ -256,58 +255,62 @@ exports.configChecklist = async function (ctx) {
   const tenantId = getTenantId()
 
   try {
-    ctx.body = await withCache(CacheKeys.CHECKLIST, TTL.ONE_HOUR, async () => {
-      let apps = []
-      if (!env.MULTI_TENANCY || tenantId) {
-        // Apps exist
-        apps = await getAllApps({ idsOnly: true, efficient: true })
-      }
+    ctx.body = await withCache(
+      CacheKeys.CHECKLIST,
+      env.CHECKLIST_CACHE_TTL,
+      async () => {
+        let apps = []
+        if (!env.MULTI_TENANCY || tenantId) {
+          // Apps exist
+          apps = await getAllApps({ idsOnly: true, efficient: true })
+        }
+
+        // They have set up SMTP
+        const smtpConfig = await getScopedFullConfig(db, {
+          type: Configs.SMTP,
+        })
+
+        // They have set up Google Auth
+        const googleConfig = await getScopedFullConfig(db, {
+          type: Configs.GOOGLE,
+        })
 
-      // They have set up SMTP
-      const smtpConfig = await getScopedFullConfig(db, {
-        type: Configs.SMTP,
-      })
-
-      // They have set up Google Auth
-      const googleConfig = await getScopedFullConfig(db, {
-        type: Configs.GOOGLE,
-      })
-
-      // They have set up OIDC
-      const oidcConfig = await getScopedFullConfig(db, {
-        type: Configs.OIDC,
-      })
-
-      // They have set up an global user
-      const users = await db.allDocs(
-        getGlobalUserParams(null, {
-          include_docs: true,
-          limit: 1,
+        // They have set up OIDC
+        const oidcConfig = await getScopedFullConfig(db, {
+          type: Configs.OIDC,
         })
-      )
-      return {
-        apps: {
-          checked: apps.length > 0,
-          label: "Create your first app",
-          link: "/builder/portal/apps",
-        },
-        smtp: {
-          checked: !!smtpConfig,
-          label: "Set up email",
-          link: "/builder/portal/manage/email",
-        },
-        adminUser: {
-          checked: users && users.rows.length >= 1,
-          label: "Create your first user",
-          link: "/builder/portal/manage/users",
-        },
-        sso: {
-          checked: !!googleConfig || !!oidcConfig,
-          label: "Set up single sign-on",
-          link: "/builder/portal/manage/auth",
-        },
+
+        // They have set up an global user
+        const users = await db.allDocs(
+          getGlobalUserParams(null, {
+            include_docs: true,
+            limit: 1,
+          })
+        )
+        return {
+          apps: {
+            checked: apps.length > 0,
+            label: "Create your first app",
+            link: "/builder/portal/apps",
+          },
+          smtp: {
+            checked: !!smtpConfig,
+            label: "Set up email",
+            link: "/builder/portal/manage/email",
+          },
+          adminUser: {
+            checked: users && users.rows.length >= 1,
+            label: "Create your first user",
+            link: "/builder/portal/manage/users",
+          },
+          sso: {
+            checked: !!googleConfig || !!oidcConfig,
+            label: "Set up single sign-on",
+            link: "/builder/portal/manage/auth",
+          },
+        }
       }
-    })
+    )
   } catch (err) {
     ctx.throw(err.status, err)
   }

package/src/environment.js

@@ -20,6 +20,12 @@ if (!LOADED && isDev() && !isTest()) {
   LOADED = true
 }
 
+function parseIntSafe(number) {
+  if (number) {
+    return parseInt(number)
+  }
+}
+
 module.exports = {
   NODE_ENV: process.env.NODE_ENV,
   SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
@@ -46,6 +52,7 @@ module.exports = {
   SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
   PLATFORM_URL: process.env.PLATFORM_URL,
   COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
+  CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
   APPS_URL: process.env.APPS_URL,
   _set(key, value) {
     process.env[key] = value