Add hot reloading for component plugins via watched plugin directory
This commit is contained in:
parent
244850cc0b
commit
6093da79d6
|
@ -130,6 +130,10 @@ spec:
|
||||||
- name: BB_ADMIN_USER_PASSWORD
|
- name: BB_ADMIN_USER_PASSWORD
|
||||||
value: {{ .Values.globals.bbAdminUserPassword | quote }}
|
value: {{ .Values.globals.bbAdminUserPassword | quote }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
{{ if .Values.globals.pluginsDir }}
|
||||||
|
- name: PLUGINS_DIR
|
||||||
|
value: { { .Values.globals.pluginsDir | quote }}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
image: budibase/apps:{{ .Values.globals.appVersion }}
|
image: budibase/apps:{{ .Values.globals.appVersion }}
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
|
|
|
@ -23,3 +23,6 @@ BUDIBASE_ENVIRONMENT=PRODUCTION
|
||||||
# An admin user can be automatically created initially if these are set
|
# An admin user can be automatically created initially if these are set
|
||||||
BB_ADMIN_USER_EMAIL=
|
BB_ADMIN_USER_EMAIL=
|
||||||
BB_ADMIN_USER_PASSWORD=
|
BB_ADMIN_USER_PASSWORD=
|
||||||
|
|
||||||
|
# A path that is watched for plugin bundles. Any bundles found are imported automatically/
|
||||||
|
PLUGINS_DIR=
|
|
@ -23,3 +23,6 @@ BUDIBASE_ENVIRONMENT=PRODUCTION
|
||||||
# An admin user can be automatically created initially if these are set
|
# An admin user can be automatically created initially if these are set
|
||||||
BB_ADMIN_USER_EMAIL=
|
BB_ADMIN_USER_EMAIL=
|
||||||
BB_ADMIN_USER_PASSWORD=
|
BB_ADMIN_USER_PASSWORD=
|
||||||
|
|
||||||
|
# A path that is watched for plugin bundles. Any bundles found are imported automatically/
|
||||||
|
PLUGINS_DIR=
|
|
@ -95,6 +95,7 @@
|
||||||
"bcryptjs": "2.4.3",
|
"bcryptjs": "2.4.3",
|
||||||
"bull": "3.29.3",
|
"bull": "3.29.3",
|
||||||
"chmodr": "1.2.0",
|
"chmodr": "1.2.0",
|
||||||
|
"chokidar": "^3.5.3",
|
||||||
"csvtojson": "2.0.10",
|
"csvtojson": "2.0.10",
|
||||||
"curlconverter": "3.21.0",
|
"curlconverter": "3.21.0",
|
||||||
"dotenv": "8.2.0",
|
"dotenv": "8.2.0",
|
||||||
|
|
|
@ -58,6 +58,7 @@ async function init() {
|
||||||
DEPLOYMENT_ENVIRONMENT: "development",
|
DEPLOYMENT_ENVIRONMENT: "development",
|
||||||
BB_ADMIN_USER_EMAIL: "",
|
BB_ADMIN_USER_EMAIL: "",
|
||||||
BB_ADMIN_USER_PASSWORD: "",
|
BB_ADMIN_USER_PASSWORD: "",
|
||||||
|
PLUGINS_DIR: "",
|
||||||
}
|
}
|
||||||
let envFile = ""
|
let envFile = ""
|
||||||
Object.keys(envFileJson).forEach(key => {
|
Object.keys(envFileJson).forEach(key => {
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { extractPluginTarball } from "../../utilities/fileSystem"
|
||||||
import { getGlobalDB } from "@budibase/backend-core/tenancy"
|
import { getGlobalDB } from "@budibase/backend-core/tenancy"
|
||||||
import { generatePluginID, getPluginParams } from "../../db/utils"
|
import { generatePluginID, getPluginParams } from "../../db/utils"
|
||||||
import { uploadDirectory } from "@budibase/backend-core/objectStore"
|
import { uploadDirectory } from "@budibase/backend-core/objectStore"
|
||||||
import { PluginType } from "@budibase/types"
|
import { PluginType, FileType } from "@budibase/types"
|
||||||
|
|
||||||
export async function getPlugins(type?: PluginType) {
|
export async function getPlugins(type?: PluginType) {
|
||||||
const db = getGlobalDB()
|
const db = getGlobalDB()
|
||||||
|
@ -21,15 +21,35 @@ export async function getPlugins(type?: PluginType) {
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function upload(ctx: any) {
|
export async function upload(ctx: any) {
|
||||||
const plugins =
|
const plugins: FileType[] =
|
||||||
ctx.request.files.file.length > 1
|
ctx.request.files.file.length > 1
|
||||||
? Array.from(ctx.request.files.file)
|
? Array.from(ctx.request.files.file)
|
||||||
: [ctx.request.files.file]
|
: [ctx.request.files.file]
|
||||||
const db = getGlobalDB()
|
|
||||||
try {
|
try {
|
||||||
let docs = []
|
let docs = []
|
||||||
// can do single or multiple plugins
|
// can do single or multiple plugins
|
||||||
for (let plugin of plugins) {
|
for (let plugin of plugins) {
|
||||||
|
const doc = await processPlugin(plugin)
|
||||||
|
docs.push(doc)
|
||||||
|
}
|
||||||
|
ctx.body = {
|
||||||
|
message: "Plugin(s) uploaded successfully",
|
||||||
|
plugins: docs,
|
||||||
|
}
|
||||||
|
} catch (err: any) {
|
||||||
|
const errMsg = err?.message ? err?.message : err
|
||||||
|
ctx.throw(400, `Failed to import plugin: ${errMsg}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function fetch(ctx: any) {
|
||||||
|
ctx.body = await getPlugins()
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function destroy(ctx: any) {}
|
||||||
|
|
||||||
|
export async function processPlugin(plugin: FileType) {
|
||||||
|
const db = getGlobalDB()
|
||||||
const { metadata, directory } = await extractPluginTarball(plugin)
|
const { metadata, directory } = await extractPluginTarball(plugin)
|
||||||
const version = metadata.package.version,
|
const version = metadata.package.version,
|
||||||
name = metadata.package.name,
|
name = metadata.package.name,
|
||||||
|
@ -67,23 +87,8 @@ export async function upload(ctx: any) {
|
||||||
jsUrl: `${bucketPath}${jsFileName}`,
|
jsUrl: `${bucketPath}${jsFileName}`,
|
||||||
}
|
}
|
||||||
const response = await db.put(doc)
|
const response = await db.put(doc)
|
||||||
docs.push({
|
return {
|
||||||
...doc,
|
...doc,
|
||||||
_rev: response.rev,
|
_rev: response.rev,
|
||||||
})
|
|
||||||
}
|
|
||||||
ctx.body = {
|
|
||||||
message: "Plugin(s) uploaded successfully",
|
|
||||||
plugins: docs,
|
|
||||||
}
|
|
||||||
} catch (err: any) {
|
|
||||||
const errMsg = err?.message ? err?.message : err
|
|
||||||
ctx.throw(400, `Failed to import plugin: ${errMsg}`)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function fetch(ctx: any) {
|
|
||||||
ctx.body = await getPlugins()
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function destroy(ctx: any) {}
|
|
||||||
|
|
|
@ -17,10 +17,15 @@ const bullboard = require("./automations/bullboard")
|
||||||
const { logAlert } = require("@budibase/backend-core/logging")
|
const { logAlert } = require("@budibase/backend-core/logging")
|
||||||
const { pinoSettings } = require("@budibase/backend-core")
|
const { pinoSettings } = require("@budibase/backend-core")
|
||||||
const { Thread } = require("./threads")
|
const { Thread } = require("./threads")
|
||||||
|
const chokidar = require("chokidar")
|
||||||
|
const fs = require("fs")
|
||||||
|
const path = require("path")
|
||||||
import redis from "./utilities/redis"
|
import redis from "./utilities/redis"
|
||||||
import * as migrations from "./migrations"
|
import * as migrations from "./migrations"
|
||||||
import { events, installation, tenancy } from "@budibase/backend-core"
|
import { events, installation, tenancy } from "@budibase/backend-core"
|
||||||
import { createAdminUser, getChecklist } from "./utilities/workerRequests"
|
import { createAdminUser, getChecklist } from "./utilities/workerRequests"
|
||||||
|
import { processPlugin } from "./api/controllers/plugin"
|
||||||
|
import { getGlobalDB } from "@budibase/backend-core/tenancy"
|
||||||
|
|
||||||
const app = new Koa()
|
const app = new Koa()
|
||||||
|
|
||||||
|
@ -132,6 +137,29 @@ module.exports = server.listen(env.PORT || 0, async () => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// monitor plugin directory if required
|
||||||
|
if (env.SELF_HOSTED && env.PLUGINS_DIR && fs.existsSync(env.PLUGINS_DIR)) {
|
||||||
|
const watchPath = path.join(env.PLUGINS_DIR, "./**/dist/*.tar.gz")
|
||||||
|
chokidar
|
||||||
|
.watch(watchPath, {
|
||||||
|
ignored: "**/node_modules",
|
||||||
|
awaitWriteFinish: true,
|
||||||
|
})
|
||||||
|
.on("all", async (event: string, path: string) => {
|
||||||
|
const tenantId = tenancy.getTenantId()
|
||||||
|
await tenancy.doInTenant(tenantId, async () => {
|
||||||
|
try {
|
||||||
|
const split = path.split("/")
|
||||||
|
const name = split[split.length - 1]
|
||||||
|
console.log("Importing plugin:", path)
|
||||||
|
await processPlugin({ name, path })
|
||||||
|
} catch (err) {
|
||||||
|
console.log("Failed to import plugin:", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// check for version updates
|
// check for version updates
|
||||||
await installation.checkInstallVersion()
|
await installation.checkInstallVersion()
|
||||||
|
|
||||||
|
|
|
@ -77,6 +77,7 @@ module.exports = {
|
||||||
SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
|
SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
|
||||||
BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL,
|
BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL,
|
||||||
BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD,
|
BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD,
|
||||||
|
PLUGINS_DIR: process.env.PLUGINS_DIR,
|
||||||
// flags
|
// flags
|
||||||
ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
|
ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
|
||||||
DISABLE_THREADING: process.env.DISABLE_THREADING,
|
DISABLE_THREADING: process.env.DISABLE_THREADING,
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2,3 +2,8 @@ export enum PluginType {
|
||||||
DATASOURCE = "datasource",
|
DATASOURCE = "datasource",
|
||||||
COMPONENT = "component",
|
COMPONENT = "component",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface FileType {
|
||||||
|
path: string
|
||||||
|
name: string
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue