tapimo 0.10.0 → 0.10.1

package/src/ApiKeys.ts

@@ -491,7 +491,7 @@ async function read(
     }
   })()
   if (value === undefined) return null
-  const parsed = schema.Record.safeParse(value)
+  const parsed = schema.Record.safeParse(StoredRecord.normalizeRateLimits(value))
   if (!parsed.success) return null
   const record = parsed.data
   if (!validScopes(record.scopes, scopeCatalog)) return null
@@ -499,6 +499,33 @@ async function read(
   return record
 }
 
+namespace StoredRecord {
+  type UnknownRecord = { [key: string]: unknown }
+
+  /** Normalizes persisted pre-period quotas without accepting legacy fields at the write boundary. */
+  export function normalizeRateLimits(value: unknown): unknown {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) return value
+    const record = value as UnknownRecord
+    const rateLimits = record['rateLimits']
+    if (!rateLimits || typeof rateLimits !== 'object' || Array.isArray(rateLimits)) return value
+
+    return {
+      ...record,
+      rateLimits: Object.fromEntries(
+        Object.entries(rateLimits).map(([scope, rateLimit]) => {
+          if (!rateLimit || typeof rateLimit !== 'object' || Array.isArray(rateLimit))
+            return [scope, rateLimit]
+          const perMinute = (rateLimit as UnknownRecord)['perMinute']
+          return [
+            scope,
+            typeof perMinute === 'number' ? { limit: perMinute, period: 'minute' } : rateLimit,
+          ]
+        }),
+      ),
+    }
+  }
+}
+
 /** Returns whether every granted scope belongs to the configured catalog. */
 function validScopes(scopes: readonly string[], scopeCatalog: Scope.Catalog): boolean {
   return scopes.every((scope) => scope === Scope.wildcard || Scope.includes(scopeCatalog, scope))

package/src/App.test.ts

@@ -246,7 +246,7 @@ describe('create', () => {
 
   test('applies the configured global MPP rate limit', async () => {
     const store = Store.memory()
-    const limit = { perMinute: 2 }
+    const limit = { limit: 2, period: 'minute' } satisfies RateLimit.Limit
     const app = TestApp.create({
       auth: { mpp: { rateLimit: limit } },
       rateLimit: { store },
@@ -267,7 +267,7 @@ describe('create', () => {
 
   test('rejects an unsupported MPP payment chain without throwing', async () => {
     const store = Store.memory()
-    const limit = { perMinute: 1 }
+    const limit = { limit: 1, period: 'minute' } satisfies RateLimit.Limit
     const app = TestApp.create({
       auth: {
         mpp: {
@@ -299,10 +299,10 @@ describe('create', () => {
 
   test('endpoint MPP rate limit overrides the global limit', async () => {
     const store = Store.memory()
-    const routeLimit = { perMinute: 1 }
+    const routeLimit = { limit: 1, period: 'minute' } satisfies RateLimit.Limit
     const app = TestApp.create({
       auth: {
-        mpp: { rateLimit: { perMinute: 2 } },
+        mpp: { rateLimit: { limit: 2, period: 'minute' } },
         overrides: {
           'GET /v1/tokens/:token': { mpp: { rateLimit: routeLimit } },
         },
@@ -687,7 +687,8 @@ describe('create', () => {
     const rateLimitStore = Store.memory()
     const app = TestApp.create({ rateLimit: { store: rateLimitStore } })
     await exhaustQuota(RateLimit.memory({ store: rateLimitStore }), 'public:anonymous', {
-      perMinute: 60,
+      limit: 60,
+      period: 'minute',
     })
 
     const response = await app.request(`/v1/tokens/${TestApp.token}`)
@@ -699,7 +700,7 @@ describe('create', () => {
   })
 
   test('returns payment challenge when API-key quota is exhausted', async () => {
-    const limit = { perMinute: 1 }
+    const limit = { limit: 1, period: 'minute' } satisfies RateLimit.Limit
     const key = { ...TestApp.key, rateLimits: { 'data:read': limit } }
     const rateLimitStore = Store.memory()
     const app = TestApp.create({
@@ -811,7 +812,8 @@ describe('create', () => {
     expect(authorized.status).toMatchInlineSnapshot(`400`)
 
     await exhaustQuota(RateLimit.memory({ now, store: rateLimitStore }), 'public:anonymous', {
-      perMinute: 60,
+      limit: 60,
+      period: 'minute',
     })
     const overQuota = await app.request('/v1/tokens/not-an-address')
     expect(overQuota.status).toMatchInlineSnapshot(`402`)
@@ -902,5 +904,5 @@ describe('chain id validation', () => {
 })
 
 async function exhaustQuota(rateLimit: RateLimit.Store, key: string, limit: RateLimit.Limit) {
-  for (let index = 0; index < limit.perMinute; index++) await rateLimit.consume({ key, limit })
+  for (let index = 0; index < limit.limit; index++) await rateLimit.consume({ key, limit })
 }

package/src/App.ts

@@ -309,6 +309,7 @@ export function create<const path extends string = '/'>(options: create.Options<
   const auth = Auth.install({
     auth: options.auth,
     db: db.source,
+    getClient,
     kv: options.kv,
     scopeCatalog,
   })

package/src/Client.test-d.ts

@@ -3102,6 +3102,7 @@ describe('narrows responses by status', () => {
         expectTypeOf(json.row_count).toEqualTypeOf<
           z.output<typeof Indexer.schema.Response>['row_count']
         >()
+        expectTypeOf(json.engine).toEqualTypeOf<'postgres' | 'clickhouse' | 'tiered' | undefined>()
         void json
         return
       }

package/src/Webhooks.ts

@@ -74,23 +74,25 @@ export function createPoller(options: createPoller.Options): createPoller.Poller
               return result
             }
           : inner
-      const dispatchBatch =
-        metrics && innerBatch
-          ? async (dispatchables: readonly AppWebhooks.poll.Dispatchable[]) => {
-              const start = Date.now()
-              const result = await innerBatch(dispatchables)
-              const durationMs = Date.now() - start
-              for (const dispatchable of dispatchables)
-                metrics.record({
-                  chainId: dispatchable.envelope.chainId,
-                  durationMs,
-                  eventType: dispatchable.envelope.type,
-                  ok: result.ok,
-                  type: 'webhook:enqueue',
-                })
-              return result
-            }
-          : innerBatch
+      const dispatchBatch = innerBatch
+        ? async (
+            dispatchables: readonly AppWebhooks.poll.Dispatchable[],
+            context: AppWebhooks.poll.DispatchContext,
+          ) => {
+            const start = Date.now()
+            const result = await innerBatch(dispatchables, context)
+            const durationMs = Date.now() - start
+            for (const dispatchable of dispatchables)
+              metrics?.record({
+                chainId: dispatchable.envelope.chainId,
+                durationMs,
+                eventType: dispatchable.envelope.type,
+                ok: result.ok,
+                type: 'webhook:enqueue',
+              })
+            return result
+          }
+        : undefined
 
       // Resolve per tick so Workers factories build a fresh Hyperdrive-pooled
       // connection each run.

package/src/admin/apps/api-keys.test.ts

@@ -105,6 +105,15 @@ describe('POST /api-keys', () => {
     expect((await core_ApiKeys.list(store))[0]?.expiresAt).toBe(expiresAt)
   })
 
+  test('rejects an expiry without the minimum storage lead time', async () => {
+    const { client } = await setup()
+    const response = await client['api-keys'].$post({
+      json: { ...validBody, expiresAt: new Date(Date.now() + 60_000).toISOString() },
+    })
+
+    expect(response.status).toBe(400)
+  })
+
   test('rejects an unknown scope with 400', async () => {
     const { client } = await setup()
     const response = await client['api-keys'].$post({

package/src/admin/apps/api-keys.ts

@@ -15,6 +15,9 @@ import type * as App from '../App.js'
 
 /** Zod schemas owned by the admin API-keys handler. */
 export namespace schema {
+  // Leave time for validation and database lookups before KV writes its minimum 60-second TTL.
+  const minimumExpiryLeadMs = 2 * 60_000
+
   const Name = z
     .pipe(
       z.string(),
@@ -27,6 +30,17 @@ export namespace schema {
       z.meta({ examples: ['Explorer testnet'] }),
     )
 
+  const ExpiresAt = z.optional(z.iso.datetime()).check(
+    z.refine(
+      (value) => value === undefined || Date.parse(value) >= Date.now() + minimumExpiryLeadMs,
+      {
+        error: 'Expiry must be at least two minutes in the future.',
+      },
+    ),
+    z.describe('ISO 8601 expiry timestamp. Omit for a non-expiring key.'),
+    z.meta({ examples: ['2100-01-01T00:00:00.000Z'] }),
+  )
+
   const ApiKey = Schema.describe(
     z.extend(ApiKeys.schema.Record, {
       createdByLabel: z
@@ -59,6 +73,7 @@ export namespace schema {
      */
     export const Body = Schema.describe(
       z.extend(z.omit(ApiKeys.schema.MintInput, { createdBy: true, name: true }), {
+        expiresAt: ExpiresAt,
         name: Name,
         scopes: z
           .readonly(

package/src/admin/ui/src/lib/query-client.ts

@@ -17,12 +17,13 @@ const persister = createAsyncStoragePersister({
 })
 
 export const persistOptions: Omit<PersistQueryClientOptions, 'queryClient'> = {
-  maxAge: 1000 * 60 * 60 * 24,
-  persister,
+  buster: 'rate-limit-periods',
   dehydrateOptions: {
     shouldDehydrateQuery: (query) =>
       query.queryKey[0] !== 'config' &&
       query.queryKey[0] !== 'organizations' &&
       defaultShouldDehydrateQuery(query),
   },
+  maxAge: 1000 * 60 * 60 * 24,
+  persister,
 }

package/src/admin/ui/src/routes/api-keys.tsx

@@ -59,9 +59,11 @@ function RouteComponent() {
       alert('Enter a name that identifies what uses this key.')
       return
     }
+    const expiresAt_value = field('expiresAt')
+    const expiresAt = expiresAt_value ? new Date(expiresAt_value).toISOString() : undefined
     const orgId = filters.orgId ?? field('orgId')
     const rateLimit = field('rateLimit')
-    const perMinute = rateLimit ? Number(rateLimit) : undefined
+    const limit = rateLimit ? Number(rateLimit) : undefined
     const environment = field('environment') === 'sandbox' ? 'sandbox' : 'production'
     const pendingZoneScopes = (['read', 'write'] as const).map((access) => {
       const chainId = field(`zoneChainId_${access}`)
@@ -87,10 +89,13 @@ function RouteComponent() {
     provision.mutate(
       {
         environment,
+        ...(expiresAt === undefined ? {} : { expiresAt }),
         name,
         ...(orgId ? { orgId } : {}),
         ...(filters.projectId ? { projectId: filters.projectId } : {}),
-        ...(perMinute === undefined ? {} : { rateLimits: { '*': { perMinute } } }),
+        ...(limit === undefined
+          ? {}
+          : { rateLimits: { '*': { limit, period: 'minute' as const } } }),
         scopes: scopes as ApiKeys.provision.Input['scopes'],
       },
       { onError: (error) => alert(error.message), onSuccess: () => setOpen(false) },
@@ -273,7 +278,7 @@ function ProvisionForm(props: {
           </div>
         ) : null}
         <Fields
-          className="min-h-0 flex-1 gap-6 [grid-template-rows:auto_auto_auto_auto_minmax(0,1fr)]"
+          className="min-h-0 flex-1 gap-6 overflow-y-auto overscroll-contain"
           variant="default"
         >
           <OrganizationAutocomplete orgId={props.orgId} />
@@ -289,6 +294,12 @@ function ProvisionForm(props: {
               <option value="sandbox">Sandbox</option>
             </select>
           </div>
+          <Input
+            label="Expires at (optional)"
+            min={toLocalDateTimeCeil(new Date(Date.now() + 2 * 60_000))}
+            name="expiresAt"
+            type="datetime-local"
+          />
           <Input
             defaultValue="10000"
             label="Rate limit"
@@ -298,14 +309,14 @@ function ProvisionForm(props: {
             suffix="req/min"
             type="number"
           />
-          <div className="flex min-h-0 flex-col gap-2 overflow-hidden">
+          <div className="flex flex-col gap-2">
             <span className="label-13 text-foreground-secondary">Scopes</span>
             {scopes.isPending ? (
               <span className="text-label-13 text-foreground-secondary">Loading scopes…</span>
             ) : scopes.error ? (
               <span className="text-label-13 text-negative">{scopes.error.message}</span>
             ) : (
-              <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain border border-border">
+              <div className="border border-border">
                 <Rows variant="surface">
                   {(scopes.data?.data ?? []).map((entry) => {
                     const zoneAccess = Scopes.accessFromTemplate(entry.scope)
@@ -618,7 +629,7 @@ function KeyList(props: {
 function KeyRow(props: { currentUser?: string | undefined; record: ApiKeys.ApiKey }) {
   const { currentUser, record } = props
   const [expanded, setExpanded] = useState(false)
-  const perMinute = record.rateLimits?.['*']?.perMinute
+  const rateLimit = record.rateLimits?.['*']
 
   return (
     <>
@@ -659,7 +670,9 @@ function KeyRow(props: { currentUser?: string | undefined; record: ApiKeys.ApiKe
             <Detail label="Key ID">{record.id}</Detail>
             <Detail label="Environment">{record.environment ?? 'production'}</Detail>
             <Detail label="Rate limit">
-              {perMinute === undefined ? 'Inherited' : `${perMinute} req/min`}
+              {rateLimit === undefined
+                ? 'Inherited'
+                : `${rateLimit.limit} req/${rateLimit.period === 'minute' ? 'min' : 'sec'}`}
             </Detail>
             <Detail label="Token">···{record.tokenLast4}</Detail>
             <Detail label="Organization">{organization(record)}</Detail>
@@ -804,9 +817,11 @@ function RevokeDialog(props: { currentUser?: string | undefined; record: ApiKeys
           <Detail label="Project">{project(record)}</Detail>
           <Detail label="Provisioned by">{creator ?? 'Unknown'}</Detail>
           <Detail label="Rate limit">
-            {record.rateLimits?.['*']?.perMinute === undefined
+            {record.rateLimits?.['*'] === undefined
               ? 'Inherited'
-              : `${record.rateLimits['*']!.perMinute} req/min`}
+              : `${record.rateLimits['*']!.limit} req/${
+                  record.rateLimits['*']!.period === 'minute' ? 'min' : 'sec'
+                }`}
           </Detail>
         </dl>
         {differentCreator ? (
@@ -858,6 +873,13 @@ function Detail(props: { children: ReactNode; className?: string; label: ReactNo
   )
 }
 
+/** Rounds an instant up for a minute-precision `datetime-local` control. */
+function toLocalDateTimeCeil(date: Date) {
+  const minute = 60_000
+  const time = Math.ceil(date.getTime() / minute) * minute
+  return new Date(time - date.getTimezoneOffset() * minute).toISOString().slice(0, 16)
+}
+
 function matches(record: ApiKeys.ApiKey, query?: string) {
   const normalized = query?.trim().toLowerCase()
   if (!normalized) return true