@fluojs/drizzle 1.0.0-beta.4 → 1.0.0-beta.5

package/README.ko.md

@@ -107,7 +107,7 @@ class UsersController {}
 ### 종료와 상태 계약
 
 `DrizzleTransactionInterceptor`는 각 HTTP 요청을 `DrizzleDatabase.requestTransaction(...)`으로 실행합니다. 애플리케이션 종료 중에는 `DrizzleDatabase`가 아직 활성 상태인 요청 트랜잭션을 abort하고, 해당 transaction callback이 settle되거나 rollback될 때까지 기다린 뒤 선택적 `dispose(database)` hook을 실행합니다. 이 순서는 pool이나 외부 관리 리소스를 닫기 전에 driver가 rollback/cleanup 작업을 끝낼 수 있게 보장합니다.
-기존 수동 transaction boundary 안에서 열린 중첩 `requestTransaction(...)` 호출도 shutdown tracking에 참여하므로, 두 번째 Drizzle transaction을 열지 않으면서 shutdown이 해당 호출을 abort하고 drain한 뒤 `dispose(database)`를 실행합니다.
+기존 요청 boundary 안에서 열린 중첩 `requestTransaction(...)` 호출은 활성 Drizzle transaction을 재사용하면서도 ambient request abort signal을 관찰합니다. 기존 수동 transaction boundary 안에서 열린 중첩 `requestTransaction(...)` 호출도 두 번째 Drizzle transaction을 열지 않고 shutdown settlement tracking에 참여하며, 해당 settlement handle은 바깥 수동 transaction이 settle될 때까지 tracking에 남아 shutdown이 `dispose(database)`를 실행하기 전에 그 바깥 경계까지 drain하게 합니다. 단, platform status activity count는 더 짧게 유지됩니다. 중첩 request callback이 settle되는 즉시, 바깥 수동 transaction이 계속 실행 중이어도 `details.activeRequestTransactions`는 감소합니다.
 종료가 시작된 뒤 새 `requestTransaction(...)` 호출은 거부되므로, 종료 boundary를 지난 뒤 시작되는 늦은 요청 트랜잭션보다 dispose가 먼저 실행되는 상황을 방지합니다.
 요청 callback이 완료된 뒤 underlying Drizzle transaction runner가 commit 또는 rollback을 끝내기 전에 request signal이 abort되면, `requestTransaction(...)`은 먼저 해당 runner가 settle될 때까지 기다린 다음 abort reason으로 reject합니다. 이 동작은 Drizzle cleanup을 request cancellation과 직렬화하면서, 완료된 callback 결과를 반환하는 대신 늦은 request abort를 caller에게 드러냅니다.
 

package/README.md

@@ -107,7 +107,7 @@ class UsersController {}
 ### Shutdown and status contracts
 
 `DrizzleTransactionInterceptor` runs each HTTP request through `DrizzleDatabase.requestTransaction(...)`. During application shutdown, `DrizzleDatabase` aborts any still-active request transaction, waits for its transaction callback to settle or roll back, and only then runs the optional `dispose(database)` hook. This ordering lets drivers finish rollback/cleanup work before pools or externally managed resources are closed.
-Nested `requestTransaction(...)` calls opened inside an existing manual transaction boundary also join shutdown tracking, so shutdown aborts and drains them before `dispose(database)` runs without opening a second Drizzle transaction.
+Nested `requestTransaction(...)` calls opened inside an existing request boundary observe the ambient request abort signal while still reusing the active Drizzle transaction. Nested `requestTransaction(...)` calls opened inside an existing manual transaction boundary also join shutdown settlement tracking without opening a second Drizzle transaction, and their settlement handle remains tracked until the outer manual transaction settles so shutdown drains that outer boundary before `dispose(database)` runs. The platform status activity count is intentionally shorter lived: once the nested request callback settles, `details.activeRequestTransactions` is decremented even if the outer manual transaction continues running.
 New `requestTransaction(...)` calls are rejected once shutdown begins, so disposal cannot overtake a late request transaction that starts after the shutdown boundary is crossed.
 If the request signal aborts after the request callback has completed but before the underlying Drizzle transaction runner finishes committing or rolling back, `requestTransaction(...)` waits for that runner to settle first and then rejects with the abort reason. This keeps Drizzle cleanup serialized with request cancellation while making the late request abort visible to the caller instead of returning the completed callback result.
 

