Merge branch 'main' into pool-centric

Author: benjie

.well-known/funding-manifest-urls

@@ -1 +1 @@
-https://graphile.org/funding.json
+https://www.graphile.org/funding.json

README.md

@@ -31,11 +31,7 @@ And please give some love to our featured sponsors 🤩:
 
 <table><tr>
 <td align="center"><a href="https://www.the-guild.dev/"><img src="https://graphile.org/images/sponsors/theguild.png" width="90" height="90" alt="The Guild" /><br />The Guild</a> *</td>
-<td align="center"><a href="https://dovetailapp.com/"><img src="https://graphile.org/images/sponsors/dovetail.png" width="90" height="90" alt="Dovetail" /><br />Dovetail</a> *</td>
-<td align="center"><a href="https://stellate.co/"><img src="https://graphile.org/images/sponsors/Stellate.png" width="90" height="90" alt="Stellate" /><br />Stellate</a> *</td>
 <td align="center"><a href="https://gosteelhead.com/"><img src="https://graphile.org/images/sponsors/steelhead.svg" width="90" height="90" alt="Steelhead" /><br />Steelhead</a> *</td>
-</tr><tr>
-<td align="center"><a href=""><img src="https://graphile.org/images/sponsors/latchbio.jpg" width="90" height="90" alt="LatchBio" /><br />LatchBio</a> *</td>
 </tr></table>
 
 <em>\* Sponsors the entire Graphile suite</em>

RELEASE_NOTES.md

@@ -44,6 +44,8 @@ Read more:
 - `helpers.abortPromise` added; will reject when `abortSignal` aborts (useful
   for `Promise.race()`)
 - `backfillPeriod` is now marked as optional in TypeScript (defaults to 0).
+- Support for loading tasks from nested folders in crontab.
+  - (`* * * * * nested/folder/task ?jobKey=my_key&jobKeyMode=preserve_run_at`)
 
 ## v0.16.6
 

SPONSORS.md

@@ -7,33 +7,27 @@ Graphile ecosystem. Find out
 ## Featured
 
 - The Guild
-- Dovetail
-- Stellate
 - Steelhead
-- LatchBio
 
 ## Leaders
 
 - Robert Claypool
-- nigelrmtaylor
 - Principia Mentis
+- nigelrmtaylor
+- Trigger.dev
 - Axinom
 - Taiste
-- Notably
-- Trigger.dev
-- Cintra
 - BairesDev
+- Cintra
 - Two Bit Solutions
 - Dimply
 - Ndustrial
+- Apollo
 - Beacon
 - deliver.media
-- Spear AI
-- Seam
-- Apollo
 - Ravio
-- OpenPipe
-- dotcom-monitor
+- prodready
+- Locomote
 
 ## Supporters
 
@@ -44,25 +38,23 @@ Graphile ecosystem. Find out
 - Alvin Ali Khaled
 - Paul Melnikow
 - Keith Layne
-- Zymego
 - nullachtvierzehn
-- IFCHOR GROUP
-- Nate Smith
-- Vizcom
-- Ether
+- Zymego
 - garpulon
+- Ether
+- Nate Smith
 - The Outbound Collective
 - Charlie Hadden
+- Vizcom
 - Kiron Open Higher Education
 - Andrew Joseph
-- SIED 70
+- SIED 70 - TE 70
 - Peter C. Romano
 - mateo
 - Dialo
-- Gus Becciu
 - kontakto-fi
 - Tailos, Inc.
 - sheilamosaik
-- Miguel O. Carvajal
-- Jovi De Croock
-- Graphite
+- Jody Hoon-Starr
+- Justin Carrus
+- WorkOS

__tests__/__snapshots__/crontab.test.ts.snap

@@ -143,5 +143,35 @@ Array [
     "task": "with_key_and_mode",
     Symbol(isParsed): true,
   },
