@budibase/backend-core 2.22.15 → 2.22.16

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.22.15",
+  "version": "2.22.16",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,8 +23,8 @@
   "dependencies": {
     "@budibase/nano": "10.1.5",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/shared-core": "2.22.15",
-    "@budibase/types": "2.22.15",
+    "@budibase/shared-core": "2.22.16",
+    "@budibase/types": "2.22.16",
     "@govtechsg/passport-openidconnect": "^1.0.2",
     "aws-cloudfront-sign": "3.0.2",
     "aws-sdk": "2.1030.0",
@@ -96,5 +96,5 @@
       }
     }
   },
-  "gitHead": "5ec5e990b3e96a2720470158c4cc8cf10926b637"
+  "gitHead": "4a14e2ae9fdbc95da043dae51af41e53a7cd8bb8"
 }

package/dist/tests/core/utilities/testContainerUtils.d.ts

@@ -1 +1,26 @@
+interface ContainerInfo {
+    Command: string;
+    CreatedAt: string;
+    ID: string;
+    Image: string;
+    Labels: string;
+    LocalVolumes: string;
+    Mounts: string;
+    Names: string;
+    Networks: string;
+    Ports: string;
+    RunningFor: string;
+    Size: string;
+    State: string;
+    Status: string;
+}
+export declare function getContainerByImage(image: string): ContainerInfo;
+export declare function getContainerById(id: string): ContainerInfo | undefined;
+export interface Port {
+    host: number;
+    container: number;
+}
+export declare function getExposedV4Ports(container: ContainerInfo): Port[];
+export declare function getExposedV4Port(container: ContainerInfo, port: number): number | undefined;
 export declare function setupEnv(...envs: any[]): void;
+export {};

package/dist/tests/core/utilities/testContainerUtils.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupEnv = void 0;
-const db_1 = require("../../../src/db");
+exports.setupEnv = exports.getExposedV4Port = exports.getExposedV4Ports = exports.getContainerById = exports.getContainerByImage = void 0;
 const child_process_1 = require("child_process");
