Skip to content

Commit dcdfdfb

Browse files
sweatybridgesweatybridge
committed
feat: support webhook retries
1 parent 1fd3dc3 commit dcdfdfb

File tree

2 files changed

+138
-87
lines changed

2 files changed

+138
-87
lines changed

‎migrations/db/migrations/20240822021428_enable_webhooks_by_default.sql

+74-47
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,27 @@
44
CREATE EXTENSION IF NOT EXISTS pg_net SCHEMA extensions;
55

66
-- Create supabase_functions schema
7-
CREATE SCHEMA supabase_functions AUTHORIZATION supabase_admin;
7+
CREATE SCHEMA IF NOT EXISTS supabase_functions AUTHORIZATION supabase_admin;
88

99
GRANT USAGE ON SCHEMA supabase_functions TO postgres, anon, authenticated, service_role;
1010
ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON TABLES TO postgres, anon, authenticated, service_role;
1111
ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON FUNCTIONS TO postgres, anon, authenticated, service_role;
1212
ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON SEQUENCES TO postgres, anon, authenticated, service_role;
1313

1414
-- supabase_functions.migrations definition
15-
CREATE TABLE supabase_functions.migrations (
15+
CREATE TABLE IF NOT EXISTS supabase_functions.migrations (
1616
version text PRIMARY KEY,
1717
inserted_at timestamptz NOT NULL DEFAULT NOW()
1818
);
1919

2020
-- Initial supabase_functions migration
21-
INSERT INTO supabase_functions.migrations (version) VALUES ('initial');
21+
INSERT INTO supabase_functions.migrations (version) VALUES
22+
('initial'),
23+
('20210809183423_update_grants'),
24+
('20240125163000_add_retry_to_http_request');
2225

2326
-- supabase_functions.hooks definition
24-
CREATE TABLE supabase_functions.hooks (
27+
CREATE TABLE IF NOT EXISTS supabase_functions.hooks (
2528
id bigserial PRIMARY KEY,
2629
hook_table_id integer NOT NULL,
2730
hook_name text NOT NULL,
@@ -32,78 +35,104 @@ CREATE INDEX supabase_functions_hooks_request_id_idx ON supabase_functions.hooks
3235
CREATE INDEX supabase_functions_hooks_h_table_id_h_name_idx ON supabase_functions.hooks USING btree (hook_table_id, hook_name);
3336
COMMENT ON TABLE supabase_functions.hooks IS 'Supabase Functions Hooks: Audit trail for triggered hooks.';
3437

35-
CREATE FUNCTION supabase_functions.http_request()
38+
CREATE OR REPLACE FUNCTION supabase_functions.http_request()
3639
RETURNS trigger
3740
LANGUAGE plpgsql
41+
SECURITY DEFINER
42+
SET search_path TO 'supabase_functions'
3843
AS $function$
3944
DECLARE
40-
request_id bigint;
45+
local_request_id bigint;
4146
payload jsonb;
4247
url text := TG_ARGV[0]::text;
4348
method text := TG_ARGV[1]::text;
4449
headers jsonb DEFAULT '{}'::jsonb;
4550
params jsonb DEFAULT '{}'::jsonb;
46-
timeout_ms integer DEFAULT 1000;
51+
timeout_ms integer;
52+
retry_count integer DEFAULT 0;
53+
max_retries integer := COALESCE(TG_ARGV[5]::integer, 0);
54+
succeeded boolean := FALSE;
55+
retry_delays double precision[] := ARRAY[0, 0.250, 0.500, 1.000, 2.500, 5.000];
56+
status_code integer := 0;
4757
BEGIN
4858
IF url IS NULL OR url = 'null' THEN
4959
RAISE EXCEPTION 'url argument is missing';
5060
END IF;
51-
5261
IF method IS NULL OR method = 'null' THEN
5362
RAISE EXCEPTION 'method argument is missing';
5463
END IF;
55-
5664
IF TG_ARGV[2] IS NULL OR TG_ARGV[2] = 'null' THEN
5765
headers = '{"Content-Type": "application/json"}'::jsonb;
5866
ELSE
5967
headers = TG_ARGV[2]::jsonb;
6068
END IF;
61-
6269
IF TG_ARGV[3] IS NULL OR TG_ARGV[3] = 'null' THEN
6370
params = '{}'::jsonb;
6471
ELSE
6572
params = TG_ARGV[3]::jsonb;
6673
END IF;
67-
68-
IF TG_ARGV[4] IS NULL OR TG_ARGV[4] = 'null' THEN
69-
timeout_ms = 1000;
70-
ELSE
74+
IF TG_ARGV[4] IS NOT NULL OR TG_ARGV[4] <> 'null' THEN
7175
timeout_ms = TG_ARGV[4]::integer;
7276
END IF;
73-
74-
CASE
75-
WHEN method = 'GET' THEN
76-
SELECT http_get INTO request_id FROM net.http_get(
77-
url,
78-
params,
79-
headers,
80-
timeout_ms
81-
);
82-
WHEN method = 'POST' THEN
83-
payload = jsonb_build_object(
84-
'old_record', OLD,
85-
'record', NEW,
86-
'type', TG_OP,
87-
'table', TG_TABLE_NAME,
88-
'schema', TG_TABLE_SCHEMA
89-
);
90-
91-
SELECT http_post INTO request_id FROM net.http_post(
92-
url,
93-
payload,
94-
params,
95-
headers,
96-
timeout_ms
97-
);
98-
ELSE
99-
RAISE EXCEPTION 'method argument % is invalid', method;
100-
END CASE;
101-
77+
-- Retry loop
78+
WHILE NOT succeeded AND retry_count <= max_retries LOOP
79+
PERFORM pg_sleep(retry_delays[retry_count + 1]);
80+
IF retry_delays[retry_count + 1] > 0 THEN
81+
RAISE WARNING 'Retrying HTTP request: {retry_attempt: %, url: "%", timeout_ms: %, retry_delay_ms: %}',
82+
retry_count, url, timeout_ms, retry_delays[retry_count + 1] * 1000;
83+
END IF;
84+
retry_count := retry_count + 1;
85+
BEGIN
86+
CASE
87+
WHEN method = 'GET' THEN
88+
SELECT http_get INTO local_request_id FROM net.http_get(
89+
url,
90+
params,
91+
headers,
92+
timeout_ms
93+
);
94+
WHEN method = 'POST' THEN
95+
payload = jsonb_build_object(
96+
'old_record', OLD,
97+
'record', NEW,
98+
'type', TG_OP,
99+
'table', TG_TABLE_NAME,
100+
'schema', TG_TABLE_SCHEMA
101+
);
102+
SELECT http_post INTO local_request_id FROM net.http_post(
103+
url,
104+
payload,
105+
params,
106+
headers,
107+
timeout_ms
108+
);
109+
ELSE
110+
RAISE EXCEPTION 'method argument % is invalid', method;
111+
END CASE;
112+
IF local_request_id IS NOT NULL THEN
113+
SELECT (response).status_code::integer
114+
INTO status_code
115+
FROM net._http_collect_response(local_request_id);
116+
IF status_code < 500 THEN
117+
succeeded := TRUE;
118+
END IF;
119+
END IF;
120+
-- Exit loop on successful request
121+
EXIT WHEN succeeded;
122+
EXCEPTION
123+
WHEN OTHERS THEN
124+
IF retry_count > max_retries THEN
125+
-- If retries exhausted, re-raise exception
126+
RAISE EXCEPTION 'HTTP request failed after % retries. SQL Error: { %, % }',
127+
max_retries, SQLERRM, SQLSTATE;
128+
END IF;
129+
END;
130+
END LOOP;
131+
-- Failed retries are not logged
102132
INSERT INTO supabase_functions.hooks
103133
(hook_table_id, hook_name, request_id)
104134
VALUES
105-
(TG_RELID, TG_NAME, request_id);
106-
135+
(TG_RELID, TG_NAME, local_request_id);
107136
RETURN NEW;
108137
END
109138
$function$;
@@ -231,8 +260,6 @@ BEGIN
231260
END
232261
$$;
233262

234-
INSERT INTO supabase_functions.migrations (version) VALUES ('20210809183423_update_grants');
235-
236263
ALTER function supabase_functions.http_request() SECURITY DEFINER;
237264
ALTER function supabase_functions.http_request() SET search_path = supabase_functions;
238265
REVOKE ALL ON FUNCTION supabase_functions.http_request() FROM PUBLIC;

‎migrations/schema.sql

+64-40
Original file line numberDiff line numberDiff line change
@@ -604,73 +604,97 @@ CREATE FUNCTION supabase_functions.http_request() RETURNS trigger
604604
SET search_path TO 'supabase_functions'
605605
AS $$
606606
DECLARE
607-
request_id bigint;
607+
local_request_id bigint;
608608
payload jsonb;
609609
url text := TG_ARGV[0]::text;
610610
method text := TG_ARGV[1]::text;
611611
headers jsonb DEFAULT '{}'::jsonb;
612612
params jsonb DEFAULT '{}'::jsonb;
613-
timeout_ms integer DEFAULT 1000;
613+
timeout_ms integer;
614+
retry_count integer DEFAULT 0;
615+
max_retries integer := COALESCE(TG_ARGV[5]::integer, 0);
616+
succeeded boolean := FALSE;
617+
retry_delays double precision[] := ARRAY[0, 0.250, 0.500, 1.000, 2.500, 5.000];
618+
status_code integer := 0;
614619
BEGIN
615620
IF url IS NULL OR url = 'null' THEN
616621
RAISE EXCEPTION 'url argument is missing';
617622
END IF;
618-
619623
IF method IS NULL OR method = 'null' THEN
620624
RAISE EXCEPTION 'method argument is missing';
621625
END IF;
622-
623626
IF TG_ARGV[2] IS NULL OR TG_ARGV[2] = 'null' THEN
624627
headers = '{"Content-Type": "application/json"}'::jsonb;
625628
ELSE
626629
headers = TG_ARGV[2]::jsonb;
627630
END IF;
628-
629631
IF TG_ARGV[3] IS NULL OR TG_ARGV[3] = 'null' THEN
630632
params = '{}'::jsonb;
631633
ELSE
632634
params = TG_ARGV[3]::jsonb;
633635
END IF;
634-
635-
IF TG_ARGV[4] IS NULL OR TG_ARGV[4] = 'null' THEN
636-
timeout_ms = 1000;
637-
ELSE
636+
IF TG_ARGV[4] IS NOT NULL OR TG_ARGV[4] <> 'null' THEN
638637
timeout_ms = TG_ARGV[4]::integer;
639638
END IF;
640-
641-
CASE
642-
WHEN method = 'GET' THEN
643-
SELECT http_get INTO request_id FROM net.http_get(
644-
url,
645-
params,
646-
headers,
647-
timeout_ms
648-
);
649-
WHEN method = 'POST' THEN
650-
payload = jsonb_build_object(
651-
'old_record', OLD,
652-
'record', NEW,
653-
'type', TG_OP,
654-
'table', TG_TABLE_NAME,
655-
'schema', TG_TABLE_SCHEMA
656-
);
657-
658-
SELECT http_post INTO request_id FROM net.http_post(
659-
url,
660-
payload,
661-
params,
662-
headers,
663-
timeout_ms
664-
);
665-
ELSE
666-
RAISE EXCEPTION 'method argument % is invalid', method;
667-
END CASE;
668-
639+
-- Retry loop
640+
WHILE NOT succeeded AND retry_count <= max_retries LOOP
641+
PERFORM pg_sleep(retry_delays[retry_count + 1]);
642+
IF retry_delays[retry_count + 1] > 0 THEN
643+
RAISE WARNING 'Retrying HTTP request: {retry_attempt: %, url: "%", timeout_ms: %, retry_delay_ms: %}',
644+
retry_count, url, timeout_ms, retry_delays[retry_count + 1] * 1000;
645+
END IF;
646+
retry_count := retry_count + 1;
647+
BEGIN
648+
CASE
649+
WHEN method = 'GET' THEN
650+
SELECT http_get INTO local_request_id FROM net.http_get(
651+
url,
652+
params,
653+
headers,
654+
timeout_ms
655+
);
656+
WHEN method = 'POST' THEN
657+
payload = jsonb_build_object(
658+
'old_record', OLD,
659+
'record', NEW,
660+
'type', TG_OP,
661+
'table', TG_TABLE_NAME,
662+
'schema', TG_TABLE_SCHEMA
663+
);
664+
SELECT http_post INTO local_request_id FROM net.http_post(
665+
url,
666+
payload,
667+
params,
668+
headers,
669+
timeout_ms
670+
);
671+
ELSE
672+
RAISE EXCEPTION 'method argument % is invalid', method;
673+
END CASE;
674+
IF local_request_id IS NOT NULL THEN
675+
SELECT (response).status_code::integer
676+
INTO status_code
677+
FROM net._http_collect_response(local_request_id);
678+
IF status_code < 500 THEN
679+
succeeded := TRUE;
680+
END IF;
681+
END IF;
682+
-- Exit loop on successful request
683+
EXIT WHEN succeeded;
684+
EXCEPTION
685+
WHEN OTHERS THEN
686+
IF retry_count > max_retries THEN
687+
-- If retries exhausted, re-raise exception
688+
RAISE EXCEPTION 'HTTP request failed after % retries. SQL Error: { %, % }',
689+
max_retries, SQLERRM, SQLSTATE;
690+
END IF;
691+
END;
692+
END LOOP;
693+
-- Failed retries are not logged
669694
INSERT INTO supabase_functions.hooks
670695
(hook_table_id, hook_name, request_id)
671696
VALUES
672-
(TG_RELID, TG_NAME, request_id);
673-
697+
(TG_RELID, TG_NAME, local_request_id);
674698
RETURN NEW;
675699
END
676700
$$;

0 commit comments

Comments
 (0)