@budibase/server 2.5.6-alpha.9 → 2.5.6

package/src/threads/automation.ts

@@ -27,15 +27,15 @@ import { processObject } from "@budibase/string-templates"
 import { cloneDeep } from "lodash/fp"
 import * as sdkUtils from "../sdk/utils"
 import env from "../environment"
-const FILTER_STEP_ID = actions.BUILTIN_ACTION_DEFINITIONS.FILTER.stepId
-const LOOP_STEP_ID = actions.BUILTIN_ACTION_DEFINITIONS.LOOP.stepId
+const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId
+const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId
 const CRON_STEP_ID = triggerDefs.CRON.stepId
 const STOPPED_STATUS = { success: true, status: AutomationStatus.STOPPED }
 
 function getLoopIterations(loopStep: LoopStep, input: LoopInput) {
   const binding = automationUtils.typecastForLooping(loopStep, input)
-  if (!binding) {
-    return 0
+  if (!loopStep || !binding) {
+    return 1
   }
   if (Array.isArray(binding)) {
     return binding.length
@@ -43,7 +43,7 @@ function getLoopIterations(loopStep: LoopStep, input: LoopInput) {
   if (typeof binding === "string") {
     return automationUtils.stringSplit(binding).length
   }
-  return 0
+  return 1
 }
 
 /**
@@ -423,25 +423,13 @@ class Orchestrator {
         }
       }
 
-      if (loopStep && iterations === 0) {
-        loopStep = undefined
-        this.executionOutput.steps.splice(loopStepNumber + 1, 0, {
-          id: step.id,
-          stepId: step.stepId,
-          outputs: { status: AutomationStatus.NO_ITERATIONS, success: true },
-          inputs: {},
-        })
-
-        this._context.steps.splice(loopStepNumber, 1)
-        iterations = 1
-      }
-
       // Delete the step after the loop step as it's irrelevant, since information is included
       // in the loop step
       if (wasLoopStep && !loopStep) {
         this._context.steps.splice(loopStepNumber + 1, 1)
         wasLoopStep = false
       }
+
       if (loopSteps && loopSteps.length) {
         let tempOutput = {
           success: true,

package/src/utilities/fileSystem/plugin.ts

@@ -5,7 +5,6 @@ import { join } from "path"
 import { objectStore } from "@budibase/backend-core"
 
 const DATASOURCE_PATH = join(budibaseTempDir(), "datasource")
-const AUTOMATION_PATH = join(budibaseTempDir(), "automation")
 
 export const getPluginMetadata = async (path: string) => {
   let metadata: any = {}
@@ -34,12 +33,12 @@ export const getPluginMetadata = async (path: string) => {
   return { metadata, directory: path }
 }
 
-async function getPluginImpl(path: string, plugin: Plugin) {
+export const getDatasourcePlugin = async (plugin: Plugin) => {
   const hash = plugin.schema?.hash
-  if (!fs.existsSync(path)) {
-    fs.mkdirSync(path)
+  if (!fs.existsSync(DATASOURCE_PATH)) {
+    fs.mkdirSync(DATASOURCE_PATH)
   }
-  const filename = join(path, plugin.name)
+  const filename = join(DATASOURCE_PATH, plugin.name)
   const metadataName = `${filename}.bbmetadata`
   if (fs.existsSync(filename)) {
     const currentHash = fs.readFileSync(metadataName, "utf8")
@@ -63,11 +62,3 @@ async function getPluginImpl(path: string, plugin: Plugin) {
 
   return require(filename)
 }
-
-export const getDatasourcePlugin = async (plugin: Plugin) => {
-  return getPluginImpl(DATASOURCE_PATH, plugin)
-}
-
-export const getAutomationPlugin = async (plugin: Plugin) => {
-  return getPluginImpl(AUTOMATION_PATH, plugin)
-}

package/src/utilities/global.ts

@@ -9,7 +9,6 @@ import {
 import env from "../environment"
 import { groups } from "@budibase/pro"
 import { UserCtx, ContextUser, User, UserGroup } from "@budibase/types"
-import { global } from "yargs"
 
 export function updateAppRole(
   user: ContextUser,
@@ -17,7 +16,7 @@ export function updateAppRole(
 ) {
   appId = appId || context.getAppId()
 
-  if (!user || (!user.roles && !user.userGroups)) {
+  if (!user || !user.roles) {
     return user
   }
   // if in an multi-tenancy environment make sure roles are never updated
@@ -28,7 +27,7 @@ export function updateAppRole(
     return user
   }
   // always use the deployed app
-  if (appId && user.roles) {
+  if (appId) {
     user.roleId = user.roles[dbCore.getProdAppID(appId)]
   }
   // if a role wasn't found then either set as admin (builder) or public (everyone else)
@@ -61,7 +60,7 @@ async function checkGroupRoles(
   return user
 }
 
-export async function processUser(
+async function processUser(
   user: ContextUser,
   opts: { appId?: string; groups?: UserGroup[] } = {}
 ) {
@@ -95,15 +94,16 @@ export async function getGlobalUser(userId: string) {
   return processUser(user, { appId })
 }
 
-export async function getGlobalUsers(
-  userIds?: string[],
-  opts?: { noProcessing?: boolean }
-) {
+export async function getGlobalUsers(users?: ContextUser[]) {
   const appId = context.getAppId()
   const db = tenancy.getGlobalDB()
+  const allGroups = await groups.fetch()
   let globalUsers
-  if (userIds) {
-    globalUsers = (await db.allDocs(getMultiIDParams(userIds))).rows.map(
+  if (users) {
+    const globalIds = users.map(user =>
+      getGlobalIDFromUserMetadataID(user._id!)
+    )
+    globalUsers = (await db.allDocs(getMultiIDParams(globalIds))).rows.map(
       row => row.doc
     )
   } else {
@@ -126,20 +126,15 @@ export async function getGlobalUsers(
     return globalUsers
   }
 
-  if (opts?.noProcessing) {
-    return globalUsers
-  } else {
-    // pass in the groups, meaning we don't actually need to retrieve them for
-    // each user individually
-    const allGroups = await groups.fetch()
-    return Promise.all(
-      globalUsers.map(user => processUser(user, { groups: allGroups }))
-    )
-  }
+  // pass in the groups, meaning we don't actually need to retrieve them for
+  // each user individually
+  return Promise.all(
+    globalUsers.map(user => processUser(user, { groups: allGroups }))
+  )
 }
 
 export async function getGlobalUsersFromMetadata(users: ContextUser[]) {
-  const globalUsers = await getGlobalUsers(users.map(user => user._id!))
+  const globalUsers = await getGlobalUsers(users)
   return users.map(user => {
     const globalUser = globalUsers.find(
       globalUser => globalUser && user._id?.includes(globalUser._id)

package/src/watch.ts

@@ -3,7 +3,7 @@ import env from "./environment"
 import chokidar from "chokidar"
 import fs from "fs"
 import { constants, tenancy } from "@budibase/backend-core"
-import pluginsSdk from "./sdk/plugins"
+import { processUploadedPlugin } from "./api/controllers/plugin"
 
 export function watch() {
   const watchPath = path.join(env.PLUGINS_DIR, "./**/*.tar.gz")
@@ -27,7 +27,7 @@ export function watch() {
           const split = path.split("/")
           const name = split[split.length - 1]
           console.log("Importing plugin:", path)
-          await pluginsSdk.processUploaded({ name, path })
+          await processUploadedPlugin({ name, path })
         } catch (err: any) {
           const message = err?.message ? err?.message : err
           console.error("Failed to import plugin:", message)

package/src/websocket.ts

@@ -0,0 +1,26 @@
+import { Server } from "socket.io"
+import http from "http"
+
+class Websocket {
+  socketServer: Server
+
+  constructor(server: http.Server, path: string) {
+    this.socketServer = new Server(server, {
+      path,
+    })
+  }
+
+  // Emit an event to all sockets
+  emit(event: string, payload: any) {
+    this.socketServer.sockets.emit(event, payload)
+  }
+}
+
+// Likely to be more socket instances in future
+let ClientAppSocket: Websocket
+
+export const initialise = (server: http.Server) => {
+  ClientAppSocket = new Websocket(server, "/socket/client")
+}
+
+export { ClientAppSocket }

package/tsconfig.json

@@ -10,13 +10,19 @@
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*"],
       "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/packages/pro/src"]
+      "@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
     }
   },
   "ts-node": {
     "require": ["tsconfig-paths/register"],
     "swc": true
   },
+  "references": [
+    { "path": "../types" },
+    { "path": "../backend-core" },
+    { "path": "../shared-core" },
+    { "path": "../../../budibase-pro/packages/pro" }
+  ],
   "include": ["src/**/*", "specs", "package.json"],
   "exclude": ["node_modules", "dist"]
 }