@@ -6,7 +6,11 @@ import * as Effect from "effect/Effect";
66import * as Layer from "effect/Layer" ;
77import * as Schema from "effect/Schema" ;
88import * as SqlError from "effect/sql/SqlError" ;
9- import { DEFAULT_MANAGED_TUNNEL_LIMIT , T3CHAT_PLAN_TUNNEL_LIMITS } from "@t3tools/contracts/relay" ;
9+ import {
10+ DEFAULT_MANAGED_TUNNEL_LIMIT ,
11+ T3CHAT_PLAN_TUNNEL_LIMITS ,
12+ type RelayT3ChatPlan ,
13+ } from "@t3tools/contracts/relay" ;
1014
1115import * as RelayDb from "../db.ts" ;
1216import {
@@ -106,27 +110,52 @@ export class ManagedTunnelLimits extends Context.Service<
106110 input : { readonly userId : string ; readonly environmentId : string } ,
107111 reserve : Effect . Effect < A , E , R > ,
108112 ) => Effect . Effect < A , E | ManagedTunnelLimitExceeded | ManagedTunnelLimitPersistenceError , R > ;
113+ /** The cap `withCapacity` enforces for a user on the given T3 Chat plan. */
114+ readonly getLimit : ( input : {
115+ readonly userId : string ;
116+ readonly plan : RelayT3ChatPlan | null ;
117+ } ) => Effect . Effect < number , ManagedTunnelLimitPersistenceError > ;
109118 }
110119> ( ) ( "t3code-relay/environments/ManagedTunnelLimits" ) { }
111120
112121const make = Effect . gen ( function * ( ) {
113122 const db = yield * RelayDb . RelayDb ;
114123 const t3Chat = yield * T3ChatAccounts . T3ChatAccounts ;
115124
125+ const planTunnelLimit = ( plan : RelayT3ChatPlan | null ) =>
126+ plan && plan !== "free" ? T3CHAT_PLAN_TUNNEL_LIMITS [ plan ] : 0 ;
127+
116128 // Asked only at the cap, so most links never call T3 Chat. Any failure keeps the lower cap.
117129 const t3ChatTunnelLimit = ( userId : string ) =>
118130 t3Chat . getLink ( { userId } ) . pipe (
119- Effect . map ( ( link ) =>
120- link && link . plan !== "free" ? T3CHAT_PLAN_TUNNEL_LIMITS [ link . plan ] : 0 ,
121- ) ,
131+ Effect . map ( ( link ) => planTunnelLimit ( link ?. plan ?? null ) ) ,
122132 Effect . catch ( ( error ) =>
123133 Effect . logWarning ( "T3 Chat plan check failed" , { userId, error : error . message } ) . pipe (
124134 Effect . as ( 0 ) ,
125135 ) ,
126136 ) ,
127137 ) ;
128138
139+ const loadOverride = ( userId : string ) =>
140+ db
141+ . select ( { maxTunnels : relayManagedTunnelLimits . maxTunnels } )
142+ . from ( relayManagedTunnelLimits )
143+ . where ( eq ( relayManagedTunnelLimits . userId , userId ) )
144+ . limit ( 1 )
145+ . pipe (
146+ Effect . map ( ( rows ) => rows [ 0 ] ?. maxTunnels ?? null ) ,
147+ Effect . mapError (
148+ ( cause ) =>
149+ new ManagedTunnelLimitPersistenceError ( { operation : "load-limit" , userId, cause } ) ,
150+ ) ,
151+ ) ;
152+
129153 return ManagedTunnelLimits . of ( {
154+ getLimit : Effect . fn ( "relay.managed_tunnel_limits.get_limit" ) ( function * ( input ) {
155+ // A manual override is the exact cap; a T3 Chat plan raises only the default.
156+ const override = yield * loadOverride ( input . userId ) ;
157+ return override ?? Math . max ( DEFAULT_MANAGED_TUNNEL_LIMIT , planTunnelLimit ( input . plan ) ) ;
158+ } ) ,
130159 withCapacity : Effect . fn ( "relay.managed_tunnel_limits.with_capacity" ) ( function * < A , E , R > (
131160 input : { readonly userId : string ; readonly environmentId : string } ,
132161 reserve : Effect . Effect < A , E , R > ,
@@ -148,22 +177,8 @@ const make = Effect.gen(function* () {
148177 ) ,
149178 ) ;
150179
151- const overrides = yield * db
152- . select ( { maxTunnels : relayManagedTunnelLimits . maxTunnels } )
153- . from ( relayManagedTunnelLimits )
154- . where ( eq ( relayManagedTunnelLimits . userId , input . userId ) )
155- . limit ( 1 )
156- . pipe (
157- Effect . mapError (
158- ( cause ) =>
159- new ManagedTunnelLimitPersistenceError ( {
160- operation : "load-limit" ,
161- userId : input . userId ,
162- cause,
163- } ) ,
164- ) ,
165- ) ;
166- const baseMaxTunnels = overrides [ 0 ] ?. maxTunnels ?? DEFAULT_MANAGED_TUNNEL_LIMIT ;
180+ const override = yield * loadOverride ( input . userId ) ;
181+ const baseMaxTunnels = override ?? DEFAULT_MANAGED_TUNNEL_LIMIT ;
167182
168183 const pendingCutoff = DateTime . formatIso (
169184 DateTime . subtract ( yield * DateTime . now , {
@@ -196,7 +211,7 @@ const make = Effect.gen(function* () {
196211 // A manual override is the exact cap; a T3 Chat plan raises only the default.
197212 // Runs under the user lock, bounded by the T3 Chat request timeout.
198213 const maxTunnels =
199- t3Chat . available && overrides . length === 0
214+ t3Chat . available && override === null
200215 ? Math . max ( baseMaxTunnels , yield * t3ChatTunnelLimit ( input . userId ) )
201216 : baseMaxTunnels ;
202217 if ( activeTunnels >= maxTunnels ) {
0 commit comments