package/dist/database.d.ts

@@ -16,6 +16,7 @@ export declare class DrizzleDatabase<TDatabase extends DrizzleDatabaseLike<TTran
     private readonly databaseOptions;
     private readonly transactions;
     private readonly activeRequestTransactions;
+    private activeRequestTransactionStatusCount;
     private lifecycleState;
     constructor(database: TDatabase, dispose?: ((database: TDatabase) => Promise<void> | void) | undefined, databaseOptions?: DrizzleRuntimeOptions);
     /**
@@ -70,6 +71,7 @@ export declare class DrizzleDatabase<TDatabase extends DrizzleDatabaseLike<TTran
     private throwIfRequestAborted;
     private trackActiveRequestTransaction;
     private untrackActiveRequestTransaction;
+    private markRequestTransactionInactiveForStatus;
     private resolveTransactionRunner;
 }
 export {};

package/dist/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAK7D,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAsBpB,KAAK,qBAAqB,GAAG;IAC3B,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAQF;;;;;;GAMG;AACH,qBACa,eAAe,CAC1B,SAAS,SAAS,mBAAmB,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,EAChF,oBAAoB,GAAG,SAAS,EAChC,mBAAmB,GAAG,OAAO,CAC7B,YAAW,qBAAqB,CAAC,SAAS,EAAE,oBAAoB,EAAE,mBAAmB,CAAC,EAAE,qBAAqB;IAO3G,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAPlC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqE;IAClG,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAuC;IACjF,OAAO,CAAC,cAAc,CAAkD;gBAGrD,QAAQ,EAAE,SAAS,EACnB,OAAO,CAAC,GAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,aAAA,EACvD,eAAe,GAAE,qBAAqD;IAGzF;;;;;;;;;OASG;IACH,OAAO,IAAI,SAAS,GAAG,oBAAoB;IAI3C,qGAAqG;IAC/F,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB5C,yFAAyF;IACzF,4BAA4B;IAS5B;;;;;;;;;;;;;OAaG;IACG,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC,CAAC;IAIrF;;;;;;;;;;;;OAYG;IACG,kBAAkB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC,CAAC;YAIpG,kBAAkB;YAmDlB,yBAAyB;YA8BzB,+BAA+B;YAqC/B,sBAAsB;IAkBpC,OAAO,CAAC,kCAAkC;IAM1C,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,6BAA6B;IAIrC,OAAO,CAAC,+BAA+B;IAIvC,OAAO,CAAC,wBAAwB;CAWjC"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAK7D,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAuBpB,KAAK,qBAAqB,GAAG;IAC3B,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AA8CF;;;;;;GAMG;AACH,qBACa,eAAe,CAC1B,SAAS,SAAS,mBAAmB,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,EAChF,oBAAoB,GAAG,SAAS,EAChC,mBAAmB,GAAG,OAAO,CAC7B,YAAW,qBAAqB,CAAC,SAAS,EAAE,oBAAoB,EAAE,mBAAmB,CAAC,EAAE,qBAAqB;IAQ3G,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IARlC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqE;IAClG,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAuC;IACjF,OAAO,CAAC,mCAAmC,CAAK;IAChD,OAAO,CAAC,cAAc,CAAkD;gBAGrD,QAAQ,EAAE,SAAS,EACnB,OAAO,CAAC,GAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,aAAA,EACvD,eAAe,GAAE,qBAAqD;IAGzF;;;;;;;;;OASG;IACH,OAAO,IAAI,SAAS,GAAG,oBAAoB;IAI3C,qGAAqG;IAC/F,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB5C,yFAAyF;IACzF,4BAA4B;IAS5B;;;;;;;;;;;;;OAaG;IACG,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC,CAAC;IAIrF;;;;;;;;;;;;OAYG;IACG,kBAAkB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC,CAAC;YAIpG,kBAAkB;YAmDlB,yBAAyB;YA8BzB,+BAA+B;YA6C/B,sBAAsB;IAkBpC,OAAO,CAAC,kCAAkC;IAM1C,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,6BAA6B;IAOrC,OAAO,CAAC,+BAA+B;IAKvC,OAAO,CAAC,uCAAuC;IAO/C,OAAO,CAAC,wBAAwB;CAWjC"}

package/dist/database.js

@@ -12,7 +12,39 @@ import { createDrizzlePlatformStatusSnapshot } from './status.js';
 const TRANSACTION_NOT_SUPPORTED_ERROR = 'Transaction not supported: Drizzle database does not implement transaction.';
 const NESTED_TRANSACTION_OPTIONS_NOT_SUPPORTED_ERROR = 'Nested Drizzle transaction options are not supported because the active transaction context is reused.';
 const REQUEST_TRANSACTION_UNAVAILABLE_ERROR = 'Drizzle request transactions are not available during shutdown.';
-let _DrizzleDatabase;
+function createRequestAbortSignalView(parentSignal, signal) {
+  if (!signal) {
+    return {
+      cleanup() {},
+      signal: parentSignal
+    };
+  }
+  const controller = new AbortController();
+  const forwardParentAbort = () => controller.abort(parentSignal.reason);
+  const forwardRequestAbort = () => controller.abort(signal.reason);
+  if (parentSignal.aborted) {
+    forwardParentAbort();
+  } else {
+    parentSignal.addEventListener('abort', forwardParentAbort, {
+      once: true
+    });
+  }
+  if (signal.aborted) {
+    forwardRequestAbort();
+  } else {
+    signal.addEventListener('abort', forwardRequestAbort, {
+      once: true
+    });
+  }
+  return {
+    cleanup() {
+      parentSignal.removeEventListener('abort', forwardParentAbort);
+      signal.removeEventListener('abort', forwardRequestAbort);
+    },
+    signal: controller.signal
+  };
+}
+
 /**
  * Transaction-aware Drizzle wrapper that integrates request scoping and shutdown handling with the Fluo runtime.
  *
@@ -20,12 +52,14 @@ let _DrizzleDatabase;
  * @typeParam TTransactionDatabase Transaction-scoped database handle resolved inside `database.transaction(...)` callbacks.
  * @typeParam TTransactionOptions Options forwarded to the underlying Drizzle transaction runner.
  */
