@budibase/server 1.3.21-alpha.1 → 1.3.21

package/dist/utilities/fileSystem/index.js

@@ -14,18 +14,14 @@ const { join } = require("path");
 const uuid = require("uuid/v4");
 const { doWithDB, dangerousGetDB, closeDB, } = require("@budibase/backend-core/db");
 const { ObjectStoreBuckets } = require("../../constants");
-const { upload, retrieve, retrieveToTmp, streamUpload, deleteFolder, downloadTarball, downloadTarballDirect, deleteFiles, } = require("./utilities");
+const { upload, retrieve, retrieveToTmp, streamUpload, deleteFolder, downloadTarball, deleteFiles, } = require("./utilities");
 const { updateClientLibrary } = require("./clientLibrary");
-const { checkSlashesInUrl } = require("../");
 const env = require("../../environment");
 const { USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX, TABLE_ROW_PREFIX, } = require("../../db/utils");
 const MemoryStream = require("memorystream");
 const { getAppId } = require("@budibase/backend-core/context");
-const tar = require("tar");
-const fetch = require("node-fetch");
 const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
 const NODE_MODULES_PATH = join(TOP_LEVEL_PATH, "node_modules");
-const DATASOURCE_PATH = join(budibaseTempDir(), "datasource");
 /**
  * The single stack system (Cloud and Builder) should not make use of the file system where possible,
  * this file handles all of the file access for the system with the intention of limiting it all to one
@@ -100,12 +96,6 @@ exports.getTemplateStream = (template) => __awaiter(void 0, void 0, void 0, func
 exports.loadHandlebarsFile = path => {
     return fs.readFileSync(path, "utf8");
 };
-/**
- * Same as above just with a different name.
- */
-exports.loadJSFile = (directory, name) => {
-    return fs.readFileSync(join(directory, name), "utf8");
-};
 /**
  * When return a file from the API need to write the file to the system temporarily so we
  * can create a read stream to send.
@@ -304,105 +294,6 @@ exports.cleanup = appIds => {
         }
     }
 };
-const createTempFolder = item => {
-    const path = join(budibaseTempDir(), item);
-    try {
-        // remove old tmp directories automatically - don't combine
-        if (fs.existsSync(path)) {
-            fs.rmSync(path, { recursive: true, force: true });
-        }
-        fs.mkdirSync(path);
-    }
-    catch (err) {
-        throw new Error(`Path cannot be created: ${err.message}`);
-    }
-    return path;
-};
-exports.createTempFolder = createTempFolder;
-const extractTarball = (fromFilePath, toPath) => __awaiter(void 0, void 0, void 0, function* () {
-    yield tar.extract({
-        file: fromFilePath,
-        C: toPath,
-    });
-});
-exports.extractTarball = extractTarball;
-const getPluginMetadata = (path) => __awaiter(void 0, void 0, void 0, function* () {
-    let metadata = {};
-    try {
-        const pkg = fs.readFileSync(join(path, "package.json"), "utf8");
-        const schema = fs.readFileSync(join(path, "schema.json"), "utf8");
-        metadata.schema = JSON.parse(schema);
-        metadata.package = JSON.parse(pkg);
-        if (!metadata.package.name ||
-            !metadata.package.version ||
-            !metadata.package.description) {
-            throw new Error("package.json is missing one of 'name', 'version' or 'description'.");
-        }
-    }
-    catch (err) {
-        throw new Error(`Unable to process schema.json/package.json in plugin. ${err.message}`);
-    }
-    return { metadata, directory: path };
-});
-exports.getPluginMetadata = getPluginMetadata;
-exports.getDatasourcePlugin = (name, url, hash) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!fs.existsSync(DATASOURCE_PATH)) {
-        fs.mkdirSync(DATASOURCE_PATH);
-    }
-    const filename = join(DATASOURCE_PATH, name);
-    const metadataName = `${filename}.bbmetadata`;
-    if (fs.existsSync(filename)) {
-        const currentHash = fs.readFileSync(metadataName, "utf8");
-        // if hash is the same return the file, otherwise remove it and re-download
-        if (currentHash === hash) {
-            return require(filename);
-        }
-        else {
-            console.log(`Updating plugin: ${name}`);
-            delete require.cache[require.resolve(filename)];
-            fs.unlinkSync(filename);
-        }
-    }
-    const fullUrl = checkSlashesInUrl(`${env.MINIO_URL}/${ObjectStoreBuckets.PLUGINS}/${url}`);
-    const response = yield fetch(fullUrl);
-    if (response.status === 200) {
-        const content = yield response.text();
-        fs.writeFileSync(filename, content);
-        fs.writeFileSync(metadataName, hash);
-        return require(filename);
-    }
-    else {
-        throw new Error(`Unable to retrieve plugin - reason: ${yield response.text()}`);
-    }
-});
-/**
- * Find for a file recursively from start path applying filter, return first match
- */
-exports.findFileRec = (startPath, filter) => {
-    if (!fs.existsSync(startPath)) {
-        return;
-    }
-    const files = fs.readdirSync(startPath);
-    for (let i = 0, len = files.length; i < len; i++) {
-        const filename = join(startPath, files[i]);
-        const stat = fs.lstatSync(filename);
-        if (stat.isDirectory()) {
-            return exports.findFileRec(filename, filter);
-        }
-        else if (filename.endsWith(filter)) {
-            return filename;
-        }
-    }
-};
-/**
- * Remove a folder which is not empty from the file system
- */
-exports.deleteFolderFileSystem = path => {
-    if (!fs.existsSync(path)) {
-        return;
-    }
-    fs.rmSync(path, { recursive: true, force: true });
-};
 /**
  * Full function definition for below can be found in the utilities.
  */
