@budibase/backend-core 2.8.12-alpha.1 → 2.8.12
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.
- package/dist/package.json +3 -4
- package/dist/src/environment.d.ts +3 -5
- package/dist/src/environment.js +70 -13
- package/dist/src/environment.js.map +1 -1
- package/dist/src/logging/index.d.ts +0 -1
- package/dist/src/logging/index.js +1 -2
- package/dist/src/logging/index.js.map +1 -1
- package/dist/src/logging/pino/logger.js +9 -14
- package/dist/src/logging/pino/logger.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -4
- package/src/environment.ts +4 -12
- package/src/logging/index.ts +0 -1
- package/src/logging/pino/logger.ts +10 -20
- package/dist/src/logging/system.d.ts +0 -9
- package/dist/src/logging/system.js +0 -101
- package/dist/src/logging/system.js.map +0 -1
- package/src/logging/system.ts +0 -81
- package/src/logging/tests/system.spec.ts +0 -61
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.8.12
|
|
3
|
+
"version": "2.8.12",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@budibase/nano": "10.1.2",
|
|
24
24
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
25
|
-
"@budibase/types": "2.8.12
|
|
25
|
+
"@budibase/types": "2.8.12",
|
|
26
26
|
"@shopify/jest-koa-mocks": "5.0.1",
|
|
27
27
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
28
28
|
"aws-cloudfront-sign": "2.2.0",
|
|
@@ -51,7 +51,6 @@
|
|
|
51
51
|
"pouchdb": "7.3.0",
|
|
52
52
|
"pouchdb-find": "7.2.2",
|
|
53
53
|
"redlock": "4.2.0",
|
|
54
|
-
"rotating-file-stream": "3.1.0",
|
|
55
54
|
"sanitize-s3-objectkey": "0.0.1",
|
|
56
55
|
"semver": "7.3.7",
|
|
57
56
|
"tar-fs": "2.1.1",
|
|
@@ -102,5 +101,5 @@
|
|
|
102
101
|
}
|
|
103
102
|
}
|
|
104
103
|
},
|
|
105
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "bbe4c851a84ec5400d6fc3e9d001132aa972cbb2"
|
|
106
105
|
}
|
|
@@ -2,11 +2,6 @@ declare function isTest(): boolean;
|
|
|
2
2
|
declare function isJest(): boolean;
|
|
3
3
|
declare function isDev(): boolean;
|
|
4
4
|
declare const environment: {
|
|
5
|
-
DISABLE_PINO_LOGGER: string | undefined;
|
|
6
|
-
_set(key: any, value: any): void;
|
|
7
|
-
ROLLING_LOG_MAX_SIZE: string;
|
|
8
|
-
VERSION: string;
|
|
9
|
-
SERVICE_NAME: string;
|
|
10
5
|
isTest: typeof isTest;
|
|
11
6
|
isJest: typeof isJest;
|
|
12
7
|
isDev: typeof isDev;
|
|
@@ -73,5 +68,8 @@ declare const environment: {
|
|
|
73
68
|
* However, this should be turned OFF by default for security purposes.
|
|
74
69
|
*/
|
|
75
70
|
ENABLE_SSO_MAINTENANCE_MODE: string | boolean | undefined;
|
|
71
|
+
VERSION: any;
|
|
72
|
+
DISABLE_PINO_LOGGER: string | undefined;
|
|
73
|
+
_set(key: any, value: any): void;
|
|
76
74
|
};
|
|
77
75
|
export default environment;
|
package/dist/src/environment.js
CHANGED
|
@@ -38,7 +38,7 @@ function httpLogging() {
|
|
|
38
38
|
}
|
|
39
39
|
return process.env.HTTP_LOGGING;
|
|
40
40
|
}
|
|
41
|
-
function
|
|
41
|
+
function findVersion() {
|
|
42
42
|
function findFileInAncestors(fileName, currentDir) {
|
|
43
43
|
const filePath = `${currentDir}/${fileName}`;
|
|
44
44
|
if ((0, fs_1.existsSync)(filePath)) {
|
|
@@ -54,24 +54,77 @@ function getPackageJsonFields() {
|
|
|
54
54
|
try {
|
|
55
55
|
const packageJsonFile = findFileInAncestors("package.json", process.cwd());
|
|
56
56
|
const content = (0, fs_1.readFileSync)(packageJsonFile, "utf-8");
|
|
57
|
-
|
|
58
|
-
return {
|
|
59
|
-
VERSION: parsedContent.version,
|
|
60
|
-
SERVICE_NAME: parsedContent.name,
|
|
61
|
-
};
|
|
57
|
+
return JSON.parse(content).version;
|
|
62
58
|
}
|
|
63
59
|
catch (_a) {
|
|
64
60
|
// throwing an error here is confusing/causes backend-core to be hard to import
|
|
65
|
-
return
|
|
61
|
+
return undefined;
|
|
66
62
|
}
|
|
67
63
|
}
|
|
68
|
-
const environment =
|
|
64
|
+
const environment = {
|
|
65
|
+
isTest,
|
|
69
66
|
isJest,
|
|
70
|
-
isDev,
|
|
67
|
+
isDev,
|
|
68
|
+
isProd: () => {
|
|
71
69
|
return !isDev();
|
|
72
|
-
},
|
|
70
|
+
},
|
|
71
|
+
JS_BCRYPT: process.env.JS_BCRYPT,
|
|
72
|
+
JWT_SECRET: process.env.JWT_SECRET,
|
|
73
|
+
JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK,
|
|
74
|
+
ENCRYPTION_KEY: process.env.ENCRYPTION_KEY,
|
|
75
|
+
API_ENCRYPTION_KEY: getAPIEncryptionKey(),
|
|
76
|
+
COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005",
|
|
77
|
+
COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
|
|
78
|
+
COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
|
|
79
|
+
GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
|
|
80
|
+
GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
|
|
81
|
+
SALT_ROUNDS: process.env.SALT_ROUNDS,
|
|
82
|
+
REDIS_URL: process.env.REDIS_URL || "localhost:6379",
|
|
83
|
+
REDIS_PASSWORD: process.env.REDIS_PASSWORD,
|
|
84
|
+
REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
|
|
85
|
+
MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
|
|
86
|
+
MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
|
|
87
|
+
AWS_REGION: process.env.AWS_REGION,
|
|
88
|
+
MINIO_URL: process.env.MINIO_URL,
|
|
89
|
+
MINIO_ENABLED: process.env.MINIO_ENABLED || 1,
|
|
90
|
+
INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
|
|
91
|
+
INTERNAL_API_KEY_FALLBACK: process.env.INTERNAL_API_KEY_FALLBACK,
|
|
92
|
+
MULTI_TENANCY: process.env.MULTI_TENANCY,
|
|
93
|
+
ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app",
|
|
94
|
+
ACCOUNT_PORTAL_API_KEY: process.env.ACCOUNT_PORTAL_API_KEY || "",
|
|
95
|
+
DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
|
|
96
|
+
SELF_HOSTED: selfHosted,
|
|
97
|
+
COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
|
|
98
|
+
PLATFORM_URL: process.env.PLATFORM_URL || "",
|
|
99
|
+
POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
|
|
100
|
+
ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
|
|
101
|
+
TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS,
|
|
102
|
+
CLOUDFRONT_CDN: process.env.CLOUDFRONT_CDN,
|
|
103
|
+
CLOUDFRONT_PRIVATE_KEY_64: process.env.CLOUDFRONT_PRIVATE_KEY_64,
|
|
104
|
+
CLOUDFRONT_PUBLIC_KEY_ID: process.env.CLOUDFRONT_PUBLIC_KEY_ID,
|
|
105
|
+
BACKUPS_BUCKET_NAME: process.env.BACKUPS_BUCKET_NAME || DefaultBucketName.BACKUPS,
|
|
106
|
+
APPS_BUCKET_NAME: process.env.APPS_BUCKET_NAME || DefaultBucketName.APPS,
|
|
107
|
+
TEMPLATES_BUCKET_NAME: process.env.TEMPLATES_BUCKET_NAME || DefaultBucketName.TEMPLATES,
|
|
108
|
+
GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL,
|
|
109
|
+
PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS,
|
|
110
|
+
USE_COUCH: process.env.USE_COUCH || true,
|
|
111
|
+
MOCK_REDIS: process.env.MOCK_REDIS,
|
|
112
|
+
DEFAULT_LICENSE: process.env.DEFAULT_LICENSE,
|
|
113
|
+
SERVICE: process.env.SERVICE || "budibase",
|
|
114
|
+
LOG_LEVEL: process.env.LOG_LEVEL || "info",
|
|
115
|
+
SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
|
|
116
|
+
DEPLOYMENT_ENVIRONMENT: process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose",
|
|
117
|
+
HTTP_LOGGING: httpLogging(),
|
|
118
|
+
ENABLE_AUDIT_LOG_IP_ADDR: process.env.ENABLE_AUDIT_LOG_IP_ADDR,
|
|
73
119
|
// smtp
|
|
74
|
-
SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
|
|
120
|
+
SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
|
|
121
|
+
SMTP_USER: process.env.SMTP_USER,
|
|
122
|
+
SMTP_PASSWORD: process.env.SMTP_PASSWORD,
|
|
123
|
+
SMTP_HOST: process.env.SMTP_HOST,
|
|
124
|
+
SMTP_PORT: parseInt(process.env.SMTP_PORT || ""),
|
|
125
|
+
SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
|
|
126
|
+
DISABLE_JWT_WARNING: process.env.DISABLE_JWT_WARNING,
|
|
127
|
+
BLACKLIST_IPS: process.env.BLACKLIST_IPS,
|
|
75
128
|
/**
|
|
76
129
|
* Enable to allow an admin user to login using a password.
|
|
77
130
|
* This can be useful to prevent lockout when configuring SSO.
|
|
@@ -79,11 +132,15 @@ const environment = Object.assign(Object.assign({ isTest,
|
|
|
79
132
|
*/
|
|
80
133
|
ENABLE_SSO_MAINTENANCE_MODE: selfHosted
|
|
81
134
|
? process.env.ENABLE_SSO_MAINTENANCE_MODE
|
|
82
|
-
: false
|
|
135
|
+
: false,
|
|
136
|
+
VERSION: findVersion(),
|
|
137
|
+
DISABLE_PINO_LOGGER: process.env.DISABLE_PINO_LOGGER,
|
|
138
|
+
_set(key, value) {
|
|
83
139
|
process.env[key] = value;
|
|
84
140
|
// @ts-ignore
|
|
85
141
|
environment[key] = value;
|
|
86
|
-
},
|
|
142
|
+
},
|
|
143
|
+
};
|
|
87
144
|
// clean up any environment variable edge cases
|
|
88
145
|
for (let [key, value] of Object.entries(environment)) {
|
|
89
146
|
// handle the edge case of "0" to disable an environment variable
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":";;AAAA,2BAA6C;AAE7C,SAAS,MAAM;IACb,OAAO,SAAS,EAAE,IAAI,MAAM,EAAE,CAAA;AAChC,CAAC;AAED,SAAS,MAAM;IACb,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;AAC1E,CAAC;AAED,SAAS,SAAS;IAChB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAA;AAC3C,CAAC;AAED,SAAS,KAAK;IACZ,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAA;AAC9C,CAAC;AAED,IAAI,MAAM,GAAG,KAAK,CAAA;AAClB,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAA;IAC1B,MAAM,GAAG,IAAI,CAAA;CACd;AAED,MAAM,iBAAiB,GAAG;IACxB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,sBAAsB;IAC5B,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACnB,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;AAE5D,SAAS,mBAAmB;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB;QACnC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB;QAChC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA,CAAC,+CAA+C;AAC5E,CAAC;AAED,SAAS,WAAW;IAClB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,SAAS,EAAE;QAC1C,2CAA2C;QAC3C,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAA;AACjC,CAAC;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,12 +26,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
26
26
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.LOG_CONTEXT = exports.
|
|
29
|
+
exports.LOG_CONTEXT = exports.logger = exports.correlation = void 0;
|
|
30
30
|
exports.correlation = __importStar(require("./correlation/correlation"));
|
|
31
31
|
var logger_1 = require("./pino/logger");
|
|
32
32
|
Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return logger_1.logger; } });
|
|
33
33
|
__exportStar(require("./alerts"), exports);
|
|
34
|
-
exports.system = __importStar(require("./system"));
|
|
35
34
|
// turn off or on context logging i.e. tenantId, appId etc
|
|
36
35
|
exports.LOG_CONTEXT = true;
|
|
37
36
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAAwD;AACxD,wCAAsC;AAA7B,gGAAA,MAAM,OAAA;AACf,2CAAwB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAAwD;AACxD,wCAAsC;AAA7B,gGAAA,MAAM,OAAA;AACf,2CAAwB;AAExB,0DAA0D;AAC/C,QAAA,WAAW,GAAG,IAAI,CAAA"}
|
|
@@ -27,13 +27,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.logger = void 0;
|
|
30
|
-
const pino_1 = __importDefault(require("pino"));
|
|
31
|
-
const pino_pretty_1 = __importDefault(require("pino-pretty"));
|
|
32
30
|
const environment_1 = __importDefault(require("../../environment"));
|
|
31
|
+
const pino_1 = __importDefault(require("pino"));
|
|
33
32
|
const context = __importStar(require("../../context"));
|
|
34
33
|
const correlation = __importStar(require("../correlation"));
|
|
35
34
|
const index_1 = require("../index");
|
|
36
|
-
const system_1 = require("../system");
|
|
37
35
|
// LOGGER
|
|
38
36
|
let pinoInstance;
|
|
39
37
|
if (!environment_1.default.DISABLE_PINO_LOGGER) {
|
|
@@ -44,23 +42,20 @@ if (!environment_1.default.DISABLE_PINO_LOGGER) {
|
|
|
44
42
|
return { level: label.toUpperCase() };
|
|
45
43
|
},
|
|
46
44
|
bindings: () => {
|
|
47
|
-
return {
|
|
48
|
-
service: environment_1.default.SERVICE_NAME,
|
|
49
|
-
};
|
|
45
|
+
return {};
|
|
50
46
|
},
|
|
51
47
|
},
|
|
52
48
|
timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
|
|
53
49
|
};
|
|
54
|
-
const destinations = [];
|
|
55
50
|
if (environment_1.default.isDev()) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
51
|
+
pinoOptions.transport = {
|
|
52
|
+
target: "pino-pretty",
|
|
53
|
+
options: {
|
|
54
|
+
singleLine: true,
|
|
55
|
+
},
|
|
56
|
+
};
|
|
60
57
|
}
|
|
61
|
-
pinoInstance =
|
|
62
|
-
? (0, pino_1.default)(pinoOptions, pino_1.default.multistream(destinations))
|
|
63
|
-
: (0, pino_1.default)(pinoOptions);
|
|
58
|
+
pinoInstance = (0, pino_1.default)(pinoOptions);
|
|
64
59
|
function isPlainObject(obj) {
|
|
65
60
|
return typeof obj === "object" && obj !== null && !(obj instanceof Error);
|
|
66
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":"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"}
|