@budibase/server 2.1.32-alpha.8 → 2.1.32

package/dist/threads/automation.js

@@ -25,14 +25,15 @@ const constants_1 = require("../constants");
 const logging_1 = require("../automations/logging");
 const types_1 = require("@budibase/types");
 const automations_1 = require("../definitions/automations");
-const backend_core_1 = require("@budibase/backend-core");
-const string_templates_1 = require("@budibase/string-templates");
-const fp_1 = require("lodash/fp");
-const environment_1 = __importDefault(require("../environment"));
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
+const { logAlertWithInfo, logWarn } = require("@budibase/backend-core/logging");
+const { processObject } = require("@budibase/string-templates");
 const FILTER_STEP_ID = actions_1.default.ACTION_DEFINITIONS.FILTER.stepId;
 const LOOP_STEP_ID = actions_1.default.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const STOPPED_STATUS = { success: true, status: types_1.AutomationStatus.STOPPED };
+const { cloneDeep } = require("lodash/fp");
+const env = require("../environment");
 function typecastForLooping(loopStep, input) {
     if (!input || !input.binding) {
         return null;
@@ -111,7 +112,7 @@ class Orchestrator {
     getMetadata() {
         return __awaiter(this, void 0, void 0, function* () {
             const metadataId = (0, utils_3.generateAutomationMetadataID)(this._automation._id);
-            const db = backend_core_1.context.getAppDB();
+            const db = getAppDB();
             let metadata;
             try {
                 metadata = yield db.get(metadataId);
@@ -130,7 +131,7 @@ class Orchestrator {
             if (!this._job.opts.repeat) {
                 return;
             }
-            backend_core_1.logging.logWarn(`CRON disabled reason=${reason} - ${this._appId}/${this._automation._id}`);
+            logWarn(`CRON disabled reason=${reason} - ${this._appId}/${this._automation._id}`);
             const automation = this._automation;
             const trigger = automation.definition.trigger;
             yield (0, utils_2.disableCronById)(this._job.id);
@@ -171,12 +172,12 @@ class Orchestrator {
             else {
                 metadata.errorCount = 0;
             }
-            const db = backend_core_1.context.getAppDB();
+            const db = getAppDB();
             try {
                 yield db.put(metadata);
             }
             catch (err) {
-                backend_core_1.logging.logAlertWithInfo("Failed to write automation metadata", db.name, automation._id, err);
+                logAlertWithInfo("Failed to write automation metadata", db.name, automation._id, err);
             }
         });
     }
@@ -236,14 +237,14 @@ class Orchestrator {
                     continue;
                 }
                 if (loopStep) {
-                    input = yield (0, string_templates_1.processObject)(loopStep.inputs, this._context);
+                    input = yield processObject(loopStep.inputs, this._context);
                     iterations = getLoopIterations(loopStep, input);
                 }
                 for (let index = 0; index < iterations; index++) {
-                    let originalStepInput = (0, fp_1.cloneDeep)(step.inputs);
+                    let originalStepInput = cloneDeep(step.inputs);
                     // Handle if the user has set a max iteration count or if it reaches the max limit set by us
                     if (loopStep && input.binding) {
-                        let newInput = yield (0, string_templates_1.processObject)(loopStep.inputs, (0, fp_1.cloneDeep)(this._context));
+                        let newInput = yield processObject(loopStep.inputs, cloneDeep(this._context));
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
                         try {
                             newInput.binding = typecastForLooping(loopStep, newInput);
@@ -291,7 +292,7 @@ class Orchestrator {
                                 }
                             }
                         }
-                        if (index === environment_1.default.AUTOMATION_MAX_ITERATIONS ||
+                        if (index === env.AUTOMATION_MAX_ITERATION ||
                             index === parseInt(loopStep.inputs.iterations)) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: constants_1.AutomationErrors.MAX_ITERATIONS,
@@ -328,7 +329,7 @@ class Orchestrator {
                     }
                     // If it's a loop step, we need to manually add the bindings to the context
                     let stepFn = yield this.getStepFunctionality(step.stepId);
-                    let inputs = yield (0, string_templates_1.processObject)(originalStepInput, this._context);
+                    let inputs = yield processObject(originalStepInput, this._context);
                     inputs = automationUtils_1.default.cleanInputValues(inputs, step.schema.inputs);
                     try {
                         // appId is always passed
@@ -403,7 +404,7 @@ function execute(job, callback) {
     if (!appId) {
         throw new Error("Unable to execute, event doesn't contain app ID.");
     }
-    return backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+    doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(job);
         try {
             const response = yield automationOrchestrator.execute();
@@ -420,7 +421,7 @@ const removeStalled = (job) => __awaiter(void 0, void 0, void 0, function* () {
     if (!appId) {
         throw new Error("Unable to execute, event doesn't contain app ID.");
     }
-    yield backend_core_1.context.doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+    yield doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(job);
         yield automationOrchestrator.stopCron("stalled");
     }));

package/dist/threads/query.js

@@ -15,12 +15,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = void 0;
 const utils_1 = __importDefault(require("./utils"));
 utils_1.default.threadSetup();
-const scriptRunner_1 = __importDefault(require("../utilities/scriptRunner"));
-const integrations_1 = require("../integrations");
-const string_templates_1 = require("@budibase/string-templates");
-const backend_core_1 = require("@budibase/backend-core");
-const utils_2 = require("../db/utils");
-const fp_1 = require("lodash/fp");
+const ScriptRunner = require("../utilities/scriptRunner");
+const { getIntegration } = require("../integrations");
+const { processStringSync } = require("@budibase/string-templates");
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
+const { refreshOAuthToken, updateUserOAuth, } = require("@budibase/backend-core/auth");
+const { user: userCache } = require("@budibase/backend-core/cache");
+const { getGlobalIDFromUserMetadataID } = require("../db/utils");
+const { cloneDeep } = require("lodash/fp");
 const { isSQL } = require("../integrations/utils");
 const { enrichQueryFields, interpolateSQL, } = require("../integrations/queries/sql");
 class QueryRunner {
@@ -48,9 +50,9 @@ class QueryRunner {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let { datasource, fields, queryVerb, transformer } = this;
-            let datasourceClone = (0, fp_1.cloneDeep)(datasource);
-            let fieldsClone = (0, fp_1.cloneDeep)(fields);
-            const Integration = yield (0, integrations_1.getIntegration)(datasourceClone.source);
+            let datasourceClone = cloneDeep(datasource);
+            let fieldsClone = cloneDeep(fields);
+            const Integration = yield getIntegration(datasourceClone.source);
             if (!Integration) {
                 throw "Integration type does not exist.";
             }
@@ -93,7 +95,7 @@ class QueryRunner {
             }
             // transform as required
             if (transformer) {
-                const runner = new scriptRunner_1.default(transformer, {
+                const runner = new ScriptRunner(transformer, {
                     data: rows,
                     params: enrichedParameters,
                 });
@@ -136,7 +138,7 @@ class QueryRunner {
     }
     runAnotherQuery(queryId, parameters) {
         return __awaiter(this, void 0, void 0, function* () {
-            const db = backend_core_1.context.getAppDB();
+            const db = getAppDB();
             const query = yield db.get(queryId);
             const datasource = yield db.get(query.datasourceId);
             return new QueryRunner({
@@ -156,13 +158,13 @@ class QueryRunner {
             if (!providerType || !(oauth2 === null || oauth2 === void 0 ? void 0 : oauth2.refreshToken)) {
                 throw new Error("No refresh token found for authenticated user");
             }
-            const resp = yield backend_core_1.auth.refreshOAuthToken(oauth2.refreshToken, providerType, configId);
+            const resp = yield refreshOAuthToken(oauth2.refreshToken, providerType, configId);
             // Refresh session flow. Should be in same location as refreshOAuthToken
             // There are several other properties available in 'resp'
             if (!resp.err) {
-                const globalUserId = (0, utils_2.getGlobalIDFromUserMetadataID)(_id);
-                yield backend_core_1.auth.updateUserOAuth(globalUserId, resp);
-                this.ctx.user = yield backend_core_1.cache.user.getUser(globalUserId);
+                const globalUserId = getGlobalIDFromUserMetadataID(_id);
+                yield updateUserOAuth(globalUserId, resp);
+                this.ctx.user = yield userCache.getUser(globalUserId);
             }
             else {
                 // In this event the user may have oAuth issues that
@@ -221,7 +223,7 @@ class QueryRunner {
                 const responses = yield Promise.all(dynamics);
                 for (let i = 0; i < foundVars.length; i++) {
                     const variable = foundVars[i];
-                    parameters[variable.name] = (0, string_templates_1.processStringSync)(variable.value, {
+                    parameters[variable.name] = processStringSync(variable.value, {
                         data: responses[i].rows,
                         info: responses[i].extra,
                     }, {
@@ -236,7 +238,7 @@ class QueryRunner {
     }
 }
 function execute(input, callback) {
-    backend_core_1.context.doInAppContext(input.appId, () => __awaiter(this, void 0, void 0, function* () {
+    doInAppContext(input.appId, () => __awaiter(this, void 0, void 0, function* () {
         const Runner = new QueryRunner(input);
         try {
             const response = yield Runner.execute();

package/dist/threads/utils.js

@@ -8,20 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasExtraData = exports.formatResponse = exports.storeDynamicVariable = exports.invalidateDynamicVariables = exports.checkCacheForDynamicVariable = exports.threadSetup = void 0;
-const environment_1 = __importDefault(require("../environment"));
-const db_1 = __importDefault(require("../db"));
-const backend_core_1 = require("@budibase/backend-core");
+const env = require("../environment");
+const db = require("../db");
+const redis = require("@budibase/backend-core/redis");
+const { SEPARATOR } = require("@budibase/backend-core/db");
 const VARIABLE_TTL_SECONDS = 3600;
 let client;
 function getClient() {
     return __awaiter(this, void 0, void 0, function* () {
         if (!client) {
-            client = yield new backend_core_1.redis.Client(backend_core_1.redis.utils.Databases.QUERY_VARS).init();
+            client = yield new redis.Client(redis.utils.Databases.QUERY_VARS).init();
         }
         return client;
     });
@@ -32,16 +30,16 @@ process.on("exit", () => __awaiter(void 0, void 0, void 0, function* () {
     }
 }));
 function makeVariableKey(queryId, variable) {
-    return `${queryId}${backend_core_1.db.SEPARATOR}${variable}`;
+    return `${queryId}${SEPARATOR}${variable}`;
 }
 function threadSetup() {
     // don't run this if not threading
-    if (environment_1.default.isTest() || environment_1.default.DISABLE_THREADING) {
+    if (env.isTest() || env.DISABLE_THREADING) {
         return;
     }
     // when thread starts, make sure it is recorded
-    environment_1.default.setInThread();
-    db_1.default.init();
+    env.setInThread();
+    db.init();
 }
 exports.threadSetup = threadSetup;
 function checkCacheForDynamicVariable(queryId, variable) {