cloudflare-next-intl 0.9.4 → 0.9.6

package/dist/src/db/context.js

@@ -126,10 +126,6 @@ function injectUidComment(sql, userId) {
     }
     return sql;
 }
-function isSelectOnly(sql) {
-    const text = typeof sql === 'string' ? sql : sql?.text;
-    return typeof text === 'string' && /^(select|with)\b/i.test(text.trimStart());
-}
 export async function withUserDb(fn, uid, dbOverride) {
     const config = await resolveDbConfig(dbOverride);
     const db = config.db;
@@ -144,17 +140,29 @@ export async function withUserDb(fn, uid, dbOverride) {
     return await withDbClient(config, async (client) => {
         const rawClient = client;
         const setSessionState = async () => {
-            await rawClient.query(`select set_config('request.jwt.claims', $1, false)`, [JSON.stringify({ sub: userId })]);
-            await rawClient.query(`set role "${role.replace(/"/g, '""')}"`);
+            await rawClient.query(`select set_config('request.jwt.claims', $1, true)`, [JSON.stringify({ sub: userId })]);
+            await rawClient.query(`set local role "${role.replace(/"/g, '""')}"`);
         };
         let inTransaction = false;
-        let sessionStateSet = false;
         let gate = Promise.resolve();
         const serialize = (op) => {
             const run = gate.then(op, op);
             gate = run.catch(() => undefined);
             return run;
         };
+        const beginWithIdentity = async () => {
+            if (inTransaction)
+                return;
+            await rawClient.query('begin');
+            try {
+                await setSessionState();
+            }
+            catch (error) {
+                await rawClient.query('rollback').catch(() => undefined);
+                throw error;
+            }
+            inTransaction = true;
+        };
         const interceptingClient = new Proxy(client, {
             get(target, prop) {
                 if (prop === 'query') {
@@ -164,16 +172,7 @@ export async function withUserDb(fn, uid, dbOverride) {
                         const isCommitOrRollback = /^(commit|rollback)\b/i.test(text.trimStart());
                         if (isBegin) {
                             return await serialize(async () => {
-                                if (!sessionStateSet) {
-                                    await rawClient.query('begin');
-                                    inTransaction = true;
-                                    await setSessionState();
-                                    sessionStateSet = true;
-                                }
-                                else if (!inTransaction) {
-                                    await rawClient.query('begin');
-                                    inTransaction = true;
-                                }
+                                await beginWithIdentity();
                                 return { rows: [], rowCount: 0 };
                             });
                         }
@@ -187,27 +186,7 @@ export async function withUserDb(fn, uid, dbOverride) {
                                 return { rows: [], rowCount: 0 };
                             });
                         }
-                        await serialize(async () => {
-                            if (!sessionStateSet) {
-                                if (isSelectOnly(sql)) {
-                                    await rawClient.query('begin');
-                                    inTransaction = true;
-                                    await setSessionState();
-                                    await rawClient.query('commit');
-                                    inTransaction = false;
-                                }
-                                else {
-                                    await rawClient.query('begin');
-                                    inTransaction = true;
-                                    await setSessionState();
-                                }
-                                sessionStateSet = true;
-                            }
-                            else if (!inTransaction && !isSelectOnly(sql)) {
-                                await rawClient.query('begin');
-                                inTransaction = true;
-                            }
-                        });
+                        await serialize(beginWithIdentity);
                         const targetClient = target;
                         return targetClient.query(injectUidComment(sql, userId), ...args);
                     };
@@ -218,15 +197,18 @@ export async function withUserDb(fn, uid, dbOverride) {
         });
         const { drizzle } = await import('drizzle-orm/node-postgres');
         const drizzleHandle = drizzle(interceptingClient);
+        const resetRole = () => rawClient.query('reset role').catch(() => undefined);
         try {
             const result = await fn(await postgresDb(drizzleHandle, interceptingClient));
             if (inTransaction)
                 await rawClient.query('commit');
+            await resetRole();
             return result;
         }
         catch (err) {
             if (inTransaction)
                 await rawClient.query('rollback').catch(() => undefined);
+            await resetRole();
             throw err;
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-next-intl",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "Optimized Next Intl Package Special for App Router and Cloudflare",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",