@budibase/server 2.1.40-alpha.6 → 2.1.42

package/src/api/controllers/deploy/{Deployment.ts → Deployment.js}

@@ -1,20 +1,15 @@
-import newid from "../../../db/newid"
-import { context } from "@budibase/backend-core"
+const newid = require("../../../db/newid")
+const { getAppId } = require("@budibase/backend-core/context")
 
 /**
  * This is used to pass around information about the deployment that is occurring
  */
-export default class Deployment {
-  _id: string
-  verification: any
-  status?: string
-  err?: any
-
+class Deployment {
   constructor(id = null) {
     this._id = id || newid()
   }
 
-  setVerification(verification: any) {
+  setVerification(verification) {
     if (!verification) {
       return
     }
@@ -25,14 +20,14 @@ export default class Deployment {
     return this.verification
   }
 
-  setStatus(status: string, err?: any) {
+  setStatus(status, err = null) {
     this.status = status
     if (err) {
       this.err = err
     }
   }
 
-  fromJSON(json: any) {
+  fromJSON(json) {
     if (json.verification) {
       this.setVerification(json.verification)
     }
@@ -42,9 +37,9 @@ export default class Deployment {
   }
 
   getJSON() {
-    const obj: any = {
+    const obj = {
       _id: this._id,
-      appId: context.getAppId(),
+      appId: getAppId(),
       status: this.status,
     }
     if (this.err) {
@@ -56,3 +51,5 @@ export default class Deployment {
     return obj
   }
 }
+
+module.exports = Deployment

package/src/api/controllers/deploy/index.ts

@@ -1,11 +1,23 @@
 import Deployment from "./Deployment"
-import { context, db as dbCore, events, cache } from "@budibase/backend-core"
+import {
+  getDevelopmentAppID,
+  getProdAppID,
+  Replication,
+} from "@budibase/backend-core/db"
 import { DocumentType, getAutomationParams } from "../../../db/utils"
 import {
   clearMetadata,
   disableAllCrons,
   enableCronTrigger,
 } from "../../../automations/utils"
+import { app as appCache } from "@budibase/backend-core/cache"
+import {
+  getAppDB,
+  getAppId,
+  getDevAppDB,
+  getProdAppDB,
+} from "@budibase/backend-core/context"
+import { events } from "@budibase/backend-core"
 import { backups } from "@budibase/pro"
 import { AppBackupTrigger } from "@budibase/types"
 
@@ -37,7 +49,7 @@ async function checkAllDeployments(deployments: any) {
 
 async function storeDeploymentHistory(deployment: any) {
   const deploymentJSON = deployment.getJSON()
-  const db = context.getAppDB()
+  const db = getAppDB()
 
   let deploymentDoc
   try {
@@ -65,7 +77,7 @@ async function storeDeploymentHistory(deployment: any) {
 }
 
 async function initDeployedApp(prodAppId: any) {
-  const db = context.getProdAppDB()
+  const db = getProdAppDB()
   console.log("Reading automation docs")
   const automations = (
     await db.allDocs(
@@ -91,9 +103,9 @@ async function initDeployedApp(prodAppId: any) {
 async function deployApp(deployment: any, userId: string) {
   let replication
   try {
-    const appId = context.getAppId()!
-    const devAppId = dbCore.getDevelopmentAppID(appId)
-    const productionAppId = dbCore.getProdAppID(appId)
+    const appId = getAppId()
+    const devAppId = getDevelopmentAppID(appId)
+    const productionAppId = getProdAppID(appId)
 
     // don't try this if feature isn't allowed, will error
     if (await backups.isEnabled()) {
@@ -110,8 +122,8 @@ async function deployApp(deployment: any, userId: string) {
       source: devAppId,
       target: productionAppId,
     }
-    replication = new dbCore.Replication(config)
-    const devDb = context.getDevAppDB()
+    replication = new Replication(config)
+    const devDb = getDevAppDB()
     console.log("Compacting development DB")
     await devDb.compact()
     console.log("Replication object created")
@@ -119,7 +131,7 @@ async function deployApp(deployment: any, userId: string) {
     console.log("replication complete.. replacing app meta doc")
     // app metadata is excluded as it is likely to be in conflict
     // replicate the app metadata document manually
-    const db = context.getProdAppDB()
+    const db = getProdAppDB()
     const appDoc = await devDb.get(DocumentType.APP_METADATA)
     try {
       const prodAppDoc = await db.get(DocumentType.APP_METADATA)
@@ -135,7 +147,7 @@ async function deployApp(deployment: any, userId: string) {
     // remove automation errors if they exist
     delete appDoc.automationErrors
     await db.put(appDoc)
-    await cache.app.invalidateAppMetadata(productionAppId)
+    await appCache.invalidateAppMetadata(productionAppId)
     console.log("New app doc written successfully.")
     await initDeployedApp(productionAppId)
     console.log("Deployed app initialised, setting deployment to successful")
@@ -158,7 +170,7 @@ async function deployApp(deployment: any, userId: string) {
 
 export async function fetchDeployments(ctx: any) {
   try {
-    const db = context.getAppDB()
+    const db = getAppDB()
     const deploymentDoc = await db.get(DocumentType.DEPLOYMENTS)
     const { updated, deployments } = await checkAllDeployments(deploymentDoc)
     if (updated) {
@@ -172,7 +184,7 @@ export async function fetchDeployments(ctx: any) {
 
 export async function deploymentProgress(ctx: any) {
   try {
-    const db = context.getAppDB()
+    const db = getAppDB()
     const deploymentDoc = await db.get(DocumentType.DEPLOYMENTS)
     ctx.body = deploymentDoc[ctx.params.deploymentId]
   } catch (err) {
@@ -185,7 +197,7 @@ export async function deploymentProgress(ctx: any) {
 
 const isFirstDeploy = async () => {
   try {
-    const db = context.getProdAppDB()
+    const db = getProdAppDB()
     await db.get(DocumentType.APP_METADATA)
   } catch (e: any) {
     if (e.status === 404) {

package/src/api/controllers/{dev.ts → dev.js}

@@ -1,23 +1,29 @@
-import fetch from "node-fetch"
-import env from "../../environment"
-import { checkSlashesInUrl } from "../../utilities"
-import { request } from "../../utilities/workerRequests"
-import { clearLock as redisClearLock } from "../../utilities/redis"
-import { DocumentType } from "../../db/utils"
-import { context } from "@budibase/backend-core"
-import { events, db as dbCore, cache } from "@budibase/backend-core"
+const fetch = require("node-fetch")
+const env = require("../../environment")
+const { checkSlashesInUrl } = require("../../utilities")
+const { request } = require("../../utilities/workerRequests")
+const { clearLock } = require("../../utilities/redis")
+const { Replication, getProdAppID } = require("@budibase/backend-core/db")
+const { DocumentType } = require("../../db/utils")
+const { app: appCache } = require("@budibase/backend-core/cache")
+const { getProdAppDB, getAppDB } = require("@budibase/backend-core/context")
+const { events } = require("@budibase/backend-core")
 
-async function redirect(ctx: any, method: string, path: string = "global") {
+async function redirect(ctx, method, path = "global") {
   const { devPath } = ctx.params
   const queryString = ctx.originalUrl.split("?")[1] || ""
   const response = await fetch(
     checkSlashesInUrl(
       `${env.WORKER_URL}/api/${path}/${devPath}?${queryString}`
     ),
-    request(ctx, {
-      method,
-      body: ctx.request.body,
-    })
+    request(
+      ctx,
+      {
+        method,
+        body: ctx.request.body,
+      },
+      true
+    )
   )
   if (response.status !== 200) {
     const err = await response.text()
@@ -40,28 +46,28 @@ async function redirect(ctx: any, method: string, path: string = "global") {
   ctx.cookies
 }
 
-export function buildRedirectGet(path: string) {
-  return async (ctx: any) => {
+exports.buildRedirectGet = path => {
+  return async ctx => {
     await redirect(ctx, "GET", path)
   }
 }
 
-export function buildRedirectPost(path: string) {
-  return async (ctx: any) => {
+exports.buildRedirectPost = path => {
+  return async ctx => {
     await redirect(ctx, "POST", path)
   }
 }
 
-export function buildRedirectDelete(path: string) {
-  return async (ctx: any) => {
+exports.buildRedirectDelete = path => {
+  return async ctx => {
     await redirect(ctx, "DELETE", path)
   }
 }
 
-export async function clearLock(ctx: any) {
+exports.clearLock = async ctx => {
   const { appId } = ctx.params
   try {
-    await redisClearLock(appId, ctx.user)
+    await clearLock(appId, ctx.user)
   } catch (err) {
     ctx.throw(400, `Unable to remove lock. ${err}`)
   }
@@ -70,16 +76,16 @@ export async function clearLock(ctx: any) {
   }
 }
 
-export async function revert(ctx: any) {
+exports.revert = async ctx => {
   const { appId } = ctx.params
-  const productionAppId = dbCore.getProdAppID(appId)
+  const productionAppId = getProdAppID(appId)
 
   // App must have been deployed first
   try {
-    const db = context.getProdAppDB({ skip_setup: true })
-    const exists = await db.exists()
-    if (!exists) {
-      throw new Error("App must be deployed to be reverted.")
+    const db = getProdAppDB({ skip_setup: true })
+    const info = await db.info()
+    if (info.error) {
+      throw info.error
     }
     const deploymentDoc = await db.get(DocumentType.DEPLOYMENTS)
     if (
@@ -92,7 +98,7 @@ export async function revert(ctx: any) {
     return ctx.throw(400, "App has not yet been deployed")
   }
 
-  const replication = new dbCore.Replication({
+  const replication = new Replication({
     source: productionAppId,
     target: appId,
   })
@@ -103,12 +109,12 @@ export async function revert(ctx: any) {
     }
 
     // update appID in reverted app to be dev version again
-    const db = context.getAppDB()
+    const db = getAppDB()
     const appDoc = await db.get(DocumentType.APP_METADATA)
     appDoc.appId = appId
     appDoc.instance._id = appId
     await db.put(appDoc)
-    await cache.app.invalidateAppMetadata(appId)
+    await appCache.invalidateAppMetadata(appId)
     ctx.body = {
       message: "Reverted changes successfully.",
     }
@@ -120,7 +126,7 @@ export async function revert(ctx: any) {
   }
 }
 
-export async function getBudibaseVersion(ctx: any) {
+exports.getBudibaseVersion = async ctx => {
   const version = require("../../../package.json").version
   ctx.body = {
     version,

package/src/api/controllers/integration.js

@@ -0,0 +1,14 @@
+const { getDefinitions } = require("../../integrations")
+
+exports.fetch = async function (ctx) {
+  ctx.status = 200
+  const defs = await getDefinitions()
+
+  ctx.body = defs
+}
+
+exports.find = async function (ctx) {
+  const defs = await getDefinitions()
+  ctx.status = 200
+  ctx.body = defs[ctx.params.type]
+}

package/src/api/controllers/{layout.ts → layout.js}

@@ -1,10 +1,10 @@
-import { EMPTY_LAYOUT } from "../../constants/layouts"
-import { generateLayoutID, getScreenParams } from "../../db/utils"
-import { events, context } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+const { EMPTY_LAYOUT } = require("../../constants/layouts")
+const { generateLayoutID, getScreenParams } = require("../../db/utils")
+const { getAppDB } = require("@budibase/backend-core/context")
+const { events } = require("@budibase/backend-core")
 
-export async function save(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.save = async function (ctx) {
+  const db = getAppDB()
   let layout = ctx.request.body
 
   if (!layout.props) {
@@ -24,8 +24,8 @@ export async function save(ctx: BBContext) {
   ctx.status = 200
 }
 
-export async function destroy(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.destroy = async function (ctx) {
+  const db = getAppDB()
   const layoutId = ctx.params.layoutId,
     layoutRev = ctx.params.layoutRev
 

package/src/api/controllers/{metadata.ts → metadata.js}

@@ -1,16 +1,15 @@
-import { MetadataTypes } from "../../constants"
-import { generateMetadataID } from "../../db/utils"
-import { saveEntityMetadata, deleteEntityMetadata } from "../../utilities"
-import { context } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+const { MetadataTypes } = require("../../constants")
+const { generateMetadataID } = require("../../db/utils")
+const { saveEntityMetadata, deleteEntityMetadata } = require("../../utilities")
+const { getAppDB } = require("@budibase/backend-core/context")
 
-export async function getTypes(ctx: BBContext) {
+exports.getTypes = async ctx => {
   ctx.body = {
     types: MetadataTypes,
   }
 }
 
-export async function saveMetadata(ctx: BBContext) {
+exports.saveMetadata = async ctx => {
   const { type, entityId } = ctx.params
   if (type === MetadataTypes.AUTOMATION_TEST_HISTORY) {
     ctx.throw(400, "Cannot save automation history type")
@@ -18,7 +17,7 @@ export async function saveMetadata(ctx: BBContext) {
   ctx.body = await saveEntityMetadata(type, entityId, ctx.request.body)
 }
 
-export async function deleteMetadata(ctx: BBContext) {
+exports.deleteMetadata = async ctx => {
   const { type, entityId } = ctx.params
   await deleteEntityMetadata(type, entityId)
   ctx.body = {
@@ -26,13 +25,13 @@ export async function deleteMetadata(ctx: BBContext) {
   }
 }
 
-export async function getMetadata(ctx: BBContext) {
+exports.getMetadata = async ctx => {
   const { type, entityId } = ctx.params
-  const db = context.getAppDB()
+  const db = getAppDB()
   const id = generateMetadataID(type, entityId)
   try {
     ctx.body = await db.get(id)
-  } catch (err: any) {
+  } catch (err) {
     if (err.status === 404) {
       ctx.body = {}
     } else {

package/src/api/controllers/migrations.js

@@ -0,0 +1,13 @@
+const { migrate, MIGRATIONS } = require("../../migrations")
+
+exports.migrate = async ctx => {
+  const options = ctx.request.body
+  // don't await as can take a while, just return
+  migrate(options)
+  ctx.status = 200
+}
+
+exports.fetchDefinitions = async ctx => {
+  ctx.body = MIGRATIONS
+  ctx.status = 200
+}

package/src/api/controllers/{permission.ts → permission.js}

@@ -1,11 +1,18 @@
-import { permissions, roles, context } from "@budibase/backend-core"
-import { getRoleParams } from "../../db/utils"
-import {
+const { getBuiltinPermissions } = require("@budibase/backend-core/permissions")
+const {
+  isBuiltin,
+  getDBRoleID,
+  getExternalRoleID,
+  getBuiltinRoles,
+  checkForRoleResourceArray,
+} = require("@budibase/backend-core/roles")
+const { getRoleParams } = require("../../db/utils")
+const {
   CURRENTLY_SUPPORTED_LEVELS,
   getBasePermissions,
-} from "../../utilities/security"
-import { removeFromArray } from "../../utilities"
-import { BBContext, Database, Role } from "@budibase/types"
+} = require("../../utilities/security")
+const { removeFromArray } = require("../../utilities")
+const { getAppDB } = require("@budibase/backend-core/context")
 
 const PermissionUpdateType = {
   REMOVE: "remove",
@@ -15,7 +22,7 @@ const PermissionUpdateType = {
 const SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
 
 // utility function to stop this repetition - permissions always stored under roles
-async function getAllDBRoles(db: Database) {
+async function getAllDBRoles(db) {
   const body = await db.allDocs(
     getRoleParams(null, {
       include_docs: true,
@@ -25,25 +32,21 @@ async function getAllDBRoles(db: Database) {
 }
 
 async function updatePermissionOnRole(
-  appId: string,
-  {
-    roleId,
-    resourceId,
-    level,
-  }: { roleId: string; resourceId: string; level: string },
-  updateType: string
+  appId,
+  { roleId, resourceId, level },
+  updateType
 ) {
-  const db = context.getAppDB()
+  const db = getAppDB()
   const remove = updateType === PermissionUpdateType.REMOVE
-  const isABuiltin = roles.isBuiltin(roleId)
-  const dbRoleId = roles.getDBRoleID(roleId)
+  const isABuiltin = isBuiltin(roleId)
+  const dbRoleId = getDBRoleID(roleId)
   const dbRoles = await getAllDBRoles(db)
   const docUpdates = []
 
   // the permission is for a built in, make sure it exists
   if (isABuiltin && !dbRoles.some(role => role._id === dbRoleId)) {
-    const builtin = roles.getBuiltinRoles()[roleId]
-    builtin._id = roles.getDBRoleID(builtin._id)
+    const builtin = getBuiltinRoles()[roleId]
+    builtin._id = getDBRoleID(builtin._id)
     dbRoles.push(builtin)
   }
 
@@ -87,44 +90,41 @@ async function updatePermissionOnRole(
   }
 
   const response = await db.bulkDocs(docUpdates)
-  return response.map((resp: any) => {
-    resp._id = roles.getExternalRoleID(resp.id)
+  return response.map(resp => {
+    resp._id = getExternalRoleID(resp.id)
     delete resp.id
     return resp
   })
 }
 
-export function fetchBuiltin(ctx: BBContext) {
-  ctx.body = Object.values(permissions.getBuiltinPermissions())
+exports.fetchBuiltin = function (ctx) {
+  ctx.body = Object.values(getBuiltinPermissions())
 }
 
-export function fetchLevels(ctx: BBContext) {
+exports.fetchLevels = function (ctx) {
   // for now only provide the read/write perms externally
   ctx.body = SUPPORTED_LEVELS
 }
 
-export async function fetch(ctx: BBContext) {
-  const db = context.getAppDB()
-  const dbRoles: Role[] = await getAllDBRoles(db)
-  let permissions: any = {}
+exports.fetch = async function (ctx) {
+  const db = getAppDB()
+  const roles = await getAllDBRoles(db)
+  let permissions = {}
   // create an object with structure role ID -> resource ID -> level
-  for (let role of dbRoles) {
+  for (let role of roles) {
     if (!role.permissions) {
       continue
     }
-    const roleId = roles.getExternalRoleID(role._id)
-    if (!roleId) {
-      ctx.throw(400, "Unable to retrieve role")
-    }
+    const roleId = getExternalRoleID(role._id)
     for (let [resource, levelArr] of Object.entries(role.permissions)) {
-      const levels: string[] = Array.isArray(levelArr) ? levelArr : [levelArr]
-      const perms: Record<string, string> = {}
-      levels.forEach(level => (perms[level] = roleId!))
+      const levels = Array.isArray(levelArr) ? [levelArr] : levelArr
+      const perms = {}
+      levels.forEach(level => (perms[level] = roleId))
       permissions[resource] = perms
     }
   }
   // apply the base permissions
-  const finalPermissions: Record<string, Record<string, string>> = {}
+  const finalPermissions = {}
   for (let [resource, permission] of Object.entries(permissions)) {
     const basePerms = getBasePermissions(resource)
     finalPermissions[resource] = Object.assign(basePerms, permission)
@@ -132,36 +132,33 @@ export async function fetch(ctx: BBContext) {
   ctx.body = finalPermissions
 }
 
-export async function getResourcePerms(ctx: BBContext) {
+exports.getResourcePerms = async function (ctx) {
   const resourceId = ctx.params.resourceId
-  const db = context.getAppDB()
+  const db = getAppDB()
   const body = await db.allDocs(
     getRoleParams(null, {
       include_docs: true,
     })
   )
-  const rolesList = body.rows.map(row => row.doc)
-  let permissions: Record<string, string> = {}
+  const roles = body.rows.map(row => row.doc)
+  let permissions = {}
   for (let level of SUPPORTED_LEVELS) {
     // update the various roleIds in the resource permissions
-    for (let role of rolesList) {
-      const rolePerms = roles.checkForRoleResourceArray(
-        role.permissions,
-        resourceId
-      )
+    for (let role of roles) {
+      const rolePerms = checkForRoleResourceArray(role.permissions, resourceId)
       if (
         rolePerms &&
         rolePerms[resourceId] &&
         rolePerms[resourceId].indexOf(level) !== -1
       ) {
-        permissions[level] = roles.getExternalRoleID(role._id)!
+        permissions[level] = getExternalRoleID(role._id)
       }
     }
   }
   ctx.body = Object.assign(getBasePermissions(resourceId), permissions)
 }
 
-export async function addPermission(ctx: BBContext) {
+exports.addPermission = async function (ctx) {
   ctx.body = await updatePermissionOnRole(
     ctx.appId,
     ctx.params,
@@ -169,7 +166,7 @@ export async function addPermission(ctx: BBContext) {
   )
 }
 
-export async function removePermission(ctx: BBContext) {
+exports.removePermission = async function (ctx) {
   ctx.body = await updatePermissionOnRole(
     ctx.appId,
     ctx.params,

package/src/api/controllers/plugin/index.ts

@@ -1,5 +1,6 @@
 import { npmUpload, urlUpload, githubUpload, fileUpload } from "./uploaders"
-import { plugins as pluginCore, tenancy } from "@budibase/backend-core"
+import { getGlobalDB } from "@budibase/backend-core/tenancy"
+import { validate } from "@budibase/backend-core/plugins"
 import { PluginType, FileType, PluginSource } from "@budibase/types"
 import env from "../../../environment"
 import { ClientAppSocket } from "../../../websocket"
@@ -7,7 +8,7 @@ import { db as dbCore } from "@budibase/backend-core"
 import { plugins } from "@budibase/pro"
 
 export async function getPlugins(type?: PluginType) {
-  const db = tenancy.getGlobalDB()
+  const db = getGlobalDB()
   const response = await db.allDocs(
     dbCore.getPluginParams(null, {
       include_docs: true,
@@ -75,7 +76,7 @@ export async function create(ctx: any) {
         break
     }
 
-    pluginCore.validate(metadata?.schema)
+    validate(metadata?.schema)
 
     // Only allow components in cloud
     if (!env.SELF_HOSTED && metadata?.schema?.type !== PluginType.COMPONENT) {
@@ -120,7 +121,7 @@ export async function processUploadedPlugin(
   source?: PluginSource
 ) {
   const { metadata, directory } = await fileUpload(plugin)
-  pluginCore.validate(metadata?.schema)
+  validate(metadata?.schema)
 
   // Only allow components in cloud
   if (!env.SELF_HOSTED && metadata?.schema?.type !== PluginType.COMPONENT) {

package/src/api/controllers/plugin/utils.ts

@@ -1,5 +1,7 @@
-import { createTempFolder } from "../../../utilities/fileSystem"
-import { objectStore } from "@budibase/backend-core"
+import {
+  createTempFolder,
+  downloadTarballDirect,
+} from "../../../utilities/fileSystem"
 
 export async function downloadUnzipTarball(
   url: string,
@@ -8,7 +10,7 @@ export async function downloadUnzipTarball(
 ) {
   try {
     const path = createTempFolder(name)
-    await objectStore.downloadTarballDirect(url, path, headers)
+    await downloadTarballDirect(url, path, headers)
 
     return path
   } catch (e: any) {