Merge pull request #69 from daichitakahashi/catchTransactionException

Catch transaction exception
daichitakahashi · Jan 29, 2025 · 657f63b · 657f63b
2 parents 9ae9cc3 + e6aa786
commit 657f63b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/cf-eventhub/CHANGELOG.md b/cf-eventhub/CHANGELOG.md
@@ -1,5 +1,11 @@
 # cf-eventhub
 
+## 0.0.20
+
+### Patch Changes
+
+- d04e7e2: fix(cf-eventhub): catch and report error during transaction
+
 ## 0.0.19
 
 ### Patch Changes

diff --git a/cf-eventhub/package.json b/cf-eventhub/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cf-eventhub",
   "type": "module",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "keywords": [
     "cloudflare"
   ],

diff --git a/cf-eventhub/src/dev/repository.ts b/cf-eventhub/src/dev/repository.ts
@@ -35,12 +35,10 @@ export class DevRepository implements Repository {
       let result: Result<T, "INTERNAL_SERVER_ERROR" | E>;
       try {
         result = await fn(tx);
-      } catch {}
-
-      // @ts-ignore
-      if (!result) {
+      } catch {
         return err("INTERNAL_SERVER_ERROR" as const);
       }
+
       if (result.isOk()) {
         this.events = tx.events;
         this.dispatches = tx.dispatches;

diff --git a/cf-eventhub/src/postgres/repository.ts b/cf-eventhub/src/postgres/repository.ts
@@ -67,7 +67,9 @@ export class PgRepository implements Repository {
         if (result.isOk()) return;
         tx.rollback();
       });
-    } catch {}
+    } catch (e) {
+      this.logger.error("error on enterTransactionalScope", { error: e });
+    }
 
     // @ts-ignore
     if (!result) {

diff --git a/iac/pulumi/CHANGELOG.md b/iac/pulumi/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @cf-eventhub/pulumi
 
+## 0.0.18
+
+### Patch Changes
+
+- Updated dependencies [d04e7e2]
+  - [email protected]
+
 ## 0.0.17
 
 ### Patch Changes

diff --git a/iac/pulumi/package.json b/iac/pulumi/package.json
@@ -2,7 +2,7 @@
   "name": "@cf-eventhub/pulumi",
   "main": "src/index.ts",
   "type": "commonjs",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "keywords": [
     "pulumi",
     "cloudflare"
@@ -17,7 +17,7 @@
   "dependencies": {
     "@pulumi/cloudflare": "^5.40.0",
     "@pulumi/pulumi": "^3.113.0",
-    "cf-eventhub": "^0.0.19"
+    "cf-eventhub": "^0.0.20"
   },
   "tsup": {
     "entry": [

diff --git a/web-console/package.json b/web-console/package.json
@@ -18,7 +18,7 @@
     "typed-htmx": "^0.3.1",
     "typescript": "^5.6.2",
     "wrangler": "^3.83.0",
-    "cf-eventhub": "^0.0.19"
+    "cf-eventhub": "^0.0.20"
   },
   "tsup": {
     "entry": [