Merge pull request #2219 from undb-io/release/v1.0.0-143

Release version v1.0.0-143

Author: nichenqin

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.0.0-143
+
+
+### 🩹 Fixes
+
+- Fix sqlite database tx ([61b124c](https://github.com/undb-io/undb/commit/61b124c))
+
+### ❤️ Contributors
+
+- Nichenqin ([@nichenqin](https://github.com/nichenqin))
+
 ## v1.0.0-142
 
 

apps/backend/src/modules/auth/auth.ts

@@ -7,22 +7,22 @@ import {
 } from "@undb/authz"
 import { AcceptInvitationCommand } from "@undb/commands"
 import type { ContextMember } from "@undb/context"
-import { type IContext, injectContext } from "@undb/context"
-import { executionContext, setContextValue } from "@undb/context/server"
+import { type IContext,injectContext } from "@undb/context"
+import { executionContext,setContextValue } from "@undb/context/server"
 import { CommandBus } from "@undb/cqrs"
-import { container, inject, singleton } from "@undb/di"
-import { None, Option, Some } from "@undb/domain"
+import { container,inject,singleton } from "@undb/di"
+import { None,Option,Some } from "@undb/domain"
 import { env } from "@undb/env"
 import { createLogger } from "@undb/logger"
-import { type IMailService, injectMailService } from "@undb/mail"
-import { type IQueryBuilder, type ITxContext, injectQueryBuilder, injectTxCTX } from "@undb/persistence/server"
-import { type ISpaceService, injectSpaceService } from "@undb/space"
-import { Context, Elysia, t } from "elysia"
-import type { Session, User } from "lucia"
-import { Lucia, generateIdFromEntropySize } from "lucia"
-import { TimeSpan, createDate, isWithinExpirationDate } from "oslo"
+import { type IMailService,injectMailService } from "@undb/mail"
+import { type IQueryBuilder,type ITxContext,injectQueryBuilder,injectTxCTX } from "@undb/persistence/server"
+import { type ISpaceService,injectSpaceService } from "@undb/space"
+import { Context,Elysia,t } from "elysia"
+import type { Session,User } from "lucia"
+import { Lucia,generateIdFromEntropySize } from "lucia"
+import { TimeSpan,createDate,isWithinExpirationDate } from "oslo"
 import { Cookie } from "oslo/cookie"
-import { alphabet, generateRandomString, sha256 } from "oslo/crypto"
+import { alphabet,generateRandomString,sha256 } from "oslo/crypto"
 import { encodeHex } from "oslo/encoding"
 import { omit } from "radash"
 import { v7 } from "uuid"
@@ -632,7 +632,6 @@ export class Auth {
       .get(
         "/invitation/:invitationId/accept",
         async (ctx) => {
-          return this.txContext.withTransaction(async () => {
             const { invitationId } = ctx.params
             await this.commandBus.execute(new AcceptInvitationCommand({ id: invitationId }))
 
@@ -673,7 +672,6 @@ export class Auth {
               const sessionCookie = this.lucia.createSessionCookie(session.id)
               return redirectToSignupOrLogin("login", email, sessionCookie)
             }
-          })
         },
         {
           params: t.Object({

package.json

@@ -1,6 +1,6 @@
 {
   "name": "undb",
-  "version": "1.0.0-142",
+  "version": "1.0.0-143",
   "private": true,
   "scripts": {
     "build": "NODE_ENV=production bun --bun turbo build",

packages/persistence/src/ctx.ts

@@ -1,8 +1,8 @@
-import { inject, singleton } from "@undb/di"
+import { inject,singleton } from "@undb/di"
 import { AsyncLocalStorage } from "node:async_hooks"
 import type { ITxContext } from "./ctx.interface"
 import { injectQueryBuilder } from "./qb.provider"
-import type { AnonymousTx, IQueryBuilder, Tx } from "./qb.type"
+import type { AnonymousTx,IQueryBuilder,Tx } from "./qb.type"
 
 export interface TxContext {
   trx: Tx | AnonymousTx
@@ -22,15 +22,21 @@ export class TxContextImpl implements ITxContext {
 
   withTransaction<T = any>(callback: () => Promise<T>): Promise<T> {
     return this.qb.transaction().execute(async (trx) => {
-      return new Promise(async (resolve, reject) => {
-        this.startTransaction(trx)
-        try {
-          const result = await callback()
-          resolve(result)
-        } catch (error) {
-          reject(error)
-        }
-      })
+      let storeExisted = false
+      const currentStore = this.context.getStore()
+      if (currentStore?.trx) {
+        storeExisted = true
+        return callback()
+      }
+
+      // 创建新事务上下文
+      this.startTransaction(trx);
+      try {
+        const result = await callback();
+        return result;
+      } catch (error) {
+        throw error;
+      }
     })
   }