@budibase/worker 3.10.1 → 3.10.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.10.1",
+  "version": "3.10.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -54,6 +54,7 @@
     "dotenv": "8.6.0",
     "email-validator": "^2.0.4",
     "global-agent": "3.0.0",
+    "http-graceful-shutdown": "^3.1.12",
     "ical-generator": "4.1.0",
     "joi": "17.6.0",
     "jsonwebtoken": "9.0.2",
@@ -120,5 +121,5 @@
       }
     }
   },
-  "gitHead": "1a95ba0eed16547cffc223832e87e5b8818a23eb"
+  "gitHead": "94264027da3376c3f544676c03c0241d88bd82b0"
 }

package/src/api/routes/global/tests/self.spec.ts

@@ -47,13 +47,12 @@ describe("/api/global/self", () => {
     })
   })
 
-  it("should update onboarding", async () => {
+  it("should update free trial confirmation date", async () => {
     const user = await config.createUser()
     await config.createSession(user)
 
     const res = await config.api.self
       .updateSelf(user, {
-        onboardedAt: "2023-03-07T14:10:54.869Z",
         freeTrialConfirmedAt: "2024-03-17T14:10:54.869Z",
       })
       .expect(200)
@@ -61,7 +60,6 @@ describe("/api/global/self", () => {
     const dbUser = (await config.getUser(user.email))!
 
     user._rev = dbUser._rev
-    expect(dbUser.onboardedAt).toBe("2023-03-07T14:10:54.869Z")
     expect(dbUser.freeTrialConfirmedAt).toBe("2024-03-17T14:10:54.869Z")
     expect(res.body._id).toBe(user._id)
   })

package/src/api/routes/validation/users.ts

@@ -25,10 +25,8 @@ export const buildSelfSaveValidation = () => {
     forceResetPassword: Joi.boolean().optional(),
     firstName: OPTIONAL_STRING,
     lastName: OPTIONAL_STRING,
-    onboardedAt: Joi.string().optional(),
     freeTrialConfirmedAt: Joi.string().optional(),
     appFavourites: Joi.array().optional(),
-    tours: Joi.object().optional(),
     appSort: Joi.string().optional(),
   }
   return auth.joiValidator.body(Joi.object(schema).required().unknown(false))

package/src/index.ts

@@ -26,12 +26,12 @@ db.init()
 import koaBody from "koa-body"
 import http from "http"
 import api from "./api"
+import gracefulShutdown from "http-graceful-shutdown"
 
 const koaSession = require("koa-session")
 
 import { userAgent } from "koa-useragent"
 
-import destroyable from "server-destroy"
 import { initPro } from "./initPro"
 import { handleScimBody } from "./middleware/handleScimBody"
 
@@ -86,29 +86,40 @@ app.use(auth.passport.session())
 app.use(api.routes())
 
 const server = http.createServer(app.callback())
-destroyable(server)
 
-let shuttingDown = false,
-  errCode = 0
-server.on("close", async () => {
-  if (shuttingDown) {
-    return
-  }
-  shuttingDown = true
-  console.log("Server Closed")
+const shutdown = async () => {
+  console.log("Worker service shutting down gracefully...")
   timers.cleanup()
   events.shutdown()
   await redis.clients.shutdown()
   await queue.shutdown()
-  if (!env.isTest()) {
-    process.exit(errCode)
+}
+
+gracefulShutdown(server, {
+  signals: "SIGINT SIGTERM",
+  timeout: 30000,
+  onShutdown: shutdown,
+  forceExit: !env.isTest,
+  finally: () => {
+    console.log("Worker service shutdown complete")
+  },
+})
+
+process.on("uncaughtException", async err => {
+  logging.logAlert("Uncaught exception.", err)
+  await shutdown()
+  if (!env.isTest) {
+    process.exit(1)
   }
 })
 
-const shutdown = () => {
-  server.close()
-  server.destroy()
-}
+process.on("unhandledRejection", async reason => {
+  logging.logAlert("Unhandled Promise Rejection", reason as Error)
+  await shutdown()
+  if (!env.isTest) {
+    process.exit(1)
+  }
+})
 
 export default server.listen(parseInt(env.PORT || "4002"), async () => {
   let startupLog = `Worker running on ${JSON.stringify(server.address())}`
@@ -125,17 +136,3 @@ export default server.listen(parseInt(env.PORT || "4002"), async () => {
   // can't integrate directly into backend-core due to cyclic issues
   await events.processors.init(proSdk.auditLogs.write)
 })
-
-process.on("uncaughtException", err => {
-  errCode = -1
-  logging.logAlert("Uncaught exception.", err)
-  shutdown()
-})
-
-process.on("SIGTERM", () => {
-  shutdown()
-})
-
-process.on("SIGINT", () => {
-  shutdown()
-})