@budibase/worker 1.0.187 → 1.0.188-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/Dockerfile +3 -1
  2. package/package.json +5 -5
  3. package/src/api/controllers/global/license.ts +1 -2
  4. package/src/api/controllers/global/self.js +2 -2
  5. package/src/environment.js +19 -12
package/Dockerfile CHANGED
@@ -9,7 +9,9 @@ WORKDIR /app
9
9
 
10
10
  # copy files and install dependencies
11
11
  COPY . ./
12
- RUN yarn
12
+ # handle node-gyp
13
+ RUN apk add --no-cache --virtual .gyp python3 make g++ \
14
+ && yarn && apk del .gyp
13
15
  RUN yarn global add pm2
14
16
 
15
17
  EXPOSE 4001
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@budibase/worker",
3
3
  "email": "hi@budibase.com",
4
- "version": "1.0.187",
4
+ "version": "1.0.188-alpha.2",
5
5
  "description": "Budibase background service",
6
6
  "main": "src/index.ts",
7
7
  "repository": {
@@ -32,9 +32,9 @@
32
32
  "author": "Budibase",
33
33
  "license": "GPL-3.0",
34
34
  "dependencies": {
35
- "@budibase/backend-core": "^1.0.187",
36
- "@budibase/pro": "1.0.186",
37
- "@budibase/string-templates": "^1.0.187",
35
+ "@budibase/backend-core": "^1.0.188-alpha.2",
36
+ "@budibase/pro": "1.0.188-alpha.1",
37
+ "@budibase/string-templates": "^1.0.188-alpha.2",
38
38
  "@koa/router": "^8.0.0",
39
39
  "@sentry/node": "6.17.7",
40
40
  "@techpass/passport-openidconnect": "^0.3.0",
@@ -90,5 +90,5 @@
90
90
  "./scripts/jestSetup.js"
91
91
  ]
92
92
  },
93
- "gitHead": "c77d7de66f212104eb34540bf1c1f27f9176f0f3"
93
+ "gitHead": "757771908b1e2cf384eef4dc6e6cae48b671f4b0"
94
94
  }
package/src/api/controllers/global/license.ts CHANGED
@@ -25,6 +25,5 @@ export const getInfo = async (ctx: any) => {
25
25
  }
26
26
 
27
27
  export const getQuotaUsage = async (ctx: any) => {
28
- const usage = await quotas.getQuotaUsage()
29
- ctx.body = usage
28
+ ctx.body = await quotas.getQuotaUsage()
30
29
  }
package/src/api/controllers/global/self.js CHANGED
@@ -75,8 +75,8 @@ const checkCurrentApp = ctx => {
75
75
  const addSessionAttributesToUser = ctx => {
76
76
  ctx.body.account = ctx.user.account
77
77
  ctx.body.license = ctx.user.license
78
- ctx.body.budibaseAccess = ctx.user.budibaseAccess
79
- ctx.body.accountPortalAccess = ctx.user.accountPortalAccess
78
+ ctx.body.budibaseAccess = !!ctx.user.budibaseAccess
79
+ ctx.body.accountPortalAccess = !!ctx.user.accountPortalAccess
80
80
  ctx.body.csrfToken = ctx.user.csrfToken
81
81
  }
82
82
 
package/src/environment.js CHANGED
@@ -27,33 +27,40 @@ function parseIntSafe(number) {
27
27
  }
28
28
 
29
29
  module.exports = {
30
- NODE_ENV: process.env.NODE_ENV,
31
- SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
32
- PORT: process.env.PORT || process.env.WORKER_PORT,
33
- CLUSTER_PORT: process.env.CLUSTER_PORT,
30
+ // auth
34
31
  MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
35
32
  MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
36
- MINIO_URL: process.env.MINIO_URL,
37
- COUCH_DB_URL: process.env.COUCH_DB_URL,
38
- LOG_LEVEL: process.env.LOG_LEVEL,
39
33
  JWT_SECRET: process.env.JWT_SECRET,
40
34
  SALT_ROUNDS: process.env.SALT_ROUNDS,
41
- REDIS_URL: process.env.REDIS_URL,
42
35
  REDIS_PASSWORD: process.env.REDIS_PASSWORD,
43
36
  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
37
+ COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
38
+ // urls
39
+ MINIO_URL: process.env.MINIO_URL,
40
+ COUCH_DB_URL: process.env.COUCH_DB_URL,
41
+ REDIS_URL: process.env.REDIS_URL,
42
+ ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
43
+ PLATFORM_URL: process.env.PLATFORM_URL,
44
+ APPS_URL: process.env.APPS_URL,
45
+ // ports
46
+ PORT: process.env.PORT || process.env.WORKER_PORT,
47
+ CLUSTER_PORT: process.env.CLUSTER_PORT,
48
+ // flags
49
+ NODE_ENV: process.env.NODE_ENV,
50
+ SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
51
+ LOG_LEVEL: process.env.LOG_LEVEL,
44
52
  MULTI_TENANCY: process.env.MULTI_TENANCY,
45
53
  DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
46
- ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
47
54
  SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
55
+ DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
56
+ // smtp
48
57
  SMTP_USER: process.env.SMTP_USER,
49
58
  SMTP_PASSWORD: process.env.SMTP_PASSWORD,
50
59
  SMTP_HOST: process.env.SMTP_HOST,
51
60
  SMTP_PORT: process.env.SMTP_PORT,
52
61
  SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
53
- PLATFORM_URL: process.env.PLATFORM_URL,
54
- COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
62
+ // other
55
63
  CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
56
- APPS_URL: process.env.APPS_URL,
57
64
  _set(key, value) {
58
65
  process.env[key] = value
59
66
  module.exports[key] = value