+let _DrizzleDatabase;
 class DrizzleDatabase {
   static {
     [_DrizzleDatabase, _initClass] = _applyDecs(this, [Inject(DRIZZLE_DATABASE, DRIZZLE_DISPOSE, DRIZZLE_OPTIONS)], []).c;
   }
   transactions = new AsyncLocalStorage();
   activeRequestTransactions = new Set();
+  activeRequestTransactionStatusCount = 0;
   lifecycleState = 'ready';
   constructor(database, dispose, databaseOptions = {
     strictTransactions: false
@@ -52,10 +86,11 @@ class DrizzleDatabase {
   /** Aborts active request transactions, waits for settlement, then runs the optional dispose hook. */
   async onApplicationShutdown() {
     this.lifecycleState = 'shutting-down';
-    for (const transaction of this.activeRequestTransactions) {
+    const activeRequestTransactions = Array.from(this.activeRequestTransactions);
+    for (const transaction of activeRequestTransactions) {
       transaction.abort(new Error('Application shutdown interrupted an open request transaction.'));
     }
-    await Promise.allSettled(Array.from(this.activeRequestTransactions, transaction => transaction.settled));
+    await Promise.allSettled(activeRequestTransactions.map(transaction => transaction.settled));
     if (this.dispose) {
       await this.dispose(this.database);
     }
@@ -65,7 +100,7 @@ class DrizzleDatabase {
   /** Produces the shared persistence status snapshot for platform diagnostics surfaces. */
   createPlatformStatusSnapshot() {
     return createDrizzlePlatformStatusSnapshot({
-      activeRequestTransactions: this.activeRequestTransactions.size,
+      activeRequestTransactions: this.activeRequestTransactionStatusCount,
       lifecycleState: this.lifecycleState,
       strictTransactions: this.databaseOptions.strictTransactions,
       supportsTransaction: typeof this.database.transaction === 'function'
@@ -125,14 +160,14 @@ class DrizzleDatabase {
       return fn();
     }
     if (!requestScoped) {
-      const deferredRequestTransactionHandles = new Set();
+      const deferredRequestTransactionSettlements = new Set();
       try {
         return await transactionRunner(transactionDatabase => this.transactions.run({
           database: transactionDatabase,
-          deferredRequestTransactionHandles
+          deferredRequestTransactionSettlements
         }, fn), options);
       } finally {
-        for (const handle of deferredRequestTransactionHandles) {
+        for (const handle of deferredRequestTransactionSettlements) {
           this.untrackActiveRequestTransaction(handle);
         }
       }
@@ -157,15 +192,19 @@ class DrizzleDatabase {
   }
   async executeNestedRequestTransaction(current, fn, signal) {
     if (current.requestAbortSignal) {
-      if (signal) {
-        return raceWithAbort(fn, signal);
+      const abortSignalView = createRequestAbortSignalView(current.requestAbortSignal, signal);
+      try {
+        const result = await raceWithAbort(fn, abortSignalView.signal);
+        this.throwIfRequestAborted(abortSignalView.signal);
+        return result;
+      } finally {
+        abortSignalView.cleanup();
       }
-      return fn();
     }
     this.assertRequestTransactionsAvailable();
     const abortContext = createRequestAbortContext(signal);
     const active = this.trackActiveRequestTransaction(abortContext.controller);
-    current.deferredRequestTransactionHandles?.add(active);
+    current.deferredRequestTransactionSettlements?.add(active);
     try {
       const result = await this.transactions.run({
         database: current.database,
@@ -175,7 +214,9 @@ class DrizzleDatabase {
       return result;
     } finally {
       abortContext.cleanup();
-      if (!current.deferredRequestTransactionHandles) {
+      if (current.deferredRequestTransactionSettlements) {
+        this.markRequestTransactionInactiveForStatus(active);
+      } else {
         this.untrackActiveRequestTransaction(active);
       }
     }
@@ -204,11 +245,23 @@ class DrizzleDatabase {
     }
   }
   trackActiveRequestTransaction(controller) {
-    return trackActiveRequestTransaction(this.activeRequestTransactions, controller);
+    const handle = trackActiveRequestTransaction(this.activeRequestTransactions, controller);
+    this.activeRequestTransactionStatusCount += 1;
+    return {
+      ...handle,
+      statusActive: true
+    };
   }
   untrackActiveRequestTransaction(handle) {
+    this.markRequestTransactionInactiveForStatus(handle);
     untrackActiveRequestTransaction(this.activeRequestTransactions, handle);
   }
+  markRequestTransactionInactiveForStatus(handle) {
+    if (handle.statusActive) {
+      this.activeRequestTransactionStatusCount -= 1;
+      handle.statusActive = false;
+    }
+  }
   resolveTransactionRunner() {
     if (typeof this.database.transaction !== 'function') {
       if (this.databaseOptions.strictTransactions) {

package/package.json

@@ -9,7 +9,7 @@
     "transaction",
     "als"
   ],
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "private": false,
   "license": "MIT",
   "repository": {
@@ -36,9 +36,9 @@
     "dist"
   ],
   "dependencies": {
-    "@fluojs/core": "^1.0.0-beta.5",
-    "@fluojs/http": "^1.0.0-beta.10",
-    "@fluojs/di": "^1.0.0-beta.7",
+    "@fluojs/core": "^1.0.0-beta.6",
+    "@fluojs/http": "^1.0.0-beta.11",
+    "@fluojs/di": "^1.0.0-beta.8",
     "@fluojs/runtime": "^1.0.0-beta.12"
   },
   "peerDependencies": {