@@ -410,6 +301,5 @@ exports.upload = upload;
 exports.retrieve = retrieve;
 exports.retrieveToTmp = retrieveToTmp;
 exports.deleteFiles = deleteFiles;
-exports.downloadTarballDirect = downloadTarballDirect;
 exports.TOP_LEVEL_PATH = TOP_LEVEL_PATH;
 exports.NODE_MODULES_PATH = NODE_MODULES_PATH;

package/dist/utilities/workerRequests.js

@@ -128,7 +128,3 @@ exports.getChecklist = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/configs/checklist"), request(null, { method: "GET" }));
     return checkResponse(response, "get checklist");
 });
-exports.generateApiKey = (userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/self/api_key"), request(null, { method: "POST", body: { userId } }));
-    return checkResponse(response, "generate API key");
-});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21",
   "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.3.21-alpha.1",
-    "@budibase/client": "1.3.21-alpha.1",
-    "@budibase/pro": "1.3.21-alpha.0",
-    "@budibase/string-templates": "1.3.21-alpha.1",
-    "@budibase/types": "1.3.21-alpha.1",
+    "@budibase/backend-core": "^1.3.21",
+    "@budibase/client": "^1.3.21",
+    "@budibase/pro": "1.3.20",
+    "@budibase/string-templates": "^1.3.21",
+    "@budibase/types": "^1.3.21",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -95,7 +95,6 @@
     "bcryptjs": "2.4.3",
     "bull": "4.8.5",
     "chmodr": "1.2.0",
-    "chokidar": "3.5.3",
     "csvtojson": "2.0.10",
     "curlconverter": "3.21.0",
     "dotenv": "8.2.0",
@@ -139,10 +138,8 @@
     "redis": "4",
     "server-destroy": "1.0.1",
     "snowflake-promise": "^4.5.0",
-    "socket.io": "^4.5.1",
     "svelte": "3.49.0",
     "swagger-parser": "10.0.3",
-    "tar": "6.1.11",
     "to-json-schema": "0.2.5",
     "uuid": "3.3.2",
     "validate.js": "0.13.1",
@@ -199,5 +196,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "01d92902c4c6a0a63c22d02e3a948bfd80d4ec0b"
+  "gitHead": "19ed43cb817a650c859e9d237c5053cd3ee54526"
 }

package/scripts/dev/manage.js

