@budibase/server 1.0.105-alpha.21 → 1.0.105-alpha.24

package/src/migrations/functions/usageQuotas/syncDevelopers.ts

@@ -0,0 +1,19 @@
+import { getTenantId } from "@budibase/backend-core/tenancy"
+import { utils } from "@budibase/backend-core"
+import { quotas, QuotaUsageType, StaticQuotaName } from "@budibase/pro"
+
+export const run = async () => {
+  // get developer count
+  const developerCount = await utils.getBuildersCount()
+
+  // sync developer count
+  const tenantId = getTenantId()
+  console.log(
+    `[Tenant: ${tenantId}] Syncing developer count: ${developerCount}`
+  )
+  await quotas.setUsage(
+    developerCount,
+    StaticQuotaName.DEVELOPERS,
+    QuotaUsageType.STATIC
+  )
+}

package/src/migrations/functions/usageQuotas/syncPublishedApps.ts

@@ -0,0 +1,21 @@
+import { getTenantId } from "@budibase/backend-core/tenancy"
+import { getAllApps } from "@budibase/backend-core/db"
+import { quotas, QuotaUsageType, StaticQuotaName } from "@budibase/pro"
+
+export const run = async () => {
+  // get app count
+  const opts: any = { dev: false }
+  const prodApps = await getAllApps(opts)
+  const prodAppCount = prodApps ? prodApps.length : 0
+
+  // sync app count
+  const tenantId = getTenantId()
+  console.log(
+    `[Tenant: ${tenantId}] Syncing published app count: ${prodAppCount}`
+  )
+  await quotas.setUsage(
+    prodAppCount,
+    StaticQuotaName.PUBLISHED_APPS,
+    QuotaUsageType.STATIC
+  )
+}

package/src/migrations/functions/usageQuotas/syncRows.ts

@@ -1,10 +1,9 @@
-import { getGlobalDB, getTenantId } from "@budibase/backend-core/tenancy"
+import { getTenantId } from "@budibase/backend-core/tenancy"
 import { getAllApps } from "@budibase/backend-core/db"
-import { getUsageQuotaDoc } from "../../../utilities/usageQuota"
 import { getUniqueRows } from "../../../utilities/usageQuota/rows"
