@teamkeel/functions-runtime 0.374.0 → 0.375.1

package/.env.test

@@ -1,2 +1,2 @@
-KEEL_DB_CONN=postgresql://postgres:postgres@localhost:5432/functions-runtime
+KEEL_DB_CONN=postgresql://postgres:postgres@localhost:7654/functions-runtime
 KEEL_DB_CONN_TYPE=pg

package/compose.yaml

@@ -7,4 +7,4 @@ services:
       - POSTGRES_PASSWORD=postgres
       - POSTGRES_DB=functions-runtime
     ports:
-      - "5432:5432"
+      - "7654:5432"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamkeel/functions-runtime",
-  "version": "0.374.0",
+  "version": "0.375.1",
   "description": "Internal package used by @teamkeel/sdk",
   "main": "src/index.js",
   "scripts": {
@@ -15,20 +15,20 @@
     "access": "public"
   },
   "devDependencies": {
-    "prettier": "2.7.1",
-    "vitest": "^0.27.1"
+    "prettier": "3.1.1",
+    "vitest": "^0.34.6"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.4.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "^0.38.0",
-    "@opentelemetry/resources": "^1.12.0",
-    "@opentelemetry/sdk-trace-base": "^1.12.0",
-    "@opentelemetry/sdk-trace-node": "^1.12.0",
+    "@opentelemetry/api": "^1.7.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "^0.46.0",
+    "@opentelemetry/resources": "^1.19.0",
+    "@opentelemetry/sdk-trace-base": "^1.19.0",
+    "@opentelemetry/sdk-trace-node": "^1.19.0",
     "change-case": "^4.1.2",
-    "json-rpc-2.0": "^1.4.1",
+    "json-rpc-2.0": "^1.7.0",
     "ksuid": "^3.0.0",
-    "kysely": "^0.23.4",
-    "pg": "^8.8.0",
+    "kysely": "^0.23.5",
+    "pg": "^8.11.3",
     "traceparent": "^1.0.0"
   }
 }

package/src/ModelAPI.test.js

@@ -517,6 +517,46 @@ test("ModelAPI.findMany - orderBy", async () => {
   expect(descendingDates.map((r) => r.name)).toEqual(["Sally", "Bob", "Jim"]);
 });
 
+test("ModelAPI.findMany - orderBy ASC and DESC capitalised", async () => {
+  await personAPI.create({
+    id: KSUID.randomSync().string,
+    name: "Jim",
+    married: false,
+    favouriteNumber: 10,
+    date: new Date(2023, 12, 29),
+  });
+  await personAPI.create({
+    id: KSUID.randomSync().string,
+    name: "Bob",
+    married: true,
+    favouriteNumber: 11,
+    date: new Date(2023, 12, 30),
+  });
+  await personAPI.create({
+    id: KSUID.randomSync().string,
+    name: "Sally",
+    married: true,
+    favouriteNumber: 12,
+    date: new Date(2023, 12, 31),
+  });
+
+  const ascendingNames = await personAPI.findMany({
+    orderBy: {
+      name: "ASC",
+    },
+  });
+
+  expect(ascendingNames.map((r) => r.name)).toEqual(["Bob", "Jim", "Sally"]);
+
+  const descendingNames = await personAPI.findMany({
+    orderBy: {
+      name: "DESC",
+    },
+  });
+
+  expect(descendingNames.map((r) => r.name)).toEqual(["Sally", "Jim", "Bob"]);
+});
+
 test("ModelAPI.findMany - offset", async () => {
   await personAPI.create({
     id: KSUID.randomSync().string,

package/src/applyAdditionalQueryConstraints.js

@@ -10,7 +10,7 @@ function applyOffset(context, qb, offset) {
 
 function applyOrderBy(context, qb, tableName, orderBy = {}) {
   Object.entries(orderBy).forEach(([key, sortOrder]) => {
-    qb = qb.orderBy(`${tableName}.${snakeCase(key)}`, sortOrder);
+    qb = qb.orderBy(`${tableName}.${snakeCase(key)}`, sortOrder.toLowerCase());
   });
   return qb;
 }

package/src/database.js

@@ -145,6 +145,19 @@ function getDialect() {
       return new PostgresDialect({
         pool: new InstrumentedPool({
           Client: InstrumentedClient,
+          // Increased idle time before closing a connection in the local pool (from 10s default).
+          // Establising a new connection on (almost) every functions query can be expensive, so this
+          // will reduce having to open connections as regularly. https://node-postgres.com/apis/pool
+          //
+          // NOTE: We should consider setting this to 0 (i.e. never pool locally) and open and close
+          // connections with each invocation. This is because the freeze/thaw nature of lambdas can cause problems
+          // with long-lived connections - see https://github.com/brianc/node-postgres/issues/2718
+          // Once we're "fully regional" this should not be a performance problem anymore.
+          //
+          // Although I doubt we will run into these freeze/thaw issues if idleTimeoutMillis is always shorter than the
+          // time is takes for a lambda to freeze (which is not a constant, but could be as short as several minutes,
+          // https://www.pluralsight.com/resources/blog/cloud/how-long-does-aws-lambda-keep-your-idle-functions-around-before-a-cold-start)
+          idleTimeoutMillis: 120000,
           connectionString: mustEnv("KEEL_DB_CONN"),
         }),
       });

package/src/handleJob.test.js

@@ -99,9 +99,6 @@ describe("ModelAPI error handling", () => {
   let db;
 
   beforeEach(async () => {
-    process.env.KEEL_DB_CONN_TYPE = "pg";
-    process.env.KEEL_DB_CONN = `postgresql://postgres:postgres@localhost:5432/functions-runtime`;
-
     db = useDatabase();
 
     await sql`

package/src/handleRequest.test.js

@@ -218,9 +218,6 @@ describe("ModelAPI error handling", () => {
   let db;
 
   beforeEach(async () => {
-    process.env.KEEL_DB_CONN_TYPE = "pg";
-    process.env.KEEL_DB_CONN = `postgresql://postgres:postgres@localhost:5432/functions-runtime`;
-
     db = useDatabase();
 
     await sql`