@arcforgelabs/flow 2026.10.33 → 2026.10.34

package/server/core/tracing.js

@@ -0,0 +1,64 @@
+import { routePattern } from '../ui/monitoring.js';
+
+// Performance traces for the installation's own tracing service
+// (docs/SENTRY.md, "Traces"). The first integration that is on and offers the
+// `traceSpan` and `traceRequest` capabilities gets them. With none on, each
+// function here runs the work as it is and adds nothing.
+//
+// `tracers()` answers the adapters to trace with; it is read at each call,
+// so an integration turned on or off later is followed.
+export function createTracing({ tracers = () => [] } = {}) {
+  const first = () => tracers()[0]?.capabilities ?? null;
+  return {
+    // Runs `work` inside a span named `name`, of kind `op`.
+    span(name, op, work, attributes = {}) {
+      const tracer = first();
+      return tracer ? tracer.traceSpan({ name, op, attributes }, work) : work();
+    },
+    // Express middleware: names each request's trace by its route pattern
+    // ("GET /api/invoicing/invoices/:id"), never by its URL, so the same
+    // click on another invoice is the same name.
+    requests() {
+      return (req, res, next) => {
+        const rename = first()?.traceRequest() ?? null;
+        if (rename) res.once('finish', () => rename(requestName(req)));
+        next();
+      };
+    },
+  };
+}
+
+// The route Express matched, else the path with its ids as ":id".
+export function requestName(req) {
+  const route = typeof req.route?.path === 'string' ? `${req.baseUrl ?? ''}${req.route.path}` : null;
+  return `${req.method} ${route ?? routePattern(req.originalUrl ?? req.url)}`;
+}
+
+// A span for each database query the pool runs. The span's name is the SQL
+// with its values left out: Flow passes values as parameters, and any quoted
+// text or number in the SQL itself becomes "?".
+export function traceQueries(pool, tracing) {
+  const wrap = (target) => {
+    const query = target.query.bind(target);
+    target.query = (...args) => {
+      // Callback calls are pg's own (the pool's query runs through a
+      // client's): the promise call around them already has its span.
+      if (typeof args.at(-1) === 'function') return query(...args);
+      return tracing.span(sqlName(args[0]), 'db', () => query(...args), { 'db.system': 'postgresql', 'db.system.name': 'postgresql' });
+    };
+  };
+  wrap(pool);
+  // A client a transaction holds (pool.connect()) queries directly.
+  pool.on('connect', wrap);
+  return pool;
+}
+
+export function sqlName(statement) {
+  const text = typeof statement === 'string' ? statement : String(statement?.text ?? '');
+  return text
+    .replace(/'(?:[^']|'')*'/g, '?')
+    .replace(/(?<![\w$])\d+(\.\d+)?\b/g, '?')
+    .replace(/\s+/g, ' ')
+    .trim()
+    .slice(0, 300) || 'query';
+}

package/server/db/migrations/0018_custom_fields.sql

