spooder 4.4.5 → 4.4.7

package/README.md

@@ -1398,6 +1398,20 @@ const db = await db_init_schema_mysql({
 }, './schema');
 ```
 
+### Pooling
+
+MySQL supports connection pooling. spooder allows you to create a connection pool instead of a single connection.
+
+```ts
+import { db_init_schema_mysql_pool } from 'spooder';
+const pool = await db_init_schema_mysql_pool({
+	// connection options
+	connectionLimit: 10
+});
+
+const connection = await pool.getConnection();
+```
+
 ### Schema Files
 
 The schema directory is expected to contain an SQL file for each table in the database with the file name matching the name of the table.

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "spooder",
 	"type": "module",
-	"version": "4.4.5",
+	"version": "4.4.7",
 	"exports": {
 		".": {
 			"bun": "./src/api.ts",

package/src/api.ts

@@ -369,20 +369,38 @@ export async function db_init_schema_sqlite(db_path: string, schema_dir: string)
 	return db;
 }
 
-export async function db_init_schema_mysql(db_info: mysql_types.ConnectionOptions, schema_dir: string): Promise<mysql_types.Connection> {
+async function _db_init_schema_mysql(db_info: mysql_types.ConnectionOptions, schema_dir: string, pool = false): Promise<mysql_types.Pool | mysql_types.Connection> {
 	if (mysql === undefined)
 		throw new Error('{db_init_schema_mysql} cannot be called without optional dependency {mysql2} installed');
 
 	// required for parsing multiple statements from schema files
 	db_info.multipleStatements = true;
 
-	const db = await mysql.createConnection(db_info);
-	await db_update_schema_mysql(db, schema_dir);
+	if (pool) {
+		const pool = mysql.createPool(db_info);
+		const connection = await pool.getConnection();
 
-	return db;
+		await db_update_schema_mysql(connection, schema_dir);
+		connection.release();
+
+		return pool;
+	} else {
+		const connection = await mysql.createConnection(db_info);
+		await db_update_schema_mysql(connection, schema_dir);
+		
+		return connection;
+	}
+}
+
+export async function db_init_schema_mysql_pool(db_info: mysql_types.ConnectionOptions, schema_dir: string): Promise<mysql_types.Pool> {
+	return await _db_init_schema_mysql(db_info, schema_dir, true) as mysql_types.Pool;
+}
+
+export async function db_init_schema_mysql(db_info: mysql_types.ConnectionOptions, schema_dir: string): Promise<mysql_types.Connection> {
+	return await _db_init_schema_mysql(db_info, schema_dir, false) as mysql_types.Connection;
 }
 
-type CookieOptions = {
+export type CookieOptions = {
 	same_site?: 'Strict' | 'Lax' | 'None',
 	secure?: boolean,
 	http_only?: boolean,
@@ -529,7 +547,7 @@ function route_directory(route_path: string, dir: string, handler: DirHandler):
 	};
 }
 
-export function validate_req_json(JSONRequestHandler: JSONRequestHandler): RequestHandler {
+export function validate_req_json(json_handler: JSONRequestHandler): RequestHandler {
 	return async (req: Request, url: URL) => {
 		try {
 			// validate content type header
@@ -542,7 +560,7 @@ export function validate_req_json(JSONRequestHandler: JSONRequestHandler): Reque
 			if (json === null || typeof json !== 'object' || Array.isArray(json))
 				return 400; // Bad Request
 
-			return JSONRequestHandler(req, url, json);
+			return json_handler(req, url, json);
 		} catch (e) {
 			return 400; // Bad Request
 		}