+  Object {
+    "identifier": "nested/task",
+    "match": [Function],
+    "options": Object {
+      "backfillPeriod": 0,
+      "jobKey": "my_key",
+      "jobKeyMode": "preserve_run_at",
+      "maxAttempts": undefined,
+      "priority": undefined,
+      "queueName": undefined,
+    },
+    "payload": null,
+    "task": "nested/task",
+    Symbol(isParsed): true,
+  },
+  Object {
+    "identifier": "nested/folder/task",
+    "match": [Function],
+    "options": Object {
+      "backfillPeriod": 0,
+      "jobKey": "my_key",
+      "jobKeyMode": "preserve_run_at",
+      "maxAttempts": undefined,
+      "priority": undefined,
+      "queueName": undefined,
+    },
+    "payload": null,
+    "task": "nested/folder/task",
+    Symbol(isParsed): true,
+  },
 ]
 `;

__tests__/crontab.test.ts

@@ -44,6 +44,8 @@ test("parses crontab file correctly", () => {
     *     *      *       *       *      lots_of_spaces     
 * * * * * with_key ?jobKey=my_key
 * * * * * with_key_and_mode ?jobKey=my_key&jobKeyMode=preserve_run_at
+* * * * * nested/task ?jobKey=my_key&jobKeyMode=preserve_run_at
+* * * * * nested/folder/task ?jobKey=my_key&jobKeyMode=preserve_run_at
 `;
   const parsed = parseCrontab(exampleCrontab);
 
@@ -173,6 +175,20 @@ test("parses crontab file correctly", () => {
   });
   expect(parsed[8].payload).toEqual(null);
 
+  expect(parsed[9].task).toEqual("nested/task");
+  expect(parsed[9].identifier).toEqual("nested/task");
+  const parsedCronMatch9 = (parsed[9].match as any)
+    .parsedCronMatch as ParsedCronMatch;
+  expect(parsedCronMatch9.minutes).toEqual(ALL_MINUTES);
+  expect(parsedCronMatch9.hours).toEqual(ALL_HOURS);
+
+  expect(parsed[10].task).toEqual("nested/folder/task");
+  expect(parsed[10].identifier).toEqual("nested/folder/task");
+  const parsedCronMatch10 = (parsed[10].match as any)
+    .parsedCronMatch as ParsedCronMatch;
+  expect(parsedCronMatch10.minutes).toEqual(ALL_MINUTES);
+  expect(parsedCronMatch10.hours).toEqual(ALL_HOURS);
+
   expect(parsed).toMatchSnapshot();
 });
 

__tests__/schema.sql

@@ -376,23 +376,23 @@ ALTER TABLE graphile_worker._private_known_crontabs ENABLE ROW LEVEL SECURITY;
 ALTER TABLE graphile_worker._private_tasks ENABLE ROW LEVEL SECURITY;
 SELECT pg_catalog.set_config('search_path', '', false);
 COPY graphile_worker.migrations (id, ts, breaking) FROM stdin;
