@budibase/worker 1.0.115 → 1.0.116

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.115",
+  "version": "1.0.116",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.115",
-    "@budibase/string-templates": "^1.0.115",
+    "@budibase/backend-core": "^1.0.116",
+    "@budibase/string-templates": "^1.0.116",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
@@ -55,7 +55,7 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0",
     "pino-pretty": "^4.0.0",
-    "pouchdb": "^7.2.1",
+    "pouchdb": "7.3.0",
     "pouchdb-all-dbs": "^1.0.2",
     "server-destroy": "^1.0.1"
   },
@@ -84,5 +84,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "732a547c2cc3940ecfe144433105960ca94423c8"
+  "gitHead": "70b8daeff623c77a66abb6ddcc994bb69edb062b"
 }

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

@@ -15,6 +15,7 @@ const { invalidateSessions } = require("@budibase/backend-core/sessions")
 const accounts = require("@budibase/backend-core/accounts")
 const {
   getGlobalDB,
+  doWithGlobalDB,
   getTenantId,
   getTenantUser,
   doesTenantExist,
@@ -51,26 +52,27 @@ exports.adminUser = async ctx => {
     ctx.throw(403, "Organisation already exists.")
   }
 
-  const db = getGlobalDB(tenantId)
-  const response = await db.allDocs(
-    getGlobalUserParams(null, {
-      include_docs: true,
-    })
-  )
-
-  // write usage quotas for cloud
-  if (!env.SELF_HOSTED) {
-    // could be a scenario where it exists, make sure its clean
-    try {
-      const usageQuota = await db.get(StaticDatabases.GLOBAL.docs.usageQuota)
-      if (usageQuota) {
-        await db.remove(usageQuota._id, usageQuota._rev)
+  const response = await doWithGlobalDB(tenantId, async db => {
+    const response = await db.allDocs(
+      getGlobalUserParams(null, {
+        include_docs: true,
+      })
+    )
+    // write usage quotas for cloud
+    if (!env.SELF_HOSTED) {
+      // could be a scenario where it exists, make sure its clean
+      try {
+        const usageQuota = await db.get(StaticDatabases.GLOBAL.docs.usageQuota)
+        if (usageQuota) {
+          await db.remove(usageQuota._id, usageQuota._rev)
+        }
+      } catch (err) {
+        // don't worry about errors
       }
-    } catch (err) {
-      // don't worry about errors
+      await db.put(generateNewUsageQuotaDoc())
     }
-    await db.put(generateNewUsageQuotaDoc())
-  }
+    return response
+  })
 
   if (response.rows.some(row => row.doc.admin)) {
     ctx.throw(

package/src/api/controllers/system/tenants.js

@@ -1,37 +1,42 @@
-const CouchDB = require("../../../db")
-const { StaticDatabases } = require("@budibase/backend-core/db")
+const { StaticDatabases, doWithDB } = require("@budibase/backend-core/db")
 const { getTenantId } = require("@budibase/backend-core/tenancy")
 const { deleteTenant } = require("@budibase/backend-core/deprovision")
 
 exports.exists = async ctx => {
   const tenantId = ctx.request.params
-  const db = new CouchDB(StaticDatabases.PLATFORM_INFO.name)
-  let exists = false
-  try {
-    const tenantsDoc = await db.get(StaticDatabases.PLATFORM_INFO.docs.tenants)
-    if (tenantsDoc) {
-      exists = tenantsDoc.tenantIds.indexOf(tenantId) !== -1
-    }
-  } catch (err) {
-    // if error it doesn't exist
-  }
   ctx.body = {
-    exists,
+    exists: await doWithDB(StaticDatabases.PLATFORM_INFO.name, async db => {
+      let exists = false
+      try {
+        const tenantsDoc = await db.get(
+          StaticDatabases.PLATFORM_INFO.docs.tenants
+        )
+        if (tenantsDoc) {
+          exists = tenantsDoc.tenantIds.indexOf(tenantId) !== -1
+        }
+      } catch (err) {
+        // if error it doesn't exist
+      }
+      return exists
+    }),
   }
 }
 
 exports.fetch = async ctx => {
-  const db = new CouchDB(StaticDatabases.PLATFORM_INFO.name)
-  let tenants = []
-  try {
-    const tenantsDoc = await db.get(StaticDatabases.PLATFORM_INFO.docs.tenants)
-    if (tenantsDoc) {
-      tenants = tenantsDoc.tenantIds
+  ctx.body = await doWithDB(StaticDatabases.PLATFORM_INFO.name, async db => {
+    let tenants = []
+    try {
+      const tenantsDoc = await db.get(
+        StaticDatabases.PLATFORM_INFO.docs.tenants
+      )
+      if (tenantsDoc) {
+        tenants = tenantsDoc.tenantIds
+      }
+    } catch (err) {
+      // if error it doesn't exist
     }
-  } catch (err) {
-    // if error it doesn't exist
-  }
-  ctx.body = tenants
+    return tenants
+  })
 }
 
 exports.delete = async ctx => {

package/src/api/routes/tests/utilities/TestConfiguration.js

@@ -1,3 +1,4 @@
+require("../../../../db").init()
 const env = require("../../../../environment")
 const controllers = require("./controllers")
 const supertest = require("supertest")
@@ -8,15 +9,12 @@ const { getGlobalUserByEmail } = require("@budibase/backend-core/utils")
 const { createASession } = require("@budibase/backend-core/sessions")
 const { newid } = require("@budibase/backend-core/src/hashing")
 const { TENANT_ID, CSRF_TOKEN } = require("./structures")
-const core = require("@budibase/backend-core")
-const CouchDB = require("../../../../db")
 const { doInTenant } = require("@budibase/backend-core/tenancy")
-core.init(CouchDB)
 
 class TestConfiguration {
   constructor(openServer = true) {
     if (openServer) {
-      env.PORT = 4003
+      env.PORT = 4012
       this.server = require("../../../../index")
       // we need the request for logging in, involves cookies, hard to fake
       this.request = supertest(this.server)

package/src/db/index.js

@@ -1,26 +1,11 @@
-const PouchDB = require("pouchdb")
-const allDbs = require("pouchdb-all-dbs")
+const core = require("@budibase/backend-core")
 const env = require("../environment")
-const { getCouchUrl } = require("@budibase/backend-core/db")
 
-// level option is purely for testing (development)
-const COUCH_DB_URL = getCouchUrl() || "http://localhost:4005"
-
-let POUCH_DB_DEFAULTS = {
-  prefix: COUCH_DB_URL,
-}
-
-if (env.isTest()) {
-  PouchDB.plugin(require("pouchdb-adapter-memory"))
-  POUCH_DB_DEFAULTS = {
-    prefix: undefined,
-    adapter: "memory",
+exports.init = () => {
+  const dbConfig = {}
+  if (env.isTest()) {
+    dbConfig.inMemory = true
+    dbConfig.allDbs = true
   }
+  core.init({ db: dbConfig })
 }
-
-const Pouch = PouchDB.defaults(POUCH_DB_DEFAULTS)
-
-// have to still have pouch alldbs for testing
-allDbs(Pouch)
-
-module.exports = Pouch

package/src/index.ts

@@ -4,8 +4,8 @@ import { Event } from "@sentry/types/dist/event"
 import Application from "koa"
 
 const env = require("./environment")
-const CouchDB = require("./db")
-require("@budibase/backend-core").init(CouchDB)
+import db from "./db"
+db.init()
 const Koa = require("koa")
 const destroyable = require("server-destroy")
 const koaBody = require("koa-body")