@@ -0,0 +1,78 @@
+CREATE TABLE IF NOT EXISTS "job_field_events" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"organisation_id" uuid NOT NULL,
+	"field_id" uuid NOT NULL,
+	"source_system" text NOT NULL,
+	"source_job_ref" text NOT NULL,
+	"from_value" jsonb,
+	"to_value" jsonb,
+	"actor" uuid,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "job_field_values" (
+	"organisation_id" uuid NOT NULL,
+	"field_id" uuid NOT NULL,
+	"source_system" text NOT NULL,
+	"source_job_ref" text NOT NULL,
+	"value" jsonb NOT NULL,
+	"updated_by" uuid,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL,
+	CONSTRAINT "job_field_values_organisation_id_field_id_source_system_source_job_ref_pk" PRIMARY KEY("organisation_id","field_id","source_system","source_job_ref")
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "job_fields" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"organisation_id" uuid NOT NULL,
+	"name" text NOT NULL,
+	"type" text NOT NULL,
+	"options" jsonb DEFAULT '[]'::jsonb NOT NULL,
+	"position" integer NOT NULL,
+	"archived_at" timestamp with time zone,
+	"created_by" uuid,
+	"updated_by" uuid,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL,
+	CONSTRAINT "job_fields_org_id" UNIQUE("organisation_id","id"),
+	CONSTRAINT "job_fields_type_valid" CHECK ("job_fields"."type" in ('dropdown', 'person', 'checkbox', 'date', 'number', 'text')),
+	CONSTRAINT "job_fields_name_valid" CHECK (length("job_fields"."name") between 1 and 60)
+);
+--> statement-breakpoint
+DO $flow_guard$ BEGIN
+	ALTER TABLE "job_field_events" ADD CONSTRAINT "job_field_events_organisation_id_organisations_id_fk" FOREIGN KEY ("organisation_id") REFERENCES "public"."organisations"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION WHEN duplicate_object OR duplicate_table OR invalid_table_definition THEN NULL;
+END $flow_guard$;--> statement-breakpoint
+DO $flow_guard$ BEGIN
+	ALTER TABLE "job_field_events" ADD CONSTRAINT "job_field_events_actor_people_id_fk" FOREIGN KEY ("actor") REFERENCES "public"."people"("id") ON DELETE set null ON UPDATE no action;
+EXCEPTION WHEN duplicate_object OR duplicate_table OR invalid_table_definition THEN NULL;
+END $flow_guard$;--> statement-breakpoint
+DO $flow_guard$ BEGIN
+	ALTER TABLE "job_field_events" ADD CONSTRAINT "job_field_events_field_same_org" FOREIGN KEY ("organisation_id","field_id") REFERENCES "public"."job_fields"("organisation_id","id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION WHEN duplicate_object OR duplicate_table OR invalid_table_definition THEN NULL;
+END $flow_guard$;--> statement-breakpoint
+DO $flow_guard$ BEGIN
+	ALTER TABLE "job_field_values" ADD CONSTRAINT "job_field_values_organisation_id_organisations_id_fk" FOREIGN KEY ("organisation_id") REFERENCES "public"."organisations"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION WHEN duplicate_object OR duplicate_table OR invalid_table_definition THEN NULL;
+END $flow_guard$;--> statement-breakpoint
+DO $flow_guard$ BEGIN
+	ALTER TABLE "job_field_values" ADD CONSTRAINT "job_field_values_updated_by_people_id_fk" FOREIGN KEY ("updated_by") REFERENCES "public"."people"("id") ON DELETE set null ON UPDATE no action;
+EXCEPTION WHEN duplicate_object OR duplicate_table OR invalid_table_definition THEN NULL;
+END $flow_guard$;--> statement-breakpoint
+DO $flow_guard$ BEGIN
+	ALTER TABLE "job_field_values" ADD CONSTRAINT "job_field_values_field_same_org" FOREIGN KEY ("organisation_id","field_id") REFERENCES "public"."job_fields"("organisation_id","id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION WHEN duplicate_object OR duplicate_table OR invalid_table_definition THEN NULL;
+END $flow_guard$;--> statement-breakpoint
+DO $flow_guard$ BEGIN
+	ALTER TABLE "job_fields" ADD CONSTRAINT "job_fields_organisation_id_organisations_id_fk" FOREIGN KEY ("organisation_id") REFERENCES "public"."organisations"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION WHEN duplicate_object OR duplicate_table OR invalid_table_definition THEN NULL;
+END $flow_guard$;--> statement-breakpoint
+DO $flow_guard$ BEGIN
+	ALTER TABLE "job_fields" ADD CONSTRAINT "job_fields_created_by_people_id_fk" FOREIGN KEY ("created_by") REFERENCES "public"."people"("id") ON DELETE set null ON UPDATE no action;
+EXCEPTION WHEN duplicate_object OR duplicate_table OR invalid_table_definition THEN NULL;
+END $flow_guard$;--> statement-breakpoint
+DO $flow_guard$ BEGIN
+	ALTER TABLE "job_fields" ADD CONSTRAINT "job_fields_updated_by_people_id_fk" FOREIGN KEY ("updated_by") REFERENCES "public"."people"("id") ON DELETE set null ON UPDATE no action;
+EXCEPTION WHEN duplicate_object OR duplicate_table OR invalid_table_definition THEN NULL;
+END $flow_guard$;--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "job_field_events_job" ON "job_field_events" USING btree ("organisation_id","source_system","source_job_ref","created_at");--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "job_field_values_job" ON "job_field_values" USING btree ("organisation_id","source_system","source_job_ref");