-1	1970-01-01 00:00:00.000000+00	t
-2	1970-01-01 00:00:00.000000+00	f
-3	1970-01-01 00:00:00.000000+00	t
-4	1970-01-01 00:00:00.000000+00	f
-5	1970-01-01 00:00:00.000000+00	f
-6	1970-01-01 00:00:00.000000+00	f
-7	1970-01-01 00:00:00.000000+00	f
-8	1970-01-01 00:00:00.000000+00	f
-9	1970-01-01 00:00:00.000000+00	f
-10	1970-01-01 00:00:00.000000+00	f
-11	1970-01-01 00:00:00.000000+00	t
-12	1970-01-01 00:00:00.000000+00	f
-13	1970-01-01 00:00:00.000000+00	t
-14	1970-01-01 00:00:00.000000+00	t
-15	1970-01-01 00:00:00.000000+00	f
-16	1970-01-01 00:00:00.000000+00	t
-17	1970-01-01 00:00:00.000000+00	f
-18	1970-01-01 00:00:00.000000+00	f
-19	1970-01-01 00:00:00.000000+00	t
+1	2025-06-10 12:04:24.070122+01	t
+2	2025-06-10 12:04:24.104214+01	f
+3	2025-06-10 12:04:24.113671+01	t
+4	2025-06-10 12:04:24.116167+01	f
+5	2025-06-10 12:04:24.119419+01	f
+6	2025-06-10 12:04:24.121693+01	f
+7	2025-06-10 12:04:24.137432+01	f
+8	2025-06-10 12:04:24.139854+01	f
+9	2025-06-10 12:04:24.153728+01	f
+10	2025-06-10 12:04:24.155443+01	f
+11	2025-06-10 12:04:24.157855+01	t
+12	2025-06-10 12:04:24.258834+01	f
+13	2025-06-10 12:04:24.261754+01	t
+14	2025-06-10 12:04:24.263805+01	t
+15	2025-06-10 12:04:24.265574+01	f
+16	2025-06-10 12:04:24.267217+01	t
+17	2025-06-10 12:04:24.270686+01	f
+18	2025-06-10 12:04:24.272704+01	f
+19	2025-06-10 12:04:24.274531+01	t
 \.

package.json

@@ -55,7 +55,7 @@
     "@types/debug": "^4.1.10",
     "@types/pg": "^8.10.5",
     "cosmiconfig": "^8.3.6",
-    "graphile-config": "^0.0.1-beta.14",
+    "graphile-config": "^0.0.1-beta.16",
     "json5": "^2.2.3",
     "pg": "^8.11.3",
     "tslib": "^2.6.2",
@@ -86,7 +86,7 @@
     "eslint-plugin-jest": "^26.0.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint_d": "^13.0.0",
-    "graphile": "^5.0.0-beta.16",
+    "graphile": "^5.0.0-beta.41",
     "jest": "^26.0.0",
     "jest-time-helpers": "0.1.1",
     "juice": "5.2.0",

src/cronConstants.ts

@@ -28,7 +28,7 @@ export const CRONTAB_WILDCARD = /^\*(?:\/([0-9]+))?$/;
 // The command from the crontab line
 /** Splits the command from the crontab line into the task, options and payload. */
 export const CRONTAB_COMMAND =
-  /^([_a-zA-Z][_a-zA-Z0-9:_-]*)(?:\s+\?([^\s]+))?(?:\s+(\{.*\}))?$/;
+  /^([_a-zA-Z][_a-zA-Z0-9:/_-]*)(?:\s+\?([^\s]+))?(?:\s+(\{.*\}))?$/;
 
 // Crontab command options
 /** Matches the id=UID option, capturing the unique identifier */

website/docs/library/queue.md

@@ -80,6 +80,27 @@ singleton throughout your code.
 - `schema` can be used to change the default `graphile_worker` schema to
   something else (equivalent to `--schema` on the CLI)
 
+:::warning If you use `pgPool`, ensure it has error handlers!
+
+If your `pgPool` doesn't have error handlers then connection issues with the
+database may cause your Worker process to exit prematurely.
+
+```ts
+import { Pool } from "pg";
+const pool = new Pool({
+  /* ... */
+});
+
+/* highlight-start */
+// No action necessary
+function handleError() {}
+pool.on("error", handleError);
+pool.on("connect", (client) => void client.on("error", handleError));
+/* highlight-end */
+```
+
+:::
+
 ## `WorkerUtils`
 
 A `WorkerUtils` instance has the following methods:
@@ -95,6 +116,13 @@ A `WorkerUtils` instance has the following methods:
 
 ## `addJobAdhoc()`
 
+:::info
+
+This was called `quickAddJob()` in Graphile Worker up until v0.16.x, but was
+renamed to `addJobAdHoc()` in v0.17.
+
+:::
+
 ```ts
 function addJobAdhoc(options: WorkerUtilsOptions, ...addJobArgs): Promise<Job>;
 ```