@budibase/server 1.2.44-alpha.0 → 1.2.46

package/dist/integrations/postgres.js

@@ -8,16 +8,13 @@ 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 });
 const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
-const sql_1 = __importDefault(require("./base/sql"));
 var PostgresModule;
 (function (PostgresModule) {
     const { Client, types } = require("pg");
+    const Sql = require("./base/sql");
     const { escapeDangerousCharacters } = require("../utilities");
     // Return "date" and "timestamp" types as plain strings.
     // This lets us reference the original stored timezone.
@@ -96,7 +93,7 @@ var PostgresModule;
             },
         },
     };
-    class PostgresIntegration extends sql_1.default {
+    class PostgresIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClient.POSTGRES);
             this.index = 1;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.2.43",
+    "version": "1.2.45",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.2.43",
-        "@budibase/client": "^1.2.43",
-        "@budibase/pro": "1.2.43",
-        "@budibase/string-templates": "^1.2.43",
-        "@budibase/types": "^1.2.43",
+        "@budibase/backend-core": "^1.2.45",
+        "@budibase/client": "^1.2.45",
+        "@budibase/pro": "1.2.45",
+        "@budibase/string-templates": "^1.2.45",
+        "@budibase/types": "^1.2.45",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -106,7 +106,7 @@
         "google-auth-library": "7.12.0",
         "google-spreadsheet": "3.2.0",
         "jimp": "0.16.1",
-        "joi": "17.6.0",
+        "joi": "17.2.1",
         "js-yaml": "4.1.0",
         "jsonschema": "1.4.0",
         "knex": "0.95.15",

package/dist/threads/automation.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execute = void 0;
+exports.removeStalled = exports.execute = void 0;
 const utils_1 = __importDefault(require("./utils"));
 utils_1.default.threadSetup();
 const utils_2 = require("../automations/utils");
@@ -130,22 +130,30 @@ class Orchestrator {
             return metadata;
         });
     }
-    checkIfShouldStop(metadata) {
+    stopCron(reason) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!metadata.errorCount || !this._repeat) {
-                return false;
+            if (!this._repeat) {
+                return;
             }
+            logWarn(`CRON disabled reason=${reason} - ${this._appId}/${this._automation._id}`);
             const automation = this._automation;
             const trigger = automation.definition.trigger;
+            yield (0, utils_2.disableCron)((_a = this._repeat) === null || _a === void 0 ? void 0 : _a.jobId, (_b = this._repeat) === null || _b === void 0 ? void 0 : _b.jobKey);
+            this.updateExecutionOutput(trigger.id, trigger.stepId, {}, {
+                status: types_1.AutomationStatus.STOPPED_ERROR,
+                success: false,
+            });
+            yield (0, logging_1.storeLog)(automation, this.executionOutput);
+        });
+    }
+    checkIfShouldStop(metadata) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!metadata.errorCount || !this._repeat) {
+                return false;
+            }
             if (metadata.errorCount >= constants_1.MAX_AUTOMATION_RECURRING_ERRORS) {
-                logWarn(`CRON disabled due to errors - ${this._appId}/${this._automation._id}`);
-                yield (0, utils_2.disableCron)((_a = this._repeat) === null || _a === void 0 ? void 0 : _a.jobId, (_b = this._repeat) === null || _b === void 0 ? void 0 : _b.jobKey);
-                this.updateExecutionOutput(trigger.id, trigger.stepId, {}, {
-                    status: types_1.AutomationStatus.STOPPED_ERROR,
-                    success: false,
-                });
-                yield (0, logging_1.storeLog)(automation, this.executionOutput);
+                yield this.stopCron("errors");
                 return true;
             }
             return false;
@@ -396,3 +404,11 @@ function execute(input, callback) {
     }));
 }
 exports.execute = execute;
+const removeStalled = (input) => {
+    const appId = input.data.event.appId;
+    doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event, input.opts);
+        yield automationOrchestrator.stopCron("stalled");
+    }));
+};
+exports.removeStalled = removeStalled;