@budibase/server 1.0.105-alpha.35 → 1.0.105-alpha.36

package/coverage/lcov-report/threads/utils.js.html

@@ -30,9 +30,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">64.28% </span>
+                <span class="strong">66.66% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>9/14</span>
+                <span class='fraction'>10/15</span>
             </div>
         
             
@@ -141,7 +141,8 @@
 <a name='L76'></a><a href='#L76'>76</a>
 <a name='L77'></a><a href='#L77'>77</a>
 <a name='L78'></a><a href='#L78'>78</a>
-<a name='L79'></a><a href='#L79'>79</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">40x</span>
+<a name='L79'></a><a href='#L79'>79</a>
+<a name='L80'></a><a href='#L80'>80</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">40x</span>
 <span class="cline-any cline-yes">40x</span>
 <span class="cline-any cline-yes">40x</span>
 <span class="cline-any cline-yes">40x</span>
@@ -219,6 +220,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const env = require("../environment")
 const CouchDB = require("../db")
 const { init } = require("@budibase/backend-core")
@@ -293,6 +295,7 @@ exports.hasExtraData = response =&gt; {
   return (
     typeof response === "object" &amp;&amp;
     !Array.isArray(response) &amp;&amp;
+    response &amp;&amp;
     response.data != null &amp;&amp;
     response.info != null
   )
@@ -304,7 +307,7 @@ exports.hasExtraData = response =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/bcrypt.js.html

@@ -115,7 +115,7 @@ const SALT_ROUNDS = <span class="cstat-no" title="statement not covered" >env.SA
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/budibaseDir.js.html

@@ -100,7 +100,7 @@ module.exports.budibaseTempDir = budibaseTempDir
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/centralPath.js.html

@@ -136,7 +136,7 @@ exports.resolve = <span class="fstat-no" title="function not covered" >fu</span>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/csvParser.js.html

@@ -502,7 +502,7 @@ module.exports = {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/global.js.html

@@ -391,7 +391,7 @@ exports.getGlobalUsersFromMetadata = async users => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/index.html

@@ -251,7 +251,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/index.js.html

@@ -553,7 +553,7 @@ exports.convertBookmark = bookmark => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html

@@ -391,7 +391,7 @@ module.exports = InMemoryQueue
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/queue/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/routing/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/routing/index.js.html

@@ -145,7 +145,7 @@ exports.createRoutingView = createRoutingView
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/index.js.html

@@ -1087,7 +1087,7 @@ exports.cleanupAttachments = async (table, { row, rows, oldRow, oldTable }) =&gt
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -187,7 +187,7 @@ exports.processFormulas = (
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/scriptRunner.js.html

@@ -142,7 +142,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/security.js.html

@@ -280,7 +280,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/statusCodes.js.html

@@ -91,7 +91,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -295,7 +295,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -142,7 +142,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -487,7 +487,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Apr 22 2022 15:27:04 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 11:19:38 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -7069,8 +7069,9 @@ BRDA:73,5,0,14
 BRDA:73,5,1,14
 BRDA:73,5,2,12
 BRDA:73,5,3,12
-BRF:14
-BRH:9
+BRDA:73,5,4,12
+BRF:15
+BRH:10
 end_of_record
 TN:
 SF:src/utilities/bcrypt.js

package/dist/definitions/datasource.js

@@ -51,6 +51,7 @@ var SourceNames;
     SourceNames["ORACLE"] = "ORACLE";
     SourceNames["GOOGLE_SHEETS"] = "GOOGLE_SHEETS";
     SourceNames["FIREBASE"] = "FIREBASE";
+    SourceNames["REDIS"] = "REDIS";
 })(SourceNames = exports.SourceNames || (exports.SourceNames = {}));
 var IncludeRelationships;
 (function (IncludeRelationships) {

package/dist/integrations/index.js

@@ -12,6 +12,7 @@ const arangodb = require("./arangodb");
 const rest = require("./rest");
 const googlesheets = require("./googlesheets");
 const firebase = require("./firebase");
+const redis = require("./redis");
 const { SourceNames } = require("../definitions/datasource");
 const environment = require("../environment");
 const DEFINITIONS = {
@@ -26,6 +27,8 @@ const DEFINITIONS = {
     [SourceNames.MYSQL]: mysql.schema,
     [SourceNames.ARANGODB]: arangodb.schema,
     [SourceNames.REST]: rest.schema,
+    [SourceNames.FIREBASE]: firebase.schema,
+    [SourceNames.REDIS]: redis.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -41,6 +44,7 @@ const INTEGRATIONS = {
     [SourceNames.REST]: rest.integration,
     [SourceNames.FIREBASE]: firebase.integration,
     [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
+    [SourceNames.REDIS]: redis.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {

package/dist/integrations/redis.js

@@ -0,0 +1,158 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 datasource_1 = require("../definitions/datasource");
+const ioredis_1 = __importDefault(require("ioredis"));
+var RedisModule;
+(function (RedisModule) {
+    const SCHEMA = {
+        docs: "https://redis.io/docs/",
+        description: "",
+        friendlyName: "Redis",
+        datasource: {
+            host: {
+                type: "string",
+                required: true,
+                default: "localhost",
+            },
+            port: {
+                type: "number",
+                required: true,
+                default: 6379,
+            },
+            username: {
+                type: "string",
+                required: false,
+            },
+            password: {
+                type: "password",
+                required: false,
+            },
+        },
+        query: {
+            create: {
+                type: datasource_1.QueryTypes.FIELDS,
+                fields: {
+                    key: {
+                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        required: true,
+                    },
+                    value: {
+                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        required: true,
+                    },
+                    ttl: {
+                        type: datasource_1.DatasourceFieldTypes.NUMBER,
+                    },
+                },
+            },
+            read: {
+                readable: true,
+                type: datasource_1.QueryTypes.FIELDS,
+                fields: {
+                    key: {
+                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        required: true,
+                    },
+                },
+            },
+            delete: {
+                type: datasource_1.QueryTypes.FIELDS,
+                fields: {
+                    key: {
+                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        required: true,
+                    },
+                },
+            },
+            command: {
+                readable: true,
+                displayName: "Redis Command",
+                type: datasource_1.QueryTypes.JSON,
+            },
+        },
+    };
+    class RedisIntegration {
+        constructor(config) {
+            this.config = config;
+            this.client = new ioredis_1.default({
+                host: this.config.host,
+                port: this.config.port,
+                username: this.config.username,
+                password: this.config.password,
+            });
+        }
+        disconnect() {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.client.disconnect();
+            });
+        }
+        redisContext(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    return yield query();
+                }
+                catch (err) {
+                    throw new Error(`Redis error: ${err}`);
+                }
+                finally {
+                    this.disconnect();
+                }
+            });
+        }
+        create(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.redisContext(() => __awaiter(this, void 0, void 0, function* () {
+                    const response = yield this.client.set(query.key, query.value);
+                    if (query.ttl) {
+                        yield this.client.expire(query.key, query.ttl);
+                    }
+                    return response;
+                }));
+            });
+        }
+        read(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.redisContext(() => __awaiter(this, void 0, void 0, function* () {
+                    const response = yield this.client.get(query.key);
+                    return response;
+                }));
+            });
+        }
+        delete(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.redisContext(() => __awaiter(this, void 0, void 0, function* () {
+                    const response = yield this.client.del(query.key);
+                    return response;
+                }));
+            });
+        }
+        command(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.redisContext(() => __awaiter(this, void 0, void 0, function* () {
+                    const commands = query.json.trim().split(" ");
+                    const pipeline = this.client.pipeline([commands]);
+                    const result = yield pipeline.exec();
+                    return {
+                        response: result[0][1],
+                    };
+                }));
+            });
+        }
+    }
+    module.exports = {
+        schema: SCHEMA,
+        integration: RedisIntegration,
+    };
+})(RedisModule || (RedisModule = {}));

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.105-alpha.34",
+    "version": "1.0.105-alpha.35",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -68,10 +68,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.105-alpha.34",
-        "@budibase/client": "^1.0.105-alpha.34",
-        "@budibase/string-templates": "^1.0.105-alpha.34",
+        "@budibase/backend-core": "^1.0.105-alpha.35",
+        "@budibase/client": "^1.0.105-alpha.35",
         "@budibase/pro": "1.0.105-alpha.34",
+        "@budibase/string-templates": "^1.0.105-alpha.35",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -160,6 +160,7 @@
         "copyfiles": "^2.4.1",
         "docker-compose": "^0.23.6",
         "eslint": "^6.8.0",
+        "ioredis-mock": "^7.2.0",
         "is-wsl": "^2.2.0",
         "jest": "^27.0.5",
         "jest-openapi": "^0.14.2",

package/dist/threads/utils.js

@@ -69,6 +69,7 @@ exports.formatResponse = resp => {
 exports.hasExtraData = response => {
     return (typeof response === "object" &&
         !Array.isArray(response) &&
+        response &&
         response.data != null &&
         response.info != null);
 };