@gadmin2n/schematics 0.0.144 → 0.0.146

package/dist/lib/application/files/gadmin2-game-angle-demo/config/.types.d.ts

@@ -77,6 +77,16 @@ export type ModelConfig = {
             desc: string;
             when?: When;
           }
+        | {
+            action: "CLONE";
+            desc: string;
+            when?: When;
+          }
+        | {
+            action: "HISTORY";
+            desc: string;
+            when?: When;
+          }
         | {
             action: "DELETE";
             desc: string;

package/dist/lib/application/files/gadmin2-game-angle-demo/config/prisma/approval.prisma

@@ -90,7 +90,9 @@ model ApprovalRequest {
   nodeId            String                   @map("node_id") @db.VarChar(64)
   workflowVersionId BigInt                   @map("workflow_version_id")
   configHash        String                   @map("config_hash") @db.VarChar(64)
+  requestHash       String                   @map("request_hash") @db.Char(64)
   configSnapshot    Json                     @map("config_snapshot")
+  task              Json?
   approvalRule      Json                     @map("approval_rule")
   rejectionRule     Json                     @map("rejection_rule")
   status            ApprovalRequestStatus    @default(PENDING)

package/dist/lib/application/files/gadmin2-game-angle-demo/config/prisma/workflow.prisma

@@ -3,6 +3,7 @@
 enum WorkflowStatus {
   DRAFT
   PUBLISHED
+  DELETING
 }
 
 enum WorkflowInstanceStatus {
@@ -13,6 +14,32 @@ enum WorkflowInstanceStatus {
   CANCELLED
 }
 
+enum WorkflowCancellationStatus {
+  NONE
+  PENDING
+  COMPLETED
+}
+
+enum WorkflowEventOperation {
+  INSERT
+  UPDATE
+  DELETE
+}
+
+enum WorkflowEventOutboxStatus {
+  PENDING
+  DISPATCHING
+  PARTIAL_FAILED
+  COMPLETED
+  FAILED
+}
+
+enum WorkflowEventDeliveryStatus {
+  PENDING
+  DISPATCHED
+  FAILED
+}
+
 enum WorkflowNodeCategory {
   TRIGGER
   ACTION
@@ -74,8 +101,9 @@ model Workflow {
   createdAt   DateTime       @default(now()) @map("created_at")
   updatedAt   DateTime       @updatedAt @map("updated_at")
 
-  versions  WorkflowVersion[]
-  instances WorkflowInstance[]
+  versions        WorkflowVersion[]
+  instances       WorkflowInstance[]
+  eventDeliveries WorkflowEventDelivery[]
 
   @@map("t_workflow")
 }
@@ -95,6 +123,7 @@ model WorkflowVersion {
 
   workflow             Workflow              @relation(fields: [workflowId], references: [id], onDelete: Cascade)
   externalInteractions ExternalInteraction[]
+  eventDeliveries     WorkflowEventDelivery[]
 
   @@unique([workflowId, version], map: "uk_workflow_version")
   @@index([workflowId], map: "idx_wv_workflow_id")
@@ -113,9 +142,19 @@ model WorkflowInstance {
   context         Json?
   result          Json?
   temporalRunId   String?                @db.VarChar(128) @map("temporal_run_id") // Temporal workflow run ID
+  idempotencyKey  String?                @db.VarChar(128) @map("idempotency_key") // 各类触发入口的稳定幂等键；同一 workflow 内唯一
+  idempotencyRequestHash String?         @db.Char(64) @map("idempotency_request_hash") // 幂等请求内容的稳定 SHA-256；同 key 不同内容必须拒绝
   sourceOutboxId  BigInt?                @map("source_outbox_id") // 触发本实例的 outbox 行 id；与 workflowId 组合后唯一，用于 outbox-poller 的幂等 upsert，避免崩溃恢复时产生重复 instance 行
-  startedAt       DateTime?              @map("started_at")
-  finishedAt      DateTime?              @map("finished_at")
+  retryOfInstanceId BigInt?              @map("retry_of_instance_id") // 从失败节点恢复时的直接来源实例
+  retryFromNodeId String?                @db.VarChar(64) @map("retry_from_node_id") // 本实例从哪个失败节点继续执行
+  cancellationStatus WorkflowCancellationStatus @default(NONE) @map("cancellation_status")
+  cancellationRequestedAt DateTime?      @map("cancellation_requested_at") @db.Timestamptz(3)
+  cancellationReason String?             @map("cancellation_reason") @db.VarChar(512)
+  cancellationLastError String?          @map("cancellation_last_error") @db.Text
+  cancellationBlockedAt DateTime?        @map("cancellation_blocked_at") @db.Timestamptz(3)
+  cancellationBlockedByNodeId String?    @map("cancellation_blocked_by_node_id") @db.VarChar(64)
+  startedAt       DateTime?              @map("started_at") @db.Timestamptz(3)
+  finishedAt      DateTime?              @map("finished_at") @db.Timestamptz(3)
   creator         String                 @default("") @db.VarChar(128) @map("creator")
   createdAt       DateTime               @default(now()) @map("created_at")
   updatedAt       DateTime               @updatedAt @map("updated_at")
@@ -123,13 +162,29 @@ model WorkflowInstance {
   workflow             Workflow              @relation(fields: [workflowId], references: [id], onDelete: Cascade)
   nodeExecutions       WorkflowNodeExecution[]
   externalInteractions ExternalInteraction[]
+  eventDelivery       WorkflowEventDelivery?
 
+  @@unique([workflowId, idempotencyKey], map: "uk_wi_workflow_idempotency") // NULL 不参与唯一性，未提供幂等键的内部执行不受影响
   @@unique([workflowId, sourceOutboxId], map: "uk_wi_workflow_outbox") // 一个 outbox 事件对一个 workflow 至多一条 instance（NULL 不参与唯一性，正常 execute / cron / webhook 不受影响）
   @@index([workflowId], map: "idx_wi_workflow_id")
   @@index([status], map: "idx_wi_status")
+  @@index([retryOfInstanceId], map: "idx_wi_retry_of_instance_id")
   @@map("t_workflow_instance")
 }
 
+// DB 写节点的事务内幂等记录。Worker 与业务写入使用同一个 PostgreSQL 事务，
+// 成功结果和副作用一起提交；Activity 重试时直接返回已提交的结果。
+/// @IgnoreNestCode
+/// @IgnoreReactCode
+/// @IgnoreAutoField
+model WorkflowActivityEffect {
+  operationKey String   @id @db.VarChar(256) @map("operation_key")
+  result       Json
+  createdAt    DateTime @default(now()) @map("created_at")
+
+  @@map("t_workflow_activity_effect")
+}
+
 /// A durable session connecting an external callback to one waiting Workflow node.
 /// @IgnoreNestCode
 /// @IgnoreReactCode
@@ -225,8 +280,8 @@ model WorkflowNodeExecution {
   input      Json?
   output     Json?
   error      Json?
-  startedAt  DateTime?              @map("started_at")
-  finishedAt DateTime?              @map("finished_at")
+  startedAt  DateTime?              @map("started_at") @db.Timestamptz(3)
+  finishedAt DateTime?              @map("finished_at") @db.Timestamptz(3)
   createdAt  DateTime               @default(now()) @map("created_at")
   updatedAt  DateTime               @updatedAt @map("updated_at")
 
@@ -312,24 +367,90 @@ model IntegrationConnection {
   @@map("t_integration_connection")
 }
 
-// Outbox Pattern：业务表触发器将事件写入此表，outbox-poller 定时扫描并触发 workflow
+/// PostgreSQL 表字段变化监听登记。登记成功后由服务端安装对应 PG Trigger。
+/// @IgnoreNestCode
+/// @IgnoreReactCode
+/// @IgnoreAutoField
+model WorkflowBusinessEventRegistration {
+  id               BigInt                 @id @default(autoincrement())
+  code             String                 @unique @default(nanoid()) @db.VarChar(21)
+  registrationKey  String                 @unique @map("registration_key") @db.Char(64)
+  schemaName       String                 @map("schema_name") @db.VarChar(63)
+  tableName        String                 @map("table_name") @db.VarChar(63)
+  operation        WorkflowEventOperation
+  watchedFields    Json                   @map("watched_fields")
+  primaryKeyFields Json                   @map("primary_key_fields")
+  isEnabled        Boolean                @default(true) @map("is_enabled")
+  creator          String                 @default("") @map("creator") @db.VarChar(128)
+  createdAt        DateTime               @default(now()) @map("created_at")
+  updatedAt        DateTime               @updatedAt @default(now()) @map("updated_at")
+
+  outboxes WorkflowEventOutbox[]
+
+  @@index([schemaName, tableName], map: "idx_wber_source")
+  @@map("t_workflow_business_event_registration")
+}
+
+/// PG Trigger 与业务数据写入同一事务创建的标准变更事件。
+/// @IgnoreNestCode
+/// @IgnoreReactCode
 /// @IgnoreAutoField
 model WorkflowEventOutbox {
-  id          BigInt    @id @default(autoincrement())
-  eventName   String    @db.VarChar(128) @map("event_name")   // 事件名, e.g. "t_order.insert"
-  /// @FormItem(JSON)
-  payload     Json                                             // 触发事件的行数据
-  processed   Boolean   @default(false)                        // 是否已处理
-  createdAt   DateTime  @default(now()) @map("created_at")     // 事件产生时间
-  processedAt DateTime? @map("processed_at")                   // 处理完成时间
-  retryCount  Int       @default(0) @map("retry_count")        // 处理失败重试次数
-  lastError   String?   @db.Text @map("last_error")            // 最近一次失败的错误信息
-
-  // 注意：未处理事件的部分索引 idx_outbox_unprocessed 由 seed/workflow-event-trigger.ts 维护
-  // （Prisma schema 不支持 WHERE 子句的 partial index）
+  id             BigInt                    @id @default(autoincrement())
+  registrationId BigInt                    @map("registration_id")
+  operation      WorkflowEventOperation
+  schemaName     String                    @map("schema_name") @db.VarChar(63)
+  tableName      String                    @map("table_name") @db.VarChar(63)
+  primaryKey     Json                      @map("primary_key")
+  before         Json?
+  after          Json?
+  changedFields  Json                      @map("changed_fields")
+  status         WorkflowEventOutboxStatus @default(PENDING)
+  retryCount     Int                       @default(0) @map("retry_count")
+  nextAttemptAt  DateTime                  @default(now()) @map("next_attempt_at")
+  subscribersFrozenAt DateTime?            @map("subscribers_frozen_at") @db.Timestamptz(3)
+  processedAt    DateTime?                 @map("processed_at")
+  lastError      String?                   @db.Text @map("last_error")
+  createdAt      DateTime                  @default(now()) @map("created_at")
+  updatedAt      DateTime                  @updatedAt @default(now()) @map("updated_at")
+
+  registration WorkflowBusinessEventRegistration @relation(fields: [registrationId], references: [id], onDelete: Restrict)
+  deliveries  WorkflowEventDelivery[]
+
+  @@index([status, nextAttemptAt, createdAt], map: "idx_weo_dispatch")
+  @@index([registrationId, createdAt], map: "idx_weo_registration")
   @@map("t_workflow_event_outbox")
 }
 
+/// 每个匹配 Workflow 的冻结投递；失败只重试本 Delivery。
+/// @IgnoreNestCode
+/// @IgnoreReactCode
+/// @IgnoreAutoField
+model WorkflowEventDelivery {
+  id                 BigInt                      @id @default(autoincrement())
+  outboxId           BigInt                      @map("outbox_id")
+  workflowId         BigInt                      @map("workflow_id")
+  workflowVersionId  BigInt                      @map("workflow_version_id")
+  workflowInstanceId BigInt                      @map("workflow_instance_id")
+  status             WorkflowEventDeliveryStatus @default(PENDING)
+  retryCount         Int                         @default(0) @map("retry_count")
+  nextAttemptAt      DateTime                    @default(now()) @map("next_attempt_at")
+  dispatchedAt       DateTime?                   @map("dispatched_at")
+  lastError          String?                     @db.Text @map("last_error")
+  createdAt          DateTime                    @default(now()) @map("created_at")
+  updatedAt          DateTime                    @updatedAt @default(now()) @map("updated_at")
+
+  outbox           WorkflowEventOutbox @relation(fields: [outboxId], references: [id], onDelete: Cascade)
+  workflow         Workflow         @relation(fields: [workflowId], references: [id], onDelete: Cascade)
+  workflowVersion  WorkflowVersion  @relation(fields: [workflowVersionId], references: [id], onDelete: Cascade)
+  workflowInstance WorkflowInstance @relation(fields: [workflowInstanceId], references: [id], onDelete: Cascade)
+
+  @@unique([outboxId, workflowId], map: "uk_wed_outbox_workflow")
+  @@unique([workflowInstanceId], map: "uk_wed_instance")
+  @@index([status, nextAttemptAt], map: "idx_wed_dispatch")
+  @@map("t_workflow_event_delivery")
+}
+
 /// @IgnoreReactCode
 /// @IgnoreAutoField
 model TemporalTenantConfig {

package/dist/lib/application/files/gadmin2-game-angle-demo/server/package.json

@@ -33,8 +33,7 @@
     "push:db": "dotenv -e .env.local -e .env  -- prisma db push --skip-generate",
     "seed": "dotenv -e .env.local -e .env  -- ts-node seed/index.ts",
     "prisma:studio": "dotenv -e .env.local -e .env  -- prisma studio",
-    "gen:jwt": "dotenv -e .env.local -e .env  -- ts-node scripts/gen-jwt.ts",
-    "migrate:human-approval-configs": "dotenv -e .env.local -e .env -- ts-node scripts/migrate-human-approval-configs.ts"
+    "gen:jwt": "dotenv -e .env.local -e .env  -- ts-node scripts/gen-jwt.ts"
   },
   "dependencies": {
     "@agendajs/postgres-backend": "^3.0.5",
@@ -68,6 +67,7 @@
     "cache-manager": "^6.4.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
+    "cron-parser": "^5.0.0",
     "cookie-parser": "^1.4.6",
     "crypto-js": "^4.2.0",
     "csvtojson": "^2.0.10",

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/data-mngt.seed.ts

@@ -19,8 +19,6 @@ import { readPrismaModels } from '../scripts/prismaModels';
 const HIDDEN_FROM_DATA_MNGT_MENU = new Set<string>([
   // Surfaced via a button in /admin/agenda-jobs (Cron Jobs page).
   'agendaJob',
-  // Surfaced via a button in /admin/workflow (Workflow list page).
-  'workflowEventOutbox',
 ]);
 
 // ─── Main Seed Function ───────────────────────────────────────────────────────