ezlogs-nextjs 0.4.3 → 0.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. package/README.md +217 -86
  2. package/THIRD_PARTY_LICENSES.md +27 -0
  3. package/dist/actors/index.d.cts +1 -1
  4. package/dist/actors/index.d.ts +1 -1
  5. package/dist/{chunk-Z2TM3LGG.js → chunk-2NFJOT6Q.js} +1 -1
  6. package/dist/{chunk-R6IWVTX3.cjs → chunk-65HRY3PW.cjs} +31 -21
  7. package/dist/{chunk-YXZZNZG6.cjs → chunk-B3WST6ES.cjs} +9 -9
  8. package/dist/{chunk-MMLQXSSD.cjs → chunk-B5ZUQULZ.cjs} +18 -11
  9. package/dist/{chunk-NX4EL7BY.cjs → chunk-DM2EAOSF.cjs} +4 -4
  10. package/dist/chunk-DRE2VXFX.js +19 -0
  11. package/dist/chunk-H3FC5HMW.cjs +16 -0
  12. package/dist/{chunk-GI6BM4MR.js → chunk-IBSNHBUC.js} +18 -12
  13. package/dist/chunk-JWJKFZBW.js +52 -0
  14. package/dist/{chunk-MHBS5FEP.js → chunk-M3VBQ5KT.js} +27 -4
  15. package/dist/chunk-NFZ5OKF3.cjs +22 -0
  16. package/dist/{chunk-GMHOUAKD.cjs → chunk-O7SFYXJC.cjs} +37 -13
  17. package/dist/{chunk-U22T7QYY.js → chunk-PK2Z2ABL.js} +13 -3
  18. package/dist/{chunk-YMIGZYFH.js → chunk-RD47JECJ.js} +1 -1
  19. package/dist/chunk-RMKGMIV2.js +13 -0
  20. package/dist/{chunk-NINIAL7M.js → chunk-U3IJV5EJ.js} +1 -1
  21. package/dist/chunk-VJR4VB4B.cjs +56 -0
  22. package/dist/{chunk-PS4U2GFJ.cjs → chunk-YO6E763S.cjs} +5 -5
  23. package/dist/{configuration-CJ5yKVlP.d.cts → configuration-b9pImwFB.d.cts} +2 -2
  24. package/dist/{configuration-CJ5yKVlP.d.ts → configuration-b9pImwFB.d.ts} +2 -2
  25. package/dist/db/drizzle.cjs +3 -3
  26. package/dist/db/drizzle.js +2 -2
  27. package/dist/db/postgres-js.cjs +4 -4
  28. package/dist/db/postgres-js.js +2 -2
  29. package/dist/db/prisma.cjs +12 -12
  30. package/dist/db/prisma.js +2 -2
  31. package/dist/db/supabase.cjs +42 -17
  32. package/dist/db/supabase.d.cts +11 -5
  33. package/dist/db/supabase.d.ts +11 -5
  34. package/dist/db/supabase.js +33 -9
  35. package/dist/index.cjs +288 -142
  36. package/dist/index.d.cts +2 -2
  37. package/dist/index.d.ts +2 -2
  38. package/dist/index.js +198 -52
  39. package/dist/jobs/bullmq.cjs +44 -16
  40. package/dist/jobs/bullmq.d.cts +7 -1
  41. package/dist/jobs/bullmq.d.ts +7 -1
  42. package/dist/jobs/bullmq.js +33 -6
  43. package/dist/jobs/inngest.cjs +36 -17
  44. package/dist/jobs/inngest.d.cts +7 -1
  45. package/dist/jobs/inngest.d.ts +7 -1
  46. package/dist/jobs/inngest.js +23 -5
  47. package/dist/jobs/supabase-queues.cjs +9 -9
  48. package/dist/jobs/supabase-queues.js +4 -4
  49. package/dist/jobs/trigger.cjs +7 -7
  50. package/dist/jobs/trigger.js +4 -4
  51. package/dist/jobs/upstash-workflow.cjs +139 -23
  52. package/dist/jobs/upstash-workflow.d.cts +20 -2
  53. package/dist/jobs/upstash-workflow.d.ts +20 -2
  54. package/dist/jobs/upstash-workflow.js +129 -14
  55. package/dist/nextjs-plugin/index.cjs +46 -29
  56. package/dist/nextjs-plugin/index.js +46 -29
  57. package/dist/nextjs-plugin/loader.cjs +70 -60
  58. package/dist/nextjs-plugin/loader.d.cts +18 -1
  59. package/dist/nextjs-plugin/loader.d.ts +18 -1
  60. package/dist/nextjs-plugin/loader.js +70 -61
  61. package/dist/triggers/index.cjs +22 -16
  62. package/dist/triggers/index.d.cts +0 -10
  63. package/dist/triggers/index.d.ts +0 -10
  64. package/dist/triggers/index.js +11 -5
  65. package/package.json +6 -5
  66. package/sql/postgres/00_install.sql +20 -3
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
- var chunkYXZZNZG6_cjs = require('../chunk-YXZZNZG6.cjs');
4
- require('../chunk-MMLQXSSD.cjs');
3
+ var chunkB3WST6ES_cjs = require('../chunk-B3WST6ES.cjs');
4
+ require('../chunk-B5ZUQULZ.cjs');
5
5
  var chunkTWTG5ILJ_cjs = require('../chunk-TWTG5ILJ.cjs');
