@budibase/server 0.9.185-alpha.13 → 0.9.185-alpha.14

package/dist/threads/automation.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+// when thread starts, make sure it is recorded
+const env = require("../environment");
+env.setInThread();
 const actions = require("../automations/actions");
 const automationUtils = require("../automations/automationUtils");
 const AutomationEmitter = require("../events/AutomationEmitter");
@@ -16,7 +19,6 @@ const { DEFAULT_TENANT_ID } = require("@budibase/auth").constants;
 const CouchDB = require("../db");
 const { DocumentTypes, isDevAppID } = require("../db/utils");
 const { doInTenant } = require("@budibase/auth/tenancy");
-const env = require("../environment");
 const usage = require("../utilities/usageQuota");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;

package/dist/threads/index.js

@@ -22,10 +22,16 @@ function typeToFile(type) {
 class Thread {
     constructor(type, opts = { timeoutMs: null, count: 1 }) {
         this.type = type;
-        if (!env.isTest()) {
+        this.count = opts.count ? opts.count : 1;
+        this.disableThreading =
+            env.isTest() ||
+                env.DISABLE_THREADING ||
+                this.count === 0 ||
+                env.isInThread();
+        if (!this.disableThreading) {
             const workerOpts = {
                 autoStart: true,
-                maxConcurrentWorkers: opts.count ? opts.count : 1,
+                maxConcurrentWorkers: this.count,
             };
             if (opts.timeoutMs) {
                 workerOpts.maxCallTime = opts.timeoutMs;
@@ -37,7 +43,7 @@ class Thread {
         return new Promise((resolve, reject) => {
             let fncToCall;
             // if in test then don't use threading
-            if (env.isTest()) {
+            if (this.disableThreading) {
                 fncToCall = require(typeToFile(this.type));
             }
             else {

package/dist/threads/query.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+// when thread starts, make sure it is recorded
+const env = require("../environment");
+env.setInThread();
 const ScriptRunner = require("../utilities/scriptRunner");
 const { integrations } = require("../integrations");
 function formatResponse(resp) {