+import { quotas, QuotaUsageType, StaticQuotaName } from "@budibase/pro"
 
 export const run = async () => {
-  const db = getGlobalDB()
   // get all rows in all apps
   // @ts-ignore
   const allApps = await getAllApps({ all: true })
@@ -16,7 +15,5 @@ export const run = async () => {
   // sync row count
   const tenantId = getTenantId()
   console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`)
-  const usageDoc = await getUsageQuotaDoc(db)
-  usageDoc.usageQuota.rows = rowCount
-  await db.put(usageDoc)
+  await quotas.setUsage(rowCount, StaticQuotaName.ROWS, QuotaUsageType.STATIC)
 }

package/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts

@@ -0,0 +1,32 @@
+import TestConfig from "../../../../tests/utilities/TestConfiguration"
+import * as syncApps from "../syncApps"
+import { quotas, QuotaUsageType, StaticQuotaName } from "@budibase/pro"
+
+describe("syncApps", () => {
+  let config = new TestConfig(false)
+
+  beforeEach(async () => {
+    await config.init()
+  })
+
+  afterAll(config.end)
+
+  it("runs successfully", async () => {
+    // create the usage quota doc and mock usages
+    await quotas.getQuotaUsage()
+    await quotas.setUsage(3, StaticQuotaName.APPS, QuotaUsageType.STATIC)
+
+    let usageDoc = await quotas.getQuotaUsage()
+    expect(usageDoc.usageQuota.apps).toEqual(3)
+
+    // create an extra app to test the migration
+    await config.createApp("quota-test")
+
+    // migrate
+    await syncApps.run()
+
+    // assert the migration worked
+    usageDoc = await quotas.getQuotaUsage()
+    expect(usageDoc.usageQuota.apps).toEqual(2)
+  })
+})

package/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts

@@ -0,0 +1,38 @@
+import TestConfig from "../../../../tests/utilities/TestConfiguration"
+import * as syncRows from "../syncRows"
+import { quotas, QuotaUsageType, StaticQuotaName } from "@budibase/pro"
+
+describe("syncRows", () => {
+  let config = new TestConfig(false)
+
+  beforeEach(async () => {
+    await config.init()
+  })
+
+  afterAll(config.end)
+
+  it("runs successfully", async () => {
+    // create the usage quota doc and mock usages
+    await quotas.getQuotaUsage()
+    await quotas.setUsage(300, StaticQuotaName.ROWS, QuotaUsageType.STATIC)
+
+    let usageDoc = await quotas.getQuotaUsage()
+    expect(usageDoc.usageQuota.rows).toEqual(300)
+
+    // app 1
+    await config.createTable()
+    await config.createRow()
+    // app 2
+    await config.createApp("second-app")
+    await config.createTable()
+    await config.createRow()
+    await config.createRow()
+
+    // migrate
+    await syncRows.run()
+
+    // assert the migration worked
+    usageDoc = await quotas.getQuotaUsage()
+    expect(usageDoc.usageQuota.rows).toEqual(3)
+  })
+})

package/src/migrations/index.ts

@@ -8,6 +8,8 @@ const {
 import * as userEmailViewCasing from "./functions/userEmailViewCasing"
 import * as quota1 from "./functions/quotas1"
 import * as appUrls from "./functions/appUrls"
+import * as developerQuota from "./functions/developerQuota"
+import * as publishedAppsQuota from "./functions/publishedAppsQuota"
 
 export interface Migration {
   type: string
@@ -27,7 +29,7 @@ export interface Migration {
  */
 export interface MigrationOptions {
   tenantIds?: string[]
-  forced?: {
+  force?: {
     [type: string]: string[]
   }
 }
@@ -49,6 +51,16 @@ export const MIGRATIONS: Migration[] = [
     opts: { all: true },
     fn: appUrls.run,
   },
+  {
+    type: MIGRATION_TYPES.GLOBAL,
+    name: "developer_quota",
+    fn: developerQuota.run,
+  },
+  {
+    type: MIGRATION_TYPES.GLOBAL,
+    name: "published_apps_quota",
+    fn: publishedAppsQuota.run,
+  },
 ]
 
 export const migrate = async (options?: MigrationOptions) => {

package/src/module.d.ts

@@ -1,3 +1,7 @@
 declare module "@budibase/backend-core"
 declare module "@budibase/backend-core/tenancy"
 declare module "@budibase/backend-core/db"
+declare module "@budibase/backend-core/context"
+declare module "@budibase/backend-core/cache"
+declare module "@budibase/backend-core/permissions"
+declare module "@budibase/backend-core/roles"

package/src/threads/{index.js → index.ts}

@@ -1,12 +1,12 @@
-const workerFarm = require("worker-farm")
-const env = require("../environment")
+import workerFarm from "worker-farm"
+import * as env from "../environment"
 
-const ThreadType = {
+export const ThreadType = {
   QUERY: "query",
   AUTOMATION: "automation",
 }
 
-function typeToFile(type) {
+function typeToFile(type: any) {
   let filename = null
   switch (type) {
     case ThreadType.QUERY:
@@ -21,8 +21,13 @@ function typeToFile(type) {
   return require.resolve(filename)
 }
 
-class Thread {
-  constructor(type, opts = { timeoutMs: null, count: 1 }) {
+export class Thread {
+  type: any
+  count: any
+  disableThreading: any
+  workers: any
+
+  constructor(type: any, opts: any = { timeoutMs: null, count: 1 }) {
     this.type = type
     this.count = opts.count ? opts.count : 1
     this.disableThreading =
@@ -31,7 +36,7 @@ class Thread {
       this.count === 0 ||
       env.isInThread()
     if (!this.disableThreading) {
-      const workerOpts = {
+      const workerOpts: any = {
         autoStart: true,
         maxConcurrentWorkers: this.count,
       }
@@ -42,7 +47,7 @@ class Thread {
     }
   }
 
-  run(data) {
+  run(data: any) {
     return new Promise((resolve, reject) => {
       let fncToCall
       // if in test then don't use threading
@@ -51,7 +56,7 @@ class Thread {
       } else {
         fncToCall = this.workers
       }
-      fncToCall(data, (err, response) => {
+      fncToCall(data, (err: any, response: any) => {
         if (err) {
           reject(err)
         } else {
@@ -61,6 +66,3 @@ class Thread {
     })
   }
 }
-
-module.exports.Thread = Thread
-module.exports.ThreadType = ThreadType

package/src/utilities/queue/inMemoryQueue.js

@@ -66,7 +66,8 @@ class InMemoryQueue {
    * @param {object} msg A message to be transported over the queue, this should be
    * a JSON message as this is required by Bull.
    */
-  add(msg) {
+  // eslint-disable-next-line no-unused-vars
+  add(msg, repeat) {
     if (typeof msg !== "object") {
       throw "Queue only supports carrying JSON."
     }
@@ -90,6 +91,11 @@ class InMemoryQueue {
     return []
   }
 
+  // eslint-disable-next-line no-unused-vars
+  removeJobs(pattern) {
+    // no-op
+  }
+
   /**
    * Implemented for tests
    */

package/tsconfig.build.json

@@ -0,0 +1,10 @@
+{
+  // Used for building with tsc
+  "extends": "./tsconfig.json",
+  "exclude": [
+    "node_modules",
+    "**/*.json",
+    "**/*.spec.js",
+    "**/*.spec.ts"
+  ]
+}

package/tsconfig.json

@@ -19,7 +19,7 @@
   "exclude": [
     "node_modules",
     "**/*.json",
-    "**/*.spec.ts",
-    "**/*.spec.js"
+    "**/*.spec.js",
+    // "**/*.spec.ts" // don't exclude spec.ts files for editor support
   ]
 }