+const IPV4_PORT_REGEX = new RegExp(`0\\.0\\.0\\.0:(\\d+)->(\\d+)/tcp`, "g");
 function getTestcontainers() {
-    return (0, child_process_1.execSync)("docker ps --format json")
+    // We use --format json to make sure the output is nice and machine-readable,
+    // and we use --no-trunc so that the command returns full container IDs so we
+    // can filter on them correctly.
+    return (0, child_process_1.execSync)("docker ps --format json --no-trunc")
         .toString()
         .split("\n")
         .filter(x => x.length > 0)
@@ -12,35 +15,54 @@ function getTestcontainers() {
         .filter(x => x.Labels.includes("org.testcontainers=true"));
 }
 function getContainerByImage(image) {
-    return getTestcontainers().find(x => x.Image.startsWith(image));
+    const containers = getTestcontainers().filter(x => x.Image.startsWith(image));
+    if (containers.length > 1) {
+        let errorMessage = `Multiple containers found starting with image: "${image}"\n\n`;
+        for (const container of containers) {
+            errorMessage += JSON.stringify(container, null, 2);
+        }
+        throw new Error(errorMessage);
+    }
+    return containers[0];
 }
-function getExposedPort(container, port) {
-    const match = container.Ports.match(new RegExp(`0.0.0.0:(\\d+)->${port}/tcp`));
-    if (!match) {
-        return undefined;
+exports.getContainerByImage = getContainerByImage;
+function getContainerById(id) {
+    return getTestcontainers().find(x => x.ID === id);
+}
+exports.getContainerById = getContainerById;
+function getExposedV4Ports(container) {
+    let ports = [];
+    for (const match of container.Ports.matchAll(IPV4_PORT_REGEX)) {
+        ports.push({ host: parseInt(match[1]), container: parseInt(match[2]) });
     }
-    return parseInt(match[1]);
+    return ports;
+}
+exports.getExposedV4Ports = getExposedV4Ports;
+function getExposedV4Port(container, port) {
+    var _a;
+    return (_a = getExposedV4Ports(container).find(x => x.container === port)) === null || _a === void 0 ? void 0 : _a.host;
 }
+exports.getExposedV4Port = getExposedV4Port;
 function setupEnv(...envs) {
+    // We start couchdb in globalSetup.ts, in the root of the monorepo, so it
+    // should be relatively safe to look for it by its image name.
     const couch = getContainerByImage("budibase/couchdb");
     if (!couch) {
         throw new Error("CouchDB container not found");
     }
-    const couchPort = getExposedPort(couch, 5984);
+    const couchPort = getExposedV4Port(couch, 5984);
     if (!couchPort) {
         throw new Error("CouchDB port not found");
     }
     const configs = [
         { key: "COUCH_DB_PORT", value: `${couchPort}` },
-        { key: "COUCH_DB_URL", value: `http://localhost:${couchPort}` },
+        { key: "COUCH_DB_URL", value: `http://127.0.0.1:${couchPort}` },
     ];
     for (const config of configs.filter(x => !!x.value)) {
         for (const env of envs) {
             env._set(config.key, config.value);
         }
     }
-    // @ts-expect-error
-    db_1.DatabaseImpl.nano = undefined;
 }
 exports.setupEnv = setupEnv;
 //# sourceMappingURL=testContainerUtils.js.map

package/dist/tests/core/utilities/testContainerUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"testContainerUtils.js","sourceRoot":"","sources":["../../../../tests/core/utilities/testContainerUtils.ts"],"names":[],"mappings":";;;AAAA,wCAA8C;AAC9C,iDAAwC;AAmBxC,SAAS,iBAAiB;IACxB,OAAO,IAAA,wBAAQ,EAAC,yBAAyB,CAAC;SACvC,QAAQ,EAAE;SACV,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAkB,CAAC;SACxC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAA;AAC9D,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa;IACxC,OAAO,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;AACjE,CAAC;AAED,SAAS,cAAc,CAAC,SAAwB,EAAE,IAAY;IAC5D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,CAAC,CAAA;IAC9E,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAC3B,CAAC;AAED,SAAgB,QAAQ,CAAC,GAAG,IAAW;IACrC,MAAM,KAAK,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,CAAA;IACrD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;KAC/C;IAED,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAC7C,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;KAC1C;IAED,MAAM,OAAO,GAAG;QACd,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,EAAE;QAC/C,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,oBAAoB,SAAS,EAAE,EAAE;KAChE,CAAA;IAED,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;QACnD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;SACnC;KACF;IAED,mBAAmB;IACnB,iBAAY,CAAC,IAAI,GAAG,SAAS,CAAA;AAC/B,CAAC;AAxBD,4BAwBC"}
+{"version":3,"file":"testContainerUtils.js","sourceRoot":"","sources":["../../../../tests/core/utilities/testContainerUtils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.22.15",
+  "version": "2.22.16",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,8 +23,8 @@
   "dependencies": {
     "@budibase/nano": "10.1.5",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/shared-core": "2.22.15",
-    "@budibase/types": "2.22.15",
+    "@budibase/shared-core": "2.22.16",
+    "@budibase/types": "2.22.16",
     "@govtechsg/passport-openidconnect": "^1.0.2",
     "aws-cloudfront-sign": "3.0.2",
     "aws-sdk": "2.1030.0",
@@ -96,5 +96,5 @@
       }
     }
   },
-  "gitHead": "5ec5e990b3e96a2720470158c4cc8cf10926b637"
+  "gitHead": "4a14e2ae9fdbc95da043dae51af41e53a7cd8bb8"
 }

package/tests/core/utilities/testContainerUtils.ts

@@ -1,6 +1,7 @@
-import { DatabaseImpl } from "../../../src/db"
 import { execSync } from "child_process"
 
+const IPV4_PORT_REGEX = new RegExp(`0\\.0\\.0\\.0:(\\d+)->(\\d+)/tcp`, "g")
+
 interface ContainerInfo {
   Command: string
   CreatedAt: string
@@ -19,7 +20,10 @@ interface ContainerInfo {
 }
 
 function getTestcontainers(): ContainerInfo[] {
-  return execSync("docker ps --format json")
+  // We use --format json to make sure the output is nice and machine-readable,
+  // and we use --no-trunc so that the command returns full container IDs so we
+  // can filter on them correctly.
+  return execSync("docker ps --format json --no-trunc")
     .toString()
     .split("\n")
     .filter(x => x.length > 0)
@@ -27,32 +31,55 @@ function getTestcontainers(): ContainerInfo[] {
     .filter(x => x.Labels.includes("org.testcontainers=true"))
 }
 
-function getContainerByImage(image: string) {
-  return getTestcontainers().find(x => x.Image.startsWith(image))
+export function getContainerByImage(image: string) {
+  const containers = getTestcontainers().filter(x => x.Image.startsWith(image))
+  if (containers.length > 1) {
+    let errorMessage = `Multiple containers found starting with image: "${image}"\n\n`
+    for (const container of containers) {
+      errorMessage += JSON.stringify(container, null, 2)
+    }
+    throw new Error(errorMessage)
+  }
+  return containers[0]
+}
+
+export function getContainerById(id: string) {
+  return getTestcontainers().find(x => x.ID === id)
 }
 
-function getExposedPort(container: ContainerInfo, port: number) {
-  const match = container.Ports.match(new RegExp(`0.0.0.0:(\\d+)->${port}/tcp`))
-  if (!match) {
-    return undefined
+export interface Port {
+  host: number
+  container: number
+}
+
+export function getExposedV4Ports(container: ContainerInfo): Port[] {
+  let ports: Port[] = []
+  for (const match of container.Ports.matchAll(IPV4_PORT_REGEX)) {
+    ports.push({ host: parseInt(match[1]), container: parseInt(match[2]) })
   }
-  return parseInt(match[1])
+  return ports
+}
+
+export function getExposedV4Port(container: ContainerInfo, port: number) {
+  return getExposedV4Ports(container).find(x => x.container === port)?.host
 }
 
 export function setupEnv(...envs: any[]) {
+  // We start couchdb in globalSetup.ts, in the root of the monorepo, so it
+  // should be relatively safe to look for it by its image name.
   const couch = getContainerByImage("budibase/couchdb")
   if (!couch) {
     throw new Error("CouchDB container not found")
   }
 
-  const couchPort = getExposedPort(couch, 5984)
+  const couchPort = getExposedV4Port(couch, 5984)
   if (!couchPort) {
     throw new Error("CouchDB port not found")
   }
 
   const configs = [
     { key: "COUCH_DB_PORT", value: `${couchPort}` },
-    { key: "COUCH_DB_URL", value: `http://localhost:${couchPort}` },
+    { key: "COUCH_DB_URL", value: `http://127.0.0.1:${couchPort}` },
   ]
 
   for (const config of configs.filter(x => !!x.value)) {
@@ -60,7 +87,4 @@ export function setupEnv(...envs: any[]) {
       env._set(config.key, config.value)
     }
   }
-
-  // @ts-expect-error
-  DatabaseImpl.nano = undefined
 }