6
6
  require('../chunk-ZDSQYCYV.cjs');
7
7
 
@@ -14,7 +14,7 @@ function ezlogsDrizzleLogger(options = {}) {
14
14
  if (parsed) {
15
15
  const resourceId = parsed.operation === "create" ? null : extractResourceIdFromSimpleWhere(query, params);
16
16
  const changes = parsed.operation === "update" ? extractSetChangesFromUpdate(query, params) : null;
17
- chunkYXZZNZG6_cjs.emitDbEvent({
17
+ chunkB3WST6ES_cjs.emitDbEvent({
18
18
  modelClass: parsed.table,
19
19
  operation: parsed.operation,
20
20
  resourceId,
@@ -1,5 +1,5 @@
1
- import { emitDbEvent } from '../chunk-NINIAL7M.js';
2
- import '../chunk-GI6BM4MR.js';
1
+ import { emitDbEvent } from '../chunk-U3IJV5EJ.js';
2
+ import '../chunk-IBSNHBUC.js';
3
3
  import { logger } from '../chunk-FCFVIRQF.js';
4
4
  import '../chunk-SIAA4J6H.js';
5
5
 
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
- var chunkPS4U2GFJ_cjs = require('../chunk-PS4U2GFJ.cjs');
4
- var chunkMMLQXSSD_cjs = require('../chunk-MMLQXSSD.cjs');
3
+ var chunkYO6E763S_cjs = require('../chunk-YO6E763S.cjs');
4
+ var chunkB5ZUQULZ_cjs = require('../chunk-B5ZUQULZ.cjs');
5
5
  require('../chunk-TWTG5ILJ.cjs');
6
6
  require('../chunk-ZDSQYCYV.cjs');
7
7
 
@@ -22,8 +22,8 @@ function wrapPostgresJs(sql) {
22
22
  return proxy;
23
23
  }
24
24
  function tagContext() {
25
- if (chunkMMLQXSSD_cjs.configuration().databaseReader == null) return null;
26
- const ctx = chunkPS4U2GFJ_cjs.getDatabaseContext();
25
+ if (chunkB5ZUQULZ_cjs.configuration().databaseReader == null) return null;
26
+ const ctx = chunkYO6E763S_cjs.getDatabaseContext();
27
27
  return ctx.correlationId ? ctx : null;
28
28
  }
29
29
  function setContext(tx, ctx) {
@@ -1,5 +1,5 @@
1
- import { getDatabaseContext } from '../chunk-YMIGZYFH.js';
2
- import { configuration } from '../chunk-GI6BM4MR.js';
1
+ import { getDatabaseContext } from '../chunk-RD47JECJ.js';
2
+ import { configuration } from '../chunk-IBSNHBUC.js';
3
3
  import '../chunk-FCFVIRQF.js';
4
4
  import '../chunk-SIAA4J6H.js';
5
5
 
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
- var chunkYXZZNZG6_cjs = require('../chunk-YXZZNZG6.cjs');
4
- var chunkMMLQXSSD_cjs = require('../chunk-MMLQXSSD.cjs');
3
+ var chunkB3WST6ES_cjs = require('../chunk-B3WST6ES.cjs');
4
+ var chunkB5ZUQULZ_cjs = require('../chunk-B5ZUQULZ.cjs');
5
5
  var chunkTWTG5ILJ_cjs = require('../chunk-TWTG5ILJ.cjs');
6
6
  require('../chunk-ZDSQYCYV.cjs');
7
7
 
@@ -62,7 +62,7 @@ async function runTagged(client, ctx) {
62
62
  if (!shouldTag(client, ctx)) return ctx.query(ctx.args);
63
63
  try {
64
64
  const results = await client.$transaction([
65
- client.$executeRawUnsafe(SET_CONTEXT_SQL, chunkMMLQXSSD_cjs.current(), chunkMMLQXSSD_cjs.getCurrentActor()?.id ?? ""),
65
+ client.$executeRawUnsafe(SET_CONTEXT_SQL, chunkB5ZUQULZ_cjs.current(), chunkB5ZUQULZ_cjs.getCurrentActor()?.id ?? ""),
66
66
  ctx.query(ctx.args)
67
67
  ]);
68
68
  return results[1];
@@ -81,12 +81,12 @@ function _resetPrismaTaggingForTests() {
81
81
  }
82
82
  function shouldTag(client, ctx) {
83
83
  if (!client || taggingDisabled.has(client)) return false;
84
- if (chunkMMLQXSSD_cjs.configuration().databaseReader == null) return false;
84
+ if (chunkB5ZUQULZ_cjs.configuration().databaseReader == null) return false;
85
85
  if (!isPostgresClient(client)) return false;
86
86
  if (typeof client.$transaction !== "function" || typeof client.$executeRawUnsafe !== "function") {
87
87
  return false;
88
88
  }
89
- if (!chunkMMLQXSSD_cjs.current()) return false;
89
+ if (!chunkB5ZUQULZ_cjs.current()) return false;
90
90
  const params = ctx.__internalParams;
91
91
  return params != null && !params.transaction;
92
92
  }
@@ -112,7 +112,7 @@ function recordPrismaOperation(ctx, result, table) {
112
112
  const dbOperation = OPERATION_TO_DB_OPERATION[ctx.operation];
113
113
  if (!dbOperation) return;
114
114
  if (isBatchResult(result)) {
115
- chunkYXZZNZG6_cjs.emitDbEvent({
115
+ chunkB3WST6ES_cjs.emitDbEvent({
116
116
  modelClass: ctx.model,
117
117
  table,
118
118
  operation: dbOperation,
@@ -139,7 +139,7 @@ function recordPrismaOperation(ctx, result, table) {
139
139
  }
140
140
  function emitSingleRowEvent(ctx, dbOperation, row, table) {
141
141
  if (!isPlainObject(row)) {
142
- chunkYXZZNZG6_cjs.emitDbEvent({
142
+ chunkB3WST6ES_cjs.emitDbEvent({
143
143
  modelClass: ctx.model,
144
144
  table,
145
145
  operation: dbOperation,
@@ -149,9 +149,9 @@ function emitSingleRowEvent(ctx, dbOperation, row, table) {
149
149
  }
150
150
  const rowObj = row;
151
151
  const resourceId = rowObj.id ?? null;
152
- const displayName = chunkYXZZNZG6_cjs.resolveDisplayName(ctx.model, rowObj);
152
+ const displayName = chunkB3WST6ES_cjs.resolveDisplayName(ctx.model, rowObj);
153
153
  if (dbOperation === "create") {
154
- chunkYXZZNZG6_cjs.emitDbEvent({
154
+ chunkB3WST6ES_cjs.emitDbEvent({
155
155
  modelClass: ctx.model,
156
156
  table,
157
157
  operation: "create",
@@ -166,7 +166,7 @@ function emitSingleRowEvent(ctx, dbOperation, row, table) {
166
166
  return;
167
167
  }
168
168
  if (dbOperation === "update") {
169
- chunkYXZZNZG6_cjs.emitDbEvent({
169
+ chunkB3WST6ES_cjs.emitDbEvent({
170
170
  modelClass: ctx.model,
171
171
  table,
172
172
  operation: "update",
@@ -177,7 +177,7 @@ function emitSingleRowEvent(ctx, dbOperation, row, table) {
177
177
  });
178
178
  return;
179
179
  }
180
- chunkYXZZNZG6_cjs.emitDbEvent({
180
+ chunkB3WST6ES_cjs.emitDbEvent({
181
181
  modelClass: ctx.model,
182
182
  table,
183
183
  operation: "destroy",
@@ -268,7 +268,7 @@ function patchPrismaClient(prisma, adapter) {
268
268
  if (prisma[EZLOGS_PRISMA_BRAND] === true) {
269
269
  return prisma;
270
270
  }
271
- const captureAndRun = chunkMMLQXSSD_cjs.makeAsyncContextCapture();
271
+ const captureAndRun = chunkB5ZUQULZ_cjs.makeAsyncContextCapture();
272
272
  if (!captureAndRun) {
273
273
  chunkTWTG5ILJ_cjs.logger.debug(
274
274
  "patchPrismaClient: AsyncLocalStorage.snapshot() unavailable; skipping ALS bind, applying ezlogsPrisma() only."
package/dist/db/prisma.js CHANGED
@@ -1,5 +1,5 @@
1
- import { emitDbEvent, resolveDisplayName } from '../chunk-NINIAL7M.js';
2
- import { current, getCurrentActor, configuration, makeAsyncContextCapture } from '../chunk-GI6BM4MR.js';
1
+ import { emitDbEvent, resolveDisplayName } from '../chunk-U3IJV5EJ.js';
2
+ import { current, getCurrentActor, configuration, makeAsyncContextCapture } from '../chunk-IBSNHBUC.js';
3
3
  import { logger } from '../chunk-FCFVIRQF.js';
4
4
  import '../chunk-SIAA4J6H.js';
5
5
 
@@ -1,13 +1,14 @@
1
1
  'use strict';
2
2
 
3
- var chunkYXZZNZG6_cjs = require('../chunk-YXZZNZG6.cjs');
4
- var chunkMMLQXSSD_cjs = require('../chunk-MMLQXSSD.cjs');
3
+ var chunkVJR4VB4B_cjs = require('../chunk-VJR4VB4B.cjs');
4
+ var chunkB3WST6ES_cjs = require('../chunk-B3WST6ES.cjs');
5
+ var chunkB5ZUQULZ_cjs = require('../chunk-B5ZUQULZ.cjs');
5
6
  var chunkTWTG5ILJ_cjs = require('../chunk-TWTG5ILJ.cjs');
6
7
  require('../chunk-ZDSQYCYV.cjs');
7
8
 
8
9
  // src/db/supabase.ts
9
10
  function triggerPathWillCapture(table) {
10
- const config = chunkMMLQXSSD_cjs.configuration();
11
+ const config = chunkB5ZUQULZ_cjs.configuration();
11
12
  if (!config.databaseReader) return false;
12
13
  const tracked = config.triggerTrackedTables;
13
14
  if (tracked === null) return false;
@@ -64,9 +65,10 @@ function wrapSupabase(client) {
64
65
  var GLOBAL_CLIENT_KEY = /* @__PURE__ */ Symbol.for("ezlogs-nextjs:supabase-current-client");
65
66
  function registerActorSource(client) {
66
67
  try {
67
- const slot = chunkMMLQXSSD_cjs.currentActorSource();
68
+ const slot = chunkB5ZUQULZ_cjs.currentActorSource();
68
69
  if (slot) {
69
- slot.client = client;
70
+ slot.clients ??= [];
71
+ if (!slot.clients.includes(client)) slot.clients.push(client);
70
72
  slot.tried = false;
71
73
  return;
72
74
  }
@@ -76,19 +78,37 @@ function registerActorSource(client) {
76
78
  }
77
79
  }
78
80
  async function tryExtractSupabaseActor() {
79
- const slot = chunkMMLQXSSD_cjs.currentActorSource();
80
- const client = slot ? slot.client : globalThis[GLOBAL_CLIENT_KEY];
81
- if (!client || typeof client.auth?.getUser !== "function") return null;
81
+ const slot = chunkB5ZUQULZ_cjs.currentActorSource();
82
+ const clients = slot ? slot.clients ?? [] : [globalThis[GLOBAL_CLIENT_KEY]];
83
+ for (const client of clients) {
84
+ const actor = await userOf(client);
85
+ if (actor) return actor;
86
+ }
87
+ return null;
88
+ }
89
+ async function userOf(client) {
90
+ const auth = client?.auth;
91
+ if (!auth) return null;
82
92
  try {
83
- const { data } = await client.auth.getUser();
93
+ if (typeof auth.getClaims === "function") {
94
+ const claims = await auth.getClaims().then((r) => r?.data?.claims, () => null);
95
+ if (claims && typeof claims.sub === "string" && claims.sub) {
96
+ return withLabel(claims.sub, claims.user_metadata?.full_name, claims.user_metadata?.name, claims.email);
97
+ }
98
+ }
99
+ if (typeof auth.getUser !== "function") return null;
100
+ const { data } = await auth.getUser();
84
101
  const user = data?.user;
85
102
  if (!user || typeof user.id !== "string" || !user.id) return null;
86
- const label = user.user_metadata?.full_name ?? user.user_metadata?.name ?? user.email ?? void 0;
87
- return label ? { id: user.id, label } : { id: user.id };
103
+ return withLabel(user.id, user.user_metadata?.full_name, user.user_metadata?.name, user.email);
88
104
  } catch {
89
105
  return null;
90
106
  }
91
107
  }
108
+ function withLabel(id, ...candidates) {
109
+ const label = candidates.find((c) => typeof c === "string" && c.length > 0);
110
+ return label ? { id, label } : { id };
111
+ }
92
112
  function wrapBuilder(builder, table, preread) {
93
113
  if (typeof builder.insert === "function") {
94
114
  builder.insert = wrapMutation(
@@ -255,7 +275,7 @@ function emitFromMutation(ctx, values, result, filters, beforeRow) {
255
275
  return;
256
276
  }
257
277
  if (!isPlainObject(values)) {
258
- chunkYXZZNZG6_cjs.emitDbEvent({
278
+ chunkB3WST6ES_cjs.emitDbEvent({
259
279
  modelClass: ctx.table,
260
280
  operation: ctx.operation,
261
281
  resourceId: idFromFilters(filters)
@@ -269,9 +289,9 @@ function emitFromMutation(ctx, values, result, filters, beforeRow) {
269
289
  function emitOneRow(ctx, values, resultRow, filters, beforeRow) {
270
290
  const resourceId = resultRow?.id ?? values.id ?? idFromFilters(filters) ?? null;
271
291
  const merged = beforeRow ?? resultRow ?? values;
272
- const displayName = chunkYXZZNZG6_cjs.resolveDisplayName(ctx.table, merged);
292
+ const displayName = chunkB3WST6ES_cjs.resolveDisplayName(ctx.table, merged);
273
293
  if (ctx.operation === "create") {
274
- chunkYXZZNZG6_cjs.emitDbEvent({
294
+ chunkB3WST6ES_cjs.emitDbEvent({
275
295
  modelClass: ctx.table,
276
296
  operation: "create",
277
297
  resourceId,
@@ -283,7 +303,7 @@ function emitOneRow(ctx, values, resultRow, filters, beforeRow) {
283
303
  }
284
304
  if (ctx.operation === "update") {
285
305
  const changes = buildUpdateChanges(values, beforeRow);
286
- chunkYXZZNZG6_cjs.emitDbEvent({
306
+ chunkB3WST6ES_cjs.emitDbEvent({
287
307
  modelClass: ctx.table,
288
308
  operation: "update",
289
309
  resourceId,
@@ -297,8 +317,8 @@ function emitFromDelete(table, result, filters, beforeRow) {
297
317
  const resultRow = pickFirstResultRow(result);
298
318
  const resourceId = resultRow?.id ?? beforeRow?.id ?? idFromFilters(filters) ?? null;
299
319
  const richestRow = resultRow ?? beforeRow;
300
- const displayName = richestRow ? chunkYXZZNZG6_cjs.resolveDisplayName(table, richestRow) : null;
301
- chunkYXZZNZG6_cjs.emitDbEvent({
320
+ const displayName = richestRow ? chunkB3WST6ES_cjs.resolveDisplayName(table, richestRow) : null;
321
+ chunkB3WST6ES_cjs.emitDbEvent({
302
322
  modelClass: table,
303
323
  operation: "destroy",
304
324
  resourceId,
@@ -361,6 +381,11 @@ function describeError(error) {
361
381
  if (error instanceof Error) return `${error.name}: ${error.message}`;
362
382
  return String(error);
363
383
  }
384
+ var __ezlogsInstrument = chunkVJR4VB4B_cjs.instrumentFrom({
385
+ "@supabase/supabase-js#createClient": (original) => chunkVJR4VB4B_cjs.instrumentFactory(original, wrapSupabase),
386
+ "@supabase/ssr#createServerClient": (original) => chunkVJR4VB4B_cjs.instrumentFactory(original, wrapSupabase)
387
+ });
364
388
 
389
+ exports.__ezlogsInstrument = __ezlogsInstrument;
365
390
  exports.tryExtractSupabaseActor = tryExtractSupabaseActor;
366
391
  exports.wrapSupabase = wrapSupabase;
@@ -16,10 +16,10 @@
16
16
  */
17
17
  declare function wrapSupabase<T>(client: T): T;
18
18
  /**
19
- * Returns the current actor (if any) by asking the Supabase client
20
- * registered in this scope (outside any scope: the most recent one)
21
- * for its authenticated user. Returns null
22
- * when no client is registered or the call fails. Used by the HTTP
19
+ * Returns the current actor (if any) by asking the Supabase clients
20
+ * constructed in this scope, oldest first (outside any scope: the most
21
+ * recent client), for their authenticated user. Returns null when no
22
+ * client knows one. Used by the HTTP
23
23
  * capturer's default `actorFromSupabase` path.
24
24
  *
25
25
  * Cheap-but-not-free: each call is a Supabase auth roundtrip. Callers
@@ -29,5 +29,11 @@ declare function tryExtractSupabaseActor(): Promise<{
29
29
  id: string;
30
30
  label?: string;
31
31
  } | null>;
32
+ /**
33
+ * Replacements for the plugin's instrumented imports (instrument.ts):
34
+ * every server-side client the app creates is wrapped.
35
+ * Internal: called by build-time generated code, not by apps.
36
+ */
37
+ declare const __ezlogsInstrument: (key: string, original: unknown) => unknown;
32
38
 
33
- export { tryExtractSupabaseActor, wrapSupabase };
39
+ export { __ezlogsInstrument, tryExtractSupabaseActor, wrapSupabase };
@@ -16,10 +16,10 @@
16
16
  */
17
17
  declare function wrapSupabase<T>(client: T): T;
18
18
  /**
19
- * Returns the current actor (if any) by asking the Supabase client
20
- * registered in this scope (outside any scope: the most recent one)
21
- * for its authenticated user. Returns null
22
- * when no client is registered or the call fails. Used by the HTTP
19
+ * Returns the current actor (if any) by asking the Supabase clients
20
+ * constructed in this scope, oldest first (outside any scope: the most
21
+ * recent client), for their authenticated user. Returns null when no
22
+ * client knows one. Used by the HTTP
23
23
  * capturer's default `actorFromSupabase` path.
24
24
  *
25
25
  * Cheap-but-not-free: each call is a Supabase auth roundtrip. Callers
@@ -29,5 +29,11 @@ declare function tryExtractSupabaseActor(): Promise<{
29
29
  id: string;
30
30
  label?: string;
31
31
  } | null>;
32
+ /**
33
+ * Replacements for the plugin's instrumented imports (instrument.ts):
34
+ * every server-side client the app creates is wrapped.
35
+ * Internal: called by build-time generated code, not by apps.
36
+ */
37
+ declare const __ezlogsInstrument: (key: string, original: unknown) => unknown;
32
38
 
33
- export { tryExtractSupabaseActor, wrapSupabase };
39
+ export { __ezlogsInstrument, tryExtractSupabaseActor, wrapSupabase };
@@ -1,5 +1,6 @@
1
- import { emitDbEvent, resolveDisplayName } from '../chunk-NINIAL7M.js';
2
- import { currentActorSource, configuration } from '../chunk-GI6BM4MR.js';
1
+ import { instrumentFrom, instrumentFactory } from '../chunk-JWJKFZBW.js';
2
+ import { emitDbEvent, resolveDisplayName } from '../chunk-U3IJV5EJ.js';
3
+ import { currentActorSource, configuration } from '../chunk-IBSNHBUC.js';
3
4
  import { logger } from '../chunk-FCFVIRQF.js';
4
5
  import '../chunk-SIAA4J6H.js';
5
6
 
@@ -64,7 +65,8 @@ function registerActorSource(client) {
64
65
  try {
65
66
  const slot = currentActorSource();
66
67
  if (slot) {
67
- slot.client = client;
68
+ slot.clients ??= [];
69
+ if (!slot.clients.includes(client)) slot.clients.push(client);
68
70
  slot.tried = false;
69
71
  return;
70
72
  }
@@ -75,18 +77,36 @@ function registerActorSource(client) {
75
77
  }
76
78
  async function tryExtractSupabaseActor() {
77
79
  const slot = currentActorSource();
78
- const client = slot ? slot.client : globalThis[GLOBAL_CLIENT_KEY];
79
- if (!client || typeof client.auth?.getUser !== "function") return null;
80
+ const clients = slot ? slot.clients ?? [] : [globalThis[GLOBAL_CLIENT_KEY]];
81
+ for (const client of clients) {
82
+ const actor = await userOf(client);
83
+ if (actor) return actor;
84
+ }
85
+ return null;
86
+ }
87
+ async function userOf(client) {
88
+ const auth = client?.auth;
89
+ if (!auth) return null;
80
90
  try {
81
- const { data } = await client.auth.getUser();
91
+ if (typeof auth.getClaims === "function") {
92
+ const claims = await auth.getClaims().then((r) => r?.data?.claims, () => null);
93
+ if (claims && typeof claims.sub === "string" && claims.sub) {
94
+ return withLabel(claims.sub, claims.user_metadata?.full_name, claims.user_metadata?.name, claims.email);
95
+ }
96
+ }
97
+ if (typeof auth.getUser !== "function") return null;
98
+ const { data } = await auth.getUser();
82
99
  const user = data?.user;
83
100
  if (!user || typeof user.id !== "string" || !user.id) return null;
84
- const label = user.user_metadata?.full_name ?? user.user_metadata?.name ?? user.email ?? void 0;
85
- return label ? { id: user.id, label } : { id: user.id };
101
+ return withLabel(user.id, user.user_metadata?.full_name, user.user_metadata?.name, user.email);
86
102
  } catch {
87
103
  return null;
88
104
  }
89
105
  }
106
+ function withLabel(id, ...candidates) {
107
+ const label = candidates.find((c) => typeof c === "string" && c.length > 0);
108
+ return label ? { id, label } : { id };
109
+ }
90
110
  function wrapBuilder(builder, table, preread) {
91
111
  if (typeof builder.insert === "function") {
92
112
  builder.insert = wrapMutation(
@@ -359,5 +379,9 @@ function describeError(error) {
359
379
  if (error instanceof Error) return `${error.name}: ${error.message}`;
360
380
  return String(error);
361
381
  }
382
+ var __ezlogsInstrument = instrumentFrom({
383
+ "@supabase/supabase-js#createClient": (original) => instrumentFactory(original, wrapSupabase),
384
+ "@supabase/ssr#createServerClient": (original) => instrumentFactory(original, wrapSupabase)
385
+ });
362
386
 
363
- export { tryExtractSupabaseActor, wrapSupabase };
387
+ export { __ezlogsInstrument, tryExtractSupabaseActor, wrapSupabase };