ras-stack 0.38.0 → 0.38.2

package/dist/database/postgres.js

@@ -36,7 +36,8 @@ export function postgresRateLimitStore(client, table = 'rate_limit') {
       `;
             if (!row)
                 throw new Error('rate limit increment returned no row');
-            return { count: row.count, resetAt: row.reset_at };
+            // A bigint column arrives as a string unless the client configures a parser, and the store owns its own type.
+            return { count: Number(row.count), resetAt: Number(row.reset_at) };
         },
     };
 }

package/dist/database/postgres.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../src/database/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA2B,MAAM,yBAAyB,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAA;AAC1D,OAAO,QAAQ,EAAE,EAAY,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAuB,MAAM,yBAAyB,CAAA;AAe7E,MAAM,UAAU,mBAAmB,CACjC,OAA4C;IAE5C,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE;QACnC,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;QACzB,KAAK,EAAE;YACL,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;YAC1F,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;SAChG;QACD,GAAG,OAAO,CAAC,MAAM;KAClB,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;AAC7B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,UAA8C,EAC9C,gBAAwB;IAExB,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAA;AAC1D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,UAA8E,EAAE,OAAO,GAAG,CAAC;IACpI,MAAM,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;AAC1C,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,sBAAsB,CAAC,MAAW,EAAE,KAAK,GAAG,YAAY;IACtE,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC1C,OAAO;QACL,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG;YACrC,MAAM,OAAO,GAAG,GAAG,GAAG,aAAa,CAAA;YACnC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,MAAM,CAAuC;sBACjD,IAAI,mCAAmC,GAAG,QAAQ,OAAO;;8BAEjD,IAAI,gBAAgB,GAAG,gBAAgB,IAAI;iCACxC,IAAI,gBAAgB,GAAG,SAAS,OAAO,SAAS,IAAI;;OAE9E,CAAA;YACD,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACjE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAA;QACpD,CAAC;KACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAA;IAC3B,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;IACjB,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;IACjB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;AACvB,CAAC","sourcesContent":["import { drizzle, type PostgresJsDatabase } from 'drizzle-orm/postgres-js'\nimport { migrate } from 'drizzle-orm/postgres-js/migrator'\nimport postgres, { type Sql } from 'postgres'\nimport { rateLimitTable, type RateLimitStore } from '../server/rate-limit.js'\n\nexport type PostgresClientOptions = NonNullable<Parameters<typeof postgres>[1]>\n\nexport type OpenDrizzlePostgresOptions<TSchema extends Record<string, unknown>> = {\n  url: string\n  schema: TSchema\n  client?: PostgresClientOptions\n}\n\nexport type DrizzlePostgresConnection<TSchema extends Record<string, unknown>> = {\n  database: PostgresJsDatabase<TSchema>\n  client: Sql\n}\n\nexport function openDrizzlePostgres<TSchema extends Record<string, unknown>>(\n  options: OpenDrizzlePostgresOptions<TSchema>,\n): DrizzlePostgresConnection<TSchema> {\n  const client = postgres(options.url, {\n    max: 10,\n    onnotice: () => undefined,\n    types: {\n      bigint: { to: 20, from: [20], serialize: (value: number) => String(value), parse: Number },\n      numeric: { to: 1700, from: [1700], serialize: (value: number) => String(value), parse: Number },\n    },\n    ...options.client,\n  })\n  const database = drizzle(client, { schema: options.schema })\n  return { database, client }\n}\n\nexport async function migrateDrizzlePostgres<TSchema extends Record<string, unknown>>(\n  connection: DrizzlePostgresConnection<TSchema>,\n  migrationsFolder: string,\n) {\n  await migrate(connection.database, { migrationsFolder })\n}\n\nexport async function closeDrizzlePostgres(connection: Pick<DrizzlePostgresConnection<Record<string, unknown>>, 'client'>, timeout = 5) {\n  await connection.client.end({ timeout })\n}\n\n// One statement so concurrent replicas cannot both read a stale count and write the same increment.\nexport function postgresRateLimitStore(client: Sql, table = 'rate_limit'): RateLimitStore {\n  const name = client(rateLimitTable(table))\n  return {\n    async increment(key, windowSeconds, now) {\n      const resetAt = now + windowSeconds\n      const [row] = await client<{ count: number; reset_at: number }[]>`\n        insert into ${name} (key, count, reset_at) values (${key}, 1, ${resetAt})\n        on conflict (key) do update set\n          count = case when ${name}.reset_at <= ${now} then 1 else ${name}.count + 1 end,\n          reset_at = case when ${name}.reset_at <= ${now} then ${resetAt} else ${name}.reset_at end\n        returning count, reset_at\n      `\n      if (!row) throw new Error('rate limit increment returned no row')\n      return { count: row.count, resetAt: row.reset_at }\n    },\n  }\n}\n\nexport function redactedPostgresUrl(source: string) {\n  const url = new URL(source)\n  url.username = ''\n  url.password = ''\n  return url.toString()\n}\n"]}
+{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../src/database/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA2B,MAAM,yBAAyB,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAA;AAC1D,OAAO,QAAQ,EAAE,EAAY,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAuB,MAAM,yBAAyB,CAAA;AAe7E,MAAM,UAAU,mBAAmB,CACjC,OAA4C;IAE5C,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE;QACnC,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;QACzB,KAAK,EAAE;YACL,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;YAC1F,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;SAChG;QACD,GAAG,OAAO,CAAC,MAAM;KAClB,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;AAC7B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,UAA8C,EAC9C,gBAAwB;IAExB,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAA;AAC1D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,UAA8E,EAAE,OAAO,GAAG,CAAC;IACpI,MAAM,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;AAC1C,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,sBAAsB,CAAC,MAAW,EAAE,KAAK,GAAG,YAAY;IACtE,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC1C,OAAO;QACL,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG;YACrC,MAAM,OAAO,GAAG,GAAG,GAAG,aAAa,CAAA;YACnC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,MAAM,CAAyD;sBACnE,IAAI,mCAAmC,GAAG,QAAQ,OAAO;;8BAEjD,IAAI,gBAAgB,GAAG,gBAAgB,IAAI;iCACxC,IAAI,gBAAgB,GAAG,SAAS,OAAO,SAAS,IAAI;;OAE9E,CAAA;YACD,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACjE,8GAA8G;YAC9G,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAA;QACpE,CAAC;KACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAA;IAC3B,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;IACjB,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;IACjB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;AACvB,CAAC","sourcesContent":["import { drizzle, type PostgresJsDatabase } from 'drizzle-orm/postgres-js'\nimport { migrate } from 'drizzle-orm/postgres-js/migrator'\nimport postgres, { type Sql } from 'postgres'\nimport { rateLimitTable, type RateLimitStore } from '../server/rate-limit.js'\n\nexport type PostgresClientOptions = NonNullable<Parameters<typeof postgres>[1]>\n\nexport type OpenDrizzlePostgresOptions<TSchema extends Record<string, unknown>> = {\n  url: string\n  schema: TSchema\n  client?: PostgresClientOptions\n}\n\nexport type DrizzlePostgresConnection<TSchema extends Record<string, unknown>> = {\n  database: PostgresJsDatabase<TSchema>\n  client: Sql\n}\n\nexport function openDrizzlePostgres<TSchema extends Record<string, unknown>>(\n  options: OpenDrizzlePostgresOptions<TSchema>,\n): DrizzlePostgresConnection<TSchema> {\n  const client = postgres(options.url, {\n    max: 10,\n    onnotice: () => undefined,\n    types: {\n      bigint: { to: 20, from: [20], serialize: (value: number) => String(value), parse: Number },\n      numeric: { to: 1700, from: [1700], serialize: (value: number) => String(value), parse: Number },\n    },\n    ...options.client,\n  })\n  const database = drizzle(client, { schema: options.schema })\n  return { database, client }\n}\n\nexport async function migrateDrizzlePostgres<TSchema extends Record<string, unknown>>(\n  connection: DrizzlePostgresConnection<TSchema>,\n  migrationsFolder: string,\n) {\n  await migrate(connection.database, { migrationsFolder })\n}\n\nexport async function closeDrizzlePostgres(connection: Pick<DrizzlePostgresConnection<Record<string, unknown>>, 'client'>, timeout = 5) {\n  await connection.client.end({ timeout })\n}\n\n// One statement so concurrent replicas cannot both read a stale count and write the same increment.\nexport function postgresRateLimitStore(client: Sql, table = 'rate_limit'): RateLimitStore {\n  const name = client(rateLimitTable(table))\n  return {\n    async increment(key, windowSeconds, now) {\n      const resetAt = now + windowSeconds\n      const [row] = await client<{ count: number | string; reset_at: number | string }[]>`\n        insert into ${name} (key, count, reset_at) values (${key}, 1, ${resetAt})\n        on conflict (key) do update set\n          count = case when ${name}.reset_at <= ${now} then 1 else ${name}.count + 1 end,\n          reset_at = case when ${name}.reset_at <= ${now} then ${resetAt} else ${name}.reset_at end\n        returning count, reset_at\n      `\n      if (!row) throw new Error('rate limit increment returned no row')\n      // A bigint column arrives as a string unless the client configures a parser, and the store owns its own type.\n      return { count: Number(row.count), resetAt: Number(row.reset_at) }\n    },\n  }\n}\n\nexport function redactedPostgresUrl(source: string) {\n  const url = new URL(source)\n  url.username = ''\n  url.password = ''\n  return url.toString()\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ras-stack",
-  "version": "0.38.0",
+  "version": "0.38.2",
   "description": "Composable full-stack primitives shared across Richard Solomou's applications.",
   "keywords": [
     "authentication",