@@ -58,7 +58,6 @@ async function init() {
       DEPLOYMENT_ENVIRONMENT: "development",
       BB_ADMIN_USER_EMAIL: "",
       BB_ADMIN_USER_PASSWORD: "",
-      PLUGINS_DIR: "",
     }
     let envFile = ""
     Object.keys(envFileJson).forEach(key => {
@@ -72,9 +71,6 @@ async function up() {
   console.log("Spinning up your budibase dev environment... 🔧✨")
   await init()
   await compose.upAll(CONFIG)
-
-  // We always ensure to restart the proxy service in case of nginx conf changes
-  await compose.restartOne("proxy-service", CONFIG)
 }
 
 async function down() {

package/scripts/localdomain.js

@@ -17,8 +17,6 @@ const arg = process.argv.slice(2)[0]
  */
 updateDotEnv({
   ACCOUNT_PORTAL_URL:
-    arg === "enable"
-      ? "http://account.local.com:10001"
-      : "http://localhost:10001",
+    arg === "enable" ? "http://local.com:10001" : "http://localhost:10001",
   COOKIE_DOMAIN: arg === "enable" ? ".local.com" : "",
 }).then(() => console.log("Updated worker!"))

package/specs/openapi.json

@@ -1327,7 +1327,7 @@
             "type": "string"
           },
           "datasourceId": {
-            "description": "The ID of the datasource the query belongs to.",
+            "description": "The ID of the data source the query belongs to.",
             "type": "string"
           },
           "parameters": {
@@ -1386,7 +1386,7 @@
                   "type": "string"
                 },
                 "datasourceId": {
-                  "description": "The ID of the datasource the query belongs to.",
+                  "description": "The ID of the data source the query belongs to.",
                   "type": "string"
                 },
                 "parameters": {
@@ -1659,117 +1659,6 @@
           "data"
         ]
       },
-      "rowSearch": {
-        "type": "object",
-        "properties": {
-          "query": {
-            "type": "object",
-            "properties": {
-              "allOr": {
-                "type": "boolean",
-                "description": "Specifies that a row should be returned if it satisfies any of the specified options, rather than requiring it to fulfill all the search parameters. This defaults to false, meaning AND logic will be used."
-              },
-              "string": {
-                "type": "object",
-                "example": {
-                  "columnName1": "value",
-                  "columnName2": "value"
-                },
-                "description": "A map of field name to the string to search for, this will look for rows that have a value starting with the string value.",
-                "additionalProperties": {
-                  "type": "string",
-                  "description": "The value to search for in the column."
-                }
-              },
-              "fuzzy": {
-                "type": "object",
-                "description": "A fuzzy search, only supported by internal tables."
-              },
-              "range": {
-                "type": "object",
-                "description": "Searches within a range, the format of this must be in the format of an object with a \"low\" and \"high\" property.",
-                "example": {
-                  "columnName1": {
-                    "low": 10,
-                    "high": 20
-                  }
-                }
-              },
-              "equal": {
-                "type": "object",
-                "description": "Searches for rows that have a column value that is exactly the value set."
-              },
-              "notEqual": {
-                "type": "object",
-                "description": "Searches for any row which does not contain the specified column value."
-              },
-              "empty": {
-                "type": "object",
-                "description": "Searches for rows which do not contain the specified column. The object should simply contain keys of the column names, these can map to any value.",
-                "example": {
-                  "columnName1": ""
-                }
-              },
-              "notEmpty": {
-                "type": "object",
-                "description": "Searches for rows which have the specified column."
-              },
-              "oneOf": {
-                "type": "object",
-                "description": "Searches for rows which have a column value that is any of the specified values. The format of this must be columnName -> [value1, value2]."
-              }
-            }
-          },
-          "paginate": {
-            "type": "boolean",
-            "description": "Enables pagination, by default this is disabled."
-          },
-          "bookmark": {
-            "oneOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "integer"
-              }
-            ],
-            "description": "If retrieving another page, the bookmark from the previous request must be supplied."
-          },
-          "limit": {
-            "type": "integer",
-            "description": "The maximum number of rows to return, useful when paginating, for internal tables this will be limited to 1000, for SQL tables it will be 5000."
-          },
-          "sort": {
-            "type": "object",
-            "description": "A set of parameters describing the sort behaviour of the search.",
-            "properties": {
-              "order": {
-                "type": "string",
-                "enum": [
-                  "ascending",
-                  "descending"
-                ],
-                "description": "The order of the sort, by default this is ascending."
-              },
-              "column": {
-                "type": "string",
-                "description": "The name of the column by which the rows will be sorted."
-              },
-              "type": {
-                "type": "string",
-                "enum": [
-                  "string",
-                  "number"
-                ],
-                "description": "Defines whether the column should be treated as a string or as numbers when sorting."
-              }
-            }
-          }
-        },
-        "required": [
-          "query"
-        ]
-      },
       "nameSearch": {
         "type": "object",
         "properties": {
@@ -2240,7 +2129,115 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/rowSearch"
+                "type": "object",
+                "required": [
+                  "query"
+                ],
+                "properties": {
+                  "query": {
+                    "type": "object",
+                    "properties": {
+                      "allOr": {
+                        "type": "boolean",
+                        "description": "Specifies that a row should be returned if it satisfies any of the specified options, rather than requiring it to fulfill all the search parameters. This defaults to false, meaning AND logic will be used."
+                      },
+                      "string": {
+                        "type": "object",
+                        "example": {
+                          "columnName1": "value",
+                          "columnName2": "value"
+                        },
+                        "description": "A map of field name to the string to search for, this will look for rows that have a value starting with the string value.",
+                        "additionalProperties": {
+                          "type": "string",
+                          "description": "The value to search for in the column."
+                        }
+                      },
+                      "fuzzy": {
+                        "type": "object",
+                        "description": "A fuzzy search, only supported by internal tables."
+                      },
+                      "range": {
+                        "type": "object",
+                        "description": "Searches within a range, the format of this must be in the format of an object with a \"low\" and \"high\" property.",
+                        "example": {
+                          "columnName1": {
+                            "low": 10,
+                            "high": 20
+                          }
+                        }
+                      },
+                      "equal": {
+                        "type": "object",
+                        "description": "Searches for rows that have a column value that is exactly the value set."
+                      },
+                      "notEqual": {
+                        "type": "object",
+                        "description": "Searches for any row which does not contain the specified column value."
+                      },
+                      "empty": {
+                        "type": "object",
+                        "description": "Searches for rows which do not contain the specified column. The object should simply contain keys of the column names, these can map to any value.",
+                        "example": {
+                          "columnName1": ""
+                        }
+                      },
+                      "notEmpty": {
+                        "type": "object",
+                        "description": "Searches for rows which have the specified column."
+                      },
+                      "oneOf": {
+                        "type": "object",
+                        "description": "Searches for rows which have a column value that is any of the specified values. The format of this must be columnName -> [value1, value2]."
+                      }
+                    }
+                  },
+                  "paginate": {
+                    "type": "boolean",
+                    "description": "Enables pagination, by default this is disabled."
+                  },
+                  "bookmark": {
+                    "oneOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "integer"
+                      }
+                    ],
+                    "description": "If retrieving another page, the bookmark from the previous request must be supplied."
+                  },
+                  "limit": {
+                    "type": "integer",
+                    "description": "The maximum number of rows to return, useful when paginating, for internal tables this will be limited to 1000, for SQL tables it will be 5000."
+                  },
+                  "sort": {
+                    "type": "object",
+                    "description": "A set of parameters describing the sort behaviour of the search.",
+                    "properties": {
+                      "order": {
+                        "type": "string",
+                        "enum": [
+                          "ascending",
+                          "descending"
+                        ],
+                        "description": "The order of the sort, by default this is ascending."
+                      },
+                      "column": {
+                        "type": "string",
+                        "description": "The name of the column by which the rows will be sorted."
+                      },
+                      "type": {
+                        "type": "string",
+                        "enum": [
+                          "string",
+                          "number"
+                        ],
+                        "description": "Defines whether the column should be treated as a string or as numbers when sorting."
+                      }
+                    }
+                  }
+                }
               }
             }
           }
@@ -2292,7 +2289,7 @@
         },
         "responses": {
           "200": {
-            "description": "Returns the created table, including the ID which has been generated for it. This can be internal or external datasources.",
+            "description": "Returns the created table, including the ID which has been generated for it. This can be internal or external data sources.",
             "content": {
               "application/json": {
                 "schema": {